Commit 8f00a1de authored Nov 23, 2018 by Minming Qi

Merge android-4.9.130 (1c7637ca) into msm-4.9



* refs/heads/tmp-1c7637ca:
  Revert "f2fs: use timespec64 for inode timestamps"
  Linux 4.9.130
  iw_cxgb4: only allow 1 flush on user qps
  vmw_balloon: include asm/io.h
  PCI: aardvark: Size bridges before resources allocation
  HID: sony: Support DS4 dongle
  HID: sony: Update device ids
  sched/fair: Fix vruntime_normalized() for remote non-migration wakeup
  ext4: show test_dummy_encryption mount option in /proc/mounts
  ext4: don't mark mmp buffer head dirty
  ext4: fix online resizing for bigalloc file systems with a 1k block size
  ext4: fix online resize's handling of a too-small final block group
  ext4: recalucate superblock checksum after updating free blocks/inodes
  ext4: avoid divide by zero fault when deleting corrupted inline directories
  ext4: check to make sure the rename(2)'s destination is not freed
  tty: vt_ioctl: fix potential Spectre v1
  drm/vc4: Fix the "no scaling" case on multi-planar YUV formats
  drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early
  drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
  drm/nouveau/drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement
  ocfs2: fix ocfs2 read block panic
  scsi: target: iscsi: Use hex2bin instead of a re-implementation
  neighbour: confirm neigh entries when ARP packet is received
  udp4: fix IP_CMSG_CHECKSUM for connected sockets
  net: hp100: fix always-true check for link up state
  net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
  ipv6: fix possible use-after-free in ip6_xmit()
  gso_segment: Reset skb->mac_len after modifying network header
  mm: shmem.c: Correctly annotate new inodes for lockdep
  ring-buffer: Allow for rescheduling when removing pages
  Revert "PCI: Add ACS quirk for Intel 300 series"
  xen/x86/vpmu: Zero struct pt_regs before calling into sample handling code
  xen/netfront: don't bug in case of too many frags
  platform/x86: alienware-wmi: Correct a memory leak
  ALSA: oxfw: fix memory leak of private data
  ALSA: oxfw: fix memory leak of discovered stream formats at error path
  ALSA: oxfw: fix memory leak for model-dependent data at error path
  ALSA: fireworks: fix memory leak of response buffer at error path
  ALSA: firewire-tascam: fix memory leak of private data
  ALSA: firewire-digi00x: fix memory leak of private data
  ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
  ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
  ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path
  ASoC: cs4265: fix MMTLR Data switch control
  NFC: Fix the number of pipes
  NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
  ANDROID: restrict store of prefer_idle as boolean
  f2fs: readahead encrypted block during GC
  f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc
  f2fs: fix performance issue observed with multi-thread sequential read
  f2fs: fix to skip verifying block address for non-regular inode
  f2fs: rework fault injection handling to avoid a warning
  f2fs: support fault_type mount option
  f2fs: fix to return success when trimming meta area
  f2fs: fix use-after-free of dicard command entry
  f2fs: support discard submission error injection
  f2fs: split discard command in prior to block layer
  f2fs: wake up gc thread immediately when gc_urgent is set
  f2fs: fix incorrect range->len in f2fs_trim_fs()
  f2fs: refresh recent accessed nat entry in lru list
  f2fs: fix avoid race between truncate and background GC
  f2fs: avoid race between zero_range and background GC
  f2fs: fix to do sanity check with block address in main area v2
  f2fs: fix to do sanity check with inline flags
  f2fs: fix to reset i_gc_failures correctly
  f2fs: fix invalid memory access
  f2fs: fix to avoid broken of dnode block list
  f2fs: use true and false for boolean values
  f2fs: fix to do sanity check with cp_pack_start_sum
  f2fs: avoid f2fs_bug_on() in cp_error case
  f2fs: fix to clear PG_checked flag in set_page_dirty()
  f2fs: fix to active page in lru list for read path
  f2fs: don't keep meta pages used for block migration
  f2fs: fix to restrict mount condition when without CONFIG_QUOTA
  f2fs: quota: do not mount as RDWR without QUOTA if quota feature enabled
  f2fs: quota: fix incorrect comments
  f2fs: add proc entry to show victim_secmap bitmap
  f2fs: let checkpoint flush dnode page of regular
  f2fs: issue discard align to section in LFS mode
  f2fs: don't allow any writes on aborted atomic writes
  f2fs: restrict setting up inode.i_advise
  f2fs: fix wrong kernel message when recover fsync data on ro fs
  f2fs: clean up ioctl interface naming
  f2fs: clean up with f2fs_is_{atomic,volatile}_file()
  f2fs: clean up with f2fs_encrypted_inode()
  f2fs: clean up with get_current_nat_page
  f2fs: kill EXT_TREE_VEC_SIZE
  f2fs: avoid duplicated permission check for "trusted." xattrs
  f2fs: fix to propagate error from __get_meta_page()
  f2fs: fix to do sanity check with i_extra_isize
  f2fs: blk_finish_plug of submit_bio in lfs mode
  f2fs: do not set free of current section
  f2fs: Keep alloc_valid_block_count in sync
  f2fs: issue small discard by LBA order
  f2fs: stop issuing discard immediately if there is queued IO
  f2fs: clean up with IS_INODE()
  f2fs: detect bug_on in f2fs_wait_discard_bios
  f2fs: fix defined but not used build warnings
  f2fs: enable real-time discard by default
  f2fs: fix to detect looped node chain correctly
  f2fs: fix to do sanity check with block address in main area
  f2fs: fix to skip GC if type in SSA and SIT is inconsistent
  f2fs: try grabbing node page lock aggressively in sync scenario
  f2fs: show the fsync_mode=nobarrier mount option
  f2fs: check the right return value of memory alloc function
  f2fs: Replace strncpy with memcpy
  f2fs: avoid the global name 'fault_name'
  f2fs: fix to do sanity check with reserved blkaddr of inline inode
  f2fs: fix to do sanity check with node footer and iblocks
  f2fs: Allocate and stat mem used by free nid bitmap more accurately
  f2fs: fix to do sanity check with user_block_count
  f2fs: fix to do sanity check with extra_attr feature
  f2fs: fix to correct return value of f2fs_trim_fs
  f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize
  f2fs: fix to do sanity check with secs_per_zone
  f2fs: disable f2fs_check_rb_tree_consistence
  f2fs: introduce and spread verify_blkaddr
  f2fs: use timespec64 for inode timestamps
  f2fs: fix to wait on page writeback before updating page
  f2fs: assign REQ_RAHEAD to bio for ->readpages
  f2fs: fix a hungtask problem caused by congestion_wait
  f2fs: Fix uninitialized return in f2fs_ioc_shutdown()
  f2fs: don't issue discard commands in online discard is on
  f2fs: fix to propagate return value of scan_nat_page()
  f2fs: support in-memory inode checksum when checking consistency
  f2fs: fix error path of fill_super
  f2fs: relocate readdir_ra configure initialization
  f2fs: move s_res{u,g}id initialization to default_options()
  f2fs: don't acquire orphan ino during recovery
  f2fs: avoid potential deadlock in f2fs_sbi_store
  f2fs: indicate shutdown f2fs to allow unmount successfully
  f2fs: keep meta pages in cp_error state
  f2fs: do checkpoint in kill_sb
  f2fs: allow wrong configured dio to buffered write
  f2fs: flush journal nat entries for nat_bits during unmount

