Linux 4.5.5
Greg KH
maintainerI'm announcing the release of the 4.5.5 kernel.
All users of the 4.5 kernel series must upgrade.
The updated 4.5.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.5.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/arm/boot/dts/at91sam9x5.dtsi | 2 crypto/ahash.c | 3 crypto/testmgr.c | 27 ++++- drivers/base/regmap/regmap-spmi.c | 2 drivers/crypto/qat/qat_common/adf_common_drv.h | 11 ++ drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 + drivers/crypto/qat/qat_common/adf_sriov.c | 26 +++-- drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 drivers/gpu/drm/i915/i915_debugfs.c | 16 --- drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_audio.c | 9 - drivers/gpu/drm/i915/intel_crt.c | 8 + drivers/gpu/drm/i915/intel_ddi.c | 24 +---- drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/i915/intel_dp_mst.c | 22 ---- drivers/gpu/drm/i915/intel_drv.h | 2 drivers/gpu/drm/i915/intel_pm.c | 6 + drivers/gpu/drm/radeon/atombios_crtc.c | 10 ++ drivers/gpu/drm/radeon/atombios_dp.c | 4 drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 drivers/infiniband/hw/mlx5/main.c | 4 drivers/input/misc/max8997_haptic.c | 6 - drivers/media/v4l2-core/videobuf2-v4l2.c | 6 - drivers/net/ethernet/atheros/atlx/atl2.c | 2 drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 4 drivers/net/ethernet/freescale/fec_main.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 6 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 57 +++++++++--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 46 +++------ drivers/net/ethernet/mellanox/mlx5/core/port.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 40 ++++++++ drivers/net/usb/cdc_mbim.c | 9 + drivers/pinctrl/pinctrl-at91-pio4.c | 2 drivers/regulator/axp20x-regulator.c | 4 drivers/regulator/s2mps11.c | 28 ++++- drivers/scsi/qla1280.c | 2 drivers/spi/spi-pxa2xx.c | 2 drivers/spi/spi-ti-qspi.c | 45 +++++---- drivers/staging/wilc1000/wilc_spi.c | 2 fs/btrfs/ctree.c | 12 +- fs/btrfs/ctree.h | 2 fs/btrfs/dev-replace.c | 2 fs/btrfs/disk-io.c | 28 +++-- fs/btrfs/file.c | 9 + fs/btrfs/inode.c | 36 +++++++ fs/btrfs/ioctl.c | 10 +- fs/btrfs/qgroup.c | 54 ++++++----- fs/btrfs/reada.c | 4 fs/btrfs/relocation.c | 1 fs/btrfs/tree-log.c | 99 ++++++++++++++++++--- fs/btrfs/tree-log.h | 2 fs/isofs/rock.c | 13 ++ fs/namei.c | 26 +---- fs/ocfs2/acl.c | 87 ++++++++++++++++++ fs/ocfs2/acl.h | 5 + fs/ocfs2/file.c | 4 fs/ocfs2/namei.c | 23 ---- fs/ocfs2/refcounttree.c | 17 --- fs/ocfs2/xattr.c | 14 +- fs/ocfs2/xattr.h | 4 fs/open.c | 12 -- include/linux/bpf.h | 3 include/linux/dcache.h | 12 ++ include/linux/mfd/samsung/s2mps11.h | 2 include/linux/mlx5/driver.h | 6 - include/linux/mlx5/vport.h | 2 include/linux/mm.h | 9 + include/linux/net.h | 10 +- include/linux/rculist_nulls.h | 39 ++++++++ include/linux/swap.h | 6 - include/net/codel.h | 4 include/net/sch_generic.h | 20 ++++ include/net/sock.h | 6 + include/uapi/linux/if.h | 28 +++++ include/uapi/linux/libc-compat.h | 44 +++++++++ kernel/bpf/inode.c | 7 - kernel/bpf/syscall.c | 24 ++++- kernel/bpf/verifier.c | 66 ++++++++------ kernel/events/ring_buffer.c | 10 +- kernel/workqueue.c | 11 ++ mm/huge_memory.c | 71 +++++++++++++-- mm/memory.c | 22 ++-- mm/swapfile.c | 13 +- mm/zsmalloc.c | 7 + net/bridge/br_ioctl.c | 5 - net/bridge/br_multicast.c | 12 +- net/core/rtnetlink.c | 18 ++- net/core/skbuff.c | 11 +- net/decnet/dn_route.c | 9 + net/ipv4/fib_frontend.c | 6 + net/ipv4/fib_semantics.c | 2 net/ipv4/ip_gre.c | 11 +- net/ipv4/route.c | 12 ++ net/ipv4/tcp_output.c | 6 - net/ipv4/udp.c | 9 + net/ipv6/ila/ila_lwt.c | 3 net/ipv6/reassembly.c | 6 - net/ipv6/route.c | 2 net/llc/af_llc.c | 1 net/netfilter/nf_conntrack_core.c | 4 net/openvswitch/actions.c | 12 +- net/openvswitch/conntrack.c | 1 net/openvswitch/vport-netdev.c | 2 net/openvswitch/vport.h | 7 - net/packet/af_packet.c | 1 net/sched/sch_api.c | 8 + net/sched/sch_cbq.c | 12 -- net/sched/sch_choke.c | 6 - net/sched/sch_codel.c | 10 +- net/sched/sch_drr.c | 9 - net/sched/sch_dsmark.c | 11 -- net/sched/sch_fq.c | 4 net/sched/sch_fq_codel.c | 17 ++- net/sched/sch_generic.c | 5 - net/sched/sch_hfsc.c | 9 - net/sched/sch_hhf.c | 10 +- net/sched/sch_htb.c | 24 ++--- net/sched/sch_multiq.c | 16 +-- net/sched/sch_netem.c | 74 +++++++++++++-- net/sched/sch_pie.c | 5 - net/sched/sch_prio.c | 15 +-- net/sched/sch_qfq.c | 9 - net/sched/sch_red.c | 10 -- net/sched/sch_sfb.c | 10 -- net/sched/sch_sfq.c | 16 +-- net/sched/sch_tbf.c | 15 +-- net/vmw_vsock/af_vsock.c | 21 ---- net/x25/x25_facilities.c | 1 samples/bpf/trace_output_kern.c | 1 sound/pci/hda/hda_sysfs.c | 8 - sound/pci/hda/patch_realtek.c | 13 ++ sound/usb/quirks.c | 3 tools/lib/traceevent/parse-filter.c | 4 tools/perf/util/sort.c | 3 136 files changed, 1250 insertions(+), 602 deletions(-)
Al Viro (2):
atomic_open(): fix the handling of create_error get_rock_ridge_filename(): handle malformed NM entries
Alex Deucher (2):
drm/radeon: fix DP mode validation
drm/amdgpu: fix DP mode validation
Alex Lyakas (2):
btrfs: csum_tree_block: return proper errno value
btrfs: do not write corrupted metadata blocks to disk
Alexander Shishkin (1):
perf/core: Disable the event on a truncated AUX record
Alexei Starovoitov (4):
bpf/verifier: reject invalid LD_ABS | BPF_DW instruction
bpf: fix refcnt overflow
bpf: fix check_map_func_compatibility logic samples/bpf: fix trace_output example
Andrea Arcangeli (1):
mm: thp: calculate the mapcount correctly for THP pages during WP faults
Arindam Nath (1):
drm/radeon: fix DP link training issue with second 4K monitor
Arnd Bergmann (1):
staging: wilc1000: remove extraneous variable
Ben Hutchings (3):
atl2: Disable unimplemented scatter/gather feature
spi: spi-ti-qspi: Fix FLEN and WLEN settings if bits_per_word is overridden
spi: spi-ti-qspi: Handle truncated frames properly
Bjørn Mork (1):
cdc_mbim: apply "NDP to end" quirk to all Huawei devices
Boris Brezillon (1):
ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC
Chris Friesen (1):
route: do not cache fib route info on local routes with oif
Craig Gallek (1):
soreuseport: fix ordering for mixed v4/v6 sockets
Daniel Borkmann (2):
net: use skb_postpush_rcsum instead of own implementations
vlan: pull on __vlan_insert_tag error path and fix csum correction
Daniel Jurgens (1):
net/mlx4_en: Fix endianness bug in IPV6 csum calculation
Daniel Vetter (1):
drm/i915: Bail out of pipe config compute loop on LPT
David S. Miller (1):
decnet: Do not build routes to devices without decnet private data.
David Sterba (3):
btrfs: remove error message from search ioctl for nonexistent tree
btrfs: change max_inline default to 2048
btrfs: fallback to vmalloc in btrfs_compare_tree
Eric Dumazet (2):
net/mlx4_en: fix spurious timestamping callbacks
tcp: refresh skb timestamp at retransmit time
Filipe Manana (6):
Btrfs: fix unreplayable log after snapshot delete + parent dir fsync
Btrfs: fix file loss on log replay after renaming a file and fsync
Btrfs: fix extent_same allowing destination offset beyond i_size
Btrfs: fix deadlock between direct IO reads and buffered writes
Btrfs: fix race when checking if we can skip fsync'ing an inode
Btrfs: do not collect ordered extents when logging that inode exists
Greg Kroah-Hartman (1):
Linux 4.5.5
Hans de Goede (1):
regulator: axp20x: Fix axp22x ldo_io voltage ranges
Herbert Xu (2):
crypto: hash - Fix page length clamping in hash walk
crypto: testmgr - Use kmalloc memory for RSA input
Ian Campbell (1):
VSOCK: do not disconnect socket when peer has shutdown SEND only
Imre Deak (1):
drm/i915/bdw: Add missing delay during L3 SQC credit programming
Jack Pham (1):
regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case
Jann Horn (1):
bpf: fix double-fdput in replace_map_fd_with_map_ptr()
Jarkko Nikula (1):
spi: pxa2xx: Do not detect number of enabled chip selects on Intel SPT
Jiri Benc (1):
gre: do not pull header in ICMP error processing
Joe Stringer (1):
openvswitch: Orphan skbs before IPv6 defrag
Johannes Thumshirn (1):
qla1280: Don't allocate 512kb of host tags
Josef Bacik (2):
Btrfs: fix truncate_space_check
Btrfs: don't use src fd for printk
Junxiao Bi (2):
ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang
ocfs2: fix posix_acl_create deadlock
Kaho Ng (1):
ALSA: hda - Fix white noise on Asus UX501VW headset
Kangjie Lu (3):
net: fix infoleak in llc
net: fix infoleak in rtnetlink
net: fix a kernel infoleak in x25 module
Krzysztof Kozlowski (1):
regulator: s2mps11: Fix invalid selector mask and voltages for buck9
Lars Persson (1):
net: sched: do not requeue a NULL skb
Linus Lüssing (1):
bridge: fix igmp / mld query parsing
Linus Torvalds (1):
nf_conntrack: avoid kernel pointer value leak in slab name
Liu Bo (1):
Btrfs: fix invalid reference in replace_path
Lucas Stach (1):
drm/radeon: fix PLL sharing on DCE6.1 (v2)
Ludovic Desroches (1):
pinctrl: at91-pio4: fix pull-up/down logic
Lyude (1):
Revert "drm/i915: start adding dp mst audio"
Maor Gottlieb (1):
net/mlx5_core: Fix soft lockup in steering error flow
Marek Szyprowski (1):
Input: max8997-haptic - fix NULL pointer dereference
Mark Fasheh (1):
btrfs: handle non-fatal errors in btrfs_qgroup_inherit()
Mathias Krause (1):
packet: fix heap info leak in PACKET_DIAG_MCLIST sock_diag interface
Mauro Carvalho Chehab (1):
Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"
Mikko Rapeli (1):
uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h
Miklos Szeredi (2):
vfs: add vfs_select_inode() helper
vfs: rename: check backing inode being equal
Namhyung Kim (1):
perf diff: Fix duplicated output column
Neil Horman (1):
netem: Segment GSO packets on enqueue
Nicolas Dichtel (1):
ipv6/ila: fix nlsize calculation for lwtunnel
Nikolay Aleksandrov (1):
net: bridge: fix old ioctl unlocked net device walk
Paolo Abeni (2):
ipv4/fib: don't warn when primary address is missing if in_dev is dead net/route: enforce hoplimit max value
Saeed Mahameed (3):
net/mlx5e: Device's mtu field is u16 and not int net/mlx5e: Fix minimum MTU
net/mlx5e: Use vport MTU rather than physical port MTU
Sergey Senozhatsky (1):
zsmalloc: fix zs_can_compact() integer overflow
Simon Horman (1):
openvswitch: use flow protocol when recalculating ipv6 checksums
Steven Rostedt (1):
tools lib traceevent: Do not reassign parg after collapse_tree()
Tadeusz Struk (2):
crypto: qat - fix invalid pf2vf_resp_wq logic
crypto: qat - fix adf_ctl_drv.c:undefined reference to adf_init_pf_wq
Takashi Iwai (3):
ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
ALSA: usb-audio: Yet another Phoneix Audio device quirk
ALSA: hda - Fix broken reconfig
Tim Bingham (1):
net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG case
Uwe Kleine-König (1):
net: fec: only clear a queue's work bit if the queue was emptied
Ville Syrjälä (1):
drm/i915: Update CDCLK_FREQ register on BDW after changing cdclk frequency
WANG Cong (4):
net_sched: introduce qdisc_replace() helper
net_sched: update hierarchical backlog too
sch_htb: update backlog as well
sch_dsmark: update backlog as well
Wanpeng Li (1):
workqueue: fix rebind bound workers warning
Yauhen Kharuzhy (1):
btrfs: Reset IO error counters before start of device replacing
Yura Pakhuchiy (1):
ALSA: hda - Fix subwoofer pin on ASUS N751 and N551
Zhao Lei (1):
btrfs: reada: Fix in-segment calculation for reada
[email protected] (1):
net: thunderx: avoid exposing kernel stack
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 5 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm/boot/dts/at91sam9x5.dtsi +1 -1
@@ -106,7 +106,7 @@ pmc: pmc@fffffc00 { compatible = "atmel,at91sam9x5-pmc", "syscon"; - reg = <0xfffffc00 0x100>; + reg = <0xfffffc00 0x200>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupt-controller; #address-cells = <1>;
crypto/ahash.c +2 -1
@@ -69,8 +69,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk)struct scatterlist *sg; sg = walk->sg; - walk->pg =sg_page (sg); walk->offset = sg->offset; + walk->pg =sg_page (walk->sg) + (walk->offset >>PAGE_SHIFT ); + walk->offset =offset_in_page (walk->offset); walk->entrylen = sg->length;if (walk->entrylen > walk->total)
crypto/testmgr.c +22 -5
@@ -1849,6 +1849,7 @@ static int alg_test_drbg(const struct alg_test_desc *desc, const char *driver,static int do_test_rsa (struct crypto_akcipher *tfm,struct akcipher_testvec *vecs) { +char *xbuf[XBUFSIZE ];struct akcipher_request *req;void *outbuf_enc =NULL ;void *outbuf_dec =NULL ;
@@ -1857,9 +1858,12 @@ static int do_test_rsa(struct crypto_akcipher *tfm,int err = -ENOMEM ;struct scatterlist src, dst, src_tab[2 ]; +if (testmgr_alloc_buf (xbuf)) +return err; + req =akcipher_request_alloc (tfm,GFP_KERNEL );if (!req) -return err; + goto free_xbuf;init_completion (&result.completion);
@@ -1877,9 +1881,14 @@ static int do_test_rsa(struct crypto_akcipher *tfm,if (!outbuf_enc) goto free_req; +if (WARN_ON (vecs->m_size >PAGE_SIZE )) + goto free_all; + +memcpy (xbuf[0 ], vecs->m, vecs->m_size); +sg_init_table (src_tab,2 ); -sg_set_buf (&src_tab[0 ], vecs->m,8 ); -sg_set_buf (&src_tab[1 ], vecs->m +8 , vecs->m_size -8 ); +sg_set_buf (&src_tab[0 ], xbuf[0 ],8 ); +sg_set_buf (&src_tab[1 ], xbuf[0 ] +8 , vecs->m_size -8 );sg_init_one (&dst, outbuf_enc, out_len_max);akcipher_request_set_crypt (req, src_tab, &dst, vecs->m_size, out_len_max);
@@ -1898,7 +1907,7 @@ static int do_test_rsa(struct crypto_akcipher *tfm, goto free_all; }/* verify that encrypted message is equal to expected */ -if (memcmp (vecs->c,sg_virt (req->dst), vecs->c_size)) { +if (memcmp (vecs->c, outbuf_enc, vecs->c_size)) {pr_err ("alg: rsa: encrypt test failed. Invalid output\n" ); err = -EINVAL ; goto free_all;
@@ -1913,7 +1922,13 @@ static int do_test_rsa(struct crypto_akcipher *tfm, err = -ENOMEM ; goto free_all; } -sg_init_one (&src, vecs->c, vecs->c_size); + +if (WARN_ON (vecs->c_size >PAGE_SIZE )) + goto free_all; + +memcpy (xbuf[0 ], vecs->c, vecs->c_size); + +sg_init_one (&src, xbuf[0 ], vecs->c_size);sg_init_one (&dst, outbuf_dec, out_len_max);init_completion (&result.completion);akcipher_request_set_crypt (req, &src, &dst, vecs->c_size, out_len_max);
@@ -1940,6 +1955,8 @@ free_all:kfree (outbuf_enc); free_req:akcipher_request_free (req); +free_xbuf: +testmgr_free_buf (xbuf);return err; }
drivers/base/regmap/regmap-spmi.c +1 -1
@@ -142,7 +142,7 @@ static int regmap_spmi_ext_read(void *context,while (val_size) { len =min_t (size_t, val_size,8 ); - err =spmi_ext_register_readl (context, addr, val, val_size); + err =spmi_ext_register_readl (context, addr, val, len);if (err) goto err_out;
drivers/crypto/qat/qat_common/adf_common_drv.h +11 -0
@@ -236,6 +236,8 @@ void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, uint32_t vf_mask);void adf_enable_pf2vf_interrupts (struct adf_accel_dev *accel_dev);void adf_disable_pf2vf_interrupts (struct adf_accel_dev *accel_dev); +int adf_init_pf_wq (void ); +void adf_exit_pf_wq (void );#else static inline int adf_sriov_configure (struct pci_dev *pdev,int numvfs) {
@@ -253,5 +255,14 @@ static inline void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev)static inline void adf_disable_pf2vf_interrupts (struct adf_accel_dev *accel_dev) { } + +static inline int adf_init_pf_wq (void ) +{ +return 0 ; +} + +static inline void adf_exit_pf_wq (void ) +{ +}#endif #endif
drivers/crypto/qat/qat_common/adf_ctl_drv.c +6 -0
@@ -462,12 +462,17 @@ static int __init adf_register_ctl_device_driver(void)if (adf_init_aer ()) goto err_aer; +if (adf_init_pf_wq ()) + goto err_pf_wq; +if (qat_crypto_register ()) goto err_crypto_register;return 0 ; err_crypto_register: +adf_exit_pf_wq (); +err_pf_wq:adf_exit_aer (); err_aer:adf_chr_drv_destroy ();
@@ -480,6 +485,7 @@ static void __exit adf_unregister_ctl_device_driver(void) {adf_chr_drv_destroy ();adf_exit_aer (); +adf_exit_pf_wq ();qat_crypto_unregister ();adf_clean_vf_map (false);mutex_destroy (&adf_ctl_lock);
drivers/crypto/qat/qat_common/adf_sriov.c +16 -10
@@ -119,11 +119,6 @@ static int adf_enable_sriov(struct adf_accel_dev *accel_dev)int i;u32 reg; -/* Workqueue for PF2VF responses */ - pf2vf_resp_wq =create_workqueue ("qat_pf2vf_resp_wq" ); -if (!pf2vf_resp_wq) -return -ENOMEM ; -for (i =0 , vf_info = accel_dev->pf.vf_info; i < totalvfs; i++, vf_info++) {/* This ptr will be populated when VFs will be created */
@@ -216,11 +211,6 @@ void adf_disable_sriov(struct adf_accel_dev *accel_dev)kfree (accel_dev->pf.vf_info); accel_dev->pf.vf_info =NULL ; - -if (pf2vf_resp_wq) { -destroy_workqueue (pf2vf_resp_wq); - pf2vf_resp_wq =NULL ; - } }EXPORT_SYMBOL_GPL (adf_disable_sriov);
@@ -304,3 +294,19 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)return numvfs; }EXPORT_SYMBOL_GPL (adf_sriov_configure); + +int __init adf_init_pf_wq (void ) +{ +/* Workqueue for PF2VF responses */ + pf2vf_resp_wq =create_workqueue ("qat_pf2vf_resp_wq" ); + +return !pf2vf_resp_wq ? -ENOMEM :0 ; +} + +void adf_exit_pf_wq (void ) +{ +if (pf2vf_resp_wq) { +destroy_workqueue (pf2vf_resp_wq); + pf2vf_resp_wq =NULL ; + } +}
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +2 -2
@@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector } } }else { -for (lane_num =1 ; lane_num <= max_lane_num; lane_num <<=1 ) { -for (i =0 ; i <ARRAY_SIZE (link_rates) && link_rates[i] <= max_link_rate; i++) { +for (i =0 ; i <ARRAY_SIZE (link_rates) && link_rates[i] <= max_link_rate; i++) { +for (lane_num =1 ; lane_num <= max_lane_num; lane_num <<=1 ) { max_pix_clock = (lane_num * link_rates[i] *8 ) / bpp;if (max_pix_clock >= pix_clock) { *dp_lanes = lane_num;
drivers/gpu/drm/i915/i915_debugfs.c +0 -16
@@ -2860,20 +2860,6 @@ static void intel_dp_info(struct seq_file *m,intel_panel_info (m, &intel_connector->panel); } -static void intel_dp_mst_info (struct seq_file *m, -struct intel_connector *intel_connector) -{ -struct intel_encoder *intel_encoder = intel_connector->encoder; -struct intel_dp_mst_encoder *intel_mst = -enc_to_mst (&intel_encoder->base); -struct intel_digital_port *intel_dig_port = intel_mst->primary; -struct intel_dp *intel_dp = &intel_dig_port->dp; -bool has_audio =drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, - intel_connector->port); - -seq_printf (m,"\taudio support: %s\n" ,yesno (has_audio)); -} -static void intel_hdmi_info (struct seq_file *m,struct intel_connector *intel_connector) {
@@ -2917,8 +2903,6 @@ static void intel_connector_info(struct seq_file *m,intel_hdmi_info (m, intel_connector); else if (intel_encoder->type == INTEL_OUTPUT_LVDS) intel_lvds_info(m, intel_connector); - else if (intel_encoder->type == INTEL_OUTPUT_DP_MST) - intel_dp_mst_info(m, intel_connector); }seq_printf (m,"\tmodes:\n" );
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -7412,6 +7412,8 @@ enum skl_disp_power_wells {#define TRANS_CLK_SEL_DISABLED (0x0<<29)#define TRANS_CLK_SEL_PORT (x) (((x)+1)<<29) +#define CDCLK_FREQ _MMIO(0x46200) +#define _TRANSA_MSA_MISC 0x60410#define _TRANSB_MSA_MISC 0x61410#define _TRANSC_MSA_MISC 0x62410
drivers/gpu/drm/i915/intel_audio.c +3 -6
@@ -262,8 +262,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) tmp |=AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_UPPER_N_MASK ; tmp &= ~AUD_CONFIG_LOWER_N_MASK ; -if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT ) || -intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DP_MST )) +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) tmp |=AUD_CONFIG_N_VALUE_INDEX ;I915_WRITE (HSW_AUD_CFG (pipe), tmp);
@@ -476,8 +475,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ; -if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT ) || -intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DP_MST )) +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) tmp |=AUD_CONFIG_N_VALUE_INDEX ;else tmp |=audio_config_hdmi_pixel_clock (adjusted_mode);
@@ -515,8 +513,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)/* ELD Conn_Type */ connector->eld[5 ] &= ~(3 <<2 ); -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT ) || -intel_pipe_has_type (crtc,INTEL_OUTPUT_DP_MST )) +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT )) connector->eld[5 ] |= (1 <<2 ); connector->eld[6 ] =drm_av_sync_delay (connector, adjusted_mode) /2 ;
drivers/gpu/drm/i915/intel_crt.c +7 -1
@@ -255,8 +255,14 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder, pipe_config->has_pch_encoder = true;/* LPT FDI RX only supports 8bpc. */ -if (HAS_PCH_LPT (dev)) +if (HAS_PCH_LPT (dev)) { +if (pipe_config->bw_constrained && pipe_config->pipe_bpp <24 ) { +DRM_DEBUG_KMS ("LPT only supports 24bpp\n" ); +return false; + } + pipe_config->pipe_bpp =24 ; + }/* FDI must always be 2.7 GHz */ if (HAS_DDI (dev)) {
drivers/gpu/drm/i915/intel_ddi.c +5 -19
@@ -3165,23 +3165,6 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), val); } -bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, -struct intel_crtc *intel_crtc) -{ -u32 temp; - -if (intel_display_power_get_if_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { - temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); - -intel_display_power_put (dev_priv,POWER_DOMAIN_AUDIO ); - -if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) -return true; - } - -return false; -} -void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) {
@@ -3242,8 +3225,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder,break ; } - pipe_config->has_audio = -intel_ddi_is_audio_enabled (dev_priv, intel_crtc); +if (intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); +if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) + pipe_config->has_audio = true; + }if (encoder->type ==INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -9793,6 +9793,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , data);mutex_unlock (&dev_priv->rps.hw_lock); +I915_WRITE (CDCLK_FREQ ,DIV_ROUND_CLOSEST (cdclk,1000 ) -1 ); +intel_update_cdclk (dev); WARN(cdclk != dev_priv->cdclk_freq,
drivers/gpu/drm/i915/intel_dp_mst.c +0 -22
@@ -78,8 +78,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,return false; } -if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, found->port)) - pipe_config->has_audio = true; mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;
@@ -104,11 +102,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; -struct drm_crtc *crtc = encoder->base.crtc; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -119,10 +112,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } -if (intel_crtc->config->has_audio) { -intel_audio_codec_disable (encoder); -intel_display_power_put (dev_priv,POWER_DOMAIN_AUDIO ); - } }static void intel_mst_post_disable_dp (struct intel_encoder *encoder)
@@ -219,7 +208,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);enum port port = intel_dig_port->port;int ret;
@@ -232,13 +220,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); - -if (crtc->config->has_audio) { -DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , -pipe_name (crtc->pipe)); -intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO ); -intel_audio_codec_enable (encoder); - } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -264,9 +245,6 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder, pipe_config->has_dp_encoder = true; - pipe_config->has_audio = -intel_ddi_is_audio_enabled (dev_priv, crtc); - temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (temp &TRANS_DDI_PHSYNC ) flags |=DRM_MODE_FLAG_PHSYNC ;
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -1013,8 +1013,6 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);void intel_ddi_prepare_link_retrain (struct intel_dp *intel_dp);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);void intel_ddi_fdi_disable (struct drm_crtc *crtc); -bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, -struct intel_crtc *intel_crtc);void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); struct intel_encoder *
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -6565,6 +6565,12 @@ static void broadwell_init_clock_gating(struct drm_device *dev) misccpctl =I915_READ (GEN7_MISCCPCTL );I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE );I915_WRITE (GEN8_L3SQCREG1 ,BDW_WA_L3SQCREG1_DEFAULT ); +/* +* Wait at least 100 clocks before re-enabling clock gating. See +* the definition of L3SQCREG1 in BSpec. +*/ +POSTING_READ (GEN8_L3SQCREG1 ); +udelay (1 );I915_WRITE (GEN7_MISCCPCTL , misccpctl);/*
drivers/gpu/drm/radeon/atombios_crtc.c +10 -0
@@ -1740,6 +1740,7 @@ static u32 radeon_get_pll_use_mask(struct drm_crtc *crtc)static int radeon_get_shared_dp_ppll (struct drm_crtc *crtc) {struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private;struct drm_crtc *test_crtc;struct radeon_crtc *test_radeon_crtc;
@@ -1749,6 +1750,10 @@ static int radeon_get_shared_dp_ppll(struct drm_crtc *crtc) test_radeon_crtc =to_radeon_crtc (test_crtc);if (test_radeon_crtc->encoder &&ENCODER_MODE_IS_DP (atombios_get_encoder_mode (test_radeon_crtc->encoder))) { +/* PPLL2 is exclusive to UNIPHYA on DCE61 */ +if (ASIC_IS_DCE61 (rdev) && !ASIC_IS_DCE8 (rdev) && + test_radeon_crtc->pll_id ==ATOM_PPLL2 ) +continue ;/* for DP use the same PLL for all */ if (test_radeon_crtc->pll_id !=ATOM_PPLL_INVALID )return test_radeon_crtc->pll_id;
@@ -1770,6 +1775,7 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) {struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private;struct drm_crtc *test_crtc;struct radeon_crtc *test_radeon_crtc;u32 adjusted_clock, test_adjusted_clock;
@@ -1785,6 +1791,10 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) test_radeon_crtc =to_radeon_crtc (test_crtc);if (test_radeon_crtc->encoder && !ENCODER_MODE_IS_DP (atombios_get_encoder_mode (test_radeon_crtc->encoder))) { +/* PPLL2 is exclusive to UNIPHYA on DCE61 */ +if (ASIC_IS_DCE61 (rdev) && !ASIC_IS_DCE8 (rdev) && + test_radeon_crtc->pll_id ==ATOM_PPLL2 ) +continue ;/* check if we are already driving this connector with another crtc */ if (test_radeon_crtc->connector == radeon_crtc->connector) {/* if we are, return that pll */
drivers/gpu/drm/radeon/atombios_dp.c +2 -2
@@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector, } } }else { -for (lane_num =1 ; lane_num <= max_lane_num; lane_num <<=1 ) { -for (i =0 ; i <ARRAY_SIZE (link_rates) && link_rates[i] <= max_link_rate; i++) { +for (i =0 ; i <ARRAY_SIZE (link_rates) && link_rates[i] <= max_link_rate; i++) { +for (lane_num =1 ; lane_num <= max_lane_num; lane_num <<=1 ) { max_pix_clock = (lane_num * link_rates[i] *8 ) / bpp;if (max_pix_clock >= pix_clock) { *dp_lanes = lane_num;
drivers/gpu/drm/radeon/radeon_dp_auxch.c +1 -1
@@ -105,7 +105,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg tmp &=AUX_HPD_SEL (0x7 ); tmp |=AUX_HPD_SEL (chan->rec.hpd); - tmp |=AUX_EN |AUX_LS_READ_EN ; + tmp |=AUX_EN |AUX_LS_READ_EN |AUX_HPD_DISCON (0x1 );WREG32 (AUX_CONTROL + aux_offset[instance], tmp);
drivers/infiniband/hw/mlx5/main.c +2 -2
@@ -654,8 +654,8 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,struct mlx5_ib_dev *dev =to_mdev (ibdev);struct mlx5_core_dev *mdev = dev->mdev;struct mlx5_hca_vport_context *rep; -int max_mtu; -int oper_mtu; +u16 max_mtu; +u16 oper_mtu;int err;u8 ib_link_width_oper;u8 vl_hw_cap;
drivers/input/misc/max8997_haptic.c +4 -2
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev)struct max8997_dev *iodev =dev_get_drvdata (pdev->dev.parent);const struct max8997_platform_data *pdata =dev_get_platdata (iodev->dev); -const struct max8997_haptic_platform_data *haptic_pdata = - pdata->haptic_pdata; +const struct max8997_haptic_platform_data *haptic_pdata =NULL ;struct max8997_haptic *chip;struct input_dev *input_dev;int error; +if (pdata) + haptic_pdata = pdata->haptic_pdata; +if (!haptic_pdata) {dev_err (&pdev->dev,"no haptic platform data\n" );return -EINVAL ;
drivers/media/v4l2-core/videobuf2-v4l2.c +0 -6
@@ -74,11 +74,6 @@ static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_bufferreturn 0 ; } -static int __verify_planes_array_core (struct vb2_buffer *vb,const void *pb) -{ -return __verify_planes_array (vb, pb); -} -/** * __verify_length() - Verify that the bytesused value for each plane fits in * the plane length and that the data offset doesn't exceed the bytesused value.
@@ -442,7 +437,6 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, }static const struct vb2_buf_ops v4l2_buf_ops = { - .verify_planes_array = __verify_planes_array_core, .fill_user_buffer = __fill_v4l2_buffer, .fill_vb2_buffer = __fill_vb2_buffer, .copy_timestamp = __copy_timestamp,
drivers/net/ethernet/atheros/atlx/atl2.c +1 -1
@@ -1412,7 +1412,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = -EIO ; - netdev->hw_features =NETIF_F_SG |NETIF_F_HW_VLAN_CTAG_RX ; + netdev->hw_features =NETIF_F_HW_VLAN_CTAG_RX ; netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX );/* Init PHY as early as possible due to power saving issue */
drivers/net/ethernet/cavium/thunder/nicvf_queues.c +4 -0
@@ -519,6 +519,7 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs,nicvf_config_vlan_stripping (nic, nic->netdev->features);/* Enable Receive queue */ +memset (&rq_cfg,0 ,sizeof (struct rq_cfg )); rq_cfg.ena =1 ; rq_cfg.tcp_ena =0 ;nicvf_queue_reg_write (nic,NIC_QSET_RQ_0_7_CFG , qidx, *(u64 *)&rq_cfg);
@@ -551,6 +552,7 @@ void nicvf_cmp_queue_config(struct nicvf *nic, struct queue_set *qs, qidx, (u64)(cq->dmem.phys_base));/* Enable Completion queue */ +memset (&cq_cfg,0 ,sizeof (struct cq_cfg )); cq_cfg.ena =1 ; cq_cfg.reset =0 ; cq_cfg.caching =0 ;
@@ -599,6 +601,7 @@ static void nicvf_snd_queue_config(struct nicvf *nic, struct queue_set *qs, qidx, (u64)(sq->dmem.phys_base));/* Enable send queue & set queue size */ +memset (&sq_cfg,0 ,sizeof (struct sq_cfg )); sq_cfg.ena =1 ; sq_cfg.reset =0 ; sq_cfg.ldwb =0 ;
@@ -635,6 +638,7 @@ static void nicvf_rbdr_config(struct nicvf *nic, struct queue_set *qs,/* Enable RBDR & set queue size */ /* Buffer size should be in multiples of 128 bytes */ +memset (&rbdr_cfg,0 ,sizeof (struct rbdr_cfg )); rbdr_cfg.ena =1 ; rbdr_cfg.reset =0 ; rbdr_cfg.ldwb =0 ;
drivers/net/ethernet/freescale/fec_main.c +8 -2
@@ -1566,9 +1566,15 @@ fec_enet_rx(struct net_device *ndev, int budget)struct fec_enet_private *fep =netdev_priv (ndev);for_each_set_bit (queue_id, &fep->work_rx,FEC_ENET_MAX_RX_QS ) { -clear_bit (queue_id, &fep->work_rx); - pkt_received +=fec_enet_rx_queue (ndev, +int ret; + + ret =fec_enet_rx_queue (ndev, budget - pkt_received, queue_id); + +if (ret < budget - pkt_received) +clear_bit (queue_id, &fep->work_rx); + + pkt_received += ret; }return pkt_received; }
drivers/net/ethernet/mellanox/mlx4/en_rx.c +1 -1
@@ -704,7 +704,7 @@ static int get_fixed_ipv6_csum(__wsum hw_checksum, struct sk_buff *skb,if (ipv6h->nexthdr ==IPPROTO_FRAGMENT || ipv6h->nexthdr ==IPPROTO_HOPOPTS )return -1 ; - hw_checksum =csum_add (hw_checksum, (__force __wsum)(ipv6h->nexthdr <<8 )); + hw_checksum =csum_add (hw_checksum, (__force __wsum )htons (ipv6h->nexthdr)); csum_pseudo_hdr =csum_partial (&ipv6h->saddr,sizeof (ipv6h->saddr) +sizeof (ipv6h->daddr),0 );
drivers/net/ethernet/mellanox/mlx4/en_tx.c +4 -2
@@ -402,7 +402,6 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,u32 packets =0 ;u32 bytes =0 ;int factor = priv->cqe_factor; -u64 timestamp =0 ;int done =0 ;int budget = priv->tx_work_limit;u32 last_nr_txbb;
@@ -442,9 +441,12 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev, new_index =be16_to_cpu (cqe->wqe_index) & size_mask; do { + u64 timestamp = 0; + txbbs_skipped += last_nr_txbb; ring_index = (ring_index + last_nr_txbb) & size_mask; - if (ring->tx_info[ring_index].ts_requested) + + if (unlikely(ring->tx_info[ring_index].ts_requested)) timestamp = mlx4_en_get_cqe_ts(cqe); /* free next descriptor */
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +44 -13
90 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +17 -29
58 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/port.c +5 -5
@@ -246,8 +246,8 @@ int mlx5_query_port_admin_status(struct mlx5_core_dev *dev, }EXPORT_SYMBOL_GPL (mlx5_query_port_admin_status); -static void mlx5_query_port_mtu (struct mlx5_core_dev *dev,int *admin_mtu, -int *max_mtu,int *oper_mtu,u8 port) +static void mlx5_query_port_mtu (struct mlx5_core_dev *dev,u16 *admin_mtu, +u16 *max_mtu,u16 *oper_mtu,u8 port) {u32 in[MLX5_ST_SZ_DW (pmtu_reg)];u32 out[MLX5_ST_SZ_DW (pmtu_reg)];
@@ -267,7 +267,7 @@ static void mlx5_query_port_mtu(struct mlx5_core_dev *dev, int *admin_mtu, *admin_mtu =MLX5_GET (pmtu_reg, out, admin_mtu); } -int mlx5_set_port_mtu (struct mlx5_core_dev *dev,int mtu,u8 port) +int mlx5_set_port_mtu (struct mlx5_core_dev *dev,u16 mtu,u8 port) {u32 in[MLX5_ST_SZ_DW (pmtu_reg)];u32 out[MLX5_ST_SZ_DW (pmtu_reg)];
@@ -282,14 +282,14 @@ int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port) }EXPORT_SYMBOL_GPL (mlx5_set_port_mtu); -void mlx5_query_port_max_mtu (struct mlx5_core_dev *dev,int *max_mtu, +void mlx5_query_port_max_mtu (struct mlx5_core_dev *dev,u16 *max_mtu,u8 port) {mlx5_query_port_mtu (dev,NULL , max_mtu,NULL , port); }EXPORT_SYMBOL_GPL (mlx5_query_port_max_mtu); -void mlx5_query_port_oper_mtu (struct mlx5_core_dev *dev,int *oper_mtu, +void mlx5_query_port_oper_mtu (struct mlx5_core_dev *dev,u16 *oper_mtu,u8 port) {mlx5_query_port_mtu (dev,NULL ,NULL , oper_mtu, port);
drivers/net/ethernet/mellanox/mlx5/core/vport.c +40 -0
@@ -196,6 +196,46 @@ int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *mdev, }EXPORT_SYMBOL_GPL (mlx5_modify_nic_vport_mac_address); +int mlx5_query_nic_vport_mtu (struct mlx5_core_dev *mdev,u16 *mtu) +{ +int outlen =MLX5_ST_SZ_BYTES (query_nic_vport_context_out); +u32 *out; +int err; + + out =mlx5_vzalloc (outlen); +if (!out) +return -ENOMEM ; + + err =mlx5_query_nic_vport_context (mdev,0 , out, outlen); +if (!err) + *mtu =MLX5_GET (query_nic_vport_context_out, out, + nic_vport_context.mtu); + +kvfree (out); +return err; +} +EXPORT_SYMBOL_GPL (mlx5_query_nic_vport_mtu); + +int mlx5_modify_nic_vport_mtu (struct mlx5_core_dev *mdev,u16 mtu) +{ +int inlen =MLX5_ST_SZ_BYTES (modify_nic_vport_context_in); +void *in; +int err; + + in =mlx5_vzalloc (inlen); +if (!in) +return -ENOMEM ; + +MLX5_SET (modify_nic_vport_context_in, in, field_select.mtu,1 ); +MLX5_SET (modify_nic_vport_context_in, in, nic_vport_context.mtu, mtu); + + err =mlx5_modify_nic_vport_context (mdev, in, inlen); + +kvfree (in); +return err; +} +EXPORT_SYMBOL_GPL (mlx5_modify_nic_vport_mtu); + int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev, u32 vport, enum mlx5_list_type list_type,
drivers/net/usb/cdc_mbim.c +7 -2
@@ -617,8 +617,13 @@ static const struct usb_device_id mbim_devs[] = { { USB_VENDOR_AND_INTERFACE_INFO(0x0bdb, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&cdc_mbim_info, }, - /* Huawei E3372 fails unless NDP comes after the IP packets */ - { USB_DEVICE_AND_INTERFACE_INFO(0x12d1, 0x157d, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), + + /* Some Huawei devices, ME906s-158 (12d1:15c1) and E3372 + * (12d1:157d), are known to fail unless the NDP is placed + * after the IP packets. Applying the quirk to all Huawei + * devices is broader than necessary, but harmless. + */ + { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&cdc_mbim_info_ndp_to_end, }, /* default entry */
drivers/pinctrl/pinctrl-at91-pio4.c +2 -0
@@ -722,9 +722,11 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,break ;case PIN_CONFIG_BIAS_PULL_UP : conf |=ATMEL_PIO_PUEN_MASK ; + conf &= (~ATMEL_PIO_PDEN_MASK );break ;case PIN_CONFIG_BIAS_PULL_DOWN : conf |=ATMEL_PIO_PDEN_MASK ; + conf &= (~ATMEL_PIO_PUEN_MASK );break ;case PIN_CONFIG_DRIVE_OPEN_DRAIN :if (arg ==0 )
drivers/regulator/axp20x-regulator.c +2 -2
@@ -221,10 +221,10 @@ static const struct regulator_desc axp22x_regulators[] = { AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),AXP_DESC (AXP22X ,ELDO3 ,"eldo3" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO3_V_OUT ,0x1f ,AXP22X_PWR_OUT_CTRL2 ,BIT (2 )), -AXP_DESC_IO (AXP22X ,LDO_IO0 ,"ldo_io0" ,"ips" ,1800 ,3300 ,100 , +AXP_DESC_IO (AXP22X ,LDO_IO0 ,"ldo_io0" ,"ips" ,700 ,3300 ,100 ,AXP22X_LDO_IO0_V_OUT ,0x1f ,AXP20X_GPIO0_CTRL ,0x07 ,AXP22X_IO_ENABLED ,AXP22X_IO_DISABLED ), -AXP_DESC_IO (AXP22X ,LDO_IO1 ,"ldo_io1" ,"ips" ,1800 ,3300 ,100 , +AXP_DESC_IO (AXP22X ,LDO_IO1 ,"ldo_io1" ,"ips" ,700 ,3300 ,100 ,AXP22X_LDO_IO1_V_OUT ,0x1f ,AXP20X_GPIO1_CTRL ,0x07 ,AXP22X_IO_ENABLED ,AXP22X_IO_DISABLED ), AXP_DESC_FIXED(AXP22X, RTC_LDO, "rtc_ldo", "ips", 3000),
drivers/regulator/s2mps11.c +22 -6
@@ -306,7 +306,7 @@ static struct regulator_ops s2mps11_buck_ops = { .enable_mask = S2MPS11_ENABLE_MASK \ } -#define regulator_desc_s2mps11_buck6_10 (num, min, step) { \ +#define regulator_desc_s2mps11_buck67810 (num, min, step) { \ .name = "BUCK"#num, \ .id = S2MPS11_BUCK##num, \ .ops = &s2mps11_buck_ops, \
@@ -322,6 +322,22 @@ static struct regulator_ops s2mps11_buck_ops = { .enable_mask = S2MPS11_ENABLE_MASK \ } +#define regulator_desc_s2mps11_buck9 { \ + .name = "BUCK9", \ + .id = S2MPS11_BUCK9, \ + .ops = &s2mps11_buck_ops, \ + .type = REGULATOR_VOLTAGE, \ + .owner = THIS_MODULE, \ + .min_uV = MIN_3000_MV, \ + .uV_step = STEP_25_MV, \ + .n_voltages = S2MPS11_BUCK9_N_VOLTAGES, \ + .ramp_delay = S2MPS11_RAMP_DELAY, \ + .vsel_reg = S2MPS11_REG_B9CTRL2, \ + .vsel_mask = S2MPS11_BUCK9_VSEL_MASK, \ + .enable_reg = S2MPS11_REG_B9CTRL1, \ + .enable_mask = S2MPS11_ENABLE_MASK \ +} +static const struct regulator_desc s2mps11_regulators[] = {regulator_desc_s2mps11_ldo (1 ,STEP_25_MV ),regulator_desc_s2mps11_ldo (2 ,STEP_50_MV ),
@@ -366,11 +382,11 @@ static const struct regulator_desc s2mps11_regulators[] = {regulator_desc_s2mps11_buck1_4 (3 ),regulator_desc_s2mps11_buck1_4 (4 ), regulator_desc_s2mps11_buck5, -regulator_desc_s2mps11_buck6_10 (6 ,MIN_600_MV ,STEP_6_25_MV ), -regulator_desc_s2mps11_buck6_10 (7 ,MIN_600_MV ,STEP_6_25_MV ), -regulator_desc_s2mps11_buck6_10 (8 ,MIN_600_MV ,STEP_6_25_MV ), -regulator_desc_s2mps11_buck6_10 (9 ,MIN_3000_MV ,STEP_25_MV ), - regulator_desc_s2mps11_buck6_10(10, MIN_750_MV, STEP_12_5_MV), +regulator_desc_s2mps11_buck67810 (6 ,MIN_600_MV ,STEP_6_25_MV ), +regulator_desc_s2mps11_buck67810 (7 ,MIN_600_MV ,STEP_6_25_MV ), +regulator_desc_s2mps11_buck67810 (8 ,MIN_600_MV ,STEP_6_25_MV ), + regulator_desc_s2mps11_buck9, + regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV), };static struct regulator_ops s2mps14_reg_ops;
drivers/scsi/qla1280.c +1 -1
@@ -4214,7 +4214,7 @@ static struct scsi_host_template qla1280_driver_template = { .eh_bus_reset_handler = qla1280_eh_bus_reset, .eh_host_reset_handler = qla1280_eh_adapter_reset, .bios_param = qla1280_biosparam, - .can_queue = 0xfffff, + .can_queue = MAX_OUTSTANDING_COMMANDS, .this_id = -1, .sg_tablesize = SG_ALL, .use_clustering = ENABLE_CLUSTERING,
drivers/spi/spi-pxa2xx.c +1 -1
@@ -111,7 +111,7 @@ static const struct lpss_config lpss_platforms[] = { .reg_general = -1, .reg_ssp = 0x20, .reg_cs_ctrl = 0x24, - .reg_capabilities = 0xfc, + .reg_capabilities = -1, .rx_threshold = 1, .tx_threshold_lo = 32, .tx_threshold_hi = 56,
drivers/spi/spi-ti-qspi.c +28 -17
122 lines not on this page · raw message
drivers/staging/wilc1000/wilc_spi.c +0 -2
@@ -120,8 +120,6 @@ static u8 crc7(u8 crc, const u8 *buffer, u32 len)#define USE_SPI_DMA 0 -static const struct wilc1000_ops wilc1000_spi_ops; -static int wilc_bus_probe (struct spi_device *spi) {int ret, gpio;
fs/btrfs/ctree.c +8 -4
@@ -19,6 +19,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/rbtree.h> +#include <linux/vmalloc.h> #include "ctree.h" #include "disk-io.h" #include "transaction.h"
@@ -5361,10 +5362,13 @@ int btrfs_compare_trees(struct btrfs_root *left_root, goto out; } - tmp_buf =kmalloc (left_root->nodesize,GFP_NOFS ); + tmp_buf =kmalloc (left_root->nodesize,GFP_KERNEL | __GFP_NOWARN);if (!tmp_buf) { - ret = -ENOMEM ; - goto out; + tmp_buf =vmalloc (left_root->nodesize); +if (!tmp_buf) { + ret = -ENOMEM ; + goto out; + } } left_path->search_commit_root =1 ;
@@ -5565,7 +5569,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, out:btrfs_free_path (left_path);btrfs_free_path (right_path); -kfree (tmp_buf); +kvfree (tmp_buf);return ret; }
fs/btrfs/ctree.h +1 -1
@@ -2252,7 +2252,7 @@ struct btrfs_ioctl_defrag_range_args {#define BTRFS_MOUNT_FREE_SPACE_TREE (1 << 26)#define BTRFS_DEFAULT_COMMIT_INTERVAL (30) -#define BTRFS_DEFAULT_MAX_INLINE (8192) +#define BTRFS_DEFAULT_MAX_INLINE (2048)#define btrfs_clear_opt (o, opt) ((o) &= ~BTRFS_MOUNT_##opt)#define btrfs_set_opt (o, opt) ((o) |= BTRFS_MOUNT_##opt)
fs/btrfs/dev-replace.c +2 -0
@@ -394,6 +394,8 @@ int btrfs_dev_replace_start(struct btrfs_root *root, dev_replace->cursor_right =0 ; dev_replace->is_valid =1 ; dev_replace->item_needs_writeback =1 ; +atomic64_set (&dev_replace->num_write_errors,0 ); +atomic64_set (&dev_replace->num_uncorrectable_read_errors,0 ); args->result =BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR ;btrfs_dev_replace_unlock (dev_replace);
fs/btrfs/disk-io.c +18 -10
@@ -303,7 +303,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info, err =map_private_extent_buffer (buf, offset,32 , &kaddr, &map_start, &map_len);if (err) -return 1 ; +return err; cur_len =min (len, map_len - (offset - map_start)); crc =btrfs_csum_data (kaddr + offset - map_start, crc, cur_len);
@@ -313,7 +313,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info,if (csum_size >sizeof (inline_result)) { result =kzalloc (csum_size,GFP_NOFS );if (!result) -return 1 ; +return -ENOMEM ; }else { result = (char *)&inline_result; }
@@ -334,7 +334,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info, val, found, btrfs_header_level(buf));if (result != (char *)&inline_result)kfree (result); -return 1 ; +return -EUCLEAN ; } }else {write_extent_buffer (buf, result,0 , csum_size);
@@ -513,11 +513,21 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page) eb = (struct extent_buffer *)page->private;if (page != eb->pages[0 ])return 0 ; + found_start =btrfs_header_bytenr (eb); -if (WARN_ON (found_start != start || !PageUptodate (page))) -return 0 ; -csum_tree_block (fs_info, eb,0 ); -return 0 ; +/* +* Please do not consolidate these warnings into a single if. +* It is useful to know what went wrong. +*/ +if (WARN_ON (found_start != start)) +return -EUCLEAN ; +if (WARN_ON (!PageUptodate (page))) +return -EUCLEAN ; + +ASSERT (memcmp_extent_buffer (eb, fs_info->fsid, +btrfs_header_fsid (),BTRFS_FSID_SIZE ) ==0 ); + +return csum_tree_block (fs_info, eb,0 ); } static int check_tree_block_fsid(struct btrfs_fs_info *fs_info,
@@ -660,10 +670,8 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, eb, found_level); ret =csum_tree_block (root->fs_info, eb,1 ); -if (ret) { - ret = -EIO ; +if (ret) goto err; - }/* * If this is a leaf block and it is corrupt, set the corrupt bit so
fs/btrfs/file.c +5 -4
@@ -1996,10 +1996,11 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)*/ smp_mb ();if (btrfs_inode_in_log (inode, root->fs_info->generation) || - (BTRFS_I (inode)->last_trans <= - root->fs_info->last_trans_committed && - (full_sync || - !btrfs_have_ordered_extents_in_range (inode, start, len)))) { + (full_sync &&BTRFS_I (inode)->last_trans <= + root->fs_info->last_trans_committed) || + (!btrfs_have_ordered_extents_in_range (inode, start, len) && +BTRFS_I (inode)->last_trans + <= root->fs_info->last_trans_committed)) {/* * We'v had everything committed since the last time we were * modified so clear this flag in case it was set for whatever
fs/btrfs/inode.c +33 -3
@@ -4211,11 +4211,20 @@ static int truncate_space_check(struct btrfs_trans_handle *trans, {int ret; +/* +* This is only used to apply pressure to the enospc system, we don't +* intend to use this reservation at all. +*/ bytes_deleted =btrfs_csum_bytes_to_leaves (root, bytes_deleted); + bytes_deleted *= root->nodesize; ret =btrfs_block_rsv_add (root, &root->fs_info->trans_block_rsv, bytes_deleted,BTRFS_RESERVE_NO_FLUSH ); -if (!ret) +if (!ret) { +trace_btrfs_space_reservation (root->fs_info,"transaction" , + trans->transid, + bytes_deleted,1 ); trans->bytes_reserved += bytes_deleted; + }return ret; }
@@ -7414,7 +7423,26 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend, cached_state, GFP_NOFS);if (ordered) { -btrfs_start_ordered_extent (inode, ordered,1 ); +/* +* If we are doing a DIO read and the ordered extent we +* found is for a buffered write, we can not wait for it +* to complete and retry, because if we do so we can +* deadlock with concurrent buffered writes on page +* locks. This happens only if our DIO read covers more +* than one extent map, if at this point has already +* created an ordered extent for a previous extent map +* and locked its range in the inode's io tree, and a +* concurrent write against that previous extent map's +* range and this range started (we unlock the ranges +* in the io tree only when the bios complete and +* buffered writes always lock pages before attempting +* to lock range in the io tree). +*/ +if (writing || +test_bit (BTRFS_ORDERED_DIRECT , &ordered->flags)) +btrfs_start_ordered_extent (inode, ordered,1 ); +else + ret = -ENOTBLK ;btrfs_put_ordered_extent (ordered); }else {/*
@@ -7431,9 +7459,11 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,* that page. */ ret = -ENOTBLK ; -break ; } +if (ret) +break ; +cond_resched (); }
fs/btrfs/ioctl.c +7 -3
@@ -59,6 +59,7 @@#include "props.h" #include "sysfs.h" #include "qgroup.h" +#include "tree-log.h" #ifdef CONFIG_64BIT /* If we have a 32-bit userspace and 64-bit kernel, then the UAPI
@@ -1656,7 +1657,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file, src_inode =file_inode (src.file);if (src_inode->i_sb !=file_inode (file)->i_sb) { -btrfs_info (BTRFS_I (src_inode)->root->fs_info, +btrfs_info (BTRFS_I (file_inode (file))->root->fs_info,"Snapshot src from another FS" ); ret = -EXDEV ; }else if (!inode_owner_or_capable (src_inode)) {
@@ -2097,8 +2098,6 @@ static noinline int search_ioctl(struct inode *inode, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -btrfs_err (info,"could not find root %llu" , - sk->tree_id);btrfs_free_path (path);return -ENOENT ; }
@@ -2476,6 +2475,8 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, trans->block_rsv = &block_rsv; trans->bytes_reserved = block_rsv.size; +btrfs_record_snapshot_destroy (trans, dir); + ret = btrfs_unlink_subvol(trans, root, dir, dest->root_key.objectid, dentry->d_name.name,
@@ -3068,6 +3069,9 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, ret =extent_same_check_offsets (src, loff, &len, olen);if (ret) goto out_unlock; + ret =extent_same_check_offsets (src, dst_loff, &len, olen); +if (ret) + goto out_unlock;/* * Single inode case wants the same checks, except we
fs/btrfs/qgroup.c +32 -22
108 lines not on this page · raw message
fs/btrfs/reada.c +2 -2
@@ -265,7 +265,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,spin_unlock (&fs_info->reada_lock);if (ret ==1 ) { -if (logical >= zone->start && logical < zone->end) +if (logical >= zone->start && logical <= zone->end)return zone;spin_lock (&fs_info->reada_lock);kref_put (&zone->refcnt, reada_zone_release);
@@ -679,7 +679,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,*/ ret =radix_tree_gang_lookup (&dev->reada_extents, (void **)&re, dev->reada_next >>PAGE_CACHE_SHIFT ,1 ); -if (ret ==0 || re->logical >= dev->reada_curr_zone->end) { +if (ret ==0 || re->logical > dev->reada_curr_zone->end) { ret =reada_pick_zone (dev);if (!ret) {spin_unlock (&fs_info->reada_lock);
fs/btrfs/relocation.c +1 -0
@@ -1850,6 +1850,7 @@ again: eb =read_tree_block (dest, old_bytenr, old_ptr_gen);if (IS_ERR (eb)) { ret =PTR_ERR (eb); +break ; }else if (!extent_buffer_uptodate (eb)) { ret = -EIO ;free_extent_buffer (eb);
fs/btrfs/tree-log.c +88 -11
155 lines not on this page · raw message
fs/btrfs/tree-log.h +2 -0
@@ -79,6 +79,8 @@ int btrfs_pin_log_trans(struct btrfs_root *root);void btrfs_record_unlink_dir (struct btrfs_trans_handle *trans,struct inode *dir,struct inode *inode,int for_rename); +void btrfs_record_snapshot_destroy (struct btrfs_trans_handle *trans, +struct inode *dir);int btrfs_log_new_name (struct btrfs_trans_handle *trans,struct inode *inode,struct inode *old_dir,struct dentry *parent);
fs/isofs/rock.c +10 -3
@@ -203,6 +203,8 @@ int get_rock_ridge_filename(struct iso_directory_record *de,int retnamlen =0 ;int truncate =0 ;int ret =0 ; +char *p; +int len;if (!ISOFS_SB (inode->i_sb)->s_rock)return 0 ;
@@ -267,12 +269,17 @@ repeat: rr->u.NM.flags);break ; } -if ((strlen (retname) + rr->len -5 ) >=254 ) { + len = rr->len -5 ; +if (retnamlen + len >=254 ) { truncate =1 ;break ; } -strncat (retname, rr->u.NM.name, rr->len -5 ); - retnamlen += rr->len -5 ; + p =memchr (rr->u.NM.name,'\0' , len); +if (unlikely (p)) + len = p - rr->u.NM.name; +memcpy (retname + retnamlen, rr->u.NM.name, len); + retnamlen += len; + retname[retnamlen] ='\0' ;break ;case SIG ('R' ,'E' ):kfree (rs.buffer);
fs/namei.c +9 -17
@@ -2968,22 +2968,10 @@ no_open: dentry =lookup_real (dir, dentry, nd->flags);if (IS_ERR (dentry))return PTR_ERR (dentry); - -if (create_error) { -int open_flag = op->open_flag; - - error = create_error; -if ((open_flag &O_EXCL )) { -if (!dentry->d_inode) - goto out; - }else if (!dentry->d_inode) { - goto out; - }else if ((open_flag &O_TRUNC ) && -d_is_reg (dentry)) { - goto out; - } -/* will fail later, go on to get the right error */ - } + } +if (create_error && !dentry->d_inode) { + error = create_error; + goto out; } looked_up: path->dentry = dentry;
@@ -4258,7 +4246,11 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,bool new_is_dir = false;unsigned max_links = new_dir->i_sb->s_max_links; -if (source == target) +/* +* Check source == target. +* On overlayfs need to look at underlying inodes. +*/ +if (vfs_select_inode (old_dentry,0 ) ==vfs_select_inode (new_dentry,0 ))return 0 ; error =may_delete (old_dir, old_dentry, is_dir);
fs/ocfs2/acl.c +87 -0
90 lines not on this page · raw message
fs/ocfs2/acl.h +5 -0
@@ -35,5 +35,10 @@ int ocfs2_set_acl(handle_t *handle,struct posix_acl *acl, struct ocfs2_alloc_context *meta_ac, struct ocfs2_alloc_context *data_ac); +extern int ocfs2_acl_chmod (struct inode *,struct buffer_head *); +extern int ocfs2_init_acl (handle_t *,struct inode *,struct inode *, +struct buffer_head *,struct buffer_head *, +struct ocfs2_alloc_context *, +struct ocfs2_alloc_context *);#endif /* OCFS2_ACL_H */
fs/ocfs2/file.c +2 -2
@@ -1268,20 +1268,20 @@ bail_unlock_rw:if (size_change)ocfs2_rw_unlock (inode,1 ); bail: -brelse (bh);/* Release quota pointers in case we acquired them */ for (qtype =0 ; qtype <OCFS2_MAXQUOTAS ; qtype++)dqput (transfer_to[qtype]);if (!status && attr->ia_valid &ATTR_MODE ) { - status =posix_acl_chmod (inode, inode->i_mode); + status =ocfs2_acl_chmod (inode, bh);if (status <0 )mlog_errno (status); }if (inode_locked)ocfs2_inode_unlock (inode,1 ); +brelse (bh);return status; }
fs/ocfs2/namei.c +2 -21
@@ -259,7 +259,6 @@ static int ocfs2_mknod(struct inode *dir,struct ocfs2_dir_lookup_result lookup = {NULL , };sigset_t oldset;int did_block_signals =0 ; -struct posix_acl *default_acl =NULL , *acl =NULL ;struct ocfs2_dentry_lock *dl =NULL ; trace_ocfs2_mknod(dir, dentry, dentry->d_name.len, dentry->d_name.name,
@@ -367,12 +366,6 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } - status =posix_acl_create (dir, &inode->i_mode, &default_acl, &acl); -if (status) { -mlog_errno (status); - goto leave; - } - handle =ocfs2_start_trans (osb,ocfs2_mknod_credits (osb->sb,S_ISDIR (mode), xattr_credits));
@@ -421,16 +414,8 @@ static int ocfs2_mknod(struct inode *dir,inc_nlink (dir); } -if (default_acl) { - status =ocfs2_set_acl (handle, inode, new_fe_bh, -ACL_TYPE_DEFAULT , default_acl, - meta_ac, data_ac); - } -if (!status && acl) { - status =ocfs2_set_acl (handle, inode, new_fe_bh, -ACL_TYPE_ACCESS , acl, - meta_ac, data_ac); - } + status =ocfs2_init_acl (handle, inode, dir, new_fe_bh, parent_fe_bh, + meta_ac, data_ac);if (status <0 ) {mlog_errno (status);
@@ -472,10 +457,6 @@ static int ocfs2_mknod(struct inode *dir,d_instantiate (dentry, inode); status =0 ; leave: -if (default_acl) -posix_acl_release (default_acl); -if (acl) -posix_acl_release (acl);if (status <0 && did_quota_inode)dquot_free_inode (inode);if (handle)
fs/ocfs2/refcounttree.c +2 -15
@@ -4248,20 +4248,12 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,struct inode *inode =d_inode (old_dentry);struct buffer_head *old_bh =NULL ;struct inode *new_orphan_inode =NULL ; -struct posix_acl *default_acl, *acl; -umode_t mode;if (!ocfs2_refcount_tree (OCFS2_SB (inode->i_sb)))return -EOPNOTSUPP ; - mode = inode->i_mode; - error =posix_acl_create (dir, &mode, &default_acl, &acl); -if (error) { -mlog_errno (error); -return error; - } - error =ocfs2_create_inode_in_orphan (dir, mode, + error =ocfs2_create_inode_in_orphan (dir, inode->i_mode, &new_orphan_inode);if (error) {mlog_errno (error);
@@ -4300,16 +4292,11 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,/* If the security isn't preserved, we need to re-initialize them. */ if (!preserve) { error =ocfs2_init_security_and_acl (dir, new_orphan_inode, - &new_dentry->d_name, - default_acl, acl); + &new_dentry->d_name);if (error)mlog_errno (error); } out: -if (default_acl) -posix_acl_release (default_acl); -if (acl) -posix_acl_release (acl);if (!error) { error =ocfs2_mv_orphaned_inode_to_new (dir, new_orphan_inode, new_dentry);
fs/ocfs2/xattr.c +5 -9
@@ -7216,12 +7216,10 @@ out:*/ int ocfs2_init_security_and_acl (struct inode *dir,struct inode *inode, -const struct qstr *qstr, -struct posix_acl *default_acl, -struct posix_acl *acl) +const struct qstr *qstr) { -struct buffer_head *dir_bh =NULL ;int ret =0 ; +struct buffer_head *dir_bh =NULL ; ret =ocfs2_init_security_get (inode, dir, qstr,NULL );if (ret) {
@@ -7234,11 +7232,9 @@ int ocfs2_init_security_and_acl(struct inode *dir,mlog_errno (ret); goto leave; } - -if (!ret && default_acl) - ret =ocfs2_iop_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); -if (!ret && acl) - ret =ocfs2_iop_set_acl (inode, acl,ACL_TYPE_ACCESS ); + ret =ocfs2_init_acl (NULL , inode, dir,NULL , dir_bh,NULL ,NULL ); +if (ret) +mlog_errno (ret);ocfs2_inode_unlock (dir,0 );brelse (dir_bh);
fs/ocfs2/xattr.h +1 -3
@@ -94,7 +94,5 @@ int ocfs2_reflink_xattrs(struct inode *old_inode, bool preserve_security);int ocfs2_init_security_and_acl (struct inode *dir,struct inode *inode, -const struct qstr *qstr, -struct posix_acl *default_acl, -struct posix_acl *acl); +const struct qstr *qstr);#endif /* OCFS2_XATTR_H */
fs/open.c +4 -8
@@ -840,16 +840,12 @@ EXPORT_SYMBOL(file_path);int vfs_open (const struct path *path,struct file *file,const struct cred *cred) { -struct dentry *dentry = path->dentry; -struct inode *inode = dentry->d_inode; +struct inode *inode =vfs_select_inode (path->dentry, file->f_flags); - file->f_path = *path; -if (dentry->d_flags &DCACHE_OP_SELECT_INODE ) { - inode = dentry->d_op->d_select_inode (dentry, file->f_flags); -if (IS_ERR (inode)) -return PTR_ERR (inode); - } +if (IS_ERR (inode)) +return PTR_ERR (inode); + file->f_path = *path;return do_dentry_open (file, inode,NULL , cred); }
include/linux/bpf.h +2 -1
@@ -165,12 +165,13 @@ void bpf_register_prog_type(struct bpf_prog_type_list *tl);void bpf_register_map_type (struct bpf_map_type_list *tl);struct bpf_prog *bpf_prog_get (u32 ufd); +struct bpf_prog *bpf_prog_inc (struct bpf_prog *prog);void bpf_prog_put (struct bpf_prog *prog);void bpf_prog_put_rcu (struct bpf_prog *prog);struct bpf_map *bpf_map_get_with_uref (u32 ufd);struct bpf_map *__bpf_map_get (struct fd f); -void bpf_map_inc (struct bpf_map *map,bool uref); +struct bpf_map *bpf_map_inc (struct bpf_map *map,bool uref);void bpf_map_put_with_uref (struct bpf_map *map);void bpf_map_put (struct bpf_map *map);
include/linux/dcache.h +12 -0
@@ -592,4 +592,16 @@ static inline struct dentry *d_real(struct dentry *dentry) return dentry; } +static inline struct inode *vfs_select_inode (struct dentry *dentry, +unsigned open_flags) +{ +struct inode *inode =d_inode (dentry); + +if (inode &&unlikely (dentry->d_flags &DCACHE_OP_SELECT_INODE )) + inode = dentry->d_op->d_select_inode (dentry, open_flags); + +return inode; +} + +#endif /* __LINUX_DCACHE_H */
include/linux/mfd/samsung/s2mps11.h +2 -0
@@ -173,10 +173,12 @@ enum s2mps11_regulators {#define S2MPS11_LDO_VSEL_MASK 0x3F#define S2MPS11_BUCK_VSEL_MASK 0xFF +#define S2MPS11_BUCK9_VSEL_MASK 0x1F#define S2MPS11_ENABLE_MASK (0x03 << S2MPS11_ENABLE_SHIFT)#define S2MPS11_ENABLE_SHIFT 0x06#define S2MPS11_LDO_N_VOLTAGES (S2MPS11_LDO_VSEL_MASK + 1)#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1) +#define S2MPS11_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1)#define S2MPS11_RAMP_DELAY 25000/* uV/us */ #define S2MPS11_CTRL1_PWRHOLD_MASK BIT(4)
include/linux/mlx5/driver.h +3 -3
@@ -813,9 +813,9 @@ int mlx5_set_port_admin_status(struct mlx5_core_dev *dev,int mlx5_query_port_admin_status (struct mlx5_core_dev *dev,enum mlx5_port_status *status); -int mlx5_set_port_mtu (struct mlx5_core_dev *dev,int mtu,u8 port); -void mlx5_query_port_max_mtu (struct mlx5_core_dev *dev,int *max_mtu,u8 port); -void mlx5_query_port_oper_mtu (struct mlx5_core_dev *dev,int *oper_mtu, +int mlx5_set_port_mtu (struct mlx5_core_dev *dev,u16 mtu,u8 port); +void mlx5_query_port_max_mtu (struct mlx5_core_dev *dev,u16 *max_mtu,u8 port); +void mlx5_query_port_oper_mtu (struct mlx5_core_dev *dev,u16 *oper_mtu,u8 port); int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev,
include/linux/mlx5/vport.h +2 -0
@@ -45,6 +45,8 @@ int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev, u16 vport, u8 *addr);int mlx5_modify_nic_vport_mac_address (struct mlx5_core_dev *dev,u16 vport,u8 *addr); +int mlx5_query_nic_vport_mtu (struct mlx5_core_dev *mdev,u16 *mtu); +int mlx5_modify_nic_vport_mtu (struct mlx5_core_dev *mdev,u16 mtu);int mlx5_query_nic_vport_system_image_guid (struct mlx5_core_dev *mdev,u64 *system_image_guid);int mlx5_query_nic_vport_node_guid (struct mlx5_core_dev *mdev,u64 *node_guid);
include/linux/mm.h +9 -0
@@ -456,11 +456,20 @@ static inline int page_mapcount(struct page *page)#ifdef CONFIG_TRANSPARENT_HUGEPAGE int total_mapcount (struct page *page); +int page_trans_huge_mapcount (struct page *page,int *total_mapcount);#else static inline int total_mapcount (struct page *page) {return page_mapcount (page); } +static inline int page_trans_huge_mapcount (struct page *page, +int *total_mapcount) +{ +int mapcount =page_mapcount (page); +if (total_mapcount) + *total_mapcount = mapcount; +return mapcount; +}#endif static inline int page_count (struct page *page)
include/linux/net.h +9 -1
@@ -245,7 +245,15 @@ do { \ net_ratelimited_function(pr_warn, fmt, ##__VA_ARGS__)#define net_info_ratelimited (fmt, ...) \ net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__) -#if defined(DEBUG ) +#if defined(CONFIG_DYNAMIC_DEBUG ) +#define net_dbg_ratelimited (fmt, ...) \ +do { \ + DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ + if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \ + net_ratelimit()) \ + __dynamic_pr_debug(&descriptor, fmt, ##__VA_ARGS__); \ +} while (0) +#elif defined(DEBUG )#define net_dbg_ratelimited (fmt, ...) \ net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__)#else
include/linux/rculist_nulls.h +39 -0
@@ -98,6 +98,45 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,if (!is_a_nulls (first)) first->pprev = &n->next; } + +/** +* hlist_nulls_add_tail_rcu +* @n: the element to add to the hash list. +* @h: the list to add to. +* +* Description: +* Adds the specified element to the end of the specified hlist_nulls, +* while permitting racing traversals. NOTE: tail insertion requires +* list traversal. +* +* The caller must take whatever precautions are necessary +* (such as holding appropriate locks) to avoid racing +* with another list-mutation primitive, such as hlist_nulls_add_head_rcu() +* or hlist_nulls_del_rcu(), running on this same list. +* However, it is perfectly legal to run concurrently with +* the _rcu list-traversal primitives, such as +* hlist_nulls_for_each_entry_rcu(), used to prevent memory-consistency +* problems on Alpha CPUs. Regardless of the type of CPU, the +* list-traversal primitive must be guarded by rcu_read_lock(). +*/ +static inline void hlist_nulls_add_tail_rcu (struct hlist_nulls_node *n, +struct hlist_nulls_head *h) +{ +struct hlist_nulls_node *i, *last =NULL ; + +for (i =hlist_nulls_first_rcu (h); !is_a_nulls (i); + i =hlist_nulls_next_rcu (i)) + last = i; + +if (last) { + n->next = last->next; + n->pprev = &last->next; +rcu_assign_pointer (hlist_nulls_next_rcu (last), n); + }else { +hlist_nulls_add_head_rcu (n, h); + } +} +/** * hlist_nulls_for_each_entry_rcu - iterate over rcu list of given type * @tpos: the type * to use as a loop cursor.
include/linux/swap.h +3 -3
@@ -418,7 +418,7 @@ extern sector_t swapdev_block(int, pgoff_t);extern int page_swapcount (struct page *);extern int swp_swapcount (swp_entry_t entry);extern struct swap_info_struct *page_swap_info (struct page *); -extern int reuse_swap_page (struct page *); +extern bool reuse_swap_page (struct page *,int *);extern int try_to_free_swap (struct page *);struct backing_dev_info ;
@@ -513,8 +513,8 @@ static inline int swp_swapcount(swp_entry_t entry)return 0 ; } -#define reuse_swap_page (page) \ - (!PageTransCompound(page) && page_mapcount(page) == 1) +#define reuse_swap_page (page, total_mapcount) \ + (page_trans_huge_mapcount(page, total_mapcount) == 1)static inline int try_to_free_swap (struct page *page) {
include/net/codel.h +4 -0
@@ -162,12 +162,14 @@ struct codel_vars {* struct codel_stats - contains codel shared variables and stats * @maxpacket: largest packet we've seen so far * @drop_count: temp count of dropped packets in dequeue() +* @drop_len: bytes of dropped packets in dequeue() * ecn_mark: number of packets we ECN marked instead of dropping * ce_mark: number of packets CE marked because sojourn time was above ce_threshold */ struct codel_stats {u32 maxpacket;u32 drop_count; +u32 drop_len;u32 ecn_mark;u32 ce_mark; };
@@ -308,6 +310,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, vars->rec_inv_sqrt); goto end; } + stats->drop_len +=qdisc_pkt_len (skb);qdisc_drop (skb, sch); stats->drop_count++; skb =dequeue_func (vars, sch);
@@ -330,6 +333,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,if (params->ecn &&INET_ECN_set_ce (skb)) { stats->ecn_mark++; }else { + stats->drop_len +=qdisc_pkt_len (skb);qdisc_drop (skb, sch); stats->drop_count++;
include/net/sch_generic.h +19 -1
@@ -396,7 +396,8 @@ struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, struct Qdisc *qdisc);void qdisc_reset (struct Qdisc *qdisc);void qdisc_destroy (struct Qdisc *qdisc); -void qdisc_tree_decrease_qlen (struct Qdisc *qdisc,unsigned int n); +void qdisc_tree_reduce_backlog (struct Qdisc *qdisc,unsigned int n, +unsigned int len);struct Qdisc *qdisc_alloc (struct netdev_queue *dev_queue,const struct Qdisc_ops *ops); struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
@@ -707,6 +708,23 @@ static inline void qdisc_reset_queue(struct Qdisc *sch) sch->qstats.backlog =0 ; } +static inline struct Qdisc *qdisc_replace (struct Qdisc *sch,struct Qdisc *new, +struct Qdisc **pold) +{ +struct Qdisc *old; + +sch_tree_lock (sch); + old = *pold; + *pold = new; +if (old !=NULL ) { +qdisc_tree_reduce_backlog (old, old->q.qlen, old->qstats.backlog); +qdisc_reset (old); + } +sch_tree_unlock (sch); + +return old; +} +static inline unsigned int __qdisc_queue_drop (struct Qdisc *sch,struct sk_buff_head *list) {
include/net/sock.h +5 -1
@@ -630,7 +630,11 @@ static inline void sk_add_node_rcu(struct sock *sk, struct hlist_head *list)static inline void __sk_nulls_add_node_rcu (struct sock *sk,struct hlist_nulls_head *list) { -hlist_nulls_add_head_rcu (&sk->sk_nulls_node, list); +if (IS_ENABLED (CONFIG_IPV6 ) && sk->sk_reuseport && + sk->sk_family ==AF_INET6 ) +hlist_nulls_add_tail_rcu (&sk->sk_nulls_node, list); +else +hlist_nulls_add_head_rcu (&sk->sk_nulls_node, list); }static inline void sk_nulls_add_node_rcu (struct sock *sk,struct hlist_nulls_head *list)
include/uapi/linux/if.h +28 -0
@@ -19,14 +19,20 @@#ifndef _LINUX_IF_H#define _LINUX_IF_H +#include <linux/libc-compat.h> /* for compatibility with glibc */ #include <linux/types.h> /* for "__kernel_caddr_t" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/compiler.h> /* for "__user" et al */ +#if __UAPI_DEF_IF_IFNAMSIZ#define IFNAMSIZ 16 +#endif /* __UAPI_DEF_IF_IFNAMSIZ */ #define IFALIASZ 256#include <linux/hdlc/ioctl.h> +/* For glibc compatibility. An empty enum does not compile. */ +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO !=0 && \ + __UAPI_DEF_IF_NET_DEVICE_FLAGS !=0 /** * enum net_device_flags - &struct net_device flags *
@@ -68,6 +74,8 @@* @IFF_ECHO: echo sent packets. Volatile. */ enum net_device_flags { +/* for compatibility with glibc net/if.h */ +#if __UAPI_DEF_IF_NET_DEVICE_FLAGSIFF_UP =1 <<0 ,/* sysfs */ IFF_BROADCAST =1 <<1 ,/* volatile */ IFF_DEBUG =1 <<2 ,/* sysfs */
@@ -84,11 +92,17 @@ enum net_device_flags {IFF_PORTSEL =1 <<13 ,/* sysfs */ IFF_AUTOMEDIA =1 <<14 ,/* sysfs */ IFF_DYNAMIC =1 <<15 ,/* sysfs */ +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHOIFF_LOWER_UP =1 <<16 ,/* volatile */ IFF_DORMANT =1 <<17 ,/* volatile */ IFF_ECHO = 1<<18, /* volatile */ +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ }; +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ +/* for compatibility with glibc net/if.h */ +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS#define IFF_UP IFF_UP#define IFF_BROADCAST IFF_BROADCAST#define IFF_DEBUG IFF_DEBUG
@@ -105,9 +119,13 @@ enum net_device_flags {#define IFF_PORTSEL IFF_PORTSEL#define IFF_AUTOMEDIA IFF_AUTOMEDIA#define IFF_DYNAMIC IFF_DYNAMIC +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ + +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO#define IFF_LOWER_UP IFF_LOWER_UP#define IFF_DORMANT IFF_DORMANT#define IFF_ECHO IFF_ECHO +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
@@ -166,6 +184,8 @@ enum {* being very small might be worth keeping for clean configuration. */ +/* for compatibility with glibc net/if.h */ +#if __UAPI_DEF_IF_IFMAP struct ifmap { unsigned long mem_start; unsigned long mem_end;
@@ -175,6 +195,7 @@ struct ifmap {unsigned char port;/* 3 bytes spare */ }; +#endif /* __UAPI_DEF_IF_IFMAP */ struct if_settings {unsigned int type;/* Type of physical device or protocol */
@@ -200,6 +221,8 @@ struct if_settings {* remainder may be interface specific. */ +/* for compatibility with glibc net/if.h */ +#if __UAPI_DEF_IF_IFREQ struct ifreq { #define IFHWADDRLEN 6 union
@@ -223,6 +246,7 @@ struct ifreq { struct if_settings ifru_settings; } ifr_ifru; }; +#endif /* __UAPI_DEF_IF_IFREQ */ #define ifr_name ifr_ifrn.ifrn_name/* interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr/* MAC address */
@@ -249,6 +273,8 @@ struct ifreq {* must know all networks accessible). */ +/* for compatibility with glibc net/if.h */ +#if __UAPI_DEF_IF_IFCONF struct ifconf { int ifc_len; /* size of buffer */ union {
@@ -256,6 +282,8 @@ struct ifconf { struct ifreq __user *ifcu_req; } ifc_ifcu; }; +#endif /* __UAPI_DEF_IF_IFCONF */ +#define ifc_buf ifc_ifcu.ifcu_buf/* buffer address */ #define ifc_req ifc_ifcu.ifcu_req/* array of structures */
include/uapi/linux/libc-compat.h +44 -0
56 lines not on this page · raw message
kernel/bpf/inode.c +4 -3
@@ -31,10 +31,10 @@ static void *bpf_any_get(void *raw, enum bpf_type type) {switch (type) {case BPF_TYPE_PROG : -atomic_inc (&((struct bpf_prog *)raw)->aux->refcnt); + raw =bpf_prog_inc (raw);break ;case BPF_TYPE_MAP : -bpf_map_inc (raw, true); + raw =bpf_map_inc (raw, true);break ;default :WARN_ON_ONCE (1 );
@@ -297,7 +297,8 @@ static void *bpf_obj_do_get(const struct filename *pathname, goto out; raw =bpf_any_get (inode->i_private, *type); -touch_atime (&path); +if (!IS_ERR (raw)) +touch_atime (&path);path_put (&path);return raw;
kernel/bpf/syscall.c +20 -4
@@ -201,11 +201,18 @@ struct bpf_map *__bpf_map_get(struct fd f)return f.file->private_data; } -void bpf_map_inc (struct bpf_map *map,bool uref) +/* prog's and map's refcnt limit */ +#define BPF_MAX_REFCNT 32768 + +struct bpf_map *bpf_map_inc (struct bpf_map *map,bool uref) { -atomic_inc (&map->refcnt); +if (atomic_inc_return (&map->refcnt) >BPF_MAX_REFCNT ) { +atomic_dec (&map->refcnt); +return ERR_PTR (-EBUSY ); + }if (uref)atomic_inc (&map->usercnt); +return map; }struct bpf_map *bpf_map_get_with_uref (u32 ufd)
@@ -217,7 +224,7 @@ struct bpf_map *bpf_map_get_with_uref(u32 ufd)if (IS_ERR (map))return map; -bpf_map_inc (map, true); + map =bpf_map_inc (map, true);fdput (f);return map;
@@ -600,6 +607,15 @@ static struct bpf_prog *__bpf_prog_get(struct fd f)return f.file->private_data; } +struct bpf_prog *bpf_prog_inc (struct bpf_prog *prog) +{ +if (atomic_inc_return (&prog->aux->refcnt) >BPF_MAX_REFCNT ) { +atomic_dec (&prog->aux->refcnt); +return ERR_PTR (-EBUSY ); + } +return prog; +} +/* called by sockets/tracing/seccomp before attaching program to an event * pairs with bpf_prog_put() */
@@ -612,7 +628,7 @@ struct bpf_prog *bpf_prog_get(u32 ufd)if (IS_ERR (prog))return prog; -atomic_inc (&prog->aux->refcnt); + prog =bpf_prog_inc (prog);fdput (f);return prog;
kernel/bpf/verifier.c +40 -26
107 lines not on this page · raw message
kernel/events/ring_buffer.c +9 -1
@@ -347,6 +347,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size, bool truncated) {struct ring_buffer *rb = handle->rb; +bool wakeup = truncated;unsigned long aux_head;u64 flags =0 ;
@@ -375,9 +376,16 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size, aux_head = rb->user_page->aux_head =local_read (&rb->aux_head);if (aux_head -local_read (&rb->aux_wakeup) >= rb->aux_watermark) { -perf_output_wakeup (handle); + wakeup = true;local_add (rb->aux_watermark, &rb->aux_wakeup); } + +if (wakeup) { +if (truncated) + handle->event->pending_disable =1 ; +perf_output_wakeup (handle); + } + handle->event =NULL ;local_set (&rb->aux_nest,0 );
kernel/workqueue.c +11 -0
@@ -4556,6 +4556,17 @@ static void rebind_workers(struct worker_pool *pool) pool->attrs->cpumask) < 0);spin_lock_irq (&pool->lock); + +/* +* XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED +* w/o preceding DOWN_PREPARE. Work around it. CPU hotplug is +* being reworked and this can go away in time. +*/ +if (!(pool->flags &POOL_DISASSOCIATED )) { +spin_unlock_irq (&pool->lock); +return ; + } + pool->flags &= ~POOL_DISASSOCIATED ;for_each_pool_worker (worker, pool) {
mm/huge_memory.c +62 -9
90 lines not on this page · raw message
mm/memory.c +14 -8
@@ -2357,6 +2357,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,* not dirty accountable. */ if (PageAnon (old_page) && !PageKsm (old_page)) { +int total_mapcount;if (!trylock_page (old_page)) {page_cache_get (old_page);pte_unmap_unlock (page_table, ptl);
@@ -2371,13 +2372,18 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, }page_cache_release (old_page); } -if (reuse_swap_page (old_page)) { -/* -* The page is all ours. Move it to our anon_vma so -* the rmap code will not search our parent or siblings. -* Protected against the rmap code by the page lock. -*/ -page_move_anon_rmap (old_page, vma, address); +if (reuse_swap_page (old_page, &total_mapcount)) { +if (total_mapcount ==1 ) { +/* +* The page is all ours. Move it to +* our anon_vma so the rmap code will +* not search our parent or siblings. +* Protected against the rmap code by +* the page lock. +*/ +page_move_anon_rmap (compound_head (old_page), + vma, address); + }unlock_page (old_page);return wp_page_reuse (mm, vma, address, page_table, ptl, orig_pte, old_page,0 ,0 );
@@ -2602,7 +2608,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,inc_mm_counter_fast (mm,MM_ANONPAGES );dec_mm_counter_fast (mm,MM_SWAPENTS ); pte =mk_pte (page, vma->vm_page_prot); -if ((flags &FAULT_FLAG_WRITE ) &&reuse_swap_page (page)) { +if ((flags &FAULT_FLAG_WRITE ) &&reuse_swap_page (page,NULL )) { pte =maybe_mkwrite (pte_mkdirty (pte), vma); flags &= ~FAULT_FLAG_WRITE ; ret |=VM_FAULT_WRITE ;
mm/swapfile.c +7 -6
@@ -916,18 +916,19 @@ out:* to it. And as a side-effect, free up its swap: because the old content * on disk will never be read, and seeking back there to write new content * later would only waste time away from clustering. +* +* NOTE: total_mapcount should not be relied upon by the caller if +* reuse_swap_page() returns false, but it may be always overwritten +* (see the other implementation for CONFIG_SWAP=n). */ -int reuse_swap_page (struct page *page) +bool reuse_swap_page (struct page *page,int *total_mapcount) {int count;VM_BUG_ON_PAGE (!PageLocked (page), page);if (unlikely (PageKsm (page))) -return 0 ; -/* The page is part of THP and cannot be reused */ -if (PageTransCompound (page)) -return 0 ; - count =page_mapcount (page); +return false; + count =page_trans_huge_mapcount (page, total_mapcount);if (count <=1 &&PageSwapCache (page)) { count +=page_swapcount (page);if (count ==1 && !PageWriteback (page)) {
mm/zsmalloc.c +5 -2
@@ -1732,10 +1732,13 @@ static struct page *isolate_source_page(struct size_class *class)static unsigned long zs_can_compact (struct size_class *class) {unsigned long obj_wasted; +unsigned long obj_allocated =zs_stat_get (class,OBJ_ALLOCATED ); +unsigned long obj_used =zs_stat_get (class,OBJ_USED ); - obj_wasted =zs_stat_get (class,OBJ_ALLOCATED ) - -zs_stat_get (class,OBJ_USED ); +if (obj_allocated <= obj_used) +return 0 ; + obj_wasted = obj_allocated - obj_used; obj_wasted /=get_maxobj_per_zspage (class->size, class->pages_per_zspage);
net/bridge/br_ioctl.c +3 -2
@@ -21,18 +21,19 @@#include <asm/uaccess.h> #include "br_private.h" -/* called with RTNL */ static int get_bridge_ifindices (struct net *net,int *indices,int num) {struct net_device *dev;int i =0 ; -for_each_netdev (net, dev) { +rcu_read_lock (); +for_each_netdev_rcu (net, dev) {if (i >= num)break ;if (dev->priv_flags &IFF_EBRIDGE ) indices[i++] = dev->ifindex; } +rcu_read_unlock ();return i; }
net/bridge/br_multicast.c +7 -5
@@ -1270,6 +1270,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,struct br_ip saddr;unsigned long max_delay;unsigned long now = jiffies; +unsigned int offset =skb_transport_offset (skb);__be32 group;int err =0 ;
@@ -1280,14 +1281,14 @@ static int br_ip4_multicast_query(struct net_bridge *br, group = ih->group; -if (skb->len ==sizeof (*ih)) { +if (skb->len == offset +sizeof (*ih)) { max_delay = ih->code * (HZ /IGMP_TIMER_SCALE );if (!max_delay) { max_delay =10 *HZ ; group =0 ; } - }else if (skb->len >=sizeof (*ih3)) { + }else if (skb->len >= offset +sizeof (*ih3)) { ih3 =igmpv3_query_hdr (skb);if (ih3->nsrcs) goto out;
@@ -1348,6 +1349,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,struct br_ip saddr;unsigned long max_delay;unsigned long now = jiffies; +unsigned int offset =skb_transport_offset (skb);const struct in6_addr *group =NULL ;bool is_general_query;int err =0 ;
@@ -1357,8 +1359,8 @@ static int br_ip6_multicast_query(struct net_bridge *br, (port && port->state == BR_STATE_DISABLED)) goto out; -if (skb->len ==sizeof (*mld)) { -if (!pskb_may_pull (skb,sizeof (*mld))) { +if (skb->len == offset +sizeof (*mld)) { +if (!pskb_may_pull (skb, offset +sizeof (*mld))) { err = -EINVAL ; goto out; }
@@ -1367,7 +1369,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,if (max_delay) group = &mld->mld_mca; }else { -if (!pskb_may_pull (skb,sizeof (*mld2q))) { +if (!pskb_may_pull (skb, offset +sizeof (*mld2q))) { err = -EINVAL ; goto out; }
net/core/rtnetlink.c +10 -8
@@ -1176,14 +1176,16 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,static int rtnl_fill_link_ifmap (struct sk_buff *skb,struct net_device *dev) { -struct rtnl_link_ifmap map = { - .mem_start = dev->mem_start, - .mem_end = dev->mem_end, - .base_addr = dev->base_addr, - .irq = dev->irq, - .dma = dev->dma, - .port = dev->if_port, - }; +struct rtnl_link_ifmap map; + +memset (&map,0 ,sizeof (map)); + map.mem_start = dev->mem_start; + map.mem_end = dev->mem_end; + map.base_addr = dev->base_addr; + map.irq = dev->irq; + map.dma = dev->dma; + map.port = dev->if_port; +if (nla_put (skb,IFLA_MAP ,sizeof (map), &map))return -EMSGSIZE ;
net/core/skbuff.c +6 -5
@@ -4427,15 +4427,16 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)__skb_push (skb, offset); err =__vlan_insert_tag (skb, skb->vlan_proto,skb_vlan_tag_get (skb)); -if (err) +if (err) { +__skb_pull (skb, offset);return err; + } + skb->protocol = skb->vlan_proto; skb->mac_len +=VLAN_HLEN ; -__skb_pull (skb, offset); -if (skb->ip_summed ==CHECKSUM_COMPLETE ) - skb->csum =csum_add (skb->csum,csum_partial (skb->data - + (2 *ETH_ALEN ),VLAN_HLEN ,0 )); +skb_postpush_rcsum (skb, skb->data + (2 *ETH_ALEN ),VLAN_HLEN ); +__skb_pull (skb, offset); }__vlan_hwaccel_put_tag (skb, vlan_proto, vlan_tci);return 0 ;
net/decnet/dn_route.c +8 -1
@@ -1034,10 +1034,13 @@ source_ok:if (!fld.daddr) { fld.daddr = fld.saddr; - err = -EADDRNOTAVAIL ;if (dev_out)dev_put (dev_out); + err = -EINVAL ; dev_out = init_net.loopback_dev; +if (!dev_out->dn_ptr) + goto out; + err = -EADDRNOTAVAIL ;dev_hold (dev_out);if (!fld.daddr) { fld.daddr =
@@ -1110,6 +1113,8 @@ source_ok:if (dev_out ==NULL ) goto out; dn_db =rcu_dereference_raw (dev_out->dn_ptr); +if (!dn_db) + goto e_inval;/* Possible improvement - check all devices for local addr */ if (dn_dev_islocal (dev_out, fld.daddr)) {dev_put (dev_out);
@@ -1151,6 +1156,8 @@ select_source:dev_put (dev_out); dev_out = init_net.loopback_dev;dev_hold (dev_out); +if (!dev_out->dn_ptr) + goto e_inval; fld.flowidn_oif = dev_out->ifindex;if (res.fi)dn_fib_info_put (res.fi);
net/ipv4/fib_frontend.c +5 -1
@@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)if (ifa->ifa_flags &IFA_F_SECONDARY ) { prim =inet_ifa_byprefix (in_dev, any, ifa->ifa_mask);if (!prim) { -pr_warn ("%s: bug: prim == NULL\n" , __func__); +/* if the device has been deleted, we don't perform +* address promotion +*/ +if (!in_dev->dead) +pr_warn ("%s: bug: prim == NULL\n" , __func__);return ; }if (iprim && iprim != prim) {
net/ipv4/fib_semantics.c +2 -0
@@ -975,6 +975,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg) val =65535 -40 ;if (type ==RTAX_MTU && val >65535 -15 ) val =65535 -15 ; +if (type ==RTAX_HOPLIMIT && val >255 ) + val =255 ;if (type ==RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK ))return -EINVAL ; fi->fib_metrics[type -1 ] = val;
net/ipv4/ip_gre.c +8 -3
@@ -179,6 +179,7 @@ static __be16 tnl_flags_to_gre_flags(__be16 tflags)return flags; } +/* Fills in tpi and returns header length to be pulled. */ static int parse_gre_header (struct sk_buff *skb,struct tnl_ptk_info *tpi,bool *csum_err) {
@@ -238,7 +239,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,return -EINVAL ; } } -return iptunnel_pull_header (skb, hdr_len, tpi->proto); +return hdr_len; } static void ipgre_err(struct sk_buff *skb, u32 info,
@@ -341,7 +342,7 @@ static void gre_err(struct sk_buff *skb, u32 info)struct tnl_ptk_info tpi;bool csum_err = false; -if (parse_gre_header (skb, &tpi, &csum_err)) { +if (parse_gre_header (skb, &tpi, &csum_err) <0 ) {if (!csum_err)/* ignore csum errors. */ return ; }
@@ -419,6 +420,7 @@ static int gre_rcv(struct sk_buff *skb) {struct tnl_ptk_info tpi;bool csum_err = false; +int hdr_len;#ifdef CONFIG_NET_IPGRE_BROADCAST if (ipv4_is_multicast (ip_hdr (skb)->daddr)) {
@@ -428,7 +430,10 @@ static int gre_rcv(struct sk_buff *skb) }#endif -if (parse_gre_header (skb, &tpi, &csum_err) <0 ) + hdr_len =parse_gre_header (skb, &tpi, &csum_err); +if (hdr_len <0 ) + goto drop; +if (iptunnel_pull_header (skb, hdr_len, tpi.proto) <0 ) goto drop;if (ipgre_rcv (skb, &tpi) ==PACKET_RCVD )
net/ipv4/route.c +12 -0
@@ -2045,6 +2045,18 @@ static struct rtable *__mkroute_output(const struct fib_result *res,*/ if (fi && res->prefixlen <4 ) fi =NULL ; + }else if ((type ==RTN_LOCAL ) && (orig_oif !=0 ) && + (orig_oif != dev_out->ifindex)) { +/* For local routes that require a particular output interface +* we do not want to cache the result. Caching the result +* causes incorrect behaviour when there are multiple source +* addresses on the interface, the end result being that if the +* intended recipient is waiting on that interface for the +* packet he won't receive it because it will be delivered on +* the loopback interface and the IP_PKTINFO ipi_ifindex will +* be set to the loopback interface as well. +*/ + fi =NULL ; } fnhe =NULL ;
net/ipv4/tcp_output.c +4 -2
@@ -2625,8 +2625,10 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)*/ if (unlikely ((NET_IP_ALIGN && ((unsigned long )skb->data &3 )) ||skb_headroom (skb) >=0xFFFF )) { -struct sk_buff *nskb =__pskb_copy (skb,MAX_TCP_HEADER , -GFP_ATOMIC ); +struct sk_buff *nskb; + +skb_mstamp_get (&skb->skb_mstamp); + nskb =__pskb_copy (skb,MAX_TCP_HEADER ,GFP_ATOMIC ); err = nskb ?tcp_transmit_skb (sk, nskb,0 ,GFP_ATOMIC ) : -ENOBUFS ; }else {
net/ipv4/udp.c +7 -2
@@ -339,8 +339,13 @@ found: hslot2 =udp_hashslot2 (udptable,udp_sk (sk)->udp_portaddr_hash);spin_lock (&hslot2->lock); -hlist_nulls_add_head_rcu (&udp_sk (sk)->udp_portaddr_node, - &hslot2->head); +if (IS_ENABLED (CONFIG_IPV6 ) && sk->sk_reuseport && + sk->sk_family ==AF_INET6 ) +hlist_nulls_add_tail_rcu (&udp_sk (sk)->udp_portaddr_node, + &hslot2->head); +else +hlist_nulls_add_head_rcu (&udp_sk (sk)->udp_portaddr_node, + &hslot2->head); hslot2->count++;spin_unlock (&hslot2->lock); }
net/ipv6/ila/ila_lwt.c +1 -2
@@ -120,8 +120,7 @@ nla_put_failure:static int ila_encap_nlsize (struct lwtunnel_state *lwtstate) { -/* No encapsulation overhead */ -return 0 ; +return nla_total_size (sizeof (u64));/* ILA_ATTR_LOCATOR */ }static int ila_encap_cmp (struct lwtunnel_state *a,struct lwtunnel_state *b)
net/ipv6/reassembly.c +2 -4
@@ -496,10 +496,8 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,IP6CB (head)->flags |=IP6SKB_FRAGMENTED ;/* Yes, and fold redundant checksum back. 8) */ -if (head->ip_summed ==CHECKSUM_COMPLETE ) - head->csum =csum_partial (skb_network_header (head), -skb_network_header_len (head), - head->csum); +skb_postpush_rcsum (head,skb_network_header (head), +skb_network_header_len (head));rcu_read_lock ();IP6_INC_STATS_BH (net,__in6_dev_get (dev),IPSTATS_MIB_REASMOKS );
net/ipv6/route.c +2 -0
@@ -1737,6 +1737,8 @@ static int ip6_convert_metrics(struct mx6_config *mxc, }else { val =nla_get_u32 (nla); } +if (type ==RTAX_HOPLIMIT && val >255 ) + val =255 ;if (type ==RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK )) goto err;
net/llc/af_llc.c +1 -0
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)if (llc->cmsg_flags &LLC_CMSG_PKTINFO ) {struct llc_pktinfo info; +memset (&info,0 ,sizeof (info)); info.lpi_ifindex =llc_sk (skb->sk)->dev->ifindex;llc_pdu_decode_dsap (skb, &info.lpi_sap);llc_pdu_decode_da (skb, info.lpi_mac);
net/netfilter/nf_conntrack_core.c +3 -1
@@ -1780,6 +1780,7 @@ void nf_conntrack_init_end(void)int nf_conntrack_init_net (struct net *net) { +static atomic64_t unique_id;int ret = -ENOMEM ;int cpu;
@@ -1802,7 +1803,8 @@ int nf_conntrack_init_net(struct net *net)if (!net->ct.stat) goto err_pcpu_lists; - net->ct.slabname =kasprintf (GFP_KERNEL ,"nf_conntrack_%p" , net); + net->ct.slabname =kasprintf (GFP_KERNEL ,"nf_conntrack_%llu" , + (u64 )atomic64_inc_return (&unique_id));if (!net->ct.slabname) goto err_slabname;
net/openvswitch/actions.c +5 -7
@@ -158,9 +158,7 @@ static int push_mpls(struct sk_buff *skb, struct sw_flow_key *key, new_mpls_lse = (__be32 *)skb_mpls_header (skb); *new_mpls_lse = mpls->mpls_lse; -if (skb->ip_summed ==CHECKSUM_COMPLETE ) - skb->csum =csum_add (skb->csum,csum_partial (new_mpls_lse, -MPLS_HLEN ,0 )); +skb_postpush_rcsum (skb, new_mpls_lse,MPLS_HLEN ); hdr =eth_hdr (skb); hdr->h_proto = mpls->mpls_ethertype;
@@ -280,7 +278,7 @@ static int set_eth_addr(struct sk_buff *skb, struct sw_flow_key *flow_key,ether_addr_copy_masked (eth_hdr (skb)->h_dest, key->eth_dst, mask->eth_dst); -ovs_skb_postpush_rcsum (skb,eth_hdr (skb),ETH_ALEN *2 ); +skb_postpush_rcsum (skb,eth_hdr (skb),ETH_ALEN *2 );ether_addr_copy (flow_key->eth.src,eth_hdr (skb)->h_source);ether_addr_copy (flow_key->eth.dst,eth_hdr (skb)->h_dest);
@@ -463,7 +461,7 @@ static int set_ipv6(struct sk_buff *skb, struct sw_flow_key *flow_key,mask_ipv6_addr (saddr, key->ipv6_src, mask->ipv6_src, masked);if (unlikely (memcmp (saddr, masked,sizeof (masked)))) { -set_ipv6_addr (skb, key->ipv6_proto, saddr, masked, +set_ipv6_addr (skb, flow_key->ip.proto, saddr, masked, true);memcpy (&flow_key->ipv6.addr.src, masked,sizeof (flow_key->ipv6.addr.src));
@@ -485,7 +483,7 @@ static int set_ipv6(struct sk_buff *skb, struct sw_flow_key *flow_key, NULL, &flags) != NEXTHDR_ROUTING); -set_ipv6_addr (skb, key->ipv6_proto, daddr, masked, +set_ipv6_addr (skb, flow_key->ip.proto, daddr, masked, recalc_csum);memcpy (&flow_key->ipv6.addr.dst, masked,sizeof (flow_key->ipv6.addr.dst));
@@ -639,7 +637,7 @@ static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *sk/* Reconstruct the MAC header. */ skb_push (skb, data->l2_len);memcpy (skb->data, &data->l2_data, data->l2_len); -ovs_skb_postpush_rcsum (skb, skb->data, data->l2_len); +skb_postpush_rcsum (skb, skb->data, data->l2_len);
Lines of this file are not shown. View the raw message.
net/sched/sch_netem.c +62 -12
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.