Conflicts:
	drivers/hid/hid-core.c
	fs/f2fs/f2fs.h

Change-Id: I482eb204568e7119959f85f975dc4bb7a720b77d
Signed-off-by: Minming Qi <mqi@codeaurora.org>

parents 3dadb717 cf4085f8

Documentation/filesystems/f2fs.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,26 @@ noinline_data Disable the inline data feature, inline data feature is
		enabled by default.
		data_flush Enable data flushing before checkpoint in order to
		persist data of regular and symlink.
		fault_injection=%d Enable fault injection in all supported types with
		specified injection rate.
		fault_type=%d Support configuring fault injection type, should be
		enabled with fault_injection option, fault type value
		is shown below, it supports single or combined type.
		Type_Name Type_Value
		FAULT_KMALLOC 0x000000001
		FAULT_KVMALLOC 0x000000002
		FAULT_PAGE_ALLOC 0x000000004
		FAULT_PAGE_GET 0x000000008
		FAULT_ALLOC_BIO 0x000000010
		FAULT_ALLOC_NID 0x000000020
		FAULT_ORPHAN 0x000000040
		FAULT_BLOCK 0x000000080
		FAULT_DIR_DEPTH 0x000000100
		FAULT_EVICT_INODE 0x000000200
		FAULT_TRUNCATE 0x000000400
		FAULT_IO 0x000000800
		FAULT_CHECKPOINT 0x000001000
		FAULT_DISCARD 0x000002000
		mode=%s Control block allocation mode which supports "adaptive"
		and "lfs". In "lfs" mode, there should be no random
		writes towards main area.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 129
		SUBLEVEL = 130
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/x86/xen/pmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs,
		irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)
		{
		int err, ret = IRQ_NONE;
		struct pt_regs regs;
		struct pt_regs regs = {0};
		const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();
		uint8_t xenpmu_flags = get_xenpmu_flags();

drivers/gpu/drm/nouveau/nouveau_connector.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -271,12 +271,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
		nv_connector->edid = NULL;
		}

		/* Outputs are only polled while runtime active, so acquiring a
		* runtime PM ref here is unnecessary (and would deadlock upon
		* runtime suspend because it waits for polling to finish).
		/* Outputs are only polled while runtime active, so resuming the
		* device here is unnecessary (and would deadlock upon runtime suspend
		* because it waits for polling to finish). We do however, want to
		* prevent the autosuspend timer from elapsing during this operation
		* if possible.
		*/
		if (!drm_kms_helper_is_poll_worker()) {
		ret = pm_runtime_get_sync(connector->dev->dev);
		if (drm_kms_helper_is_poll_worker()) {
		pm_runtime_get_noresume(dev->dev);
		} else {
		ret = pm_runtime_get_sync(dev->dev);
		if (ret < 0 && ret != -EACCES)
		return conn_status;
		}
		@@ -354,10 +358,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)

		out:

		if (!drm_kms_helper_is_poll_worker()) {
		pm_runtime_mark_last_busy(connector->dev->dev);
		pm_runtime_put_autosuspend(connector->dev->dev);
		}
		pm_runtime_mark_last_busy(dev->dev);
		pm_runtime_put_autosuspend(dev->dev);

		return conn_status;
		}

drivers/gpu/drm/nouveau/nouveau_display.c

+25 −8

Original line number	Diff line number	Diff line
		@@ -367,8 +367,6 @@ nouveau_display_hpd_work(struct work_struct *work)
		pm_runtime_get_sync(drm->dev->dev);

		drm_helper_hpd_irq_event(drm->dev);
		/* enable polling for external displays */
		drm_kms_helper_poll_enable(drm->dev);

		pm_runtime_mark_last_busy(drm->dev->dev);
		pm_runtime_put_sync(drm->dev->dev);
		@@ -391,15 +389,29 @@ nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
		{
		struct nouveau_drm drm = container_of(nb, typeof(drm), acpi_nb);
		struct acpi_bus_event *info = data;
		int ret;

		if (!strcmp(info->device_class, ACPI_VIDEO_CLASS)) {
		if (info->type == ACPI_VIDEO_NOTIFY_PROBE) {
		/*
		* This may be the only indication we receive of a
		* connector hotplug on a runtime suspended GPU,
		* schedule hpd_work to check.
		ret = pm_runtime_get(drm->dev->dev);
		if (ret == 1 \|\| ret == -EACCES) {
		/* If the GPU is already awake, or in a state
		* where we can't wake it up, it can handle
		* it's own hotplug events.
		*/
		pm_runtime_put_autosuspend(drm->dev->dev);
		} else if (ret == 0) {
		/* This may be the only indication we receive
		* of a connector hotplug on a runtime
		* suspended GPU, schedule hpd_work to check.
		*/
		NV_DEBUG(drm, "ACPI requested connector reprobe\n");
		schedule_work(&drm->hpd_work);
		pm_runtime_put_noidle(drm->dev->dev);
		} else {
		NV_WARN(drm, "Dropped ACPI reprobe event due to RPM error: %d\n",
		ret);
		}

		/* acpi-video should not generate keypresses for this */
		return NOTIFY_BAD;
		@@ -422,6 +434,11 @@ nouveau_display_init(struct drm_device *dev)
		if (ret)
		return ret;

		/* enable connector detection and polling for connectors without HPD
		* support
		*/
		drm_kms_helper_poll_enable(dev);

		/* enable hotplug interrupts */
		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
		struct nouveau_connector *conn = nouveau_connector(connector);