5.7.17-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 18/204 btrfs: dont traverse into the seed devices in show_devname
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
commit 4faf55b03823e96c44dc4e364520000ed3b12fdb upstream.
->show_devname currently shows the lowest devid in the list. As the seed devices have the lowest devid in the sprouted filesystem, the userland tool such as findmnt end up seeing seed device instead of the device from the read-writable sprouted filesystem. As shown below.
mount /dev/sda /btrfs
mount: /btrfs: WARNING: device write-protected, mounted read-only.
findmnt --output SOURCE,TARGET,UUID /btrfs
SOURCE TARGET UUID
/dev/sda /btrfs 899f7027-3e46-4626-93e7-7d4c9ad19111
btrfs dev add -f /dev/sdb /btrfs
umount /btrfs
mount /dev/sdb /btrfs
findmnt --output SOURCE,TARGET,UUID /btrfs
SOURCE TARGET UUID
/dev/sda /btrfs 899f7027-3e46-4626-93e7-7d4c9ad19111
All sprouts from a single seed will show the same seed device and the same fsid. That's confusing.
This is causing problems in our prototype as there isn't any reference to the sprout file-system(s) which is being used for actual read and write.
This was added in the patch which implemented the show_devname in btrfs commit 9c5085c14798 ("Btrfs: implement ->show_devname").
I tried to look for any particular reason that we need to show the seed device, there isn't any.
So instead, do not traverse through the seed devices, just show the lowest devid in the sprouted fsid.
After the patch:
mount /dev/sda /btrfs
mount: /btrfs: WARNING: device write-protected, mounted read-only.
findmnt --output SOURCE,TARGET,UUID /btrfs
SOURCE TARGET UUID
/dev/sda /btrfs 899f7027-3e46-4626-93e7-7d4c9ad19111
btrfs dev add -f /dev/sdb /btrfs
mount -o rw,remount /dev/sdb /btrfs
findmnt --output SOURCE,TARGET,UUID /btrfs
SOURCE TARGET UUID
/dev/sdb /btrfs 595ca0e6-b82e-46b5-b9e2-c72a6928be48
mount /dev/sda /btrfs1
mount: /btrfs1: WARNING: device write-protected, mounted read-only.
btrfs dev add -f /dev/sdc /btrfs1
findmnt --output SOURCE,TARGET,UUID /btrfs1
SOURCE TARGET UUID
/dev/sdc /btrfs1 ca1dbb7a-8446-4f95-853c-a20f3f82bdbb
cat /proc/self/mounts | grep btrfs
/dev/sdb /btrfs btrfs rw,relatime,noacl,space_cache,subvolid=5,subvol=/ 0 0 /dev/sdc /btrfs1 btrfs ro,relatime,noacl,space_cache,subvolid=5,subvol=/ 0 0
--- fs/btrfs/super.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
fs/btrfs/super.c +7 -14
@@ -2294,9 +2294,7 @@ static int btrfs_unfreeze(struct super_bstatic int btrfs_show_devname (struct seq_file *m,struct dentry *root) {struct btrfs_fs_info *fs_info =btrfs_sb (root->d_sb); -struct btrfs_fs_devices *cur_devices;struct btrfs_device *dev, *first_dev =NULL ; -struct list_head *head;/* * Lightweight locking of the devices. We should not need
@@ -2306,18 +2304,13 @@ static int btrfs_show_devname(struct seq* least until the rcu_read_unlock. */ rcu_read_lock (); - cur_devices = fs_info->fs_devices; -while (cur_devices) { - head = &cur_devices->devices; -list_for_each_entry_rcu (dev, head, dev_list) { -if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) -continue ; -if (!dev->name) -continue ; -if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev; - } - cur_devices = cur_devices->seed; +list_for_each_entry_rcu (dev, &fs_info->fs_devices->devices, dev_list) { +if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) +continue ; +if (!dev->name) +continue ; +if (!first_dev || dev->devid < first_dev->devid) + first_dev = dev; }if (first_dev)
Greg Kroah-Hartman
maintainerPATCH 22/204 btrfs: relocation: review the call sites which can be interrupted by signal
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 44d354abf33e92a5e73b965c84caf5a5d5e58a0b upstream.
Since most metadata reservation calls can return -EINTR when get interrupted by fatal signal, we need to review the all the metadata reservation call sites.
In relocation code, the metadata reservation happens in the following sites:
- btrfs_block_rsv_refill() in merge_reloc_root() merge_reloc_root() is a pretty critical section, we don't want to be interrupted by signal, so change the flush status to BTRFS_RESERVE_FLUSH_LIMIT, so it won't get interrupted by signal. Since such change can be ENPSPC-prone, also shrink the amount of metadata to reserve least amount avoid deadly ENOSPC there.
- btrfs_block_rsv_refill() in reserve_metadata_space()
It calls with BTRFS_RESERVE_FLUSH_LIMIT, which won't get interrupted by signal.
- btrfs_block_rsv_refill() in prepare_to_relocate()
- btrfs_block_rsv_add() in prepare_to_relocate()
- btrfs_block_rsv_refill() in relocate_block_group()
- btrfs_delalloc_reserve_metadata() in relocate_file_extent_cluster()
- btrfs_start_transaction() in relocate_block_group()
- btrfs_start_transaction() in create_reloc_inode()
Can be interrupted by fatal signal and we can handle it easily. For these call sites, just catch the -EINTR value in btrfs_balance() and count them as canceled.
--- fs/btrfs/relocation.c | 12 ++++++++++-- fs/btrfs/volumes.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-)
fs/btrfs/relocation.c +10 -2
@@ -2402,12 +2402,20 @@ static noinline_for_stack int merge_relobtrfs_unlock_up_safe (path,0 ); } - min_reserved = fs_info->nodesize * (BTRFS_MAX_LEVEL -1 ) *2 ; +/* +* In merge_reloc_root(), we modify the upper level pointer to swap the +* tree blocks between reloc tree and subvolume tree. Thus for tree +* block COW, we COW at most from level 1 to root level for each tree. +* +* Thus the needed metadata size is at most root_level * nodesize, +* and * 2 since we have two trees to COW. +*/ + min_reserved = fs_info->nodesize *btrfs_root_level (root_item) *2 ;memset (&next_key,0 ,sizeof (next_key));while (1 ) { ret =btrfs_block_rsv_refill (root, rc->block_rsv, min_reserved, -BTRFS_RESERVE_FLUSH_ALL ); +BTRFS_RESERVE_FLUSH_LIMIT );if (ret) { err = ret; goto out;
fs/btrfs/volumes.c +16 -1
@@ -4154,7 +4154,22 @@ int btrfs_balance(struct btrfs_fs_info *mutex_lock (&fs_info->balance_mutex);if (ret == -ECANCELED &&atomic_read (&fs_info->balance_pause_req))btrfs_info (fs_info,"balance: paused" ); -else if (ret == -ECANCELED &&atomic_read (&fs_info->balance_cancel_req)) +/* +* Balance can be canceled by: +* +* - Regular cancel request +* Then ret == -ECANCELED and balance_cancel_req > 0 +* +* - Fatal signal to "btrfs" process +* Either the signal caught by wait_reserve_ticket() and callers +* got -EINTR, or caught by btrfs_should_cancel_balance() and +* got -ECANCELED. +* Either way, in this case balance_cancel_req = 0, and +* ret == -EINTR or ret == -ECANCELED. +* +* So here we only check the return value to catch canceled balance. +*/ +else if (ret == -ECANCELED || ret == -EINTR )btrfs_info (fs_info,"balance: canceled" );else btrfs_info (fs_info,"balance: ended with status: %d" , ret);
Greg Kroah-Hartman
maintainerPATCH 5/204 PCI/ATS: Add pci_pri_supported() to check device or associated PF
In reply to Greg Kroah-HartmanFrom: Ashok Raj <[email protected]>
commit 3f9a7a13fe4cb6e119e4e4745fbf975d30bfac9b upstream.
For SR-IOV, the PF PRI is shared between the PF and any associated VFs, and the PRI Capability is allowed for PFs but not for VFs. Searching for the PRI Capability on a VF always fails, even if its associated PF supports PRI.
Add pci_pri_supported() to check whether device or its associated PF supports PRI.
--- drivers/iommu/intel-iommu.c | 2 +- drivers/pci/ats.c | 15 +++++++++++++++ include/linux/pci-ats.h | 4 ++++ 3 files changed, 20 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +1 -1
@@ -2645,7 +2645,7 @@ static struct dmar_domain *dmar_insert_o }if (info->ats_supported &&ecap_prs (iommu->ecap) && -pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI )) +pci_pri_supported (pdev)) info->pri_supported =1 ; } }
drivers/pci/ats.c +15 -0
@@ -309,6 +309,21 @@ int pci_prg_resp_pasid_required(struct p return pdev->pasid_required; } + +/** +* pci_pri_supported - Check if PRI is supported. +* @pdev: PCI device structure +* +* Returns true if PRI capability is present, false otherwise. +*/ +bool pci_pri_supported (struct pci_dev *pdev) +{ +/* VFs share the PF PRI */ +if (pci_physfn (pdev)->pri_cap) +return true; +return false; +} +EXPORT_SYMBOL_GPL (pci_pri_supported);#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID
include/linux/pci-ats.h +4 -0
@@ -25,6 +25,10 @@ int pci_enable_pri(struct pci_dev *pdev,void pci_disable_pri (struct pci_dev *pdev);int pci_reset_pri (struct pci_dev *pdev);int pci_prg_resp_pasid_required (struct pci_dev *pdev); +bool pci_pri_supported (struct pci_dev *pdev); +#else +static inline bool pci_pri_supported (struct pci_dev *pdev) +{return false; }#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID
Greg Kroah-Hartman
maintainerPATCH 7/204 PCI: Add device even if driver attach failed
In reply to Greg Kroah-HartmanFrom: Rajat Jain <[email protected]>
commit 2194bc7c39610be7cabe7456c5f63a570604f015 upstream.
device_attach() returning failure indicates a driver error while trying to probe the device. In such a scenario, the PCI device should still be added in the system and be visible to the user.
When device_attach() fails, merely warn about it and keep the PCI device in the system.
This partially reverts ab1a187bba5c ("PCI: Check device_attach() return value always").
--- drivers/pci/bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/pci/bus.c +1 -5
@@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev * dev->match_driver = true; retval =device_attach (&dev->dev); -if (retval <0 && retval != -EPROBE_DEFER ) { +if (retval <0 && retval != -EPROBE_DEFER )pci_warn (dev,"device attach failed (%d)\n" , retval); -pci_proc_detach_device (dev); -pci_remove_sysfs_dev_files (dev); -return ; - }pci_dev_assign_added (dev, true); }
Greg Kroah-Hartman
maintainerPATCH 4/204 PCI: hotplug: ACPI: Fix context refcounting in acpiphp_grab_context()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit dae68d7fd4930315389117e9da35b763f12238f9 upstream.
If context is not NULL in acpiphp_grab_context(), but the is_going_away flag is set for the device's parent, the reference counter of the context needs to be decremented before returning NULL or the context will never be freed, so make that happen.
--- drivers/pci/hotplug/acpiphp_glue.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/pci/hotplug/acpiphp_glue.c +11 -3
@@ -122,13 +122,21 @@ static struct acpiphp_context *acpiphp_gstruct acpiphp_context *context;acpi_lock_hp_context (); + context =acpiphp_get_context (adev); -if (!context || context->func.parent->is_going_away) { -acpi_unlock_hp_context (); -return NULL ; +if (!context) + goto unlock; + +if (context->func.parent->is_going_away) { +acpiphp_put_context (context); + context =NULL ; + goto unlock; } +get_bridge (context->func.parent);acpiphp_put_context (context); + +unlock:acpi_unlock_hp_context ();return context; }
Greg Kroah-Hartman
maintainerPATCH 8/204 PCI: qcom: Define some PARF params needed for ipq8064 SoC
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
commit 5149901e9e6deca487c01cc434a3ac4125c7b00b upstream.
Set some specific value for Tx De-Emphasis, Tx Swing and Rx equalization needed on some ipq8064 based device (Netgear R7800 for example). Without this the system locks on kernel load.
--- drivers/pci/controller/dwc/pcie-qcom.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +24 -0
@@ -77,6 +77,18 @@#define DBI_RO_WR_EN 1#define PERST_DELAY_US 1000 +/* PARF registers */ +#define PCIE20_PARF_PCS_DEEMPH 0x34 +#define PCS_DEEMPH_TX_DEEMPH_GEN1 (x) ((x) << 16) +#define PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB (x) ((x) << 8) +#define PCS_DEEMPH_TX_DEEMPH_GEN2_6DB (x) ((x) << 0) + +#define PCIE20_PARF_PCS_SWING 0x38 +#define PCS_SWING_TX_SWING_FULL (x) ((x) << 8) +#define PCS_SWING_TX_SWING_LOW (x) ((x) << 0) + +#define PCIE20_PARF_CONFIG_BITS 0x50 +#define PHY_RX0_EQ (x) ((x) << 24)#define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358#define SLV_ADDR_SPACE_SZ 0x10000000
@@ -286,6 +298,7 @@ static int qcom_pcie_init_2_1_0(struct qstruct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;struct dw_pcie *pci = pcie->pci;struct device *dev = pci->dev; +struct device_node *node = dev->of_node;u32 val;int ret;
@@ -330,6 +343,17 @@ static int qcom_pcie_init_2_1_0(struct q val &= ~BIT (0 );writel (val, pcie->parf +PCIE20_PARF_PHY_CTRL ); +if (of_device_is_compatible (node,"qcom,pcie-ipq8064" )) { +writel (PCS_DEEMPH_TX_DEEMPH_GEN1 (24 ) | +PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB (24 ) | +PCS_DEEMPH_TX_DEEMPH_GEN2_6DB (34 ), + pcie->parf +PCIE20_PARF_PCS_DEEMPH ); +writel (PCS_SWING_TX_SWING_FULL (120 ) | +PCS_SWING_TX_SWING_LOW (120 ), + pcie->parf +PCIE20_PARF_PCS_SWING ); +writel (PHY_RX0_EQ (4 ), pcie->parf +PCIE20_PARF_CONFIG_BITS ); + } +/* enable external reference clock */ val =readl (pcie->parf +PCIE20_PARF_PHY_REFCLK ); val |=BIT (16 );
Greg Kroah-Hartman
maintainerPATCH 26/204 btrfs: sysfs: use NOFS for device creation
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit a47bd78d0c44621efb98b525d04d60dc4d1a79b0 upstream.
Dave hit this splat during testing btrfs/078:
======================================================
WARNING: possible circular locking dependency detected
5.8.0-rc6-default+ #1191 Not tainted
------------------------------------------------------
kswapd0/75 is trying to acquire lock:
ffffa040e9d04ff8 (&delayed_node->mutex){+.+.}-{3:3}, at: __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs]
but task is already holding lock:
ffffffff8b0c8040 (fs_reclaim){+.+.}-{0:0}, at: __fs_reclaim_acquire+0x5/0x30
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (fs_reclaim){+.+.}-{0:0}:
__lock_acquire+0x56f/0xaa0 lock_acquire+0xa3/0x440 fs_reclaim_acquire.part.0+0x25/0x30 __kmalloc_track_caller+0x49/0x330 kstrdup+0x2e/0x60 __kernfs_new_node.constprop.0+0x44/0x250 kernfs_new_node+0x25/0x50 kernfs_create_link+0x34/0xa0 sysfs_do_create_link_sd+0x5e/0xd0 btrfs_sysfs_add_devices_dir+0x65/0x100 [btrfs] btrfs_init_new_device+0x44c/0x12b0 [btrfs] btrfs_ioctl+0xc3c/0x25c0 [btrfs] ksys_ioctl+0x68/0xa0 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x50/0xe0 entry_SYSCALL_64_after_hwframe+0x44/0xa9
-> #1 (&fs_info->chunk_mutex){+.+.}-{3:3}:
__lock_acquire+0x56f/0xaa0 lock_acquire+0xa3/0x440 __mutex_lock+0xa0/0xaf0 btrfs_chunk_alloc+0x137/0x3e0 [btrfs] find_free_extent+0xb44/0xfb0 [btrfs] btrfs_reserve_extent+0x9b/0x180 [btrfs] btrfs_alloc_tree_block+0xc1/0x350 [btrfs] alloc_tree_block_no_bg_flush+0x4a/0x60 [btrfs] __btrfs_cow_block+0x143/0x7a0 [btrfs] btrfs_cow_block+0x15f/0x310 [btrfs] push_leaf_right+0x150/0x240 [btrfs] split_leaf+0x3cd/0x6d0 [btrfs] btrfs_search_slot+0xd14/0xf70 [btrfs] btrfs_insert_empty_items+0x64/0xc0 [btrfs] __btrfs_commit_inode_delayed_items+0xb2/0x840 [btrfs] btrfs_async_run_delayed_root+0x10e/0x1d0 [btrfs] btrfs_work_helper+0x2f9/0x650 [btrfs] process_one_work+0x22c/0x600 worker_thread+0x50/0x3b0 kthread+0x137/0x150 ret_from_fork+0x1f/0x30
-> #0 (&delayed_node->mutex){+.+.}-{3:3}:
check_prev_add+0x98/0xa20 validate_chain+0xa8c/0x2a00 __lock_acquire+0x56f/0xaa0 lock_acquire+0xa3/0x440 __mutex_lock+0xa0/0xaf0 __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] btrfs_evict_inode+0x3bf/0x560 [btrfs] evict+0xd6/0x1c0 dispose_list+0x48/0x70 prune_icache_sb+0x54/0x80 super_cache_scan+0x121/0x1a0 do_shrink_slab+0x175/0x420 shrink_slab+0xb1/0x2e0 shrink_node+0x192/0x600 balance_pgdat+0x31f/0x750 kswapd+0x206/0x510 kthread+0x137/0x150 ret_from_fork+0x1f/0x30
other info that might help us debug this:
Chain exists of:
&delayed_node->mutex --> &fs_info->chunk_mutex --> fs_reclaim
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(fs_reclaim);
lock(&fs_info->chunk_mutex);
lock(fs_reclaim);
lock(&delayed_node->mutex);*** DEADLOCK ***
3 locks held by kswapd0/75:
#0: ffffffff8b0c8040 (fs_reclaim){+.+.}-{0:0}, at: __fs_reclaim_acquire+0x5/0x30 #1: ffffffff8b0b50b8 (shrinker_rwsem){++++}-{3:3}, at: shrink_slab+0x54/0x2e0 #2: ffffa040e057c0e8 (&type->s_umount_key#26){++++}-{3:3}, at: trylock_super+0x16/0x50
stack backtrace: CPU: 2 PID: 75 Comm: kswapd0 Not tainted 5.8.0-rc6-default+ #1191 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba527-rebuilt.opensuse.org 04/01/2014 Call Trace: dump_stack+0x78/0xa0 check_noncircular+0x16f/0x190 check_prev_add+0x98/0xa20 validate_chain+0xa8c/0x2a00 __lock_acquire+0x56f/0xaa0 lock_acquire+0xa3/0x440 ? __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] __mutex_lock+0xa0/0xaf0 ? __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] ? __lock_acquire+0x56f/0xaa0 ? __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] ? lock_acquire+0xa3/0x440 ? btrfs_evict_inode+0x138/0x560 [btrfs] ? btrfs_evict_inode+0x2fe/0x560 [btrfs] ? __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] __btrfs_release_delayed_node.part.0+0x3f/0x310 [btrfs] btrfs_evict_inode+0x3bf/0x560 [btrfs] evict+0xd6/0x1c0 dispose_list+0x48/0x70 prune_icache_sb+0x54/0x80 super_cache_scan+0x121/0x1a0 do_shrink_slab+0x175/0x420 shrink_slab+0xb1/0x2e0 shrink_node+0x192/0x600 balance_pgdat+0x31f/0x750 kswapd+0x206/0x510 ? _raw_spin_unlock_irqrestore+0x3e/0x50 ? finish_wait+0x90/0x90 ? balance_pgdat+0x750/0x750 kthread+0x137/0x150 ? kthread_stop+0x2a0/0x2a0 ret_from_fork+0x1f/0x30
This is because we're holding the chunk_mutex while adding this device and adding its sysfs entries. We actually hold different locks in different places when calling this function, the dev_replace semaphore for instance in dev replace, so instead of moving this call around simply wrap it's operations in NOFS.
--- fs/btrfs/sysfs.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/sysfs.c +3 -0
@@ -1273,7 +1273,9 @@ int btrfs_sysfs_add_devices_dir(struct b {int error =0 ;struct btrfs_device *dev; +unsigned int nofs_flag; + nofs_flag =memalloc_nofs_save ();list_for_each_entry (dev, &fs_devices->devices, dev_list) {if (one_device && one_device != dev)
@@ -1301,6 +1303,7 @@ int btrfs_sysfs_add_devices_dir(struct bbreak ; } } +memalloc_nofs_restore (nofs_flag);return error; }
Greg Kroah-Hartman
maintainerPATCH 38/204 dt-bindings: iio: io-channel-mux: Fix compatible string in example code
In reply to Greg Kroah-HartmanFrom: Christian Eggers <[email protected]>
commit add48ba425192c6e04ce70549129cacd01e2a09e upstream.
The correct compatible string is "gpio-mux" (see bindings/mux/gpio-mux.txt).
--- Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt +1 -1
@@ -21,7 +21,7 @@ controller state. The mux controller sta Example: mux: mux-controller { - compatible = "mux-gpio"; + compatible = "gpio-mux"; #mux-control-cells = <0>; mux-gpios = <&pioA 0 GPIO_ACTIVE_HIGH>,
Greg Kroah-Hartman
maintainerPATCH 40/204 iio: imu: st_lsm6dsx: reset hw ts after resume
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
commit a1bab9396c2d98c601ce81c27567159dfbc10c19 upstream.
Reset hw time samples generator after system resume in order to avoid disalignment between system and device time reference since FIFO batching and time samples generator are disabled during suspend.
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +-- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 +++++++++++++++-------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1 -2
@@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct s u16 watermark);int st_lsm6dsx_update_fifo (struct st_lsm6dsx_sensor *sensor,bool enable);int st_lsm6dsx_flush_fifo (struct st_lsm6dsx_hw *hw); -int st_lsm6dsx_set_fifo_mode (struct st_lsm6dsx_hw *hw, -enum st_lsm6dsx_fifo_mode fifo_mode); +int st_lsm6dsx_resume_fifo (struct st_lsm6dsx_hw *hw);int st_lsm6dsx_read_fifo (struct st_lsm6dsx_hw *hw);int st_lsm6dsx_read_tagged_fifo (struct st_lsm6dsx_hw *hw);int st_lsm6dsx_check_odr (struct st_lsm6dsx_sensor *sensor,u32 odr,u8 *val);
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +15 -8
@@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(return err; } -int st_lsm6dsx_set_fifo_mode (struct st_lsm6dsx_hw *hw, -enum st_lsm6dsx_fifo_mode fifo_mode) +static int st_lsm6dsx_set_fifo_mode (struct st_lsm6dsx_hw *hw, +enum st_lsm6dsx_fifo_mode fifo_mode) {unsigned int data;
@@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(structreturn 0 ; } +int st_lsm6dsx_resume_fifo (struct st_lsm6dsx_hw *hw) +{ +int err; + +/* reset hw ts counter */ + err =st_lsm6dsx_reset_hw_ts (hw); +if (err <0 ) +return err; + +return st_lsm6dsx_set_fifo_mode (hw,ST_LSM6DSX_FIFO_CONT ); +} +/* * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN * in order to avoid a kmalloc for each bus access
@@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm goto out;if (fifo_mask) { -/* reset hw ts counter */ - err =st_lsm6dsx_reset_hw_ts (hw); -if (err <0 ) - goto out; - - err =st_lsm6dsx_set_fifo_mode (hw,ST_LSM6DSX_FIFO_CONT ); + err =st_lsm6dsx_resume_fifo (hw);if (err <0 ) goto out; }
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +1 -1
@@ -2451,7 +2451,7 @@ static int __maybe_unused st_lsm6dsx_res }if (hw->fifo_mask) - err =st_lsm6dsx_set_fifo_mode (hw,ST_LSM6DSX_FIFO_CONT ); + err =st_lsm6dsx_resume_fifo (hw);return err; }
Greg Kroah-Hartman
maintainerPATCH 45/204 powerpc: Allow 4224 bytes of stack expansion for the signal frame
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 63dee5df43a31f3844efabc58972f0a206ca4534 upstream.
We have powerpc specific logic in our page fault handling to decide if an access to an unmapped address below the stack pointer should expand the stack VMA.
The code was originally added in 2004 "ported from 2.4". The rough logic is that the stack is allowed to grow to 1MB with no extra checking. Over 1MB the access must be within 2048 bytes of the stack pointer, or be from a user instruction that updates the stack pointer.
The 2048 byte allowance below the stack pointer is there to cover the 288 byte "red zone" as well as the "about 1.5kB" needed by the signal delivery code.
Unfortunately since then the signal frame has expanded, and is now 4224 bytes on 64-bit kernels with transactional memory enabled. This means if a process has consumed more than 1MB of stack, and its stack pointer lies less than 4224 bytes from the next page boundary, signal delivery will fault when trying to expand the stack and the process will see a SEGV.
The total size of the signal frame is the size of struct rt_sigframe (which includes the red zone) plus __SIGNAL_FRAMESIZE (128 bytes on 64-bit).
The 2048 byte allowance was correct until 2008 as the signal frame was:
struct rt_sigframe {
struct ucontext uc; /* 0 1440 */
/* --- cacheline 11 boundary (1408 bytes) was 32 bytes ago --- */
long unsigned int _unused[2]; /* 1440 16 */
unsigned int tramp[6]; /* 1456 24 */
struct siginfo * pinfo; /* 1480 8 */
void * puc; /* 1488 8 */
struct siginfo info; /* 1496 128 */
/* --- cacheline 12 boundary (1536 bytes) was 88 bytes ago --- */
char abigap[288]; /* 1624 288 */
/* size: 1920, cachelines: 15, members: 7 */ /* padding: 8 */
};
1920 + 128 = 2048
Then in commit ce48b2100785 ("powerpc: Add VSX context save/restore, ptrace and signal support") (Jul 2008) the signal frame expanded to 2304 bytes:
struct rt_sigframe {
struct ucontext uc; /* 0 1696 */ <--
/* --- cacheline 13 boundary (1664 bytes) was 32 bytes ago --- */
long unsigned int _unused[2]; /* 1696 16 */
unsigned int tramp[6]; /* 1712 24 */
struct siginfo * pinfo; /* 1736 8 */
void * puc; /* 1744 8 */
struct siginfo info; /* 1752 128 */
/* --- cacheline 14 boundary (1792 bytes) was 88 bytes ago --- */
char abigap[288]; /* 1880 288 */
/* size: 2176, cachelines: 17, members: 7 */ /* padding: 8 */
};
2176 + 128 = 2304
At this point we should have been exposed to the bug, though as far as I know it was never reported. I no longer have a system old enough to easily test on.
Then in 2010 commit 320b2b8de126 ("mm: keep a guard page below a grow-down stack segment") caused our stack expansion code to never trigger, as there was always a VMA found for a write up to PAGE_SIZE below r1.
That meant the bug was hidden as we continued to expand the signal frame in commit 2b0a576d15e0 ("powerpc: Add new transactional memory state to the signal context") (Feb 2013):
struct rt_sigframe {
struct ucontext uc; /* 0 1696 */
/* --- cacheline 13 boundary (1664 bytes) was 32 bytes ago --- */
struct ucontext uc_transact; /* 1696 1696 */ <--
/* --- cacheline 26 boundary (3328 bytes) was 64 bytes ago --- */
long unsigned int _unused[2]; /* 3392 16 */
unsigned int tramp[6]; /* 3408 24 */
struct siginfo * pinfo; /* 3432 8 */
void * puc; /* 3440 8 */
struct siginfo info; /* 3448 128 */
/* --- cacheline 27 boundary (3456 bytes) was 120 bytes ago --- */
char abigap[288]; /* 3576 288 */
/* size: 3872, cachelines: 31, members: 8 */
/* padding: 8 */
/* last cacheline: 32 bytes */
};3872 + 128 = 4000
And commit 573ebfa6601f ("powerpc: Increase stack redzone for 64-bit userspace to 512 bytes") (Feb 2014):
struct rt_sigframe {
struct ucontext uc; /* 0 1696 */
/* --- cacheline 13 boundary (1664 bytes) was 32 bytes ago --- */
struct ucontext uc_transact; /* 1696 1696 */
/* --- cacheline 26 boundary (3328 bytes) was 64 bytes ago --- */
long unsigned int _unused[2]; /* 3392 16 */
unsigned int tramp[6]; /* 3408 24 */
struct siginfo * pinfo; /* 3432 8 */
void * puc; /* 3440 8 */
struct siginfo info; /* 3448 128 */
/* --- cacheline 27 boundary (3456 bytes) was 120 bytes ago --- */
char abigap[512]; /* 3576 512 */ <--
/* size: 4096, cachelines: 32, members: 8 */ /* padding: 8 */
};
4096 + 128 = 4224
Then finally in 2017, commit 1be7107fbe18 ("mm: larger stack guard gap, between vmas") exposed us to the existing bug, because it changed the stack VMA to be the correct/real size, meaning our stack expansion code is now triggered.
Fix it by increasing the allowance to 4224 bytes.
Hard-coding 4224 is obviously unsafe against future expansions of the signal frame in the same way as the existing code. We can't easily use sizeof() because the signal frame structure is not in a header. We will either fix that, or rip out all the custom stack expansion checking logic entirely.
--- arch/powerpc/mm/fault.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/powerpc/mm/fault.c +5 -2
@@ -241,6 +241,9 @@ static bool bad_kernel_fault(struct pt_rreturn false; } +// This comes from 64-bit struct rt_sigframe + __SIGNAL_FRAMESIZE +#define SIGFRAME_MAX_SIZE (4096 + 128) +static bool bad_stack_expansion (struct pt_regs *regs,unsigned long address,struct vm_area_struct *vma,unsigned int flags,bool *must_retry)
@@ -248,7 +251,7 @@ static bool bad_stack_expansion(struct p/* * N.B. The POWER/Open ABI allows programs to access up to * 288 bytes below the stack pointer. -* The kernel signal delivery code writes up to about 1.5kB +* The kernel signal delivery code writes a bit over 4KB * below the stack pointer (r1) before decrementing it. * The exec code can write slightly over 640kB to the stack * before setting the user r1. Thus we allow the stack to
@@ -273,7 +276,7 @@ static bool bad_stack_expansion(struct p* between the last mapped region and the stack will * expand the stack rather than segfaulting. */ -if (address +2048 >= uregs->gpr[1 ]) +if (address +SIGFRAME_MAX_SIZE >= uregs->gpr[1 ])return false; if ((flags & FAULT_FLAG_WRITE) && (flags & FAULT_FLAG_USER) &&
Greg Kroah-Hartman
maintainerPATCH 27/204 btrfs: dont WARN if we abort a transaction with EROFS
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit f95ebdbed46a4d8b9fdb7bff109fdbb6fc9a6dc8 upstream.
If we got some sort of corruption via a read and call btrfs_handle_fs_error() we'll set BTRFS_FS_STATE_ERROR on the fs and complain. If a subsequent trans handle trips over this it'll get EROFS and then abort. However at that point we're not aborting for the original reason, we're aborting because we've been flipped read only. We do not need to WARN_ON() here.
--- fs/btrfs/ctree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/ctree.h +1 -1
@@ -3198,7 +3198,7 @@ do { \/* Report first abort since mount */ \if (!test_and_set_bit (BTRFS_FS_STATE_TRANS_ABORTED , \ &((trans)->fs_info->fs_state))) { \ -if ((errno) != -EIO ) { \ +if ((errno) != -EIO && (errno) != -EROFS ) { \WARN (1 ,KERN_DEBUG \"BTRFS: Transaction aborted (error %d)\n" , \ (errno)); \
Greg Kroah-Hartman
maintainerPATCH 47/204 pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 1c95348ba327fe8621d3680890c2341523d3524a upstream.
Ingenic SoCs don't natively support registering an interrupt for both rising and falling edges. This has to be emulated in software.
Until now, this was emulated by switching back and forth between IRQ_TYPE_EDGE_RISING and IRQ_TYPE_EDGE_FALLING according to the level of the GPIO. While this worked most of the time, when used with GPIOs that need debouncing, some events would be lost. For instance, between the time a falling-edge interrupt happens and the interrupt handler configures the hardware for rising-edge, the level of the pin may have already risen, and the rising-edge event is lost.
To address that issue, instead of switching back and forth between IRQ_TYPE_EDGE_RISING and IRQ_TYPE_EDGE_FALLING, we now switch back and forth between IRQ_TYPE_LEVEL_LOW and IRQ_TYPE_LEVEL_HIGH. Since we always switch in the interrupt handler, they actually permit to detect level changes. In the example above, if the pin level rises before switching the IRQ type from IRQ_TYPE_LEVEL_LOW to IRQ_TYPE_LEVEL_HIGH, a new interrupt will raise as soon as the handler exits, and the rising-edge event will be properly detected.
--- drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-ingenic.c +3 -3
@@ -1810,9 +1810,9 @@ static void ingenic_gpio_irq_ack(struct*/ high =ingenic_gpio_get_value (jzgc, irq);if (high) -irq_set_type (jzgc, irq,IRQ_TYPE_EDGE_FALLING ); +irq_set_type (jzgc, irq,IRQ_TYPE_LEVEL_LOW );else -irq_set_type (jzgc, irq,IRQ_TYPE_EDGE_RISING ); +irq_set_type (jzgc, irq,IRQ_TYPE_LEVEL_HIGH ); }if (jzgc->jzpc->info->version >=ID_JZ4760 )
@@ -1848,7 +1848,7 @@ static int ingenic_gpio_irq_set_type(str*/ bool high =ingenic_gpio_get_value (jzgc, irqd->hwirq); - type = high ?IRQ_TYPE_EDGE_FALLING :IRQ_TYPE_EDGE_RISING ; + type = high ?IRQ_TYPE_LEVEL_LOW :IRQ_TYPE_LEVEL_HIGH ; }irq_set_type (jzgc, irqd->hwirq, type);
Greg Kroah-Hartman
maintainerPATCH 48/204 pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 84e7a946da71f678affacea301f6d5cb4d9784e8 upstream.
The PAT1 register contains information about the IRQ type (edge/level) for input GPIOs with IRQ enabled, and the direction for non-IRQ GPIOs. So it makes sense to read it only if the GPIO has no interrupt configured, otherwise input GPIOs configured for level IRQs are misdetected as output GPIOs.
--- drivers/pinctrl/pinctrl-ingenic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ingenic.c +2 -1
@@ -1955,7 +1955,8 @@ static int ingenic_gpio_get_direction(stunsigned int pin = gc->base + offset;if (jzpc->info->version >=ID_JZ4760 ) { -if (ingenic_get_pin_config (jzpc, pin,JZ4760_GPIO_PAT1 )) +if (ingenic_get_pin_config (jzpc, pin,JZ4760_GPIO_INT ) || +ingenic_get_pin_config (jzpc, pin,JZ4760_GPIO_PAT1 ))return GPIO_LINE_DIRECTION_IN ;return GPIO_LINE_DIRECTION_OUT ; }
Greg Kroah-Hartman
maintainerPATCH 49/204 media: venus: fix multiple encoder crash
In reply to Greg Kroah-HartmanFrom: Mansur Alisha Shaik <[email protected]>
commit e0eb34810113dbbf1ace57440cf48d514312a373 upstream.
Currently we are considering the instances which are available in core->inst list for load calculation in min_loaded_core() function, but this is incorrect because by the time we call decide_core() for second instance, the third instance not filled yet codec_freq_data pointer.
Solve this by considering the instances whose session has started.
--- drivers/media/platform/qcom/venus/pm_helpers.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/qcom/venus/pm_helpers.c +4 -0
@@ -496,6 +496,10 @@ min_loaded_core(struct venus_inst *inst,list_for_each_entry (inst_pos, &core->instances, list) {if (inst_pos == inst)continue ; + +if (inst_pos->state !=INST_START ) +continue ; + vpp_freq = inst_pos->clk_data.codec_freq_data->vpp_freq; coreid = inst_pos->clk_data.core_id;
Greg Kroah-Hartman
maintainerPATCH 51/204 net: ethernet: stmmac: Disable hardware multicast filter
In reply to Greg Kroah-HartmanFrom: Jonathan McDowell <[email protected]>
commit df43dd526e6609769ae513a81443c7aa727c8ca3 upstream.
The IPQ806x does not appear to have a functional multicast ethernet address filter. This was observed as a failure to correctly receive IPv6 packets on a LAN to the all stations address. Checking the vendor driver shows that it does not attempt to enable the multicast filter and instead falls back to receiving all multicast packets, internally setting ALLMULTI.
Use the new fallback support in the dwmac1000 driver to correctly achieve the same with the mainline IPQ806x driver. Confirmed to fix IPv6 functionality on an RB3011 router.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +1 -0
@@ -351,6 +351,7 @@ static int ipq806x_gmac_probe(struct pla plat_dat->has_gmac = true; plat_dat->bsp_priv = gmac; plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed; + plat_dat->multicast_filter_bins =0 ; err =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);if (err)
Greg Kroah-Hartman
maintainerPATCH 52/204 net: stmmac: dwmac1000: provide multicast filter fallback
In reply to Greg Kroah-HartmanFrom: Jonathan McDowell <[email protected]>
commit 592d751c1e174df5ff219946908b005eb48934b3 upstream.
If we don't have a hardware multicast filter available then instead of silently failing to listen for the requested ethernet broadcast addresses fall back to receiving all multicast packets, in a similar fashion to other drivers with no multicast filter.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +3 -0
@@ -164,6 +164,9 @@ static void dwmac1000_set_filter(struct value =GMAC_FRAME_FILTER_PR |GMAC_FRAME_FILTER_PCF ; }else if (dev->flags &IFF_ALLMULTI ) { value =GMAC_FRAME_FILTER_PM ;/* pass all multi */ + }else if (!netdev_mc_empty (dev) && (mcbitslog2 ==0 )) { +/* Fall back to all multicast if we've no filter */ + value =GMAC_FRAME_FILTER_PM ; }else if (!netdev_mc_empty (dev)) {struct netdev_hw_addr *ha;
Greg Kroah-Hartman
maintainerPATCH 53/204 irqchip/loongson-liointc: Fix misuse of gc->mask_cache
In reply to Greg Kroah-HartmanFrom: Huacai Chen <[email protected]>
commit c9c73a05413ea4a465cae1cb3593b01b190a233f upstream.
In gc->mask_cache bits, 1 means enabled and 0 means disabled, but in the loongson-liointc driver mask_cache is misused by reverting its meaning. This patch fix the bug and update the comments as well.
--- drivers/irqchip/irq-loongson-liointc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/irqchip/irq-loongson-liointc.c +5 -5
@@ -60,7 +60,7 @@ static void liointc_chained_handle_irq(sif (!pending) {/* Always blame LPC IRQ if we have that bug */ if (handler->priv->has_lpc_irq_errata && - (handler->parent_int_map & ~gc->mask_cache & + (handler->parent_int_map & gc->mask_cache &BIT (LIOINTC_ERRATA_IRQ ))) pending =BIT (LIOINTC_ERRATA_IRQ );else
@@ -132,11 +132,11 @@ static void liointc_resume(struct irq_chirq_gc_lock_irqsave (gc, flags);/* Disable all at first */ writel (0xffffffff , gc->reg_base +LIOINTC_REG_INTC_DISABLE ); -/* Revert map cache */ +/* Restore map cache */ for (i =0 ; i <LIOINTC_CHIP_IRQ ; i++)writeb (priv->map_cache[i], gc->reg_base + i); -/* Revert mask cache */ -writel (~gc->mask_cache, gc->reg_base +LIOINTC_REG_INTC_ENABLE ); +/* Restore mask cache */ +writel (gc->mask_cache, gc->reg_base +LIOINTC_REG_INTC_ENABLE );irq_gc_unlock_irqrestore (gc, flags); }
@@ -244,7 +244,7 @@ int __init liointc_of_init(struct device ct->chip.irq_mask_ack = irq_gc_mask_disable_reg; ct->chip.irq_set_type = liointc_set_type; - gc->mask_cache =0xffffffff ; + gc->mask_cache =0 ; priv->gc = gc;for (i =0 ; i <LIOINTC_NUM_PARENT ; i++) {
Greg Kroah-Hartman
maintainerPATCH 54/204 irqchip/gic-v4.1: Ensure accessing the correct RD when writing INVALLR
In reply to Greg Kroah-HartmanFrom: Zenghui Yu <[email protected]>
commit 3af9571cd585efafc2facbd8dbd407317ff898cf upstream.
The GICv4.1 spec tells us that it's CONSTRAINED UNPREDICTABLE to issue a register-based invalidation operation for a vPEID not mapped to that RD, or another RD within the same CommonLPIAff group.
To follow this rule, commit f3a059219bc7 ("irqchip/gic-v4.1: Ensure mutual exclusion between vPE affinity change and RD access") tried to address the race between the RD accesses and the vPE affinity change, but somehow forgot to take GICR_INVALLR into account. Let's take the vpe_lock before evaluating vpe->col_idx to fix it.
--- drivers/irqchip/irq-gic-v3-its.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +7 -3
@@ -3974,18 +3974,22 @@ static void its_vpe_4_1_deschedule(strucstatic void its_vpe_4_1_invall (struct its_vpe *vpe) {void __iomem *rdbase; +unsigned long flags;u64 val; +int cpu; val =GICR_INVALLR_V ; val |=FIELD_PREP (GICR_INVALLR_VPEID , vpe->vpe_id);/* Target the redistributor this vPE is currently known on */ -raw_spin_lock (&gic_data_rdist_cpu (vpe->col_idx)->rd_lock); - rdbase =per_cpu_ptr (gic_rdists->rdist, vpe->col_idx)->rd_base; + cpu =vpe_to_cpuid_lock (vpe, &flags); +raw_spin_lock (&gic_data_rdist_cpu (cpu)->rd_lock); + rdbase =per_cpu_ptr (gic_rdists->rdist, cpu)->rd_base;gic_write_lpir (val, rdbase +GICR_INVALLR );wait_for_syncr (rdbase); -raw_spin_unlock (&gic_data_rdist_cpu (vpe->col_idx)->rd_lock); +raw_spin_unlock (&gic_data_rdist_cpu (cpu)->rd_lock); +vpe_to_cpuid_unlock (vpe, flags); }static int its_vpe_4_1_set_vcpu_affinity (struct irq_data *d,void *vcpu_info)
Greg Kroah-Hartman
maintainerPATCH 56/204 net/compat: Add missing sock updates for SCM_RIGHTS
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit d9539752d23283db4692384a634034f451261e29 upstream.
Add missed sock updates to compat path via a new helper, which will be used more in coming patches. (The net/core/scm.c code is left as-is here to assist with -stable backports for the compat path.)
--- include/net/sock.h | 4 ++++ net/compat.c | 1 + net/core/sock.c | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+)
include/net/sock.h +4 -0
@@ -890,6 +890,8 @@ static inline int sk_memalloc_socks(void {return static_branch_unlikely (&memalloc_socks_key); } + +void __receive_sock (struct file *file);#else static inline int sk_memalloc_socks (void )
@@ -897,6 +899,8 @@ static inline int sk_memalloc_socks(void return 0; } +static inline void __receive_sock (struct file *file) +{ }#endif static inline gfp_t sk_gfp_mask (const struct sock *sk,gfp_t gfp_mask)
net/compat.c +1 -0
@@ -307,6 +307,7 @@ void scm_detach_fds_compat(struct msghdrbreak ; }/* Bump the usage count and install the file. */ +__receive_sock (fp[i]);fd_install (new_fd,get_file (fp[i])); }
net/core/sock.c +21 -0
@@ -2753,6 +2753,27 @@ int sock_no_mmap(struct file *file, stru }EXPORT_SYMBOL (sock_no_mmap); +/* +* When a file is received (via SCM_RIGHTS, etc), we must bump the +* various sock-based usage counts. +*/ +void __receive_sock (struct file *file) +{ +struct socket *sock; +int error; + +/* +* The resulting value of "error" is ignored here since we only +* need to take action when the file is a socket and testing +* "sock" for NULL is sufficient. +*/ + sock =sock_from_file (file, &error); +if (sock) { +sock_update_netprioidx (&sock->sk->sk_cgrp_data); +sock_update_classid (&sock->sk->sk_cgrp_data); + } +} +ssize_t sock_no_sendpage (struct socket *sock,struct page *page,int offset,size_t size,int flags) {ssize_t res;
Greg Kroah-Hartman
maintainerPATCH 28/204 btrfs: fix race between page release and a fast fsync
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 3d6448e631591756da36efb3ea6355ff6f383c3a upstream.
When releasing an extent map, done through the page release callback, we can race with an ongoing fast fsync and cause the fsync to miss a new extent and not log it. The steps for this to happen are the following:
1) A page is dirtied for some inode I;
2) Writeback for that page is triggered by a path other than fsync, for example by the system due to memory pressure;
3) When the ordered extent for the extent (a single 4K page) finishes, we unpin the corresponding extent map and set its generation to N, the current transaction's generation;
4) The btrfs_releasepage() callback is invoked by the system due to memory pressure for that no longer dirty page of inode I;
5) At the same time, some task calls fsync on inode I, joins transaction N, and at btrfs_log_inode() it sees that the inode does not have the full sync flag set, so we proceed with a fast fsync. But before we get into btrfs_log_changed_extents() and lock the inode's extent map tree:
6) Through btrfs_releasepage() we end up at try_release_extent_mapping() and we remove the extent map for the new 4Kb extent, because it is neither pinned anymore nor locked. By calling remove_extent_mapping(), we remove the extent map from the list of modified extents, since the extent map does not have the logging flag set. We unlock the inode's extent map tree;
7) The task doing the fast fsync now enters btrfs_log_changed_extents(), locks the inode's extent map tree and iterates its list of modified extents, which no longer has the 4Kb extent in it, so it does not log the extent;
8) The fsync finishes;
9) Before transaction N is committed, a power failure happens. After replaying the log, the 4K extent of inode I will be missing, since it was not logged due to the race with try_release_extent_mapping().
So fix this by teaching try_release_extent_mapping() to not remove an extent map if it's still in the list of modified extents.
--- fs/btrfs/extent_io.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
fs/btrfs/extent_io.c +13 -3
@@ -4504,15 +4504,25 @@ int try_release_extent_mapping(struct pafree_extent_map (em);break ; } -if (!test_range_bit (tree, em->start, -extent_map_end (em) -1 , -EXTENT_LOCKED ,0 ,NULL )) { +if (test_range_bit (tree, em->start, +extent_map_end (em) -1 , +EXTENT_LOCKED ,0 ,NULL )) + goto next; +/* +* If it's not in the list of modified extents, used +* by a fast fsync, we can remove it. If it's being +* logged we can safely remove it since fsync took an +* extra reference on the em. +*/ +if (list_empty (&em->list) || +test_bit (EXTENT_FLAG_LOGGING , &em->flags)) {set_bit (BTRFS_INODE_NEEDS_FULL_SYNC , &btrfs_inode->runtime_flags);remove_extent_mapping (map, em);/* once for the rb tree */ free_extent_map (em); } +next: start =extent_map_end (em);write_unlock (&map->lock);
Greg Kroah-Hartman
maintainerPATCH 55/204 pidfd: Add missing sock updates for pidfd_getfd()
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit 4969f8a073977123504609d7310b42a588297aa4 upstream.
The sock counting (sock_update_netprioidx() and sock_update_classid()) was missing from pidfd's implementation of received fd installation. Add a call to the new __receive_sock() helper.
--- kernel/pid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/pid.c +5 -2
@@ -42,6 +42,7 @@#include <linux/sched/signal.h> #include <linux/sched/task.h> #include <linux/idr.h> +#include <net/sock.h> struct pid init_struct_pid = { .count =REFCOUNT_INIT (1 ),
@@ -624,10 +625,12 @@ static int pidfd_getfd(struct pid *pid, } ret =get_unused_fd_flags (O_CLOEXEC ); -if (ret <0 ) +if (ret <0 ) {fput (file); -else + }else { +__receive_sock (file);fd_install (ret, file); + }return ret; }
Greg Kroah-Hartman
maintainerPATCH 70/204 hugetlbfs: remove call to huge_pte_alloc without i_mmap_rwsem
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
commit 34ae204f18519f0920bd50a644abd6fefc8dbfcf upstream.
Commit c0d0381ade79 ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization") requires callers of huge_pte_alloc to hold i_mmap_rwsem in at least read mode. This is because the explicit locking in huge_pmd_share (called by huge_pte_alloc) was removed. When restructuring the code, the call to huge_pte_alloc in the else block at the beginning of hugetlb_fault was missed.
Unfortunately, that else clause is exercised when there is no page table entry. This will likely lead to a call to huge_pmd_share. If huge_pmd_share thinks pmd sharing is possible, it will traverse the mapping tree (i_mmap) without holding i_mmap_rwsem. If someone else is modifying the tree, bad things such as addressing exceptions or worse could happen.
Simply remove the else clause. It should have been removed previously. The code following the else will call huge_pte_alloc with the appropriate locking.
To prevent this type of issue in the future, add routines to assert that i_mmap_rwsem is held, and call these routines in huge pmd sharing routines.
--- include/linux/fs.h | 10 ++++++++++ include/linux/hugetlb.h | 8 +++++--- mm/hugetlb.c | 15 +++++++-------- mm/rmap.c | 2 +- 4 files changed, 23 insertions(+), 12 deletions(-)
include/linux/fs.h +10 -0
@@ -546,6 +546,16 @@ static inline void i_mmap_unlock_read(stup_read (&mapping->i_mmap_rwsem); } +static inline void i_mmap_assert_locked (struct address_space *mapping) +{ +lockdep_assert_held (&mapping->i_mmap_rwsem); +} + +static inline void i_mmap_assert_write_locked (struct address_space *mapping) +{ +lockdep_assert_held_write (&mapping->i_mmap_rwsem); +} +/* * Might pages of this file be mapped into userspace? */
include/linux/hugetlb.h +5 -3
@@ -165,7 +165,8 @@ pte_t *huge_pte_alloc(struct mm_struct * unsigned long addr, unsigned long sz);pte_t *huge_pte_offset (struct mm_struct *mm,unsigned long addr,unsigned long sz); -int huge_pmd_unshare (struct mm_struct *mm,unsigned long *addr,pte_t *ptep); +int huge_pmd_unshare (struct mm_struct *mm,struct vm_area_struct *vma, +unsigned long *addr,pte_t *ptep);void adjust_range_if_pmd_sharing_possible (struct vm_area_struct *vma,unsigned long *start,unsigned long *end); struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
@@ -204,8 +205,9 @@ static inline struct address_space *hugereturn NULL ; } -static inline int huge_pmd_unshare (struct mm_struct *mm,unsigned long *addr, -pte_t *ptep) +static inline int huge_pmd_unshare (struct mm_struct *mm, +struct vm_area_struct *vma, +unsigned long *addr,pte_t *ptep) {return 0 ; }
mm/hugetlb.c +7 -8
@@ -3840,7 +3840,7 @@ void __unmap_hugepage_range(struct mmu_gcontinue ; ptl =huge_pte_lock (h, mm, ptep); -if (huge_pmd_unshare (mm, &address, ptep)) { +if (huge_pmd_unshare (mm, vma, &address, ptep)) {spin_unlock (ptl);/* * We just unmapped a page of PMDs by clearing a PUD.
@@ -4427,10 +4427,6 @@ vm_fault_t hugetlb_fault(struct mm_struc }else if (unlikely (is_hugetlb_entry_hwpoisoned (entry)))return VM_FAULT_HWPOISON_LARGE |VM_FAULT_SET_HINDEX (hstate_index (h)); - }else { - ptep =huge_pte_alloc (mm, haddr,huge_page_size (h)); -if (!ptep) -return VM_FAULT_OOM ; }/*
@@ -4907,7 +4903,7 @@ unsigned long hugetlb_change_protection(if (!ptep)continue ; ptl =huge_pte_lock (h, mm, ptep); -if (huge_pmd_unshare (mm, &address, ptep)) { +if (huge_pmd_unshare (mm, vma, &address, ptep)) { pages++;spin_unlock (ptl); shared_pmd = true;
@@ -5288,12 +5284,14 @@ out:* returns: 1 successfully unmapped a shared pte page * 0 the underlying pte page is not shared, or it is the last user */ -int huge_pmd_unshare (struct mm_struct *mm,unsigned long *addr,pte_t *ptep) +int huge_pmd_unshare (struct mm_struct *mm,struct vm_area_struct *vma, +unsigned long *addr,pte_t *ptep) {pgd_t *pgd =pgd_offset (mm, *addr);p4d_t *p4d =p4d_offset (pgd, *addr);pud_t *pud =pud_offset (p4d, *addr); +i_mmap_assert_write_locked (vma->vm_file->f_mapping);BUG_ON (page_count (virt_to_page (ptep)) ==0 );if (page_count (virt_to_page (ptep)) ==1 )return 0 ;
@@ -5311,7 +5309,8 @@ pte_t *huge_pmd_share(struct mm_struct *return NULL ; } -int huge_pmd_unshare (struct mm_struct *mm,unsigned long *addr,pte_t *ptep) +int huge_pmd_unshare (struct mm_struct *mm,struct vm_area_struct *vma, +unsigned long *addr,pte_t *ptep) {return 0 ; }
mm/rmap.c +1 -1
@@ -1458,7 +1458,7 @@ static bool try_to_unmap_one(struct page* do this outside rmap routines. */ VM_BUG_ON (!(flags &TTU_RMAP_LOCKED )); -if (huge_pmd_unshare (mm, &address, pvmw.pte)) { +if (huge_pmd_unshare (mm, vma, &address, pvmw.pte)) {/* * huge_pmd_unshare unmapped an entire PMD * page. There is no way of knowing exactly
Greg Kroah-Hartman
maintainerPATCH 71/204 mm/shuffle: dont move pages between zones and dont read garbage memmaps
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit 4a93025cbe4a0b19d1a25a2d763a3d2018bad0d9 upstream.
Especially with memory hotplug, we can have offline sections (with a garbage memmap) and overlapping zones. We have to make sure to only touch initialized memmaps (online sections managed by the buddy) and that the zone matches, to not move pages between zones.
To test if this can actually happen, I added a simple
BUG_ON(page_zone(page_i) != page_zone(page_j));
right before the swap. When hotplugging a 256M DIMM to a 4G x86-64 VM and onlining the first memory block "online_movable" and the second memory block "online_kernel", it will trigger the BUG, as both zones (NORMAL and MOVABLE) overlap.
This might result in all kinds of weird situations (e.g., double allocations, list corruptions, unmovable allocations ending up in the movable zone).
--- mm/shuffle.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
mm/shuffle.c +9 -9
@@ -58,25 +58,25 @@ module_param_call(shuffle, shuffle_store* For two pages to be swapped in the shuffle, they must be free (on a * 'free_area' lru), have the same order, and have the same migratetype. */ -static struct page *__meminit shuffle_valid_page (unsigned long pfn,int order) +static struct page *__meminit shuffle_valid_page (struct zone *zone, +unsigned long pfn,int order) { -struct page *page; +struct page *page =pfn_to_online_page (pfn);/* * Given we're dealing with randomly selected pfns in a zone we * need to ask questions like... */ -/* ...is the pfn even in the memmap? */ -if (!pfn_valid_within (pfn)) +/* ... is the page managed by the buddy? */ +if (!page)return NULL ; -/* ...is the pfn in a present section or a hole? */ -if (!pfn_in_present_section (pfn)) +/* ... is the page assigned to the same zone? */ +if (page_zone (page) != zone)return NULL ;/* ...is the page free and currently on a free_area list? */ - page =pfn_to_page (pfn);if (!PageBuddy (page))return NULL ;
@@ -123,7 +123,7 @@ void __meminit __shuffle_zone(struct zon* page_j randomly selected in the span @zone_start_pfn to * @spanned_pages. */ - page_i =shuffle_valid_page (i, order); + page_i =shuffle_valid_page (z, i, order);if (!page_i)continue ;
@@ -137,7 +137,7 @@ void __meminit __shuffle_zone(struct zon j = z->zone_start_pfn +ALIGN_DOWN (get_random_long () % z->spanned_pages, order_pages); - page_j =shuffle_valid_page (j, order); + page_j =shuffle_valid_page (z, j, order);if (page_j && page_j != page_i)break ; }
Greg Kroah-Hartman
maintainerPATCH 76/204 ftrace: Setup correct FTRACE_FL_REGS flags for module
In reply to Greg Kroah-HartmanFrom: Chengming Zhou <[email protected]>
commit 8a224ffb3f52b0027f6b7279854c71a31c48fc97 upstream.
When module loaded and enabled, we will use __ftrace_replace_code for module if any ftrace_ops referenced it found. But we will get wrong ftrace_addr for module rec in ftrace_get_addr_new, because rec->flags has not been setup correctly. It can cause the callback function of a ftrace_ops has FTRACE_OPS_FL_SAVE_REGS to be called with pt_regs set to NULL.
So setup correct FTRACE_FL_REGS flags for rec when we call referenced_filters to find ftrace_ops references it.
--- kernel/trace/ftrace.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +7 -4
@@ -6198,8 +6198,11 @@ static int referenced_filters(struct dynint cnt =0 ;for (ops = ftrace_ops_list; ops != &ftrace_list_end; ops = ops->next) { -if (ops_references_rec (ops, rec)) - cnt++; +if (ops_references_rec (ops, rec)) { + cnt++; +if (ops->flags &FTRACE_OPS_FL_SAVE_REGS ) + rec->flags |=FTRACE_FL_REGS ; + } }return cnt;
@@ -6378,8 +6381,8 @@ void ftrace_module_enable(struct moduleif (ftrace_start_up) cnt +=referenced_filters (rec); -/* This clears FTRACE_FL_DISABLED */ - rec->flags = cnt; + rec->flags &= ~FTRACE_FL_DISABLED ; + rec->flags += cnt;if (ftrace_start_up && cnt) {int failed =__ftrace_replace_code (rec,1 );
Greg Kroah-Hartman
maintainerPATCH 77/204 kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
commit 0cb2f1372baa60af8456388a574af6133edd7d80 upstream.
We found a case of kernel panic on our server. The stack trace is as follows(omit some irrelevant information):
BUG: kernel NULL pointer dereference, address: 0000000000000080 RIP: 0010:kprobe_ftrace_handler+0x5e/0xe0 RSP: 0018:ffffb512c6550998 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff8e9d16eea018 RCX: 0000000000000000 RDX: ffffffffbe1179c0 RSI: ffffffffc0535564 RDI: ffffffffc0534ec0 RBP: ffffffffc0534ec1 R08: ffff8e9d1bbb0f00 R09: 0000000000000004 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: ffff8e9d1f797060 R14: 000000000000bacc R15: ffff8e9ce13eca00 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000080 CR3: 00000008453d0005 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> ftrace_ops_assist_func+0x56/0xe0 ftrace_call+0x5/0x34 tcpa_statistic_send+0x5/0x130 [ttcp_engine]
The tcpa_statistic_send is the function being kprobed. After analysis, the root cause is that the fourth parameter regs of kprobe_ftrace_handler is NULL. Why regs is NULL? We use the crash tool to analyze the kdump.
crash> dis tcpa_statistic_send -r
<tcpa_statistic_send>: callq 0xffffffffbd8018c0 <ftrace_caller>
The tcpa_statistic_send calls ftrace_caller instead of ftrace_regs_caller. So it is reasonable that the fourth parameter regs of kprobe_ftrace_handler is NULL. In theory, we should call the ftrace_regs_caller instead of the ftrace_caller. After in-depth analysis, we found a reproducible path.
Writing a simple kernel module which starts a periodic timer. The timer's handler is named 'kprobe_test_timer_handler'. The module name is kprobe_test.ko.
1) insmod kprobe_test.ko
2) bpftrace -e 'kretprobe:kprobe_test_timer_handler {}'
3) echo 0 > /proc/sys/kernel/ftrace_enabled
4) rmmod kprobe_test
5) stop step 2) kprobe
6) insmod kprobe_test.ko
7) bpftrace -e 'kretprobe:kprobe_test_timer_handler {}'
We mark the kprobe as GONE but not disarm the kprobe in the step 4). The step 5) also do not disarm the kprobe when unregister kprobe. So we do not remove the ip from the filter. In this case, when the module loads again in the step 6), we will replace the code to ftrace_caller via the ftrace_module_enable(). When we register kprobe again, we will not replace ftrace_caller to ftrace_regs_caller because the ftrace is disabled in the step 3). So the step 7) will trigger kernel panic. Fix this problem by disarming the kprobe when the module is going away.
--- kernel/kprobes.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/kprobes.c +7 -0
@@ -2104,6 +2104,13 @@ static void kill_kprobe(struct kprobe *p* the original probed function (which will be freed soon) any more. */ arch_remove_kprobe (p); + +/* +* The module is going away. We should disarm the kprobe which +* is using ftrace. +*/ +if (kprobe_ftrace (p)) +disarm_kprobe_ftrace (p); }/* Disable one kprobe */
Greg Kroah-Hartman
maintainerPATCH 78/204 tracing/hwlat: Honor the tracing_cpumask
In reply to Greg Kroah-HartmanFrom: Kevin Hao <[email protected]>
commit 96b4833b6827a62c295b149213c68b559514c929 upstream.
In calculation of the cpu mask for the hwlat kernel thread, the wrong cpu mask is used instead of the tracing_cpumask, this causes the tracing/tracing_cpumask useless for hwlat tracer. Fixes it.
--- kernel/trace/trace_hwlat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/trace_hwlat.c +3 -2
@@ -283,6 +283,7 @@ static bool disable_migrate;static void move_to_next_cpu (void ) {struct cpumask *current_mask = &save_cpumask; +struct trace_array *tr = hwlat_trace;int next_cpu;if (disable_migrate)
@@ -296,7 +297,7 @@ static void move_to_next_cpu(void) goto disable;get_online_cpus (); -cpumask_and (current_mask, cpu_online_mask, tracing_buffer_mask); +cpumask_and (current_mask, cpu_online_mask, tr->tracing_cpumask); next_cpu =cpumask_next (smp_processor_id (), current_mask);put_online_cpus ();
@@ -373,7 +374,7 @@ static int start_kthread(struct trace_ar/* Just pick the first CPU on first iteration */ current_mask = &save_cpumask;get_online_cpus (); -cpumask_and (current_mask, cpu_online_mask, tracing_buffer_mask); +cpumask_and (current_mask, cpu_online_mask, tr->tracing_cpumask);put_online_cpus (); next_cpu =cpumask_first (current_mask);
Greg Kroah-Hartman
maintainerPATCH 79/204 tracing: Use trace_sched_process_free() instead of exit() for pid tracing
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit afcab636657421f7ebfa0783a91f90256bba0091 upstream.
On exit, if a process is preempted after the trace_sched_process_exit() tracepoint but before the process is done exiting, then when it gets scheduled in, the function tracers will not filter it properly against the function tracing pid filters.
That is because the function tracing pid filters hooks to the sched_process_exit() tracepoint to remove the exiting task's pid from the filter list. Because the filtering happens at the sched_switch tracepoint, when the exiting task schedules back in to finish up the exit, it will no longer be in the function pid filtering tables.
This was noticeable in the notrace self tests on a preemptable kernel, as the tests would fail as it exits and preempted after being taken off the notrace filter table and on scheduling back in it would not be in the notrace list, and then the ending of the exit function would trace. The test detected this and would fail.
--- kernel/trace/ftrace.c | 4 ++-- kernel/trace/trace_events.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +2 -2
@@ -6980,12 +6980,12 @@ void ftrace_pid_follow_fork(struct traceif (enable) {register_trace_sched_process_fork (ftrace_pid_follow_sched_process_fork, tr); -register_trace_sched_process_exit (ftrace_pid_follow_sched_process_exit, +register_trace_sched_process_free (ftrace_pid_follow_sched_process_exit, tr); }else {unregister_trace_sched_process_fork (ftrace_pid_follow_sched_process_fork, tr); -unregister_trace_sched_process_exit (ftrace_pid_follow_sched_process_exit, +unregister_trace_sched_process_free (ftrace_pid_follow_sched_process_exit, tr); } }
kernel/trace/trace_events.c +2 -2
@@ -538,12 +538,12 @@ void trace_event_follow_fork(struct tracif (enable) {register_trace_prio_sched_process_fork (event_filter_pid_sched_process_fork, tr,INT_MIN ); -register_trace_prio_sched_process_exit (event_filter_pid_sched_process_exit, +register_trace_prio_sched_process_free (event_filter_pid_sched_process_exit, tr,INT_MAX ); }else {unregister_trace_sched_process_fork (event_filter_pid_sched_process_fork, tr); -unregister_trace_sched_process_exit (event_filter_pid_sched_process_exit, +unregister_trace_sched_process_free (event_filter_pid_sched_process_exit, tr); } }
Greg Kroah-Hartman
maintainerPATCH 81/204 watchdog: f71808e_wdt: remove use of wrong watchdog_info option
In reply to Greg Kroah-HartmanFrom: Ahmad Fatoum <[email protected]>
commit 802141462d844f2e6a4d63a12260d79b7afc4c34 upstream.
The flags that should be or-ed into the watchdog_info.options by drivers all start with WDIOF_, e.g. WDIOF_SETTIMEOUT, which indicates that the driver's watchdog_ops has a usable set_timeout.
WDIOC_SETTIMEOUT was used instead, which expands to 0xc0045706, which equals:
WDIOF_FANFAULT | WDIOF_EXTERN1 | WDIOF_PRETIMEOUT | WDIOF_ALARMONLY | WDIOF_MAGICCLOSE | 0xc0045000
These were so far indicated to userspace on WDIOC_GETSUPPORT. As the driver has not yet been migrated to the new watchdog kernel API, the constant can just be dropped without substitute.
--- drivers/watchdog/f71808e_wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/f71808e_wdt.c +1 -2
@@ -690,8 +690,7 @@ static int __init watchdog_init(int sioa* into the module have been registered yet. */ watchdog.sioaddr = sioaddr; - watchdog.ident.options =WDIOC_SETTIMEOUT - |WDIOF_MAGICCLOSE + watchdog.ident.options =WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING |WDIOF_CARDRESET ;
Greg Kroah-Hartman
maintainerPATCH 59/204 bcache: allocate meta data pages as compound pages
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
commit 5fe48867856367142d91a82f2cbf7a57a24cbb70 upstream.
There are some meta data of bcache are allocated by multiple pages, and they are used as bio bv_page for I/Os to the cache device. for example cache_set->uuids, cache->disk_buckets, journal_write->data, bset_tree->data.
For such meta data memory, all the allocated pages should be treated as a single memory block. Then the memory management and underlying I/O code can treat them more clearly.
This patch adds __GFP_COMP flag to all the location allocating >0 order pages for the above mentioned meta data. Then their pages are treated as compound pages now.
--- drivers/md/bcache/bset.c | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/journal.c | 4 ++-- drivers/md/bcache/super.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/md/bcache/bset.c +1 -1
@@ -322,7 +322,7 @@ int bch_btree_keys_alloc(struct btree_ke b->page_order = page_order; - t->data = (void *)__get_free_pages (gfp, b->page_order); + t->data = (void *)__get_free_pages (__GFP_COMP|gfp, b->page_order);if (!t->data) goto err;
drivers/md/bcache/btree.c +1 -1
@@ -785,7 +785,7 @@ int bch_btree_cache_alloc(struct cache_smutex_init (&c->verify_lock); c->verify_ondisk = (void *) -__get_free_pages (GFP_KERNEL ,ilog2 (bucket_pages (c))); +__get_free_pages (GFP_KERNEL |__GFP_COMP,ilog2 (bucket_pages (c))); c->verify_data =mca_bucket_alloc (c, &ZERO_KEY ,GFP_KERNEL );
drivers/md/bcache/journal.c +2 -2
@@ -999,8 +999,8 @@ int bch_journal_alloc(struct cache_set * j->w[1 ].c = c;if (!(init_fifo (&j->pin,JOURNAL_PIN ,GFP_KERNEL )) || - !(j->w[0 ].data = (void *)__get_free_pages (GFP_KERNEL ,JSET_BITS )) || - !(j->w[1 ].data = (void *)__get_free_pages (GFP_KERNEL ,JSET_BITS ))) + !(j->w[0 ].data = (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP,JSET_BITS )) || + !(j->w[1 ].data = (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP,JSET_BITS )))return -ENOMEM ;return 0 ;
drivers/md/bcache/super.c +1 -1
@@ -1775,7 +1775,7 @@ void bch_cache_set_unregister(struct cac }#define alloc_bucket_pages (gfp, c) \ - ((void *) __get_free_pages(__GFP_ZERO|gfp, ilog2(bucket_pages(c)))) + ((void *) __get_free_pages(__GFP_ZERO|__GFP_COMP|gfp, ilog2(bucket_pages(c))))struct cache_set *bch_cache_set_alloc (struct cache_sb *sb) {
Greg Kroah-Hartman
maintainerPATCH 82/204 watchdog: f71808e_wdt: clear watchdog timeout occurred flag
In reply to Greg Kroah-HartmanFrom: Ahmad Fatoum <[email protected]>
commit 4f39d575844148fbf3081571a1f3b4ae04150958 upstream.
The flag indicating a watchdog timeout having occurred normally persists till Power-On Reset of the Fintek Super I/O chip. The user can clear it by writing a `1' to the bit.
The driver doesn't offer a restart method, so regular system reboot might not reset the Super I/O and if the watchdog isn't enabled, we won't touch the register containing the bit on the next boot. In this case all subsequent regular reboots will be wrongly flagged by the driver as being caused by the watchdog.
Fix this by having the flag cleared after read. This is also done by other drivers like those for the i6300esb and mpc8xxx_wdt.
--- drivers/watchdog/f71808e_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/watchdog/f71808e_wdt.c +7 -0
@@ -706,6 +706,13 @@ static int __init watchdog_init(int sioa wdt_conf =superio_inb (sioaddr,F71808FG_REG_WDT_CONF ); watchdog.caused_reboot = wdt_conf &BIT (F71808FG_FLAG_WDTMOUT_STS ); +/* +* We don't want WDTMOUT_STS to stick around till regular reboot. +* Write 1 to the bit to clear it to zero. +*/ +superio_outb (sioaddr,F71808FG_REG_WDT_CONF , + wdt_conf |BIT (F71808FG_FLAG_WDTMOUT_STS )); +superio_exit (sioaddr); err =watchdog_set_timeout (timeout);
Greg Kroah-Hartman
maintainerPATCH 83/204 ceph: set sec_context xattr on symlink creation
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit b748fc7a8763a5b3f8149f12c45711cd73ef8176 upstream.
Symlink inodes should have the security context set in their xattrs on creation. We already set the context on creation, but we don't attach the pagelist. The effect is that symlink inodes don't get an SELinux context set on them at creation, so they end up unlabeled instead of inheriting the proper context. Make it do so.
--- fs/ceph/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ceph/dir.c +4 -0
@@ -924,6 +924,10 @@ static int ceph_symlink(struct inode *di req->r_num_caps =2 ; req->r_dentry_drop =CEPH_CAP_FILE_SHARED |CEPH_CAP_AUTH_EXCL ; req->r_dentry_unless =CEPH_CAP_FILE_EXCL ; +if (as_ctx.pagelist) { + req->r_pagelist = as_ctx.pagelist; + as_ctx.pagelist =NULL ; + } err =ceph_mdsc_do_request (mdsc, dir, req);if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);
Greg Kroah-Hartman
maintainerPATCH 86/204 dm: dont call report zones for more than the user requested
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
commit a9cb9f4148ef6bb8fabbdaa85c42b2171fbd5a0d upstream.
Don't call report zones for more zones than the user actually requested, otherwise this can lead to out-of-bounds accesses in the callback functions.
Such a situation can happen if the target's ->report_zones() callback function returns 0 because we've reached the end of the target and then restart the report zones on the second target.
We're again calling into ->report_zones() and ultimately into the user supplied callback function but when we're not subtracting the number of zones already processed this may lead to out-of-bounds accesses in the user callbacks.
--- drivers/md/dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/dm.c +2 -1
@@ -503,7 +503,8 @@ static int dm_blk_report_zones(struct ge } args.tgt = tgt; - ret = tgt->type->report_zones (tgt, &args, nr_zones); + ret = tgt->type->report_zones (tgt, &args, + nr_zones - args.zone_idx);if (ret <0 ) goto out; } while (args.zone_idx < nr_zones &&
Greg Kroah-Hartman
maintainerPATCH 60/204 bcache: fix overflow in offset_to_stripe()
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
commit 7a1481267999c02abf4a624515c1b5c7c1fccbd6 upstream.
offset_to_stripe() returns the stripe number (in type unsigned int) from an offset (in type uint64_t) by the following calculation,
do_div(offset, d->stripe_size);
For large capacity backing device (e.g. 18TB) with small stripe size (e.g. 4KB), the result is 4831838208 and exceeds UINT_MAX. The actual returned value which caller receives is 536870912, due to the overflow.
Indeed in bcache_device_init(), bcache_device->nr_stripes is limited in range [1, INT_MAX]. Therefore all valid stripe numbers in bcache are in range [0, bcache_dev->nr_stripes - 1].
This patch adds a upper limition check in offset_to_stripe(): the max valid stripe number should be less than bcache_device->nr_stripes. If the calculated stripe number from do_div() is equal to or larger than bcache_device->nr_stripe, -EINVAL will be returned. (Normally nr_stripes is less than INT_MAX, exceeding upper limitation doesn't mean overflow, therefore -EOVERFLOW is not used as error code.)
This patch also changes nr_stripes' type of struct bcache_device from 'unsigned int' to 'int', and return value type of offset_to_stripe() from 'unsigned int' to 'int', to match their exact data ranges.
All locations where bcache_device->nr_stripes and offset_to_stripe() are referenced also get updated for the above type change.
--- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/writeback.c | 14 +++++++++----- drivers/md/bcache/writeback.h | 19 +++++++++++++++++-- 3 files changed, 27 insertions(+), 8 deletions(-)
drivers/md/bcache/bcache.h +1 -1
@@ -264,7 +264,7 @@ struct bcache_device {#define BCACHE_DEV_UNLINK_DONE 2#define BCACHE_DEV_WB_RUNNING 3#define BCACHE_DEV_RATE_DW_RUNNING 4 -unsigned int nr_stripes; +int nr_stripes;unsigned int stripe_size;atomic_t *stripe_sectors_dirty;unsigned long *full_dirty_stripes;
drivers/md/bcache/writeback.c +9 -5
@@ -523,15 +523,19 @@ void bcache_dev_sectors_dirty_add(struct uint64_t offset, int nr_sectors) {struct bcache_device *d = c->devices[inode]; -unsigned int stripe_offset, stripe, sectors_dirty; +unsigned int stripe_offset, sectors_dirty; +int stripe;if (!d)return ; + stripe =offset_to_stripe (d, offset); +if (stripe <0 ) +return ; +if (UUID_FLASH_ONLY (&c->uuids[inode]))atomic_long_add (nr_sectors, &c->flash_dev_dirty_sectors); - stripe =offset_to_stripe (d, offset); stripe_offset = offset & (d->stripe_size -1 );while (nr_sectors) {
@@ -571,12 +575,12 @@ static bool dirty_pred(struct keybuf *bustatic void refill_full_stripes (struct cached_dev *dc) {struct keybuf *buf = &dc->writeback_keys; -unsigned int start_stripe, stripe, next_stripe; +unsigned int start_stripe, next_stripe; +int stripe;bool wrapped = false; stripe =offset_to_stripe (&dc->disk,KEY_OFFSET (&buf->last_scanned)); - -if (stripe >= dc->disk.nr_stripes) +if (stripe <0 ) stripe =0 ; start_stripe = stripe;
drivers/md/bcache/writeback.h +17 -2
@@ -52,10 +52,22 @@ static inline uint64_t bcache_dev_sectorreturn ret; } -static inline unsigned int offset_to_stripe (struct bcache_device *d, +static inline int offset_to_stripe (struct bcache_device *d,uint64_t offset) {do_div (offset, d->stripe_size); + +/* d->nr_stripes is in range [1, INT_MAX] */ +if (unlikely (offset >= d->nr_stripes)) { +pr_err ("Invalid stripe %llu (>= nr_stripes %d).\n" , + offset, d->nr_stripes); +return -EINVAL ; + } + +/* +* Here offset is definitly smaller than INT_MAX, +* return it as int will never overflow. +*/ return offset; }
@@ -63,7 +75,10 @@ static inline bool bcache_dev_stripe_diruint64_t offset, unsigned int nr_sectors) { - unsigned int stripe = offset_to_stripe(&dc->disk, offset); + int stripe = offset_to_stripe(&dc->disk, offset); + +if (stripe <0 ) +return false;while (1 ) {if (atomic_read (dc->disk.stripe_sectors_dirty + stripe))
Greg Kroah-Hartman
maintainerPATCH 61/204 mac80211: fix misplaced while instead of if
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 5981fe5b0529ba25d95f37d7faa434183ad618c5 upstream.
This never was intended to be a 'while' loop, it should've just been an 'if' instead of 'while'. Fix this.
I noticed this while applying another patch from Ben that intended to fix a busy loop at this spot.
--- net/mac80211/sta_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/sta_info.c +1 -1
@@ -1050,7 +1050,7 @@ static void __sta_info_destroy_part2(strmight_sleep ();lockdep_assert_held (&local->sta_mtx); -while (sta->sta_state ==IEEE80211_STA_AUTHORIZED ) { +if (sta->sta_state ==IEEE80211_STA_AUTHORIZED ) { ret =sta_info_move_state (sta,IEEE80211_STA_ASSOC );WARN_ON_ONCE (ret); }
Greg Kroah-Hartman
maintainerPATCH 62/204 driver core: Avoid binding drivers to dead devices
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 654888327e9f655a9d55ad477a9583e90e8c9b5c upstream.
Commit 3451a495ef24 ("driver core: Establish order of operations for device_add and device_del via bitflag") sought to prevent asynchronous driver binding to a device which is being removed. It added a per-device "dead" flag which is checked in the following code paths:
* asynchronous binding in __driver_attach_async_helper()
* synchronous binding in device_driver_attach()
* asynchronous binding in __device_attach_async_helper()
It did *not* check the flag upon:
* synchronous binding in __device_attach()
However __device_attach() may also be called asynchronously from:
deferred_probe_work_func()
bus_probe_device()
device_initial_probe()
__device_attach()So if the commit's intention was to check the "dead" flag in all asynchronous code paths, then a check is also necessary in __device_attach(). Add the missing check.
--- drivers/base/dd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/dd.c +3 -1
@@ -846,7 +846,9 @@ static int __device_attach(struct deviceint ret =0 ;device_lock (dev); -if (dev->driver) { +if (dev->p->dead) { + goto out_unlock; + }else if (dev->driver) {if (device_is_bound (dev)) { ret =1 ; goto out_unlock;
Greg Kroah-Hartman
maintainerPATCH 63/204 MIPS: CPU#0 is not hotpluggable
In reply to Greg Kroah-HartmanFrom: Huacai Chen <[email protected]>
commit 9cce844abf07b683cff5f0273977d5f8d0af94c7 upstream.
Now CPU#0 is not hotpluggable on MIPS, so prevent to create /sys/devices /system/cpu/cpu0/online which confuses some user-space tools.
--- arch/mips/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/topology.c +1 -1
@@ -20,7 +20,7 @@ static int __init topology_init(void)for_each_present_cpu (i) {struct cpu *c = &per_cpu (cpu_devices, i); - c->hotpluggable =1 ; + c->hotpluggable = !!i; ret =register_cpu (c, i);if (ret) printk(KERN_WARNING "topology_init: register_cpu %d "
Greg Kroah-Hartman
maintainerPATCH 64/204 MIPS: qi_lb60: Fix routing to audio amplifier
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 0889a67a9e7a56ba39af223d536630b20b877fda upstream.
The ROUT (right channel output of audio codec) was connected to INL (left channel of audio amplifier) instead of INR (right channel of audio amplifier).
--- arch/mips/boot/dts/ingenic/qi_lb60.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/boot/dts/ingenic/qi_lb60.dts +1 -1
@@ -69,7 +69,7 @@ "Speaker", "OUTL", "Speaker", "OUTR", "INL", "LOUT", - "INL", "ROUT"; + "INR", "ROUT"; simple-audio-card,aux-devs = <&>;
Greg Kroah-Hartman
maintainerPATCH 87/204 module: Correctly truncate sysfs sections output
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit 11990a5bd7e558e9203c1070fc52fb6f0488e75b upstream.
The only-root-readable /sys/module/$module/sections/$section files did not truncate their output to the available buffer size. While most paths into the kernfs read handlers end up using PAGE_SIZE buffers, it's possible to get there through other paths (e.g. splice, sendfile). Actually limit the output to the "count" passed into the read function, and report it back correctly. *sigh*
--- kernel/module.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
kernel/module.c +19 -3
@@ -1517,18 +1517,34 @@ struct module_sect_attrs {struct module_sect_attr attrs[]; }; +#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4))static ssize_t module_sect_read (struct file *file,struct kobject *kobj,struct bin_attribute *battr,char *buf,loff_t pos,size_t count) {struct module_sect_attr *sattr = container_of(battr, struct module_sect_attr, battr); +char bounce[MODULE_SECT_READ_SIZE +1 ]; +size_t wrote;if (pos !=0 )return -EINVAL ; -return sprintf (buf,"0x%px\n" , -kallsyms_show_value (file->f_cred) ? (void *)sattr->address :NULL ); +/* +* Since we're a binary read handler, we must account for the +* trailing NUL byte that sprintf will write: if "buf" is +* too small to hold the NUL, or the NUL is exactly the last +* byte, the read will look like it got truncated by one byte. +* Since there is no way to ask sprintf nicely to not write +* the NUL, we have to use a bounce buffer. +*/ + wrote =scnprintf (bounce,sizeof (bounce),"0x%px\n" , +kallsyms_show_value (file->f_cred) + ? (void *)sattr->address :NULL ); + count =min (count, wrote); +memcpy (buf, bounce, count); + +return count; }static void free_sect_attrs (struct module_sect_attrs *sect_attrs)
@@ -1577,7 +1593,7 @@ static void add_sect_attrs(struct module goto out; sect_attrs->nsections++; sattr->battr.read = module_sect_read; - sattr->battr.size =3 /* "0x", "\n" */ + (BITS_PER_LONG /4 ); + sattr->battr.size =MODULE_SECT_READ_SIZE ; sattr->battr.attr.mode =0400 ; *(gattr++) = &(sattr++)->battr; }
Greg Kroah-Hartman
maintainerPATCH 100/204 mfd: arizona: Ensure 32k clock is put on driver unbind and error
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit ddff6c45b21d0437ce0c85f8ac35d7b5480513d7 ]
Whilst it doesn't matter if the internal 32k clock register settings are cleaned up on exit, as the part will be turned off losing any settings, hence the driver hasn't historially bothered. The external clock should however be cleaned up, as it could cause clocks to be left on, and will at best generate a warning on unbind.
Add clean up on both the probe error path and unbind for the 32k clock.
--- drivers/mfd/arizona-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/mfd/arizona-core.c +18 -0
@@ -1426,6 +1426,15 @@ int arizona_dev_init(struct arizona *arizona)arizona_irq_exit (arizona); err_pm:pm_runtime_disable (arizona->dev); + +switch (arizona->pdata.clk32k_src) { +case ARIZONA_32KZ_MCLK1 : +case ARIZONA_32KZ_MCLK2 : +arizona_clk32k_disable (arizona); +break ; +default : +break ; + } err_reset:arizona_enable_reset (arizona);regulator_disable (arizona->dcvdd);
@@ -1448,6 +1457,15 @@ int arizona_dev_exit(struct arizona *arizona)regulator_disable (arizona->dcvdd);regulator_put (arizona->dcvdd); +switch (arizona->pdata.clk32k_src) { +case ARIZONA_32KZ_MCLK1 : +case ARIZONA_32KZ_MCLK2 : +arizona_clk32k_disable (arizona); +break ; +default : +break ; + } +mfd_remove_devices (arizona->dev);arizona_free_irq (arizona,ARIZONA_IRQ_UNDERCLOCKED , arizona);arizona_free_irq (arizona,ARIZONA_IRQ_OVERCLOCKED , arizona);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/204 crypto: algif_aead - Only wake up when ctx->more is zero
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit f3c802a1f30013f8f723b62d7fa49eb9e991da23 ]
AEAD does not support partial requests so we must not wake up while ctx->more is set. In order to distinguish between the case of no data sent yet and a zero-length request, a new init flag has been added to ctx.
SKCIPHER has also been modified to ensure that at least a block of data is available if there is more data to come.
--- crypto/af_alg.c | 11 ++++++++--- crypto/algif_aead.c | 4 ++-- crypto/algif_skcipher.c | 4 ++-- include/crypto/if_alg.h | 4 +++- 4 files changed, 15 insertions(+), 8 deletions(-)
crypto/af_alg.c +8 -3
@@ -635,6 +635,7 @@ void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst,if (!ctx->used) ctx->merge =0 ; + ctx->init = ctx->more; }EXPORT_SYMBOL_GPL (af_alg_pull_tsgl);
@@ -734,9 +735,10 @@ EXPORT_SYMBOL_GPL(af_alg_wmem_wakeup);* * @sk socket of connection to user space * @flags If MSG_DONTWAIT is set, then only report if function would sleep +* @min Set to minimum request size if partial requests are allowed. * @return 0 when writable memory is available, < 0 upon error */ -int af_alg_wait_for_data (struct sock *sk,unsigned flags) +int af_alg_wait_for_data (struct sock *sk,unsigned flags,unsigned min) {DEFINE_WAIT_FUNC (wait, woken_wake_function);struct alg_sock *ask =alg_sk (sk);
@@ -754,7 +756,9 @@ int af_alg_wait_for_data(struct sock *sk, unsigned flags)if (signal_pending (current))break ; timeout =MAX_SCHEDULE_TIMEOUT ; -if (sk_wait_event (sk, &timeout, (ctx->used || !ctx->more), +if (sk_wait_event (sk, &timeout, + ctx->init && (!ctx->more || + (min && ctx->used >= min)), &wait)) { err =0 ;break ;
@@ -843,7 +847,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, }lock_sock (sk); -if (!ctx->more && ctx->used) { +if (ctx->init && (init || !ctx->more)) { err = -EINVAL ; goto unlock; }
@@ -854,6 +858,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size,memcpy (ctx->iv, con.iv->iv, ivsize); ctx->aead_assoclen = con.aead_assoclen; + ctx->init = true; }while (size) {
crypto/algif_aead.c +2 -2
@@ -106,8 +106,8 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,size_t usedpages =0 ;/* [in] RX bufs to be used from user */ size_t processed =0 ;/* [in] TX bufs to be consumed */ -if (!ctx->used) { - err =af_alg_wait_for_data (sk, flags); +if (!ctx->init || ctx->more) { + err =af_alg_wait_for_data (sk, flags,0 );if (err)return err; }
crypto/algif_skcipher.c +2 -2
@@ -61,8 +61,8 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,int err =0 ;size_t len =0 ; -if (!ctx->used) { - err =af_alg_wait_for_data (sk, flags); +if (!ctx->init || (ctx->more && ctx->used < bs)) { + err =af_alg_wait_for_data (sk, flags, bs);if (err)return err; }
include/crypto/if_alg.h +3 -1
@@ -135,6 +135,7 @@ struct af_alg_async_req {* SG? * @enc: Cryptographic operation to be performed when * recvmsg is invoked. +* @init: True if metadata has been sent. * @len: Length of memory allocated for this data structure. */ struct af_alg_ctx {
@@ -151,6 +152,7 @@ struct af_alg_ctx {bool more;bool merge;bool enc; +bool init;unsigned int len; };
@@ -226,7 +228,7 @@ unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes, size_t offset);void af_alg_pull_tsgl (struct sock *sk,size_t used,struct scatterlist *dst,size_t dst_offset);void af_alg_wmem_wakeup (struct sock *sk); -int af_alg_wait_for_data (struct sock *sk,unsigned flags); +int af_alg_wait_for_data (struct sock *sk,unsigned flags,unsigned min);int af_alg_sendmsg (struct socket *sock,struct msghdr *msg,size_t size,unsigned int ivsize); ssize_t af_alg_sendpage(struct socket *sock, struct page *page,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 103/204 mtd: rawnand: brcmnand: ECC error handling on EDU transfers
In reply to Greg Kroah-HartmanFrom: Kamal Dasu <[email protected]>
[ Upstream commit 4551e78ad98add1f16b70cf286d5aad3ce7bcd4c ]
Implement ECC correctable and uncorrectable error handling for EDU reads. If ECC correctable bitflips are encountered on EDU transfer, read page again using PIO. This is needed due to a NAND controller limitation where corrected data is not transferred to the DMA buffer on ECC error. This applies to ECC correctable errors that are reported by the controller hardware based on set number of bitflips threshold in the controller threshold register, bitflips below the threshold are corrected silently and are not reported by the controller hardware.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +26 -0
@@ -1859,6 +1859,22 @@ static int brcmnand_edu_trans(struct brcmnand_host *host, u64 addr, u32 *buf,edu_writel (ctrl,EDU_STOP ,0 );/* force stop */ edu_readl (ctrl,EDU_STOP ); +if (!ret && edu_cmd ==EDU_CMD_READ ) { +u64 err_addr =0 ; + +/* +* check for ECC errors here, subpage ECC errors are +* retained in ECC error address register +*/ + err_addr =brcmnand_get_uncorrecc_addr (ctrl); +if (!err_addr) { + err_addr =brcmnand_get_correcc_addr (ctrl); +if (err_addr) + ret = -EUCLEAN ; + }else + ret = -EBADMSG ; + } +return ret; }
@@ -2065,6 +2081,7 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip,u64 err_addr =0 ;int err;bool retry = true; +bool edu_err = false;dev_dbg (ctrl->dev,"read %llx -> %p\n" , (unsigned long long )addr, buf);
@@ -2082,6 +2099,10 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip,else return -EIO ; } + +if (has_edu (ctrl) && err_addr) + edu_err = true; + }else {if (oob)memset (oob,0x99 , mtd->oobsize);
@@ -2129,6 +2150,11 @@ static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip,if (mtd_is_bitflip (err)) {unsigned int corrected =brcmnand_count_corrected (ctrl); +/* in case of EDU correctable error we read again using PIO */ +if (edu_err) + err =brcmnand_read_by_pio (mtd, chip, addr, trans, buf, + oob, &err_addr); +dev_dbg (ctrl->dev,"corrected error at 0x%llx\n" , (unsigned long long )err_addr); mtd->ecc_stats.corrected += corrected;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 104/204 platform/chrome: cros_ec_ishtp: Fix a double-unlock issue
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit aaa3cbbac326c95308e315f1ab964a3369c4d07d ]
In function cros_ec_ishtp_probe(), "up_write" is already called before function "cros_ec_dev_init". But "up_write" will be called again after the calling of the function "cros_ec_dev_init" failed. Thus add a call of the function “down_write” in this if branch for the completion of the exception handling.
--- drivers/platform/chrome/cros_ec_ishtp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/chrome/cros_ec_ishtp.c +3 -1
@@ -660,8 +660,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)/* Register croc_ec_dev mfd */ rv =cros_ec_dev_init (client_data); -if (rv) +if (rv) { +down_write (&init_lock); goto end_cros_ec_dev_init_error; + }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/204 octeontx2-af: change (struct qmem)->entry_sz from u8 to u16
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 393415203f5c916b5907e0a7c89f4c2c5a9c5505 ]
We need to increase TSO_HEADER_SIZE from 128 to 256.
Since otx2_sq_init() calls qmem_alloc() with TSO_HEADER_SIZE, we need to change (struct qmem)->entry_sz to avoid truncation to 0.
--- drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/common.h +1 -1
@@ -43,7 +43,7 @@ struct qmem {void *base;dma_addr_t iova;int alloc_sz; -u8 entry_sz; +u16 entry_sz;u8 align;u32 qsize; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 106/204 RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah()
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit 65936bf25f90fe440bb2d11624c7d10fab266639 ]
ipoib_mcast_carrier_on_task() insanely open codes a rtnl_lock() such that the only time flush_workqueue() can be called is if it also clears IPOIB_FLAG_OPER_UP.
Thus the flush inside ipoib_flush_ah() will deadlock if it gets unlucky enough, and lockdep doesn't help us to find it early:
CPU0 CPU1 CPU2
__ipoib_ib_dev_flush()
down_read(vlan_rwsem)
ipoib_vlan_add()
rtnl_trylock()
down_write(vlan_rwsem)
ipoib_mcast_carrier_on_task()
while (!rtnl_trylock())
msleep(20);
ipoib_flush_ah()
flush_workqueue(priv->wq)Clean up the ah_reaper related functions and lifecycle to make sense:
- Start/Stop of the reaper should only be done in open/stop NDOs, not in any other places
- cancel and flush of the reaper should only happen in the stop NDO. cancel is only functional when combined with IPOIB_STOP_REAPER.
- Non-stop places were flushing the AH's just need to flush out dead AH's synchronously and ignore the background task completely. It is fully locked and harmless to leave running.
Which ultimately fixes the ABBA deadlock by removing the unnecessary flush_workqueue() from the problematic place under the vlan_rwsem.
--- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 65 ++++++++++------------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + 2 files changed, 31 insertions(+), 36 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib_ib.c +29 -36
@@ -670,13 +670,12 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb,return rc; } -static void __ipoib_reap_ah (struct net_device *dev) +static void ipoib_reap_dead_ahs (struct ipoib_dev_priv *priv) { -struct ipoib_dev_priv *priv =ipoib_priv (dev);struct ipoib_ah *ah, *tah;unsigned long flags; -netif_tx_lock_bh (dev); +netif_tx_lock_bh (priv->dev);spin_lock_irqsave (&priv->lock, flags);list_for_each_entry_safe (ah, tah, &priv->dead_ahs, list)
@@ -687,37 +686,37 @@ static void __ipoib_reap_ah(struct net_device *dev) }spin_unlock_irqrestore (&priv->lock, flags); -netif_tx_unlock_bh (dev); +netif_tx_unlock_bh (priv->dev); }void ipoib_reap_ah (struct work_struct *work) {struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, ah_reap_task.work); -struct net_device *dev = priv->dev; -__ipoib_reap_ah (dev); +ipoib_reap_dead_ahs (priv);if (!test_bit (IPOIB_STOP_REAPER , &priv->flags))queue_delayed_work (priv->wq, &priv->ah_reap_task,round_jiffies_relative (HZ )); } -static void ipoib_flush_ah (struct net_device *dev) +static void ipoib_start_ah_reaper (struct ipoib_dev_priv *priv) { -struct ipoib_dev_priv *priv =ipoib_priv (dev); - -cancel_delayed_work (&priv->ah_reap_task); -flush_workqueue (priv->wq); -ipoib_reap_ah (&priv->ah_reap_task.work); +clear_bit (IPOIB_STOP_REAPER , &priv->flags); +queue_delayed_work (priv->wq, &priv->ah_reap_task, +round_jiffies_relative (HZ )); } -static void ipoib_stop_ah (struct net_device *dev) +static void ipoib_stop_ah_reaper (struct ipoib_dev_priv *priv) { -struct ipoib_dev_priv *priv =ipoib_priv (dev); -set_bit (IPOIB_STOP_REAPER , &priv->flags); -ipoib_flush_ah (dev); +cancel_delayed_work (&priv->ah_reap_task); +/* +* After ipoib_stop_ah_reaper() we always go through +* ipoib_reap_dead_ahs() which ensures the work is really stopped and +* does a final flush out of the dead_ah's list +*/ }static int recvs_pending (struct net_device *dev)
@@ -846,16 +845,6 @@ int ipoib_ib_dev_stop_default(struct net_device *dev)return 0 ; } -void ipoib_ib_dev_stop (struct net_device *dev) -{ -struct ipoib_dev_priv *priv =ipoib_priv (dev); - - priv->rn_ops->ndo_stop (dev); - -clear_bit (IPOIB_FLAG_INITIALIZED , &priv->flags); -ipoib_flush_ah (dev); -} -int ipoib_ib_dev_open_default (struct net_device *dev) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
@@ -899,10 +888,7 @@ int ipoib_ib_dev_open(struct net_device *dev)return -1 ; } -clear_bit (IPOIB_STOP_REAPER , &priv->flags); -queue_delayed_work (priv->wq, &priv->ah_reap_task, -round_jiffies_relative (HZ )); - +ipoib_start_ah_reaper (priv);if (priv->rn_ops->ndo_open (dev)) {pr_warn ("%s: Failed to open dev\n" , dev->name); goto dev_stop;
@@ -913,13 +899,20 @@ int ipoib_ib_dev_open(struct net_device *dev)return 0 ; dev_stop: -set_bit (IPOIB_STOP_REAPER , &priv->flags); -cancel_delayed_work (&priv->ah_reap_task); -set_bit (IPOIB_FLAG_INITIALIZED , &priv->flags); -ipoib_ib_dev_stop (dev); +ipoib_stop_ah_reaper (priv);return -1 ; } +void ipoib_ib_dev_stop (struct net_device *dev) +{ +struct ipoib_dev_priv *priv =ipoib_priv (dev); + + priv->rn_ops->ndo_stop (dev); + +clear_bit (IPOIB_FLAG_INITIALIZED , &priv->flags); +ipoib_stop_ah_reaper (priv); +} +void ipoib_pkey_dev_check_presence (struct net_device *dev) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
@@ -1230,7 +1223,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,ipoib_mcast_dev_flush (dev);if (oper_up)set_bit (IPOIB_FLAG_OPER_UP , &priv->flags); -ipoib_flush_ah (dev); +ipoib_reap_dead_ahs (priv); }if (level >=IPOIB_FLUSH_NORMAL )
@@ -1305,7 +1298,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)* the neighbor garbage collection is stopped and reaped. * That should all be done now, so make a final ah flush. */ -ipoib_stop_ah (dev); +ipoib_reap_dead_ahs (priv);clear_bit (IPOIB_PKEY_ASSIGNED , &priv->flags);
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -0
@@ -1975,6 +1975,8 @@ static void ipoib_ndo_uninit(struct net_device *dev)/* no more works over the priv->wq */ if (priv->wq) { +/* See ipoib_mcast_carrier_on_task() */ +WARN_ON (test_bit (IPOIB_FLAG_OPER_UP , &priv->flags));flush_workqueue (priv->wq);destroy_workqueue (priv->wq); priv->wq =NULL ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 108/204 media: staging: rkisp1: remove macro RKISP1_DIR_SINK_SRC
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit b861d139a36a4593498932bfec957bdcc7d98eb3 ]
The macro RKISP1_DIR_SINK_SRC is a mask of two flags.
The macro hides the fact that it's a mask and the code
is actually more clear if we replace it the with bitwise-or explicitly.
--- drivers/staging/media/rkisp1/rkisp1-isp.c | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/staging/media/rkisp1/rkisp1-isp.c +12 -13
@@ -25,7 +25,6 @@#define RKISP1_DIR_SRC BIT(0)#define RKISP1_DIR_SINK BIT(1) -#define RKISP1_DIR_SINK_SRC (RKISP1_DIR_SINK | RKISP1_DIR_SRC)/* * NOTE: MIPI controller and input MUX are also configured in this file.
@@ -69,84 +68,84 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = { .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 10, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 10, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 10, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 10, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 12, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 12, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 12, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 12, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 8, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 8, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 8, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, .fmt_type = RKISP1_FMT_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 8, - .direction = RKISP1_DIR_SINK_SRC, + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, }, { .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, .fmt_type = RKISP1_FMT_YUV,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/204 perf intel-pt: Fix FUP packet state
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 401136bb084fd021acd9f8c51b52fe0a25e326b2 upstream.
While walking code towards a FUP ip, the packet state is INTEL_PT_STATE_FUP or INTEL_PT_STATE_FUP_NO_TIP. That was mishandled resulting in the state becoming INTEL_PT_STATE_IN_SYNC prematurely. The result was an occasional lost EXSTOP event.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 21 ++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +7 -14
@@ -1164,6 +1164,7 @@ static int intel_pt_walk_fup(struct intereturn 0 ;if (err == -EAGAIN ||intel_pt_fup_with_nlip (decoder, &intel_pt_insn, ip, err)) { + decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ;if (intel_pt_fup_event (decoder))return 0 ;return -EAGAIN ;
@@ -1942,17 +1943,13 @@ next: }if (decoder->set_fup_mwait) no_tip = true; +if (no_tip) + decoder->pkt_state =INTEL_PT_STATE_FUP_NO_TIP ; +else + decoder->pkt_state =INTEL_PT_STATE_FUP ; err =intel_pt_walk_fup (decoder); -if (err != -EAGAIN ) { -if (err) -return err; -if (no_tip) - decoder->pkt_state = -INTEL_PT_STATE_FUP_NO_TIP ; -else - decoder->pkt_state =INTEL_PT_STATE_FUP ; -return 0 ; - } +if (err != -EAGAIN ) +return err;if (no_tip) { no_tip = false;break ;
@@ -2599,15 +2596,11 @@ const struct intel_pt_state *intel_pt_de err =intel_pt_walk_tip (decoder);break ;case INTEL_PT_STATE_FUP : - decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; err =intel_pt_walk_fup (decoder);if (err == -EAGAIN ) err =intel_pt_walk_fup_tip (decoder); -else if (!err) - decoder->pkt_state =INTEL_PT_STATE_FUP ;break ;case INTEL_PT_STATE_FUP_NO_TIP : - decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; err =intel_pt_walk_fup (decoder);if (err == -EAGAIN ) err =intel_pt_walk_trace (decoder);
Greg Kroah-Hartman
maintainerPATCH 110/204 media: rockchip: rga: Only set output CSC mode for RGB input
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 0f879bab72f47e8ba2421a984e7acfa763d3e84e ]
Setting the output CSC mode is required for a YUV output, but must not be set when the input is also YUV. Doing this (as tested with a YUV420P to YUV420P conversion) results in wrong colors.
Adapt the logic to only set the output CSC mode when the output is YUV and the input is RGB. Also add a comment to clarify the rationale.
--- drivers/media/platform/rockchip/rga/rga-hw.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rga/rga-hw.c +7 -1
@@ -200,6 +200,11 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) dst_info.data.format = ctx->out.fmt->hw_format; dst_info.data.swap = ctx->out.fmt->color_swap; +/* +* CSC mode must only be set when the colorspace families differ between +* input and output. It must remain unset (zeroed) if both are the same. +*/ +if (RGA_COLOR_FMT_IS_YUV (ctx->in.fmt->hw_format) &&RGA_COLOR_FMT_IS_RGB (ctx->out.fmt->hw_format)) {switch (ctx->in.colorspace) {
@@ -212,7 +217,8 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) } } -if (RGA_COLOR_FMT_IS_YUV (ctx->out.fmt->hw_format)) { +if (RGA_COLOR_FMT_IS_RGB (ctx->in.fmt->hw_format) && +RGA_COLOR_FMT_IS_YUV (ctx->out.fmt->hw_format)) {switch (ctx->out.colorspace) {case V4L2_COLORSPACE_REC709 : dst_info.data.csc_mode =RGA_SRC_CSC_MODE_BT709_R0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 112/204 sched/uclamp: Protect uclamp fast path code with static key
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 46609ce227039fd192e0ecc7d940bed587fd2c78 ]
There is a report that when uclamp is enabled, a netperf UDP test regresses compared to a kernel compiled without uclamp.
https://lore.kernel.org/lkml/[email protected]/
While investigating the root cause, there were no sign that the uclamp code is doing anything particularly expensive but could suffer from bad cache behavior under certain circumstances that are yet to be understood.
https://lore.kernel.org/lkml/20200616110824.dgkkbyapn3io6wik@e107158-lin/
To reduce the pressure on the fast path anyway, add a static key that is by default will skip executing uclamp logic in the enqueue/dequeue_task() fast path until it's needed.
As soon as the user start using util clamp by:
1. Changing uclamp value of a task with sched_setattr()
2. Modifying the default sysctl_sched_util_clamp_{min, max}
3. Modifying the default cpu.uclamp.{min, max} value in cgroup
We flip the static key now that the user has opted to use util clamp. Effectively re-introducing uclamp logic in the enqueue/dequeue_task() fast path. It stays on from that point forward until the next reboot.
This should help minimize the effect of util clamp on workloads that don't need it but still allow distros to ship their kernels with uclamp compiled in by default.
SCHED_WARN_ON() in uclamp_rq_dec_id() was removed since now we can end up with unbalanced call to uclamp_rq_dec_id() if we flip the key while a task is running in the rq. Since we know it is harmless we just quietly return if we attempt a uclamp_rq_dec_id() when rq->uclamp[].bucket[].tasks is 0.
In schedutil, we introduce a new uclamp_is_enabled() helper which takes the static key into account to ensure RT boosting behavior is retained.
The following results demonstrates how this helps on 2 Sockets Xeon E5 2x10-Cores system.
nouclamp uclamp uclamp-static-key Hmean send-64 162.43 ( 0.00%) 157.84 * -2.82%* 163.39 * 0.59%* Hmean send-128 324.71 ( 0.00%) 314.78 * -3.06%* 326.18 * 0.45%* Hmean send-256 641.55 ( 0.00%) 628.67 * -2.01%* 648.12 * 1.02%* Hmean send-1024 2525.28 ( 0.00%) 2448.26 * -3.05%* 2543.73 * 0.73%* Hmean send-2048 4836.14 ( 0.00%) 4712.08 * -2.57%* 4867.69 * 0.65%* Hmean send-3312 7540.83 ( 0.00%) 7425.45 * -1.53%* 7621.06 * 1.06%* Hmean send-4096 9124.53 ( 0.00%) 8948.82 * -1.93%* 9276.25 * 1.66%* Hmean send-8192 15589.67 ( 0.00%) 15486.35 * -0.66%* 15819.98 * 1.48%* Hmean send-16384 26386.47 ( 0.00%) 25752.25 * -2.40%* 26773.74 * 1.47%*
The perf diff between nouclamp and uclamp-static-key when uclamp is disabled in the fast path:
8.73% -1.55% [kernel.kallsyms] [k] try_to_wake_up
0.07% +0.04% [kernel.kallsyms] [k] deactivate_task
0.13% -0.02% [kernel.kallsyms] [k] activate_taskThe diff between nouclamp and uclamp-static-key when uclamp is enabled in the fast path:
8.73% -0.72% [kernel.kallsyms] [k] try_to_wake_up
0.13% +0.39% [kernel.kallsyms] [k] activate_task
0.07% +0.38% [kernel.kallsyms] [k] deactivate_task--- kernel/sched/core.c | 74 +++++++++++++++++++++++++++++++- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/sched.h | 47 +++++++++++++++++++- 3 files changed, 119 insertions(+), 4 deletions(-)
kernel/sched/core.c +73 -1
@@ -793,6 +793,26 @@ unsigned int sysctl_sched_uclamp_util_max = SCHED_CAPACITY_SCALE;/* All clamps are required to be less or equal than these values */ static struct uclamp_se uclamp_default[UCLAMP_CNT ]; +/* +* This static key is used to reduce the uclamp overhead in the fast path. It +* primarily disables the call to uclamp_rq_{inc, dec}() in +* enqueue/dequeue_task(). +* +* This allows users to continue to enable uclamp in their kernel config with +* minimum uclamp overhead in the fast path. +* +* As soon as userspace modifies any of the uclamp knobs, the static key is +* enabled, since we have an actual users that make use of uclamp +* functionality. +* +* The knobs that would enable this static key are: +* +* * A task modifying its uclamp value with sched_setattr(). +* * An admin modifying the sysctl_sched_uclamp_{min, max} via procfs. +* * An admin modifying the cgroup cpu.uclamp.{min, max} +*/ +DEFINE_STATIC_KEY_FALSE (sched_uclamp_used); +/* Integer rounded range for each bucket */ #define UCLAMP_BUCKET_DELTA DIV_ROUND_CLOSEST(SCHED_CAPACITY_SCALE, UCLAMP_BUCKETS)
@@ -989,10 +1009,38 @@ static inline void uclamp_rq_dec_id(struct rq *rq, struct task_struct *p,lockdep_assert_held (&rq->lock); +/* +* If sched_uclamp_used was enabled after task @p was enqueued, +* we could end up with unbalanced call to uclamp_rq_dec_id(). +* +* In this case the uc_se->active flag should be false since no uclamp +* accounting was performed at enqueue time and we can just return +* here. +* +* Need to be careful of the following enqeueue/dequeue ordering +* problem too +* +* enqueue(taskA) +* // sched_uclamp_used gets enabled +* enqueue(taskB) +* dequeue(taskA) +* // Must not decrement bukcet->tasks here +* dequeue(taskB) +* +* where we could end up with stale data in uc_se and +* bucket[uc_se->bucket_id]. +* +* The following check here eliminates the possibility of such race. +*/ +if (unlikely (!uc_se->active)) +return ; + bucket = &uc_rq->bucket[uc_se->bucket_id]; +SCHED_WARN_ON (!bucket->tasks);if (likely (bucket->tasks)) bucket->tasks--; + uc_se->active = false;/*
@@ -1020,6 +1068,15 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p) {enum uclamp_id clamp_id; +/* +* Avoid any overhead until uclamp is actually used by the userspace. +* +* The condition is constructed such that a NOP is generated when +* sched_uclamp_used is disabled. +*/ +if (!static_branch_unlikely (&sched_uclamp_used)) +return ; +if (unlikely (!p->sched_class->uclamp_enabled))return ;
@@ -1035,6 +1092,15 @@ static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) {enum uclamp_id clamp_id; +/* +* Avoid any overhead until uclamp is actually used by the userspace. +* +* The condition is constructed such that a NOP is generated when +* sched_uclamp_used is disabled. +*/ +if (!static_branch_unlikely (&sched_uclamp_used)) +return ; +if (unlikely (!p->sched_class->uclamp_enabled))return ;
@@ -1144,8 +1210,10 @@ int sysctl_sched_uclamp_handler(struct ctl_table *table, int write, update_root_tg = true; } -if (update_root_tg) +if (update_root_tg) { +static_branch_enable (&sched_uclamp_used);uclamp_update_root_tg (); + }/* * We update all RUNNABLE tasks only when task groups are in use.
@@ -1210,6 +1278,8 @@ static void __setscheduler_uclamp(struct task_struct *p,if (likely (!(attr->sched_flags &SCHED_FLAG_UTIL_CLAMP )))return ; +static_branch_enable (&sched_uclamp_used); +if (attr->sched_flags &SCHED_FLAG_UTIL_CLAMP_MIN ) {uclamp_se_set (&p->uclamp_req[UCLAMP_MIN ], attr->sched_util_min, true);
@@ -7306,6 +7376,8 @@ static ssize_t cpu_uclamp_write(struct kernfs_open_file *of, char *buf,if (req.ret)return req.ret; +static_branch_enable (&sched_uclamp_used); +mutex_lock (&uclamp_mutex);rcu_read_lock ();
kernel/sched/cpufreq_schedutil.c +1 -1
@@ -210,7 +210,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,unsigned long dl_util, util, irq;struct rq *rq =cpu_rq (cpu); -if (!IS_BUILTIN (CONFIG_UCLAMP_TASK ) && +if (!uclamp_is_used () && type ==FREQUENCY_UTIL &&rt_rq_is_runnable (&rq->rt)) {return max; }
kernel/sched/sched.h +45 -2
75 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 118/204 USB: serial: ftdi_sio: clean up receive processing
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit ce054039ba5e47b75a3be02a00274e52b06a6456 ]
Clean up receive processing by dropping the character pointer and keeping the length argument unchanged throughout the function.
Also make it more apparent that sysrq processing can consume a characters by adding an explicit continue.
--- drivers/usb/serial/ftdi_sio.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/usb/serial/ftdi_sio.c +9 -10
@@ -2483,7 +2483,6 @@ static int ftdi_process_packet(struct usb_serial_port *port, struct ftdi_private *priv, unsigned char *buf, int len) { unsigned char status; -unsigned char *ch;int i;char flag;
@@ -2526,8 +2525,7 @@ static int ftdi_process_packet(struct usb_serial_port *port,else priv->transmit_empty =0 ; - len -=2 ; -if (!len) +if (len ==2 )return 0 ;/* status only */ /*
@@ -2556,19 +2554,20 @@ static int ftdi_process_packet(struct usb_serial_port *port, } } - port->icount.rx += len; - ch = buf +2 ; + port->icount.rx += len -2 ;if (port->port.console && port->sysrq) { -for (i =0 ; i < len; i++, ch++) { -if (!usb_serial_handle_sysrq_char (port, *ch)) -tty_insert_flip_char (&port->port, *ch, flag); +for (i =2 ; i < len; i++) { +if (usb_serial_handle_sysrq_char (port, buf[i])) +continue ; +tty_insert_flip_char (&port->port, buf[i], flag); } }else { -tty_insert_flip_string_fixed_flag (&port->port, ch, flag, len); +tty_insert_flip_string_fixed_flag (&port->port, buf +2 , flag, + len -2 ); } -return len; +return len -2 ; }static void ftdi_process_read_urb (struct urb *urb)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 119/204 USB: serial: ftdi_sio: fix break and sysrq handling
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 733fff67941dad64b8a630450b8372b1873edc41 ]
Only the last NUL in a packet should be flagged as a break character, for example, to avoid dropping unrelated characters when IGNBRK is set.
Also make sysrq work by consuming the break character instead of having it immediately cancel the sysrq request, and by not processing it prematurely to avoid triggering a sysrq based on an unrelated character received in the same packet (which was received *before* the break).
Note that the break flag can be left set also for a packet received immediately following a break and that and an ending NUL in such a packet will continue to be reported as a break as there's no good way to tell it apart from an actual break.
Tested on FT232R and FT232H.
--- drivers/usb/serial/ftdi_sio.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/usb/serial/ftdi_sio.c +17 -7
@@ -2483,6 +2483,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, struct ftdi_private *priv, unsigned char *buf, int len) { unsigned char status; +bool brkint = false;int i;char flag;
@@ -2534,13 +2535,17 @@ static int ftdi_process_packet(struct usb_serial_port *port,*/ flag =TTY_NORMAL ;if (buf[1 ] &FTDI_RS_ERR_MASK ) { -/* Break takes precedence over parity, which takes precedence -* over framing errors */ -if (buf[1 ] &FTDI_RS_BI ) { - flag =TTY_BREAK ; +/* +* Break takes precedence over parity, which takes precedence +* over framing errors. Note that break is only associated +* with the last character in the buffer and only when it's a +* NUL. +*/ +if (buf[1 ] &FTDI_RS_BI && buf[len -1 ] =='\0' ) { port->icount.brk++; -usb_serial_handle_break (port); - }else if (buf[1 ] &FTDI_RS_PE ) { + brkint = true; + } +if (buf[1 ] &FTDI_RS_PE ) { flag =TTY_PARITY ; port->icount.parity++; }else if (buf[1 ] &FTDI_RS_FE ) {
@@ -2556,8 +2561,13 @@ static int ftdi_process_packet(struct usb_serial_port *port, port->icount.rx += len -2 ; -if (port->port.console && port->sysrq) { +if (brkint || (port->port.console && port->sysrq)) {for (i =2 ; i < len; i++) { +if (brkint && i == len -1 ) { +if (usb_serial_handle_break (port)) +return len -3 ; + flag =TTY_BREAK ; + }if (usb_serial_handle_sysrq_char (port, buf[i]))continue ;tty_insert_flip_char (&port->port, buf[i], flag);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 121/204 devres: keep both device name and resource name in pretty name
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 35bd8c07db2ce8fd2834ef866240613a4ef982e7 ]
Sometimes debugging a device is easiest using devmem on its register map, and that can be seen with /proc/iomem. But some device drivers have many memory regions. Take for example a networking switch. Its memory map used to look like this in /proc/iomem:
1fc000000-1fc3fffff : pcie@1f0000000
1fc000000-1fc3fffff : 0000:00:00.5
1fc010000-1fc01ffff : sys
1fc030000-1fc03ffff : rew
1fc060000-1fc0603ff : s2
1fc070000-1fc0701ff : devcpu_gcb
1fc080000-1fc0800ff : qs
1fc090000-1fc0900cb : ptp
1fc100000-1fc10ffff : port0
1fc110000-1fc11ffff : port1
1fc120000-1fc12ffff : port2
1fc130000-1fc13ffff : port3
1fc140000-1fc14ffff : port4
1fc150000-1fc15ffff : port5
1fc200000-1fc21ffff : qsys
1fc280000-1fc28ffff : anaBut after the patch in Fixes: was applied, the information is now presented in a much more opaque way:
1fc000000-1fc3fffff : pcie@1f0000000
1fc000000-1fc3fffff : 0000:00:00.5
1fc010000-1fc01ffff : 0000:00:00.5
1fc030000-1fc03ffff : 0000:00:00.5
1fc060000-1fc0603ff : 0000:00:00.5
1fc070000-1fc0701ff : 0000:00:00.5
1fc080000-1fc0800ff : 0000:00:00.5
1fc090000-1fc0900cb : 0000:00:00.5
1fc100000-1fc10ffff : 0000:00:00.5
1fc110000-1fc11ffff : 0000:00:00.5
1fc120000-1fc12ffff : 0000:00:00.5
1fc130000-1fc13ffff : 0000:00:00.5
1fc140000-1fc14ffff : 0000:00:00.5
1fc150000-1fc15ffff : 0000:00:00.5
1fc200000-1fc21ffff : 0000:00:00.5
1fc280000-1fc28ffff : 0000:00:00.5That patch made a fair comment that /proc/iomem might be confusing when it shows resources without an associated device, but we can do better than just hide the resource name altogether. Namely, we can print the device name _and_ the resource name. Like this:
1fc000000-1fc3fffff : pcie@1f0000000
1fc000000-1fc3fffff : 0000:00:00.5
1fc010000-1fc01ffff : 0000:00:00.5 sys
1fc030000-1fc03ffff : 0000:00:00.5 rew
1fc060000-1fc0603ff : 0000:00:00.5 s2
1fc070000-1fc0701ff : 0000:00:00.5 devcpu_gcb
1fc080000-1fc0800ff : 0000:00:00.5 qs
1fc090000-1fc0900cb : 0000:00:00.5 ptp
1fc100000-1fc10ffff : 0000:00:00.5 port0
1fc110000-1fc11ffff : 0000:00:00.5 port1
1fc120000-1fc12ffff : 0000:00:00.5 port2
1fc130000-1fc13ffff : 0000:00:00.5 port3
1fc140000-1fc14ffff : 0000:00:00.5 port4
1fc150000-1fc15ffff : 0000:00:00.5 port5
1fc200000-1fc21ffff : 0000:00:00.5 qsys
1fc280000-1fc28ffff : 0000:00:00.5 ana--- lib/devres.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
lib/devres.c +10 -1
@@ -119,6 +119,7 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, {resource_size_t size;void __iomem *dest_ptr; +char *pretty_name;BUG_ON (!dev);
@@ -129,7 +130,15 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, size =resource_size (res); -if (!devm_request_mem_region (dev, res->start, size,dev_name (dev))) { +if (res->name) + pretty_name =devm_kasprintf (dev,GFP_KERNEL ,"%s %s" , +dev_name (dev), res->name); +else + pretty_name =devm_kstrdup (dev,dev_name (dev),GFP_KERNEL ); +if (!pretty_name) +return IOMEM_ERR_PTR (-ENOMEM ); + +if (!devm_request_mem_region (dev, res->start, size, pretty_name)) {dev_err (dev,"can't request region for resource %pR\n" , res);return IOMEM_ERR_PTR (-EBUSY ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 120/204 crypto: af_alg - Fix regression on empty requests
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 662bb52f50bca16a74fe92b487a14d7dccb85e1a ]
Some user-space programs rely on crypto requests that have no control metadata. This broke when a check was added to require the presence of control metadata with the ctx->init flag.
This patch fixes the regression by setting ctx->init as long as one sendmsg(2) has been made, with or without a control message.
--- crypto/af_alg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/af_alg.c +1 -1
@@ -851,6 +851,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, err = -EINVAL ; goto unlock; } + ctx->init = true;if (init) { ctx->enc = enc;
@@ -858,7 +859,6 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size,memcpy (ctx->iv, con.iv->iv, ivsize); ctx->aead_assoclen = con.aead_assoclen; - ctx->init = true; }while (size) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/204 remoteproc: qcom: q6v5: Update running state before requesting stop
In reply to Greg Kroah-HartmanFrom: Sibi Sankar <[email protected]>
commit 5b7be880074c73540948f8fc597e0407b98fabfa upstream.
Sometimes the stop triggers a watchdog rather than a stop-ack. Update the running state to false on requesting stop to skip the watchdog instead.
Error Logs:
$ echo stop > /sys/class/remoteproc/remoteproc0/state ipa 1e40000.ipa: received modem stopping event remoteproc-modem: watchdog received: sys_m_smsm_mpss.c:291:APPS force stop qcom-q6v5-mss 4080000.remoteproc-modem: port failed halt ipa 1e40000.ipa: received modem offline event remoteproc0: stopped remote processor 4080000.remoteproc-modem
--- drivers/remoteproc/qcom_q6v5.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/remoteproc/qcom_q6v5.c +2 -0
@@ -153,6 +153,8 @@ int qcom_q6v5_request_stop(struct qcom_q {int ret; + q6v5->running = false; +qcom_smem_state_update_bits (q6v5->state,BIT (q6v5->stop_bit),BIT (q6v5->stop_bit));
Greg Kroah-Hartman
maintainerPATCH 93/204 gfs2: Never call gfs2_block_zero_range with an open transaction
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
commit 70499cdfeb3625c87eebe4f7a7ea06fa7447e5df upstream.
Before this patch, some functions started transactions then they called gfs2_block_zero_range. However, gfs2_block_zero_range, like writes, can start transactions, which results in a recursive transaction error. For example:
do_shrink
trunc_start
gfs2_trans_begin <------------------------------------------------
gfs2_block_zero_range
iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops);
iomap_apply ... iomap_zero_range_actor
iomap_begin
gfs2_iomap_begin
gfs2_iomap_begin_write
actor (iomap_zero_range_actor)
iomap_zero
iomap_write_begin
gfs2_iomap_page_prepare
gfs2_trans_begin <------------------------This patch reorders the callers of gfs2_block_zero_range so that they only start their transactions after the call. It also adds a BUG_ON to ensure this doesn't happen again.
--- fs/gfs2/bmap.c | 69 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 30 deletions(-)
fs/gfs2/bmap.c +39 -30
@@ -1351,9 +1351,15 @@ int gfs2_extent_map(struct inode *inode,return ret; } +/* +* NOTE: Never call gfs2_block_zero_range with an open transaction because it +* uses iomap write to perform its actions, which begin their own transactions +* (iomap_begin, page_prepare, etc.) +*/ static int gfs2_block_zero_range (struct inode *inode,loff_t from,unsigned int length) { +BUG_ON (current->journal_info);return iomap_zero_range (inode, from, length,NULL , &gfs2_iomap_ops); }
@@ -1414,6 +1420,16 @@ static int trunc_start(struct inode *inou64 oldsize = inode->i_size;int error; +if (!gfs2_is_stuffed (ip)) { +unsigned int blocksize =i_blocksize (inode); +unsigned int offs = newsize & (blocksize -1 ); +if (offs) { + error =gfs2_block_zero_range (inode, newsize, + blocksize - offs); +if (error) +return error; + } + }if (journaled) error =gfs2_trans_begin (sdp,RES_DINODE +RES_JDATA ,GFS2_JTRUNC_REVOKES );else
@@ -1427,19 +1443,10 @@ static int trunc_start(struct inode *inogfs2_trans_add_meta (ip->i_gl, dibh); -if (gfs2_is_stuffed (ip)) { +if (gfs2_is_stuffed (ip))gfs2_buffer_clear_tail (dibh,sizeof (struct gfs2_dinode ) + newsize); - }else { -unsigned int blocksize =i_blocksize (inode); -unsigned int offs = newsize & (blocksize -1 ); -if (offs) { - error =gfs2_block_zero_range (inode, newsize, - blocksize - offs); -if (error) - goto out; - } +else ip->i_diskflags |=GFS2_DIF_TRUNC_IN_PROG ; - }i_size_write (inode, newsize); ip->i_inode.i_mtime = ip->i_inode.i_ctime =current_time (&ip->i_inode);
@@ -2448,25 +2455,7 @@ int __gfs2_punch_hole(struct file *file,loff_t start, end;int error; - start =round_down (offset, blocksize); - end =round_up (offset + length, blocksize) -1 ; - error =filemap_write_and_wait_range (inode->i_mapping, start, end); -if (error) -return error; - -if (gfs2_is_jdata (ip)) - error =gfs2_trans_begin (sdp,RES_DINODE +2 *RES_JDATA , -GFS2_JTRUNC_REVOKES ); -else - error =gfs2_trans_begin (sdp,RES_DINODE ,0 ); -if (error) -return error; - -if (gfs2_is_stuffed (ip)) { - error =stuffed_zero_range (inode, offset, length); -if (error) - goto out; - }else { +if (!gfs2_is_stuffed (ip)) {unsigned int start_off, end_len; start_off = offset & (blocksize -1 );
@@ -2489,6 +2478,26 @@ int __gfs2_punch_hole(struct file *file, } } + start =round_down (offset, blocksize); + end =round_up (offset + length, blocksize) -1 ; + error =filemap_write_and_wait_range (inode->i_mapping, start, end); +if (error) +return error; + +if (gfs2_is_jdata (ip)) + error =gfs2_trans_begin (sdp,RES_DINODE +2 *RES_JDATA , +GFS2_JTRUNC_REVOKES ); +else + error =gfs2_trans_begin (sdp,RES_DINODE ,0 ); +if (error) +return error; + +if (gfs2_is_stuffed (ip)) { + error =stuffed_zero_range (inode, offset, length); +if (error) + goto out; + } +if (gfs2_is_jdata (ip)) {BUG_ON (!current->journal_info);gfs2_journaled_truncate_range (inode, offset, length);
Greg Kroah-Hartman
maintainerPATCH 123/204 RDMA/counter: Allow manually bind QPs with different pids to same counter
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit cbeb7d896c0f296451ffa7b67e7706786b8364c8 ]
In manual mode allow bind user QPs with different pids to same counter, since this is allowed in auto mode.
Bind kernel QPs and user QPs to the same counter are not allowed.
--- drivers/infiniband/core/counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/counters.c +1 -1
@@ -483,7 +483,7 @@ int rdma_counter_bind_qpn(struct ib_device *dev, u8 port, goto err; } -if (counter->res.task != qp->res.task) { +if (rdma_is_kernel_res (&counter->res) !=rdma_is_kernel_res (&qp->res)) { ret = -EINVAL ; goto err_task; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/204 remoteproc: qcom_q6v5_mss: Validate MBA firmware size before load
In reply to Greg Kroah-HartmanFrom: Sibi Sankar <[email protected]>
commit e013f455d95add874f310dc47c608e8c70692ae5 upstream.
The following mem abort is observed when the mba firmware size exceeds the allocated mba region. MBA firmware size is restricted to a maximum size of 1M and remaining memory region is used by modem debug policy firmware when available. Hence verify whether the MBA firmware size lies within the allocated memory region and is not greater than 1M before loading.
Err Logs:
Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0x40/0x218 rproc_boot+0x5b4/0x608 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8 __arm64_sys_write+0x24/0x30
...
--- drivers/remoteproc/qcom_q6v5_mss.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/remoteproc/qcom_q6v5_mss.c +6 -0
@@ -408,6 +408,12 @@ static int q6v5_load(struct rproc *rproc {struct q6v5 *qproc = rproc->priv; +/* MBA is restricted to a maximum size of 1M */ +if (fw->size > qproc->mba_size || fw->size >SZ_1M ) { +dev_err (qproc->dev,"MBA firmware load failed\n" ); +return -EINVAL ; + } +memcpy (qproc->mba_region, fw->data, fw->size);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 133/204 clk: actions: Fix h_clk for Actions S500 SoC
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit f47ee279d25fb0e010cae5d6e758e39b40eb6378 ]
The h_clk clock in the Actions Semi S500 SoC clock driver has an invalid parent. Replace with the correct one.
--- drivers/clk/actions/owl-s500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/actions/owl-s500.c +1 -1
@@ -183,7 +183,7 @@ static OWL_GATE(timer_clk, "timer_clk", "hosc", CMU_DEVCLKEN1, 27, 0, 0); static OWL_GATE(hdmi_clk, "hdmi_clk", "hosc", CMU_DEVCLKEN1, 3, 0, 0);/* divider clocks */ -static OWL_DIVIDER(h_clk, "h_clk", "ahbprevdiv_clk", CMU_BUSCLK1, 12, 2, NULL, 0, 0); +static OWL_DIVIDER(h_clk, "h_clk", "ahbprediv_clk", CMU_BUSCLK1, 12, 2, NULL, 0, 0); static OWL_DIVIDER(rmii_ref_clk, "rmii_ref_clk", "ethernet_pll_clk", CMU_ETHERNETPLL, 1, 1, rmii_ref_div_table, 0, 0);/* factor clocks */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 140/204 iommu/vt-d: Enforce PASID devTLB field mask
In reply to Greg Kroah-HartmanFrom: Liu Yi L <[email protected]>
[ Upstream commit 5f77d6ca5ca74e4b4a5e2e010f7ff50c45dea326 ]
Set proper masks to avoid invalid input spillover to reserved bits.
--- include/linux/intel-iommu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/intel-iommu.h +2 -2
@@ -363,8 +363,8 @@ enum {#define QI_DEV_EIOTLB_ADDR (a) ((u64)(a) & VTD_PAGE_MASK)#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11) -#define QI_DEV_EIOTLB_GLOB (g) ((u64)g) -#define QI_DEV_EIOTLB_PASID (p) (((u64)p) << 32) +#define QI_DEV_EIOTLB_GLOB (g) ((u64)(g) & 0x1) +#define QI_DEV_EIOTLB_PASID (p) ((u64)((p) & 0xfffff) << 32)#define QI_DEV_EIOTLB_SID (sid) ((u64)((sid) & 0xffff) << 16)#define QI_DEV_EIOTLB_QDEP (qd) ((u64)((qd) & 0x1f) << 4)#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 141/204 i2c: rcar: slave: only send STOP event when we have been addressed
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 314139f9f0abdba61ed9a8463bbcb0bf900ac5a2 ]
When the SSR interrupt is activated, it will detect every STOP condition on the bus, not only the ones after we have been addressed. So, enable this interrupt only after we have been addressed, and disable it otherwise.
--- drivers/i2c/busses/i2c-rcar.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-rcar.c +4 -3
@@ -583,13 +583,14 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv)rcar_i2c_write (priv,ICSIER ,SDR |SSR |SAR ); } -rcar_i2c_write (priv,ICSSR , ~SAR &0xff ); +/* Clear SSR, too, because of old STOPs to other clients than us */ +rcar_i2c_write (priv,ICSSR , ~(SAR |SSR ) &0xff ); }/* master sent stop */ if (ssr_filtered &SSR ) {i2c_slave_event (priv->slave,I2C_SLAVE_STOP , &value); -rcar_i2c_write (priv,ICSIER ,SAR |SSR ); +rcar_i2c_write (priv,ICSIER ,SAR );rcar_i2c_write (priv,ICSSR , ~SSR &0xff ); }
@@ -853,7 +854,7 @@ static int rcar_reg_slave(struct i2c_client *slave) priv->slave = slave;rcar_i2c_write (priv,ICSAR , slave->addr);rcar_i2c_write (priv,ICSSR ,0 ); -rcar_i2c_write (priv,ICSIER ,SAR |SSR ); +rcar_i2c_write (priv,ICSIER ,SAR );rcar_i2c_write (priv,ICSCR ,SIE |SDBS );return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 142/204 f2fs: compress: fix to update isize when overwriting compressed file
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 944dd22ea4475bd11180fd2f431a4a547ca4d8f5 ]
We missed to update isize of compressed file in write_end() with below case:
cluster size is 16KB
- write 14KB data from offset 0
- overwrite 16KB data from offset 0
--- fs/f2fs/data.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/data.c +4 -0
@@ -3353,6 +3353,10 @@ static int f2fs_write_end(struct file *file,if (f2fs_compressed_file (inode) && fsdata) {f2fs_compress_write_end (inode, fsdata, page->index, copied);f2fs_update_time (F2FS_I_SB (inode),REQ_TIME ); + +if (pos + copied >i_size_read (inode) && + !f2fs_verity_in_progress (inode)) +f2fs_i_size_write (inode, pos + copied);return copied; }#endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 143/204 clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 3386af51d3bcebcba3f7becdb1ef2e384abe90cf ]
Add missing halt_check, hwcg_reg and hwcg_bit properties. These were likely omitted when porting the driver upstream.
--- drivers/clk/qcom/gcc-sdm660.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/qcom/gcc-sdm660.c +3 -0
@@ -1715,6 +1715,9 @@ static struct clk_branch gcc_mss_cfg_ahb_clk = {static struct clk_branch gcc_mss_mnoc_bimc_axi_clk = { .halt_reg =0x8a004 , + .halt_check =BRANCH_HALT , + .hwcg_reg =0x8a004 , + .hwcg_bit =1 , .clkr = { .enable_reg =0x8a004 , .enable_mask =BIT (0 ),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 146/204 sched/uclamp: Fix a deadlock when enabling uclamp static key
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit e65855a52b479f98674998cb23b21ef5a8144b04 ]
The following splat was caught when setting uclamp value of a task:
BUG: sleeping function called from invalid context at ./include/linux/percpu-rwsem.h:49 cpus_read_lock+0x68/0x130 static_key_enable+0x1c/0x38 __sched_setscheduler+0x900/0xad8
Fix by ensuring we enable the key outside of the critical section in __sched_setscheduler()
--- kernel/sched/core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
kernel/sched/core.c +9 -2
@@ -1248,6 +1248,15 @@ static int uclamp_validate(struct task_struct *p,if (upper_bound >SCHED_CAPACITY_SCALE )return -EINVAL ; +/* +* We have valid uclamp attributes; make sure uclamp is enabled. +* +* We need to do that here, because enabling static branches is a +* blocking operation which obviously cannot be done while holding +* scheduler locks. +*/ +static_branch_enable (&sched_uclamp_used); +return 0 ; }
@@ -1278,8 +1287,6 @@ static void __setscheduler_uclamp(struct task_struct *p,if (likely (!(attr->sched_flags &SCHED_FLAG_UTIL_CLAMP )))return ; -static_branch_enable (&sched_uclamp_used); -if (attr->sched_flags &SCHED_FLAG_UTIL_CLAMP_MIN ) {uclamp_se_set (&p->uclamp_req[UCLAMP_MIN ], attr->sched_util_min, true);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 147/204 pwm: bcm-iproc: handle clk_get_rate() return
In reply to Greg Kroah-HartmanFrom: Rayagonda Kokatanur <[email protected]>
[ Upstream commit 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 ]
Handle clk_get_rate() returning 0 to avoid possible division by zero.
--- drivers/pwm/pwm-bcm-iproc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pwm/pwm-bcm-iproc.c +7 -2
@@ -85,8 +85,6 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,u64 tmp, multi, rate;u32 value, prescale; - rate =clk_get_rate (ip->clk); - value =readl (ip->base +IPROC_PWM_CTRL_OFFSET );if (value &BIT (IPROC_PWM_CTRL_EN_SHIFT (pwm->hwpwm)))
@@ -99,6 +97,13 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,else state->polarity =PWM_POLARITY_INVERSED ; + rate =clk_get_rate (ip->clk); +if (rate ==0 ) { + state->period =0 ; + state->duty_cycle =0 ; +return ; + } + value =readl (ip->base +IPROC_PWM_PRESCALE_OFFSET ); prescale = value >>IPROC_PWM_PRESCALE_SHIFT (pwm->hwpwm); prescale &=IPROC_PWM_PRESCALE_MAX ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 150/204 nfs: ensure correct writeback errors are returned on close()
In reply to Greg Kroah-HartmanFrom: Scott Mayhew <[email protected]>
[ Upstream commit 67dd23f9e6fbaf163431912ef5599c5e0693476c ]
nfs_wb_all() calls filemap_write_and_wait(), which uses filemap_check_errors() to determine the error to return. filemap_check_errors() only looks at the mapping->flags and will therefore only return either -ENOSPC or -EIO. To ensure that the correct error is returned on close(), nfs{,4}_file_flush() should call filemap_check_wb_err() which looks at the errseq value in mapping->wb_err without consuming it.
generic one")
--- fs/nfs/file.c | 5 ++++- fs/nfs/nfs4file.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/nfs/file.c +4 -1
@@ -140,6 +140,7 @@ static int nfs_file_flush(struct file *file, fl_owner_t id) {struct inode *inode =file_inode (file); +errseq_t since;dprintk ("NFS: flush(%pD2)\n" , file);
@@ -148,7 +149,9 @@ nfs_file_flush(struct file *file, fl_owner_t id)return 0 ;/* Flush writes to the server and return any errors */ -return nfs_wb_all (inode); + since =filemap_sample_wb_err (file->f_mapping); +nfs_wb_all (inode); +return filemap_check_wb_err (file->f_mapping, since); }ssize_t
fs/nfs/nfs4file.c +4 -1
@@ -110,6 +110,7 @@ static int nfs4_file_flush(struct file *file, fl_owner_t id) {struct inode *inode =file_inode (file); +errseq_t since;dprintk ("NFS: flush(%pD2)\n" , file);
@@ -125,7 +126,9 @@ nfs4_file_flush(struct file *file, fl_owner_t id)return filemap_fdatawrite (file->f_mapping);/* Flush writes to the server and return any errors */ -return nfs_wb_all (inode); + since =filemap_sample_wb_err (file->f_mapping); +nfs_wb_all (inode); +return filemap_check_wb_err (file->f_mapping, since); }#ifdef CONFIG_NFS_V4_2
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 151/204 ubifs: Fix wrong orphan node deletion in ubifs_jnl_update|rename
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit 094b6d1295474f338201b846a1f15e72eb0b12cf ]
There a wrong orphan node deleting in error handling path in ubifs_jnl_update() and ubifs_jnl_rename(), which may cause following error msg:
UBIFS error (ubi0:0 pid 1522): ubifs_delete_orphan [ubifs]:
missing orphan ino 65
Fix this by checking whether the node has been operated for adding to orphan list before being deleted,
--- fs/ubifs/journal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ubifs/journal.c +6 -4
@@ -539,7 +539,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, const struct fscrypt_name *nm, const struct inode *inode, int deletion, int xent) { - int err, dlen, ilen, len, lnum, ino_offs, dent_offs; + int err, dlen, ilen, len, lnum, ino_offs, dent_offs, orphan_added = 0;int aligned_dlen, aligned_ilen, sync =IS_DIRSYNC (dir);int last_reference = !!(deletion && inode->i_nlink ==0 );struct ubifs_inode *ui =ubifs_inode (inode);
@@ -630,6 +630,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, goto out_finish; } ui->del_cmtno = c->cmt_no; + orphan_added =1 ; } err =write_head (c,BASEHD , dent, len, &lnum, &dent_offs, sync);
@@ -702,7 +703,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,kfree (dent); out_ro:ubifs_ro_mode (c, err); -if (last_reference) +if (orphan_added)ubifs_delete_orphan (c, inode->i_ino);finish_reservation (c);return err;
@@ -1218,7 +1219,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,void *p;union ubifs_key key;struct ubifs_dent_node *dent, *dent2; -int err, dlen1, dlen2, ilen, lnum, offs, len; +int err, dlen1, dlen2, ilen, lnum, offs, len, orphan_added =0 ;int aligned_dlen1, aligned_dlen2, plen =UBIFS_INO_NODE_SZ ;int last_reference = !!(new_inode && new_inode->i_nlink ==0 );int move = (old_dir != new_dir);
@@ -1334,6 +1335,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, goto out_finish; } new_ui->del_cmtno = c->cmt_no; + orphan_added =1 ; } err =write_head (c,BASEHD , dent, len, &lnum, &offs, sync);
@@ -1415,7 +1417,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,release_head (c,BASEHD ); out_ro:ubifs_ro_mode (c, err); -if (last_reference) +if (orphan_added)ubifs_delete_orphan (c, new_inode->i_ino); out_finish:finish_reservation (c);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 152/204 clk: bcm2835: Do not use prediv with bcm2711s PLLs
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit f34e4651ce66a754f41203284acf09b28b9dd955 ]
Contrary to previous SoCs, bcm2711 doesn't have a prescaler in the PLL feedback loop. Bypass it by zeroing fb_prediv_mask when running on bcm2711.
Note that, since the prediv configuration bits were re-purposed, this was triggering miscalculations on all clocks hanging from the VPU clock, notably the aux UART, making its output unintelligible.
--- drivers/clk/bcm/clk-bcm2835.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/clk/bcm/clk-bcm2835.c +21 -4
@@ -314,6 +314,7 @@ struct bcm2835_cprman {struct device *dev;void __iomem *regs;spinlock_t regs_lock;/* spinlock for all clocks */ +unsigned int soc;/* * Real names of cprman clock parents looked up through
@@ -525,6 +526,20 @@ static int bcm2835_pll_is_on(struct clk_hw *hw)A2W_PLL_CTRL_PRST_DISABLE ; } +static u32 bcm2835_pll_get_prediv_mask (struct bcm2835_cprman *cprman, +const struct bcm2835_pll_data *data) +{ +/* +* On BCM2711 there isn't a pre-divisor available in the PLL feedback +* loop. Bits 13:14 of ANA1 (PLLA,PLLB,PLLC,PLLD) have been re-purposed +* for to for VCO RANGE bits. +*/ +if (cprman->soc &SOC_BCM2711 ) +return 0 ; + +return data->ana->fb_prediv_mask; +} +static void bcm2835_pll_choose_ndiv_and_fdiv (unsigned long rate,unsigned long parent_rate,u32 *ndiv,u32 *fdiv)
@@ -582,7 +597,7 @@ static unsigned long bcm2835_pll_get_rate(struct clk_hw *hw, ndiv = (a2wctrl &A2W_PLL_CTRL_NDIV_MASK ) >>A2W_PLL_CTRL_NDIV_SHIFT ; pdiv = (a2wctrl &A2W_PLL_CTRL_PDIV_MASK ) >>A2W_PLL_CTRL_PDIV_SHIFT ; using_prediv =cprman_read (cprman, data->ana_reg_base +4 ) & - data->ana->fb_prediv_mask; +bcm2835_pll_get_prediv_mask (cprman, data);if (using_prediv) { ndiv *=2 ;
@@ -665,6 +680,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw);struct bcm2835_cprman *cprman = pll->cprman;const struct bcm2835_pll_data *data = pll->data; +u32 prediv_mask =bcm2835_pll_get_prediv_mask (cprman, data);bool was_using_prediv, use_fb_prediv, do_ana_setup_first;u32 ndiv, fdiv, a2w_ctl;u32 ana[4 ];
@@ -682,7 +698,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw,for (i =3 ; i >=0 ; i--) ana[i] =cprman_read (cprman, data->ana_reg_base + i *4 ); - was_using_prediv = ana[1 ] & data->ana->fb_prediv_mask; + was_using_prediv = ana[1 ] & prediv_mask; ana[0 ] &= ~data->ana->mask0; ana[0 ] |= data->ana->set0;
@@ -692,10 +708,10 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, ana[3 ] |= data->ana->set3;if (was_using_prediv && !use_fb_prediv) { - ana[1 ] &= ~data->ana->fb_prediv_mask; + ana[1 ] &= ~prediv_mask; do_ana_setup_first = true; }else if (!was_using_prediv && use_fb_prediv) { - ana[1 ] |= data->ana->fb_prediv_mask; + ana[1 ] |= prediv_mask; do_ana_setup_first = false; }else { do_ana_setup_first = true;
@@ -2232,6 +2248,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)platform_set_drvdata (pdev, cprman); cprman->onecell.num = asize; + cprman->soc = pdata->soc; hws = cprman->onecell.hws;for (i =0 ; i < asize; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 125/204 rtw88: pci: disable aspm for platform inter-op with module parameter
In reply to Greg Kroah-HartmanFrom: Yan-Hsuan Chuang <[email protected]>
[ Upstream commit 68aa716b7dd36f55e080da9e27bc594346334c41 ]
Some platforms cannot read the DBI register successfully for the ASPM settings. After the read failed, the bus could be unstable, and the device just became unavailable [1]. For those platforms, the ASPM should be disabled. But as the ASPM can help the driver to save the power consumption in power save mode, the ASPM is still needed. So, add a module parameter for them to disable it, then the device can still work, while others can benefit from the less power consumption that brings by ASPM enabled.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=206411
[2] Note that my lenovo T430 is the same.
--- drivers/net/wireless/realtek/rtw88/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/realtek/rtw88/pci.c +9 -0
@@ -14,8 +14,11 @@#include "debug.h" static bool rtw_disable_msi; +static bool rtw_pci_disable_aspm;module_param_named (disable_msi, rtw_disable_msi, bool,0644 ); +module_param_named (disable_aspm, rtw_pci_disable_aspm, bool,0644 );MODULE_PARM_DESC (disable_msi,"Set Y to disable MSI interrupt support" ); +MODULE_PARM_DESC (disable_aspm,"Set Y to disable PCI ASPM support" );static u32 rtw_pci_tx_queue_idx_addr[] = { [RTW_TX_QUEUE_BK ] =RTK_PCI_TXBD_IDX_BKQ ,
@@ -1189,6 +1192,9 @@ static void rtw_pci_clkreq_set(struct rtw_dev *rtwdev, bool enable)u8 value;int ret; +if (rtw_pci_disable_aspm) +return ; + ret =rtw_dbi_read8 (rtwdev,RTK_PCIE_LINK_CFG , &value);if (ret) {rtw_err (rtwdev,"failed to read CLKREQ_L1, ret=%d" , ret);
@@ -1208,6 +1214,9 @@ static void rtw_pci_aspm_set(struct rtw_dev *rtwdev, bool enable)u8 value;int ret; +if (rtw_pci_disable_aspm) +return ; + ret =rtw_dbi_read8 (rtwdev,RTK_PCIE_LINK_CFG , &value);if (ret) {rtw_err (rtwdev,"failed to read ASPM, ret=%d" , ret);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 126/204 rtc: pl031: fix set_alarm by adding back call to alarm_irq_enable
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
[ Upstream commit 4df2ef85f0efe44505f511ca5e4455585f53a2da ]
Commit c8ff5841a90b ("rtc: pl031: switch to rtc_time64_to_tm/rtc_tm_to_time64") seemed to have accidentally removed the call to pl031_alarm_irq_enable from pl031_set_alarm while switching to 64-bit apis.
Let us add back the same to get the set alarm functionality back.
--- drivers/rtc/rtc-pl031.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-pl031.c +1 -0
@@ -275,6 +275,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)struct pl031_local *ldata =dev_get_drvdata (dev);writel (rtc_tm_to_time64 (&alarm->time), ldata->base +RTC_MR ); +pl031_alarm_irq_enable (dev, alarm->enabled);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 155/204 openrisc: Fix oops caused when dumping stack
In reply to Greg Kroah-HartmanFrom: Stafford Horne <[email protected]>
[ Upstream commit 57b8e277c33620e115633cdf700a260b55095460 ]
When dumping a stack with 'cat /proc/#/stack' the kernel would oops. For example:
# cat /proc/690/stack
Unable to handle kernel access
at virtual address 0x7fc60f58 Oops#: 0000
CPU #: 0
PC: c00097fc SR: 0000807f SP: d6f09b9c
GPR00: 00000000 GPR01: d6f09b9c GPR02: d6f09bb8 GPR03: d6f09bc4
GPR04: 7fc60f5c GPR05: c00099b4 GPR06: 00000000 GPR07: d6f09ba3
GPR08: ffffff00 GPR09: c0009804 GPR10: d6f08000 GPR11: 00000000
GPR12: ffffe000 GPR13: dbb86000 GPR14: 00000001 GPR15: dbb86250
GPR16: 7fc60f63 GPR17: 00000f5c GPR18: d6f09bc4 GPR19: 00000000
GPR20: c00099b4 GPR21: ffffffc0 GPR22: 00000000 GPR23: 00000000
GPR24: 00000001 GPR25: 000002c6 GPR26: d78b6850 GPR27: 00000001
GPR28: 00000000 GPR29: dbb86000 GPR30: ffffffff GPR31: dbb862fc
RES: 00000000 oGPR11: ffffffff
Process cat (pid: 702, stackpage=d79d6000)
Stack:
Call trace:
[<598977f2>] save_stack_trace_tsk+0x40/0x74
[<95063f0e>] stack_trace_save_tsk+0x44/0x58
[<b557bfdd>] proc_pid_stack+0xd0/0x13c
[<a2df8eda>] proc_single_show+0x6c/0xf0
[<e5a737b7>] seq_read+0x1b4/0x688
[<2d6c7480>] do_iter_read+0x208/0x248
[<2182a2fb>] vfs_readv+0x64/0x90This was caused by the stack trace code in save_stack_trace_tsk using the wrong stack pointer. It was using the user stack pointer instead of the kernel stack pointer. Fix this by using the right stack.
Also for good measure we add try_get_task_stack/put_task_stack to ensure the task is not lost while we are walking it's stack.
--- arch/openrisc/kernel/stacktrace.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/openrisc/kernel/stacktrace.c +16 -2
@@ -13,6 +13,7 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <asm/processor.h>
@@ -68,12 +69,25 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) {unsigned long *sp =NULL ; +if (!try_get_task_stack (tsk)) +return ; +if (tsk == current) sp = (unsigned long *) &sp; -else - sp = (unsigned long *)KSTK_ESP (tsk); +else { +unsigned long ksp; + +/* Locate stack from kernel context */ + ksp =task_thread_info (tsk)->ksp; + ksp +=STACK_FRAME_OVERHEAD ;/* redzone */ + ksp +=sizeof (struct pt_regs ); + + sp = (unsigned long *) ksp; + }unwind_stack (trace, sp, save_stack_address_nosched); + +put_task_stack (tsk); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 164/204 Input: sentelic - fix error return when fsp_reg_write fails
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit ea38f06e0291986eb93beb6d61fd413607a30ca4 ]
Currently when the call to fsp_reg_write fails -EIO is not being returned because the count is being returned instead of the return value in retval. Fix this by returning the value in retval instead of count.
Addresses-Coverity: ("Unused value")
--- drivers/input/mouse/sentelic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/mouse/sentelic.c +1 -1
@@ -441,7 +441,7 @@ static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,fsp_reg_write_enable (psmouse, false); -return count; +return retval; }PSMOUSE_DEFINE_WO_ATTR (setreg,S_IWUSR ,NULL , fsp_attr_set_setreg);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 122/204 RDMA/counter: Only bind user QPs in auto mode
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit c9f557421e505f75da4234a6af8eff46bc08614b ]
In auto mode only bind user QPs to a dynamic counter, since this feature is mainly used for system statistic and diagnostic purpose, while there's no need to counter kernel QPs so far.
--- drivers/infiniband/core/counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/counters.c +1 -1
@@ -288,7 +288,7 @@ int rdma_counter_bind_qp_auto(struct ib_qp *qp, u8 port)struct rdma_counter *counter;int ret; -if (!qp->res.valid) +if (!qp->res.valid ||rdma_is_kernel_res (&qp->res))return 0 ;if (!rdma_is_port_valid (dev, port))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 166/204 recordmcount: Fix build failure on non arm64
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 3df14264ad9930733a8166e5bd0eccc1727564bb ]
Commit ea0eada45632 leads to the following build failure on powerpc:
HOSTCC scripts/recordmcountscripts/recordmcount.c: In function 'arm64_is_fake_mcount':scripts/recordmcount.c:440: error: 'R_AARCH64_CALL26' undeclared (first use in this function) scripts/recordmcount.c:440: error: (Each undeclared identifier is reported only once scripts/recordmcount.c:440: error: for each function it appears in.)
make[2]: *** [scripts/recordmcount] Error 1
Make sure R_AARCH64_CALL26 is always defined.
--- scripts/recordmcount.c | 2 ++ 1 file changed, 2 insertions(+)
scripts/recordmcount.c +2 -0
@@ -42,6 +42,8 @@#define R_ARM_THM_CALL 10#define R_ARM_CALL 28 +#define R_AARCH64_CALL26 283 +static int fd_map;/* File descriptor for file being modified. */ static int mmap_failed;/* Boolean flag. */ static char gpfx;/* prefix for global symbol name (sometimes '_') */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 130/204 dm rq: dont call blk_mq_queue_stopped() in dm_stop_queue()
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit e766668c6cd49d741cfb49eaeb38998ba34d27bc ]
dm_stop_queue() only uses blk_mq_quiesce_queue() so it doesn't formally stop the blk-mq queue; therefore there is no point making the blk_mq_queue_stopped() check -- it will never be stopped.
In addition, even though dm_stop_queue() actually tries to quiesce hw queues via blk_mq_quiesce_queue(), checking with blk_queue_quiesced() to avoid unnecessary queue quiesce isn't reliable because: the QUEUE_FLAG_QUIESCED flag is set before synchronize_rcu() and dm_stop_queue() may be called when synchronize_rcu() from another blk_mq_quiesce_queue() is in-progress.
--- drivers/md/dm-rq.c | 3 --- 1 file changed, 3 deletions(-)
drivers/md/dm-rq.c +0 -3
@@ -70,9 +70,6 @@ void dm_start_queue(struct request_queue *q)void dm_stop_queue (struct request_queue *q) { -if (blk_mq_queue_stopped (q)) -return ; -blk_mq_quiesce_queue (q); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 167/204 vdpa: Fix pointer math bug in vdpasim_get_config()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit cf16fe9243bfa2863491026fc727618c7c593c84 ]
If "offset" is non-zero then we end up copying from beyond the end of the config because of pointer math. We can fix this by casting the struct to a u8 pointer.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -1
@@ -521,7 +521,7 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,struct vdpasim *vdpasim =vdpa_to_sim (vdpa);if (offset + len <sizeof (struct virtio_net_config )) -memcpy (buf, &vdpasim->config + offset, len); +memcpy (buf, (u8 *)&vdpasim->config + offset, len); } static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 173/204 nfs: Fix getxattr kernel panic and memory overflow
In reply to Greg Kroah-HartmanFrom: Jeffrey Mitchell <[email protected]>
[ Upstream commit b4487b93545214a9db8cbf32e86411677b0cca21 ]
Move the buffer size check to decode_attr_security_label() before memcpy() Only call memcpy() if the buffer is large enough
--- fs/nfs/nfs4proc.c | 2 -- fs/nfs/nfs4xdr.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/nfs/nfs4proc.c +0 -2
@@ -5845,8 +5845,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf,return ret;if (!(fattr.valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL ))return -ENOENT ; -if (buflen < label.len) -return -ERANGE ;return 0 ; }
fs/nfs/nfs4xdr.c +5 -1
@@ -4166,7 +4166,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,return -EIO ;if (len <NFS4_MAXLABELLEN ) {if (label) { -memcpy (label->label, p, len); +if (label->len) { +if (label->len < len) +return -ERANGE ; +memcpy (label->label, p, len); + } label->len = len; label->pi = pi; label->lfs = lfs;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 174/204 NFS: Fix flexfiles read failover
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 563c53e73b8b6ec842828736f77e633f7b0911e9 ]
The current mirrored read failover code is correctly resetting the mirror index between failed reads, however it is not able to actually flip the RPC call over to the next RPC client.
The end result is that we keep resending the RPC call to the same client over and over.
The fix is to use the pnfs_read_resend_pnfs() mechanism to schedule a new RPC call, but we need to add the ability to pass in a mirror index so that we always retry the next mirror in the list.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 50 ++++++++++++++++++-------- fs/nfs/pnfs.c | 4 ++- fs/nfs/pnfs.h | 2 +- 3 files changed, 40 insertions(+), 16 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +36 -14
@@ -790,6 +790,19 @@ ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg,return ff_layout_choose_any_ds_for_read (lseg, start_idx, best_idx); } +static struct nfs4_pnfs_ds * +ff_layout_get_ds_for_read (struct nfs_pageio_descriptor *pgio,int *best_idx) +{ +struct pnfs_layout_segment *lseg = pgio->pg_lseg; +struct nfs4_pnfs_ds *ds; + + ds =ff_layout_choose_best_ds_for_read (lseg, pgio->pg_mirror_idx, + best_idx); +if (ds || !pgio->pg_mirror_idx) +return ds; +return ff_layout_choose_best_ds_for_read (lseg,0 , best_idx); +} + static void ff_layout_pg_get_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req,
@@ -840,7 +853,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, goto out_nolseg; } - ds =ff_layout_choose_best_ds_for_read (pgio->pg_lseg,0 , &ds_idx); + ds =ff_layout_get_ds_for_read (pgio, &ds_idx);if (!ds) {if (!ff_layout_no_fallback_to_mds (pgio->pg_lseg)) goto out_mds;
@@ -1028,11 +1041,24 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs) } } +static void ff_layout_resend_pnfs_read (struct nfs_pgio_header *hdr) +{ +u32 idx = hdr->pgio_mirror_idx +1 ; +int new_idx =0 ; + +if (ff_layout_choose_any_ds_for_read (hdr->lseg, idx +1 , &new_idx)) +ff_layout_send_layouterror (hdr->lseg); +else +pnfs_error_mark_layout_for_return (hdr->inode, hdr->lseg); +pnfs_read_resend_pnfs (hdr, new_idx); +} +static void ff_layout_reset_read (struct nfs_pgio_header *hdr) {struct rpc_task *task = &hdr->task;pnfs_layoutcommit_inode (hdr->inode, false); +pnfs_error_mark_layout_for_return (hdr->inode, hdr->lseg);if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) { dprintk("%s Reset task %5u for i/o through MDS "
@@ -1234,6 +1260,12 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,break ;case NFS4ERR_NXIO :ff_layout_mark_ds_unreachable (lseg, idx); +/* +* Don't return the layout if this is a read and we still +* have layouts to try +*/ +if (opnum ==OP_READ ) +break ;/* Fallthrough */ default : pnfs_error_mark_layout_for_return(lseg->pls_layout->plh_inode,
@@ -1247,7 +1279,6 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,static int ff_layout_read_done_cb (struct rpc_task *task,struct nfs_pgio_header *hdr) { -int new_idx = hdr->pgio_mirror_idx;int err;if (task->tk_status <0 ) {
@@ -1267,10 +1298,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task,clear_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags);switch (err) {case -NFS4ERR_RESET_TO_PNFS : -if (ff_layout_choose_best_ds_for_read (hdr->lseg, - hdr->pgio_mirror_idx +1 , - &new_idx)) - goto out_layouterror;set_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags);return task->tk_status;case -NFS4ERR_RESET_TO_MDS :
@@ -1281,10 +1308,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task, }return 0 ; -out_layouterror: -ff_layout_read_record_layoutstats_done (task, hdr); -ff_layout_send_layouterror (hdr->lseg); - hdr->pgio_mirror_idx = new_idx; out_eagain:rpc_restart_call_prepare (task);return -EAGAIN ;
@@ -1411,10 +1434,9 @@ static void ff_layout_read_release(void *data)struct nfs_pgio_header *hdr = data;ff_layout_read_record_layoutstats_done (&hdr->task, hdr); -if (test_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags)) { -ff_layout_send_layouterror (hdr->lseg); -pnfs_read_resend_pnfs (hdr); - }else if (test_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags)) +if (test_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags)) +ff_layout_resend_pnfs_read (hdr); +else if (test_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags))ff_layout_reset_read (hdr);pnfs_generic_rw_release (data); }
fs/nfs/pnfs.c +3 -1
@@ -2939,7 +2939,8 @@ pnfs_try_to_read_data(struct nfs_pgio_header *hdr, }/* Resend all requests through pnfs. */ -void pnfs_read_resend_pnfs (struct nfs_pgio_header *hdr) +void pnfs_read_resend_pnfs (struct nfs_pgio_header *hdr, +unsigned int mirror_idx) {struct nfs_pageio_descriptor pgio;
@@ -2950,6 +2951,7 @@ void pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr)nfs_pageio_init_read (&pgio, hdr->inode, false, hdr->completion_ops); + pgio.pg_mirror_idx = mirror_idx; hdr->task.tk_status =nfs_pageio_resend (&pgio, hdr); } }
fs/nfs/pnfs.h +1 -1
@@ -311,7 +311,7 @@ int _pnfs_return_layout(struct inode *);int pnfs_commit_and_return_layout (struct inode *);void pnfs_ld_write_done (struct nfs_pgio_header *);void pnfs_ld_read_done (struct nfs_pgio_header *); -void pnfs_read_resend_pnfs (struct nfs_pgio_header *); +void pnfs_read_resend_pnfs (struct nfs_pgio_header *,unsigned int mirror_idx); struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx, loff_t pos,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 127/204 crypto: caam - Remove broken arc4 support
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit eeedb618378f8a09779546a3eeac16b000447d62 ]
The arc4 algorithm requires storing state in the request context in order to allow more than one encrypt/decrypt operation. As this driver does not seem to do that, it means that using it for more than one operation is broken.
--- drivers/crypto/caam/caamalg.c | 29 ----------------------------- drivers/crypto/caam/compat.h | 1 - 2 files changed, 30 deletions(-)
drivers/crypto/caam/caamalg.c +0 -29
@@ -810,12 +810,6 @@ static int ctr_skcipher_setkey(struct crypto_skcipher *skcipher,return skcipher_setkey (skcipher, key, keylen, ctx1_iv_off); } -static int arc4_skcipher_setkey (struct crypto_skcipher *skcipher, -const u8 *key,unsigned int keylen) -{ -return skcipher_setkey (skcipher, key, keylen,0 ); -} -static int des_skcipher_setkey (struct crypto_skcipher *skcipher,const u8 *key,unsigned int keylen) {
@@ -1967,21 +1961,6 @@ static struct caam_skcipher_alg driver_algs[] = { }, .caam.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_ECB, }, - { - .skcipher = { - .base = { - .cra_name = "ecb(arc4)", - .cra_driver_name = "ecb-arc4-caam", - .cra_blocksize = ARC4_BLOCK_SIZE, - }, - .setkey = arc4_skcipher_setkey, - .encrypt = skcipher_encrypt, - .decrypt = skcipher_decrypt, - .min_keysize = ARC4_MIN_KEY_SIZE, - .max_keysize = ARC4_MAX_KEY_SIZE, - }, - .caam.class1_alg_type = OP_ALG_ALGSEL_ARC4 | OP_ALG_AAI_ECB, - }, }; static struct caam_aead_alg driver_aeads[] = {
@@ -3457,7 +3436,6 @@ int caam_algapi_init(struct device *ctrldev)struct caam_drv_private *priv =dev_get_drvdata (ctrldev);int i =0 , err =0 ;u32 aes_vid, aes_inst, des_inst, md_vid, md_inst, ccha_inst, ptha_inst; -u32 arc4_inst;unsigned int md_limit =SHA512_DIGEST_SIZE ;bool registered = false, gcm_support;
@@ -3477,8 +3455,6 @@ int caam_algapi_init(struct device *ctrldev)CHA_ID_LS_DES_SHIFT ; aes_inst = cha_inst &CHA_ID_LS_AES_MASK ; md_inst = (cha_inst &CHA_ID_LS_MD_MASK ) >>CHA_ID_LS_MD_SHIFT ; - arc4_inst = (cha_inst &CHA_ID_LS_ARC4_MASK ) >> -CHA_ID_LS_ARC4_SHIFT ; ccha_inst =0 ; ptha_inst =0 ;
@@ -3499,7 +3475,6 @@ int caam_algapi_init(struct device *ctrldev) md_inst = mdha &CHA_VER_NUM_MASK ; ccha_inst =rd_reg32 (&priv->ctrl->vreg.ccha) &CHA_VER_NUM_MASK ; ptha_inst =rd_reg32 (&priv->ctrl->vreg.ptha) &CHA_VER_NUM_MASK ; - arc4_inst =rd_reg32 (&priv->ctrl->vreg.afha) &CHA_VER_NUM_MASK ; gcm_support = aesa &CHA_VER_MISC_AES_GCM ; }
@@ -3522,10 +3497,6 @@ int caam_algapi_init(struct device *ctrldev)if (!aes_inst && (alg_sel ==OP_ALG_ALGSEL_AES ))continue ; -/* Skip ARC4 algorithms if not supported by device */ -if (!arc4_inst && alg_sel ==OP_ALG_ALGSEL_ARC4 ) -continue ; -/* * Check support for AES modes not available * on LP devices.
drivers/crypto/caam/compat.h +0 -1
@@ -43,7 +43,6 @@#include <crypto/akcipher.h> #include <crypto/scatterwalk.h> #include <crypto/skcipher.h> -#include <crypto/arc4.h> #include <crypto/internal/skcipher.h> #include <crypto/internal/hash.h> #include <crypto/internal/rsa.h>
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 183/204 crypto: algif_aead - fix uninitialized ctx->init
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
[ Upstream commit 21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd ]
In skcipher_accept_parent_nokey() the whole af_alg_ctx structure is cleared by memset() after allocation, so add such memset() also to aead_accept_parent_nokey() so that the new "init" field is also initialized to zero. Without that the initial ctx->init checks might randomly return true and cause errors.
While there, also remove the redundant zero assignments in both functions.
Found via libkcapi testsuite.
--- crypto/algif_aead.c | 6 ------ crypto/algif_skcipher.c | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-)
crypto/algif_aead.c +0 -6
@@ -558,12 +558,6 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)INIT_LIST_HEAD (&ctx->tsgl_list); ctx->len = len; - ctx->used =0 ; -atomic_set (&ctx->rcvused,0 ); - ctx->more =0 ; - ctx->merge =0 ; - ctx->enc =0 ; - ctx->aead_assoclen =0 ;crypto_init_wait (&ctx->wait); ask->private = ctx;
crypto/algif_skcipher.c +1 -6
@@ -333,6 +333,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) ctx =sock_kmalloc (sk, len,GFP_KERNEL );if (!ctx)return -ENOMEM ; +memset (ctx,0 , len); ctx->iv =sock_kmalloc (sk,crypto_skcipher_ivsize (tfm),GFP_KERNEL );
@@ -340,16 +341,10 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)sock_kfree_s (sk, ctx, len);return -ENOMEM ; } -memset (ctx->iv,0 ,crypto_skcipher_ivsize (tfm));INIT_LIST_HEAD (&ctx->tsgl_list); ctx->len = len; - ctx->used =0 ; -atomic_set (&ctx->rcvused,0 ); - ctx->more =0 ; - ctx->merge =0 ; - ctx->enc =0 ;crypto_init_wait (&ctx->wait); ask->private = ctx;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 129/204 gpu: ipu-v3: image-convert: Wait for all EOFs before completing a tile
In reply to Greg Kroah-HartmanFrom: Steve Longerbeam <[email protected]>
[ Upstream commit dd81d821d0b3f77d949d0cac5c05c1f05b921d46 ]
Use a bit-mask of EOF irqs to determine when all required idmac channel EOFs have been received for a tile conversion, and only do tile completion processing after all EOFs have been received. Otherwise it was found that a conversion would stall after the completion of a tile and the start of the next tile, because the input/read idmac channel had not completed and entered idle state, thus locking up the channel when attempting to re-start it for the next tile.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 109 +++++++++++++++++++------ 1 file changed, 82 insertions(+), 27 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +82 -27
@@ -137,6 +137,17 @@ struct ipu_image_convert_ctx;struct ipu_image_convert_chan ;struct ipu_image_convert_priv ; +enum eof_irq_mask { +EOF_IRQ_IN =BIT (0 ), +EOF_IRQ_ROT_IN =BIT (1 ), +EOF_IRQ_OUT =BIT (2 ), +EOF_IRQ_ROT_OUT =BIT (3 ), +}; + +#define EOF_IRQ_COMPLETE (EOF_IRQ_IN | EOF_IRQ_OUT) +#define EOF_IRQ_ROT_COMPLETE (EOF_IRQ_IN | EOF_IRQ_OUT | \ + EOF_IRQ_ROT_IN | EOF_IRQ_ROT_OUT) +struct ipu_image_convert_ctx {struct ipu_image_convert_chan *chan;
@@ -173,6 +184,9 @@ struct ipu_image_convert_ctx {/* where to place converted tile in dest image */ unsigned int out_tile_map[MAX_TILES ]; +/* mask of completed EOF irqs at every tile conversion */ +enum eof_irq_mask eof_mask; +struct list_head list; };
@@ -189,6 +203,8 @@ struct ipu_image_convert_chan {struct ipuv3_channel *rotation_out_chan;/* the IPU end-of-frame irqs */ +int in_eof_irq; +int rot_in_eof_irq;int out_eof_irq;int rot_out_eof_irq;
@@ -1380,6 +1396,9 @@ static int convert_start(struct ipu_image_convert_run *run, unsigned int tile)dev_dbg (priv->ipu->dev,"%s: task %u: starting ctx %p run %p tile %u -> %u\n" , __func__, chan->ic_task, ctx, run, tile, dst_tile); +/* clear EOF irq mask */ + ctx->eof_mask =0 ; +if (ipu_rot_mode_is_irt (ctx->rot_mode)) {/* swap width/height for resizer */ dest_width = d_image->tile[dst_tile].height;
@@ -1615,7 +1634,7 @@ static bool ic_settings_changed(struct ipu_image_convert_ctx *ctx) }/* hold irqlock when calling */ -static irqreturn_t do_irq (struct ipu_image_convert_run *run) +static irqreturn_t do_tile_complete (struct ipu_image_convert_run *run) {struct ipu_image_convert_ctx *ctx = run->ctx;struct ipu_image_convert_chan *chan = ctx->chan;
@@ -1700,6 +1719,7 @@ static irqreturn_t do_irq(struct ipu_image_convert_run *run) ctx->cur_buf_num ^=1 ; } + ctx->eof_mask =0 ;/* clear EOF irq mask for next tile */ ctx->next_tile++;return IRQ_HANDLED ; done:
@@ -1715,8 +1735,9 @@ static irqreturn_t eof_irq(int irq, void *data)struct ipu_image_convert_priv *priv = chan->priv;struct ipu_image_convert_ctx *ctx;struct ipu_image_convert_run *run; +irqreturn_t ret =IRQ_HANDLED ; +bool tile_complete = false;unsigned long flags; -irqreturn_t ret;spin_lock_irqsave (&chan->irqlock, flags);
@@ -1729,27 +1750,33 @@ static irqreturn_t eof_irq(int irq, void *data) ctx = run->ctx; -if (irq == chan->out_eof_irq) { -if (ipu_rot_mode_is_irt (ctx->rot_mode)) { -/* this is a rotation op, just ignore */ - ret =IRQ_HANDLED ; - goto out; - } - }else if (irq == chan->rot_out_eof_irq) { +if (irq == chan->in_eof_irq) { + ctx->eof_mask |=EOF_IRQ_IN ; + }else if (irq == chan->out_eof_irq) { + ctx->eof_mask |=EOF_IRQ_OUT ; + }else if (irq == chan->rot_in_eof_irq || + irq == chan->rot_out_eof_irq) {if (!ipu_rot_mode_is_irt (ctx->rot_mode)) {/* this was NOT a rotation op, shouldn't happen */ dev_err (priv->ipu->dev,"Unexpected rotation interrupt\n" ); - ret =IRQ_HANDLED ; goto out; } + ctx->eof_mask |= (irq == chan->rot_in_eof_irq) ? +EOF_IRQ_ROT_IN :EOF_IRQ_ROT_OUT ; }else {dev_err (priv->ipu->dev,"Received unknown irq %d\n" , irq); ret =IRQ_NONE ; goto out; } - ret =do_irq (run); +if (ipu_rot_mode_is_irt (ctx->rot_mode)) + tile_complete = (ctx->eof_mask ==EOF_IRQ_ROT_COMPLETE ); +else + tile_complete = (ctx->eof_mask ==EOF_IRQ_COMPLETE ); + +if (tile_complete) + ret =do_tile_complete (run); out:spin_unlock_irqrestore (&chan->irqlock, flags);return ret;
@@ -1783,6 +1810,10 @@ static void force_abort(struct ipu_image_convert_ctx *ctx)static void release_ipu_resources (struct ipu_image_convert_chan *chan) { +if (chan->in_eof_irq >=0 ) +free_irq (chan->in_eof_irq, chan); +if (chan->rot_in_eof_irq >=0 ) +free_irq (chan->rot_in_eof_irq, chan);if (chan->out_eof_irq >=0 )free_irq (chan->out_eof_irq, chan);if (chan->rot_out_eof_irq >=0 )
@@ -1801,7 +1832,27 @@ static void release_ipu_resources(struct ipu_image_convert_chan *chan) chan->in_chan = chan->out_chan = chan->rotation_in_chan = chan->rotation_out_chan =NULL ; - chan->out_eof_irq = chan->rot_out_eof_irq =-1 ; + chan->in_eof_irq =-1 ; + chan->rot_in_eof_irq =-1 ; + chan->out_eof_irq =-1 ; + chan->rot_out_eof_irq =-1 ; +} + +static int get_eof_irq (struct ipu_image_convert_chan *chan, +struct ipuv3_channel *channel) +{ +struct ipu_image_convert_priv *priv = chan->priv; +int ret, irq; + + irq =ipu_idmac_channel_irq (priv->ipu, channel,IPU_IRQ_EOF ); + + ret =request_threaded_irq (irq, eof_irq, do_bh,0 ,"ipu-ic" , chan); +if (ret <0 ) { +dev_err (priv->ipu->dev,"could not acquire irq %d\n" , irq); +return ret; + } + +return irq; }static int get_ipu_resources (struct ipu_image_convert_chan *chan)
@@ -1837,31 +1888,33 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) }/* acquire the EOF interrupts */ - chan->out_eof_irq =ipu_idmac_channel_irq (priv->ipu, - chan->out_chan, -IPU_IRQ_EOF ); + ret =get_eof_irq (chan, chan->in_chan); +if (ret <0 ) { + chan->in_eof_irq =-1 ; + goto err; + } + chan->in_eof_irq = ret; - ret =request_threaded_irq (chan->out_eof_irq, eof_irq, do_bh, -0 ,"ipu-ic" , chan); + ret =get_eof_irq (chan, chan->rotation_in_chan);if (ret <0 ) { -dev_err (priv->ipu->dev,"could not acquire irq %d\n" , - chan->out_eof_irq); - chan->out_eof_irq =-1 ; + chan->rot_in_eof_irq =-1 ; goto err; } + chan->rot_in_eof_irq = ret; - chan->rot_out_eof_irq =ipu_idmac_channel_irq (priv->ipu, - chan->rotation_out_chan, -IPU_IRQ_EOF ); + ret =get_eof_irq (chan, chan->out_chan); +if (ret <0 ) { + chan->out_eof_irq =-1 ; + goto err; + } + chan->out_eof_irq = ret; - ret =request_threaded_irq (chan->rot_out_eof_irq, eof_irq, do_bh, -0 ,"ipu-ic" , chan); + ret =get_eof_irq (chan, chan->rotation_out_chan);if (ret <0 ) { -dev_err (priv->ipu->dev,"could not acquire irq %d\n" , - chan->rot_out_eof_irq); chan->rot_out_eof_irq =-1 ; goto err; } + chan->rot_out_eof_irq = ret;return 0 ; err:
@@ -2440,6 +2493,8 @@ int ipu_image_convert_init(struct ipu_soc *ipu, struct device *dev) chan->ic_task = i; chan->priv = priv; chan->dma_ch = &image_convert_dma_chan[i]; + chan->in_eof_irq =-1 ; + chan->rot_in_eof_irq =-1 ; chan->out_eof_irq =-1 ; chan->rot_out_eof_irq =-1 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 128/204 gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq handlers
In reply to Greg Kroah-HartmanFrom: Steve Longerbeam <[email protected]>
[ Upstream commit 0f6245f42ce9b7e4d20f2cda8d5f12b55a44d7d1 ]
Combine the rotate_irq() and norotate_irq() handlers into a single eof_irq() handler.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 58 +++++++++----------------- 1 file changed, 20 insertions(+), 38 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +20 -38
@@ -1709,9 +1709,10 @@ static irqreturn_t do_irq(struct ipu_image_convert_run *run)return IRQ_WAKE_THREAD ; } -static irqreturn_t norotate_irq (int irq,void *data) +static irqreturn_t eof_irq (int irq,void *data) {struct ipu_image_convert_chan *chan = data; +struct ipu_image_convert_priv *priv = chan->priv;struct ipu_image_convert_ctx *ctx;struct ipu_image_convert_run *run;unsigned long flags;
@@ -1728,45 +1729,26 @@ static irqreturn_t norotate_irq(int irq, void *data) ctx = run->ctx; -if (ipu_rot_mode_is_irt (ctx->rot_mode)) { -/* this is a rotation operation, just ignore */ -spin_unlock_irqrestore (&chan->irqlock, flags); -return IRQ_HANDLED ; - } - - ret =do_irq (run); -out: -spin_unlock_irqrestore (&chan->irqlock, flags); -return ret; -} - -static irqreturn_t rotate_irq (int irq,void *data) -{ -struct ipu_image_convert_chan *chan = data; -struct ipu_image_convert_priv *priv = chan->priv; -struct ipu_image_convert_ctx *ctx; -struct ipu_image_convert_run *run; -unsigned long flags; -irqreturn_t ret; - -spin_lock_irqsave (&chan->irqlock, flags); - -/* get current run and its context */ - run = chan->current_run; -if (!run) { +if (irq == chan->out_eof_irq) { +if (ipu_rot_mode_is_irt (ctx->rot_mode)) { +/* this is a rotation op, just ignore */ + ret =IRQ_HANDLED ; + goto out; + } + }else if (irq == chan->rot_out_eof_irq) { +if (!ipu_rot_mode_is_irt (ctx->rot_mode)) { +/* this was NOT a rotation op, shouldn't happen */ +dev_err (priv->ipu->dev, +"Unexpected rotation interrupt\n" ); + ret =IRQ_HANDLED ; + goto out; + } + }else { +dev_err (priv->ipu->dev,"Received unknown irq %d\n" , irq); ret =IRQ_NONE ; goto out; } - ctx = run->ctx; - -if (!ipu_rot_mode_is_irt (ctx->rot_mode)) { -/* this was NOT a rotation operation, shouldn't happen */ -dev_err (priv->ipu->dev,"Unexpected rotation interrupt\n" ); -spin_unlock_irqrestore (&chan->irqlock, flags); -return IRQ_HANDLED ; - } - ret =do_irq (run); out:spin_unlock_irqrestore (&chan->irqlock, flags);
@@ -1859,7 +1841,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) chan->out_chan, IPU_IRQ_EOF); - ret =request_threaded_irq (chan->out_eof_irq, norotate_irq, do_bh, + ret =request_threaded_irq (chan->out_eof_irq, eof_irq, do_bh,0 ,"ipu-ic" , chan);if (ret <0 ) { dev_err(priv->ipu->dev, "could not acquire irq %d\n",
@@ -1872,7 +1854,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) chan->rotation_out_chan, IPU_IRQ_EOF); - ret =request_threaded_irq (chan->rot_out_eof_irq, rotate_irq, do_bh, + ret =request_threaded_irq (chan->rot_out_eof_irq, eof_irq, do_bh,0 ,"ipu-ic" , chan);if (ret <0 ) { dev_err(priv->ipu->dev, "could not acquire irq %d\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 171/204 s390/Kconfig: add missing ZCRYPT dependency to VFIO_AP
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 929a343b858612100cb09443a8aaa20d4a4706d3 ]
The VFIO_AP uses ap_driver_register() (and deregister) functions implemented in ap_bus.c (compiled into ap.o). However the ap.o will be built only if CONFIG_ZCRYPT is selected.
This was not visible before commit e93a1695d7fb ("iommu: Enable compile testing for some of drivers") because the CONFIG_VFIO_AP depends on CONFIG_S390_AP_IOMMU which depends on the missing CONFIG_ZCRYPT. After adding COMPILE_TEST, it is possible to select a configuration with VFIO_AP and S390_AP_IOMMU but without the ZCRYPT.
Add proper dependency to the VFIO_AP to fix build errors:
ERROR: modpost: "ap_driver_register" [drivers/s390/crypto/vfio_ap.ko] undefined!
ERROR: modpost: "ap_driver_unregister" [drivers/s390/crypto/vfio_ap.ko] undefined!
--- arch/s390/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/s390/Kconfig +1 -0
@@ -769,6 +769,7 @@ config VFIO_AP def_tristate n prompt "VFIO support for AP devices" depends on S390_AP_IOMMU && VFIO_MDEV_DEVICE && KVM + depends on ZCRYPT help This driver grants access to Adjunct Processor (AP) devices via the VFIO mediated device interface.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 131/204 ima: Fail rule parsing when appraise_flag=blacklist is unsupportable
In reply to Greg Kroah-HartmanFrom: Tyler Hicks <[email protected]>
[ Upstream commit 5f3e92657bbfb63ad3109433d843c89996114b03 ]
Verifying that a file hash is not blacklisted is currently only supported for files with appended signatures (modsig). In the future, this might change.
For now, the "appraise_flag" option is only appropriate for appraise actions and its "blacklist" value is only appropriate when CONFIG_IMA_APPRAISE_MODSIG is enabled and "appraise_flag=blacklist" is only appropriate when "appraise_type=imasig|modsig" is also present. Make this clear at policy load so that IMA policy authors don't assume that other uses of "appraise_flag=blacklist" are supported.
--- security/integrity/ima/ima_policy.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
security/integrity/ima/ima_policy.c +14 -1
@@ -1035,6 +1035,11 @@ static bool ima_validate_rule(struct ima_rule_entry *entry)return false; } +/* Ensure that combinations of flags are compatible with each other */ +if (entry->flags &IMA_CHECK_BLACKLIST && + !(entry->flags &IMA_MODSIG_ALLOWED )) +return false; +return true; }
@@ -1371,9 +1376,17 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) result = -EINVAL ;break ;case Opt_appraise_flag: +if (entry->action !=APPRAISE ) { + result = -EINVAL ; +break ; + } +ima_log_string (ab,"appraise_flag" , args[0 ].from); -if (strstr (args[0 ].from,"blacklist" )) +if (IS_ENABLED (CONFIG_IMA_APPRAISE_MODSIG ) && +strstr (args[0 ].from,"blacklist" )) entry->flags |=IMA_CHECK_BLACKLIST ; +else + result = -EINVAL ;break ;case Opt_permit_directio: entry->flags |=IMA_PERMIT_DIRECTIO ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 169/204 drm/vmwgfx: Fix two list_for_each loop exit tests
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4437c1152ce0e57ab8f401aa696ea6291cc07ab1 ]
These if statements are supposed to be true if we ended the list_for_each_entry() loops without hitting a break statement but they don't work.
In the first loop, we increment "i" after the "if (i == unit)" condition so we don't necessarily know that "i" is not equal to unit at the end of the loop.
In the second loop we exit when mode is not pointing to a valid drm_display_mode struct so it doesn't make sense to check "mode->type".
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +4 -4
@@ -2578,7 +2578,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, ++i; } -if (i != unit) { +if (&con->head == &dev_priv->dev->mode_config.connector_list) {DRM_ERROR ("Could not find initial display unit.\n" ); ret = -EINVAL ; goto out_unlock;
@@ -2602,13 +2602,13 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,break ; } -if (mode->type &DRM_MODE_TYPE_PREFERRED ) - *p_mode = mode; -else { +if (&mode->head == &con->modes) {WARN_ONCE (true,"Could not find initial preferred mode.\n" ); *p_mode =list_first_entry (&con->modes, struct drm_display_mode, head); + }else { + *p_mode = mode; } out_unlock:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 165/204 vdpa_sim: init iommu lock
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 1e3e792650d2c0df8dd796906275b7c79e278664 ]
The patch adding the iommu lock did not initialize it. The struct is zero-initialized so this is mostly a problem when using lockdep.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 1 + 1 file changed, 1 insertion(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -0
@@ -330,6 +330,7 @@ static struct vdpasim *vdpasim_create(void)INIT_WORK (&vdpasim->work, vdpasim_work);spin_lock_init (&vdpasim->lock); +spin_lock_init (&vdpasim->iommu_lock); dev = &vdpasim->vdpa.dev; dev->coherent_dma_mask =DMA_BIT_MASK (64 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 170/204 s390/test_unwind: fix possible memleak in test_unwind()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 75d3e7f4769d276a056efa1cc7f08de571fc9b4b ]
test_unwind() misses to call kfree(bt) in an error path. Add the missed function call to fix it.
--- arch/s390/lib/test_unwind.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/lib/test_unwind.c +1 -0
@@ -63,6 +63,7 @@ static noinline int test_unwind(struct task_struct *task, struct pt_regs *regs,break ;if (state.reliable && !addr) {pr_err ("unwind state reliable but addr is 0\n" ); +kfree (bt);return -EINVAL ; }sprint_symbol (sym, addr);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 172/204 net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 50caa777a3a24d7027748e96265728ce748b41ef ]
Fix the missing clk_disable_unprepare() before return from emac_clks_phase1_init() in the error handling case.
--- drivers/net/ethernet/qualcomm/emac/emac.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/net/ethernet/qualcomm/emac/emac.c +14 -3
@@ -473,13 +473,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev, ret =clk_prepare_enable (adpt->clk[EMAC_CLK_CFG_AHB ]);if (ret) -return ret; + goto disable_clk_axi; ret =clk_set_rate (adpt->clk[EMAC_CLK_HIGH_SPEED ],19200000 );if (ret) -return ret; + goto disable_clk_cfg_ahb; + + ret =clk_prepare_enable (adpt->clk[EMAC_CLK_HIGH_SPEED ]); +if (ret) + goto disable_clk_cfg_ahb; -return clk_prepare_enable (adpt->clk[EMAC_CLK_HIGH_SPEED ]); +return 0 ; + +disable_clk_cfg_ahb: +clk_disable_unprepare (adpt->clk[EMAC_CLK_CFG_AHB ]); +disable_clk_axi: +clk_disable_unprepare (adpt->clk[EMAC_CLK_AXI ]); + +return ret; }/* Enable clocks; needs emac_clks_phase1_init to be called before */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 156/204 scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
In reply to Greg Kroah-HartmanFrom: Ewan D. Milne <[email protected]>
[ Upstream commit af6de8c60fe9433afa73cea6fcccdccd98ad3e5e ]
We cannot wait on a completion object in the lpfc_nvme_targetport structure in the _destroy_targetport() code path because the NVMe/fc transport will free that structure immediately after the .targetport_delete() callback. This results in a use-after-free, and a crash if slub_debug=FZPU is enabled.
An earlier fix put put the completion on the stack, but commit 2a0fb340fcc8 ("scsi: lpfc: Correct localport timeout duration error") subsequently changed the code to reference the completion through a pointer in the object rather than the local stack variable. Fix this by using the stack variable directly.
--- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nvmet.c +1 -1
@@ -1914,7 +1914,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba) } tgtp->tport_unreg_cmp = &tport_unreg_cmp;nvmet_fc_unregister_targetport (phba->targetport); -if (!wait_for_completion_timeout (tgtp->tport_unreg_cmp, +if (!wait_for_completion_timeout (&tport_unreg_cmp,msecs_to_jiffies (LPFC_NVMET_WAIT_TMO )))lpfc_printf_log (phba,KERN_ERR ,LOG_NVME , "6179 Unreg targetport x%px timeout "
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 154/204 libnvdimm/security: ensure sysfs poll thread woke up and fetch updated attr
In reply to Greg Kroah-HartmanFrom: Jane Chu <[email protected]>
[ Upstream commit 7f674025d9f7321dea11b802cc0ab3f09cbe51c5 ]
commit 7d988097c546 ("acpi/nfit, libnvdimm/security: Add security DSM overwrite support") adds a sysfs_notify_dirent() to wake up userspace poll thread when the "overwrite" operation has completed. But the notification is issued before the internal dimm security state and flags have been updated, so the userspace poll thread wakes up and fetches the not-yet-updated attr and falls back to sleep, forever. But if user from another terminal issue "ndctl wait-overwrite nmemX" again, the command returns instantly.
--- drivers/nvdimm/security.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/nvdimm/security.c +8 -3
@@ -450,14 +450,19 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm)else dev_dbg (&nvdimm->dev,"overwrite completed\n" ); -if (nvdimm->sec.overwrite_state) -sysfs_notify_dirent (nvdimm->sec.overwrite_state); +/* +* Mark the overwrite work done and update dimm security flags, +* then send a sysfs event notification to wake up userspace +* poll threads to picked up the changed state. +*/ nvdimm->sec.overwrite_tmo =0 ;clear_bit (NDD_SECURITY_OVERWRITE , &nvdimm->flags);clear_bit (NDD_WORK_PENDING , &nvdimm->flags); -put_device (&nvdimm->dev); nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_USER ); nvdimm->sec.ext_flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); +if (nvdimm->sec.overwrite_state) +sysfs_notify_dirent (nvdimm->sec.overwrite_state); +put_device (&nvdimm->dev); }void nvdimm_security_overwrite_query (struct work_struct *work)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 201/204 drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
In reply to Greg Kroah-HartmanFrom: Xin Xiong <[email protected]>
commit a34a0a632dd991a371fec56431d73279f9c54029 upstream.
drm_dp_mst_allocate_vcpi() invokes drm_dp_mst_topology_get_port_validated(), which increases the refcount of the "port".
These reference counting issues take place in two exception handling paths separately. Either when “slots” is less than 0 or when drm_dp_init_vcpi() returns a negative value, the function forgets to reduce the refcnt increased drm_dp_mst_topology_get_port_validated(), which results in a refcount leak.
Fix these issues by pulling up the error handling when "slots" is less than 0, and calling drm_dp_mst_topology_put_port() before termination when drm_dp_init_vcpi() returns a negative value.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +4 -3
@@ -4319,11 +4319,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm {int ret; - port =drm_dp_mst_topology_get_port_validated (mgr, port); -if (!port) +if (slots <0 )return false; -if (slots <0 ) + port =drm_dp_mst_topology_get_port_validated (mgr, port); +if (!port)return false;if (port->vcpi.vcpi >0 ) {
@@ -4339,6 +4339,7 @@ bool drm_dp_mst_allocate_vcpi(struct drmif (ret) {DRM_DEBUG_KMS ("failed to init vcpi slots=%d max=63 ret=%d\n" ,DIV_ROUND_UP (pbn, mgr->pbn_div), ret); +drm_dp_mst_topology_put_port (port); goto out; } DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",
Greg Kroah-Hartman
maintainerPATCH 202/204 drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume
In reply to Greg Kroah-HartmanFrom: Sandeep Raghuraman <[email protected]>
commit f87812284172a9809820d10143b573d833cd3f75 upstream.
Reproducing bug report here:
After hibernating and resuming, DPM is not enabled. This remains the case even if you test hibernate using the steps here:
https://www.kernel.org/doc/html/latest/power/basic-pm-debugging.html
I debugged the problem, and figured out that in the file hardwaremanager.c,
in the function, phm_enable_dynamic_state_management(), the check
'if (!hwmgr->pp_one_vf && smum_is_dpm_running(hwmgr) && !amdgpu_passthrough(adev) && adev->in_suspend)' returns true for the hibernate case, and false for the suspend case.
This means that for the hibernate case, the AMDGPU driver doesn't enable DPM (even though it should) and simply returns from that function.
In the suspend case, it goes ahead and enables DPM, even though it doesn't need to.
I debugged further, and found out that in the case of suspend, for the CIK/Hawaii GPUs, smum_is_dpm_running(hwmgr) returns false, while in the case of hibernate, smum_is_dpm_running(hwmgr) returns true.
For CIK, the ci_is_dpm_running() function calls the ci_is_smc_ram_running() function, which is ultimately used to determine if DPM is currently enabled or not, and this seems to provide the wrong answer.
I've changed the ci_is_dpm_running() function to instead use the same method that some other AMD GPU chips do (e.g Fiji), which seems to read the voltage controller. I've tested on my R9 390 and it seems to work correctly for both suspend and hibernate use cases, and has been stable so far.
--- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +4 -1
@@ -2725,7 +2725,10 @@ static int ci_initialize_mc_reg_table(ststatic bool ci_is_dpm_running (struct pp_hwmgr *hwmgr) { -return ci_is_smc_ram_running (hwmgr); +return (1 ==PHM_READ_INDIRECT_FIELD (hwmgr->device, +CGS_IND_REG__SMC ,FEATURE_STATUS , +VOLTAGE_CONTROLLER_ON )) + ? true : false; }static int ci_smu_init (struct pp_hwmgr *hwmgr)
Greg Kroah-Hartman
maintainerPATCH 178/204 fs/minix: remove expected error message in block_to_path()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit f666f9fb9a36f1c833b9d18923572f0e4d304754 ]
When truncating a file to a size within the last allowed logical block, block_to_path() is called with the *next* block. This exceeds the limit, causing the "block %ld too big" error message to be printed.
This case isn't actually an error; there are just no more blocks past that point. So, remove this error message.
--- fs/minix/itree_v1.c | 12 ++++++------ fs/minix/itree_v2.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
fs/minix/itree_v1.c +6 -6
@@ -29,12 +29,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) { -if (printk_ratelimit ()) -printk ("MINIX-fs: block_to_path: " -"block %ld too big on dev %pg\n" , - block, inode->i_sb->s_bdev); - }else if (block <7 ) { +return 0 ; + } +if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) +return 0 ; + +if (block <7 ) { offsets[n++] = block; }else if ((block -=7 ) <512 ) { offsets[n++] =7 ;
fs/minix/itree_v2.c +6 -6
@@ -32,12 +32,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, sb->s_bdev); - }else if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) { -if (printk_ratelimit ()) -printk ("MINIX-fs: block_to_path: " -"block %ld too big on dev %pg\n" , - block, sb->s_bdev); - }else if (block <DIRCOUNT ) { +return 0 ; + } +if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) +return 0 ; + +if (block <DIRCOUNT ) { offsets[n++] = block; }else if ((block -=DIRCOUNT ) <INDIRCOUNT (sb)) { offsets[n++] =DIRCOUNT ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 185/204 perf bench mem: Always memset source before memcpy
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit 1beaef29c34154ccdcb3f1ae557f6883eda18840 ]
For memcpy, the source pages are memset to zero only when --cycles is used. This leads to wildly different results with or without --cycles, since all sources pages are likely to be mapped to the same zero page without explicit writes.
Before this fix:
$ export cmd="./perf stat -e LLC-loads -- ./perf bench \ mem memcpy -s 1024MB -l 100 -f default" $ $cmd
2,935,826 LLC-loads
3.821677452 seconds time elapsed$ $cmd --cycles
217,533,436 LLC-loads
8.616725985 seconds time elapsedAfter this fix:
$ $cmd
214,459,686 LLC-loads
8.674301124 seconds time elapsed$ $cmd --cycles
214,758,651 LLC-loads
8.644480006 seconds time elapsed--- tools/perf/bench/mem-functions.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
tools/perf/bench/mem-functions.c +11 -10
@@ -223,12 +223,8 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info *return 0 ; } -static u64 do_memcpy_cycles (const struct function *r,size_t size,void *src,void *dst) +static void memcpy_prefault (memcpy_t fn,size_t size,void *src,void *dst) { -u64 cycle_start =0ULL , cycle_end =0ULL ; -memcpy_t fn = r->fn.memcpy; -int i; -/* Make sure to always prefault zero pages even if MMAP_THRESH is crossed: */ memset (src,0 , size);
@@ -237,6 +233,15 @@ static u64 do_memcpy_cycles(const struct function *r, size_t size, void *src, vo* to not measure page fault overhead: */ fn (dst, src, size); +} + +static u64 do_memcpy_cycles (const struct function *r,size_t size,void *src,void *dst) +{ +u64 cycle_start =0ULL , cycle_end =0ULL ; +memcpy_t fn = r->fn.memcpy; +int i; + +memcpy_prefault (fn, size, src, dst); cycle_start =get_cycles ();for (i =0 ; i < nr_loops; ++i)
@@ -252,11 +257,7 @@ static double do_memcpy_gettimeofday(const struct function *r, size_t size, voidmemcpy_t fn = r->fn.memcpy;int i; -/* -* We prefault the freshly allocated memory range here, -* to not measure page fault overhead: -*/ -fn (dst, src, size); +memcpy_prefault (fn, size, src, dst);BUG_ON (gettimeofday (&tv_start,NULL ));for (i =0 ; i < nr_loops; ++i)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 168/204 drm/vmwgfx: Use correct vmw_legacy_display_unit pointer
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 1d2c0c565bc0da25f5e899a862fb58e612b222df ]
The "entry" pointer is an offset from the list head and it doesn't point to a valid vmw_legacy_display_unit struct. Presumably the intent was to point to the last entry.
Also the "i++" wasn't used so I have removed that as well.
--- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -3
@@ -81,7 +81,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)struct vmw_legacy_display_unit *entry;struct drm_framebuffer *fb =NULL ;struct drm_crtc *crtc =NULL ; -int i =0 ; +int i;/* If there is no display topology the host just assumes * that the guest will set the same layout as the host.
@@ -92,12 +92,11 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) crtc = &entry->base.crtc; w =max (w, crtc->x + crtc->mode.hdisplay); h =max (h, crtc->y + crtc->mode.vdisplay); - i++; }if (crtc ==NULL )return 0 ; - fb = entry->base.crtc.primary->state->fb; + fb = crtc->primary->state->fb; return vmw_kms_write_svga(dev_priv, w, h, fb->pitches[0], fb->format->cpp[0] * 8,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 190/204 ASoC: tegra: Use device managed resource APIs to get the clock
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit 0de6db30ef79b391cedd749801a49c485d2daf4b upstream.
tegra_asoc_utils uses clk_get() to get the clock and clk_put() to free them explicitly.
This patch updates it to use device managed resource API devm_clk_get() so the clock will be automatically released and freed when the device is unbound and removes tegra_asoc_utils_fini() as its no longer needed.
--- sound/soc/tegra/tegra_alc5632.c | 7 +------ sound/soc/tegra/tegra_asoc_utils.c | 34 +++++++--------------------------- sound/soc/tegra/tegra_asoc_utils.h | 1 - sound/soc/tegra/tegra_max98090.c | 22 ++++++---------------- sound/soc/tegra/tegra_rt5640.c | 22 ++++++---------------- sound/soc/tegra/tegra_rt5677.c | 7 +------ sound/soc/tegra/tegra_sgtl5000.c | 7 +------ sound/soc/tegra/tegra_wm8753.c | 22 ++++++---------------- sound/soc/tegra/tegra_wm8903.c | 22 ++++++---------------- sound/soc/tegra/tegra_wm9712.c | 8 ++------ sound/soc/tegra/trimslice.c | 18 ++++-------------- 11 files changed, 40 insertions(+), 130 deletions(-)
sound/soc/tegra/tegra_alc5632.c +1 -6
@@ -205,13 +205,11 @@ static int tegra_alc5632_probe(struct plif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&alc5632->util_data); err_put_cpu_of_node:of_node_put (tegra_alc5632_dai.cpus->of_node); tegra_alc5632_dai.cpus->of_node =NULL ;
@@ -226,12 +224,9 @@ err:static int tegra_alc5632_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_alc5632 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -of_node_put (tegra_alc5632_dai.cpus->of_node); tegra_alc5632_dai.cpus->of_node =NULL ; tegra_alc5632_dai.platforms->of_node =NULL ;
sound/soc/tegra/tegra_asoc_utils.c +7 -27
@@ -175,52 +175,32 @@ int tegra_asoc_utils_init(struct tegra_areturn -EINVAL ; } - data->clk_pll_a =clk_get (dev,"pll_a" ); + data->clk_pll_a =devm_clk_get (dev,"pll_a" );if (IS_ERR (data->clk_pll_a)) {dev_err (data->dev,"Can't retrieve clk pll_a\n" ); - ret =PTR_ERR (data->clk_pll_a); - goto err; +return PTR_ERR (data->clk_pll_a); } - data->clk_pll_a_out0 =clk_get (dev,"pll_a_out0" ); + data->clk_pll_a_out0 =devm_clk_get (dev,"pll_a_out0" );if (IS_ERR (data->clk_pll_a_out0)) {dev_err (data->dev,"Can't retrieve clk pll_a_out0\n" ); - ret =PTR_ERR (data->clk_pll_a_out0); - goto err_put_pll_a; +return PTR_ERR (data->clk_pll_a_out0); } - data->clk_cdev1 =clk_get (dev,"mclk" ); + data->clk_cdev1 =devm_clk_get (dev,"mclk" );if (IS_ERR (data->clk_cdev1)) {dev_err (data->dev,"Can't retrieve clk cdev1\n" ); - ret =PTR_ERR (data->clk_cdev1); - goto err_put_pll_a_out0; +return PTR_ERR (data->clk_cdev1); } ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 );if (ret) - goto err_put_cdev1; +return ret;return 0 ; - -err_put_cdev1: -clk_put (data->clk_cdev1); -err_put_pll_a_out0: -clk_put (data->clk_pll_a_out0); -err_put_pll_a: -clk_put (data->clk_pll_a); -err: -return ret; }EXPORT_SYMBOL_GPL (tegra_asoc_utils_init); -void tegra_asoc_utils_fini (struct tegra_asoc_utils_data *data) -{ -clk_put (data->clk_cdev1); -clk_put (data->clk_pll_a_out0); -clk_put (data->clk_pll_a); -} -EXPORT_SYMBOL_GPL (tegra_asoc_utils_fini); -MODULE_AUTHOR ("Stephen Warren <[email protected]>" );MODULE_DESCRIPTION ("Tegra ASoC utility code" );MODULE_LICENSE ("GPL" );
sound/soc/tegra/tegra_asoc_utils.h +0 -1
@@ -34,6 +34,5 @@ int tegra_asoc_utils_set_rate(struct tegint tegra_asoc_utils_set_ac97_rate (struct tegra_asoc_utils_data *data);int tegra_asoc_utils_init (struct tegra_asoc_utils_data *data,struct device *dev); -void tegra_asoc_utils_fini (struct tegra_asoc_utils_data *data);#endif
sound/soc/tegra/tegra_max98090.c +6 -16
@@ -218,19 +218,18 @@ static int tegra_max98090_probe(struct p ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_max98090_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_max98090_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_max98090_dai.cpus->of_node = of_parse_phandle(np,
@@ -238,40 +237,31 @@ static int tegra_max98090_probe(struct pif (!tegra_max98090_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_max98090_dai.platforms->of_node = tegra_max98090_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_max98090_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_max98090 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_rt5640.c +6 -16
@@ -164,19 +164,18 @@ static int tegra_rt5640_probe(struct pla ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_rt5640_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_rt5640_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_rt5640_dai.cpus->of_node = of_parse_phandle(np,
@@ -184,40 +183,31 @@ static int tegra_rt5640_probe(struct plaif (!tegra_rt5640_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_rt5640_dai.platforms->of_node = tegra_rt5640_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_rt5640_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_rt5640 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_rt5677.c +1 -6
@@ -270,13 +270,11 @@ static int tegra_rt5677_probe(struct plaif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); err_put_cpu_of_node:of_node_put (tegra_rt5677_dai.cpus->of_node); tegra_rt5677_dai.cpus->of_node =NULL ;
@@ -291,12 +289,9 @@ err:static int tegra_rt5677_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_rt5677 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); - tegra_rt5677_dai.platforms->of_node =NULL ;of_node_put (tegra_rt5677_dai.codecs->of_node); tegra_rt5677_dai.codecs->of_node =NULL ;
sound/soc/tegra/tegra_sgtl5000.c +1 -6
@@ -156,13 +156,11 @@ static int tegra_sgtl5000_driver_probe(sif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); err_put_cpu_of_node:of_node_put (tegra_sgtl5000_dai.cpus->of_node); tegra_sgtl5000_dai.cpus->of_node =NULL ;
@@ -177,13 +175,10 @@ err:static int tegra_sgtl5000_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_sgtl5000 *machine =snd_soc_card_get_drvdata (card);int ret; ret =snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -of_node_put (tegra_sgtl5000_dai.cpus->of_node); tegra_sgtl5000_dai.cpus->of_node =NULL ; tegra_sgtl5000_dai.platforms->of_node =NULL ;
sound/soc/tegra/tegra_wm8753.c +6 -16
@@ -127,19 +127,18 @@ static int tegra_wm8753_driver_probe(str ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_wm8753_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_wm8753_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8753_dai.cpus->of_node = of_parse_phandle(np,
@@ -147,40 +146,31 @@ static int tegra_wm8753_driver_probe(strif (!tegra_wm8753_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8753_dai.platforms->of_node = tegra_wm8753_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_wm8753_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_wm8753 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_wm8903.c +6 -16
@@ -323,19 +323,18 @@ static int tegra_wm8903_driver_probe(str ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_wm8903_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_wm8903_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8903_dai.cpus->of_node = of_parse_phandle(np,
@@ -343,40 +342,31 @@ static int tegra_wm8903_driver_probe(strif (!tegra_wm8903_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8903_dai.platforms->of_node = tegra_wm8903_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_wm8903_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_wm8903 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_wm9712.c +2 -6
@@ -113,19 +113,17 @@ static int tegra_wm9712_driver_probe(str ret =tegra_asoc_utils_set_ac97_rate (&machine->util_data);if (ret) - goto asoc_utils_fini; + goto codec_unregister; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto asoc_utils_fini; + goto codec_unregister; }return 0 ; -asoc_utils_fini: -tegra_asoc_utils_fini (&machine->util_data); codec_unregister:platform_device_del (machine->codec); codec_put:
@@ -140,8 +138,6 @@ static int tegra_wm9712_driver_remove(stsnd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -platform_device_unregister (machine->codec);return 0 ;
sound/soc/tegra/trimslice.c +4 -14
@@ -125,8 +125,7 @@ static int tegra_snd_trimslice_probe(strif (!trimslice_tlv320aic23_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } trimslice_tlv320aic23_dai.cpus->of_node = of_parse_phandle(np,
@@ -134,8 +133,7 @@ static int tegra_snd_trimslice_probe(strif (!trimslice_tlv320aic23_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } trimslice_tlv320aic23_dai.platforms->of_node =
@@ -143,32 +141,24 @@ static int tegra_snd_trimslice_probe(str ret =tegra_asoc_utils_init (&trimslice->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&trimslice->util_data); -err: -return ret; }static int tegra_snd_trimslice_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_trimslice *trimslice =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&trimslice->util_data); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 204/204 drm/amd/display: dchubbub p-state warning during surface planes switch
In reply to Greg Kroah-HartmanFrom: hersen wu <[email protected]>
commit 8b0379a85762b516c7b46aed7dbf2a4947c00564 upstream.
[Why]ramp_up_dispclk_with_dpp is to change dispclk, dppclk and dprefclk according to bandwidth requirement. call stack: rv1_update_clocks --> update_clocks --> dcn10_prepare_bandwidth / dcn10_optimize_bandwidth --> prepare_bandwidth / optimize_bandwidth. before change dcn hw, prepare_bandwidth will be called first to allow enough clock, watermark for change, after end of dcn hw change, optimize_bandwidth is executed to lower clock to save power for new dcn hw settings.
below is sequence of commit_planes_for_stream:
step 1: prepare_bandwidth - raise clock to have enough bandwidth step 2: lock_doublebuffer_enable
step 3: pipe_control_lock(true) - make dchubp register change will not take effect right way
step 4: apply_ctx_for_surface - program dchubp
step 5: pipe_control_lock(false) - dchubp register change take effect step 6: optimize_bandwidth --> dc_post_update_surfaces_to_stream for full_date, optimize clock to save power
at end of step 1, dcn clocks (dprefclk, dispclk, dppclk) may be changed for new dchubp configuration. but real dcn hub dchubps are still running with old configuration until end of step 5. this need clocks settings at step 1 should not less than that before step 1. this is checked by two conditions: 1. if (should_set_clock(safe_to_lower , new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz)
2. request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz
the second condition is based on new dchubp configuration. dppclk for new dchubp may be different from dppclk before step 1. for example, before step 1, dchubps are as below:
pipe 0: recout=(0,40,1920,980) viewport=(0,0,1920,979) pipe 1: recout=(0,0,1920,1080) viewport=(0,0,1920,1080) for dppclk for pipe0 need dppclk = dispclk
new dchubp pipe split configuration:
pipe 0: recout=(0,0,960,1080) viewport=(0,0,960,1080) pipe 1: recout=(960,0,960,1080) viewport=(960,0,960,1080) dppclk only needs dppclk = dispclk /2.
dispclk, dppclk are not lock by otg master lock. they take effect after step 1. during this transition, dispclk are the same, but dppclk is changed to half of previous clock for old dchubp configuration between step 1 and step 6. This may cause p-state warning intermittently.
[How]
for new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz, we need make sure dppclk are not changed to less between step 1 and 6. for new_clocks->dispclk_khz > clk_mgr_base->clks.dispclk_khz, new display clock is raised, but we do not know ratio of new_clocks->dispclk_khz and clk_mgr_base->clks.dispclk_khz, new_clocks->dispclk_khz /2 does not guarantee equal or higher than old dppclk. we could ignore power saving different between dppclk = displck and dppclk = dispclk / 2 between step 1 and step 6. as long as safe_to_lower = false, set dpclk = dispclk to simplify condition check.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 69 ++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +67 -2
@@ -85,12 +85,77 @@ static int rv1_determine_dppclk_thresholreturn disp_clk_threshold; } -static void ramp_up_dispclk_with_dpp (struct clk_mgr_internal *clk_mgr,struct dc *dc,struct dc_clocks *new_clocks) +static void ramp_up_dispclk_with_dpp ( +struct clk_mgr_internal *clk_mgr, +struct dc *dc, +struct dc_clocks *new_clocks, +bool safe_to_lower) {int i;int dispclk_to_dpp_threshold =rv1_determine_dppclk_threshold (clk_mgr, new_clocks);bool request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz; +/* this function is to change dispclk, dppclk and dprefclk according to +* bandwidth requirement. Its call stack is rv1_update_clocks --> +* update_clocks --> dcn10_prepare_bandwidth / dcn10_optimize_bandwidth +* --> prepare_bandwidth / optimize_bandwidth. before change dcn hw, +* prepare_bandwidth will be called first to allow enough clock, +* watermark for change, after end of dcn hw change, optimize_bandwidth +* is executed to lower clock to save power for new dcn hw settings. +* +* below is sequence of commit_planes_for_stream: +* +* step 1: prepare_bandwidth - raise clock to have enough bandwidth +* step 2: lock_doublebuffer_enable +* step 3: pipe_control_lock(true) - make dchubp register change will +* not take effect right way +* step 4: apply_ctx_for_surface - program dchubp +* step 5: pipe_control_lock(false) - dchubp register change take effect +* step 6: optimize_bandwidth --> dc_post_update_surfaces_to_stream +* for full_date, optimize clock to save power +* +* at end of step 1, dcn clocks (dprefclk, dispclk, dppclk) may be +* changed for new dchubp configuration. but real dcn hub dchubps are +* still running with old configuration until end of step 5. this need +* clocks settings at step 1 should not less than that before step 1. +* this is checked by two conditions: 1. if (should_set_clock(safe_to_lower +* , new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || +* new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz) +* 2. request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz +* +* the second condition is based on new dchubp configuration. dppclk +* for new dchubp may be different from dppclk before step 1. +* for example, before step 1, dchubps are as below: +* pipe 0: recout=(0,40,1920,980) viewport=(0,0,1920,979) +* pipe 1: recout=(0,0,1920,1080) viewport=(0,0,1920,1080) +* for dppclk for pipe0 need dppclk = dispclk +* +* new dchubp pipe split configuration: +* pipe 0: recout=(0,0,960,1080) viewport=(0,0,960,1080) +* pipe 1: recout=(960,0,960,1080) viewport=(960,0,960,1080) +* dppclk only needs dppclk = dispclk /2. +* +* dispclk, dppclk are not lock by otg master lock. they take effect +* after step 1. during this transition, dispclk are the same, but +* dppclk is changed to half of previous clock for old dchubp +* configuration between step 1 and step 6. This may cause p-state +* warning intermittently. +* +* for new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz, we +* need make sure dppclk are not changed to less between step 1 and 6. +* for new_clocks->dispclk_khz > clk_mgr_base->clks.dispclk_khz, +* new display clock is raised, but we do not know ratio of +* new_clocks->dispclk_khz and clk_mgr_base->clks.dispclk_khz, +* new_clocks->dispclk_khz /2 does not guarantee equal or higher than +* old dppclk. we could ignore power saving different between +* dppclk = displck and dppclk = dispclk / 2 between step 1 and step 6. +* as long as safe_to_lower = false, set dpclk = dispclk to simplify +* condition check. +* todo: review this change for other asic. +**/ +if (!safe_to_lower) + request_dpp_div = false; +/* set disp clk to dpp clk threshold */ clk_mgr->funcs->set_dispclk (clk_mgr, dispclk_to_dpp_threshold);
@@ -209,7 +274,7 @@ static void rv1_update_clocks(struct clk/* program dispclk on = as a w/a for sleep resume clock ramping issues */ if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz) { -ramp_up_dispclk_with_dpp (clk_mgr, dc, new_clocks); +ramp_up_dispclk_with_dpp (clk_mgr, dc, new_clocks, safe_to_lower); clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; send_request_to_lower = true; }
Greg Kroah-Hartman
maintainerPATCH 196/204 drm/dp_mst: Fix the DDC I2C device registration of an MST port
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
commit d8bd15b37d328a935a4fc695fed8b19157503950 upstream.
During the initial MST probing an MST port's I2C device will be registered using the kdev of the DRM device as a parent. Later after MST Connection Status Notifications this I2C device will be re-registered with the kdev of the port's connector. This will also move inconsistently the I2C device's sysfs entry from the DRM device's sysfs dir to the connector's dir.
Fix the above by keeping the DRM kdev as the parent of the I2C device.
Ideally the connector's kdev would be used as a parent, similarly to non-MST connectors, however that needs some more refactoring to ensure the connector's kdev is already available early enough. So keep the existing (initial) behavior for now.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +16 -12
@@ -88,8 +88,8 @@ static int drm_dp_send_enum_path_resourcstatic bool drm_dp_validate_guid (struct drm_dp_mst_topology_mgr *mgr,u8 *guid); -static int drm_dp_mst_register_i2c_bus (struct drm_dp_aux *aux); -static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_aux *aux); +static int drm_dp_mst_register_i2c_bus (struct drm_dp_mst_port *port); +static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_mst_port *port);static void drm_dp_mst_kick_tx (struct drm_dp_mst_topology_mgr *mgr);#define DBG_PREFIX "[dp_mst]"
@@ -1981,7 +1981,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_po }/* remove i2c over sideband */ -drm_dp_mst_unregister_i2c_bus (&port->aux); +drm_dp_mst_unregister_i2c_bus (port); }else {mutex_lock (&mgr->lock);drm_dp_mst_topology_put_mstb (port->mstb);
@@ -1996,7 +1996,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_poif (port->pdt !=DP_PEER_DEVICE_NONE ) {if (drm_dp_mst_is_end_device (port->pdt, port->mcs)) {/* add i2c over sideband */ - ret =drm_dp_mst_register_i2c_bus (&port->aux); + ret =drm_dp_mst_register_i2c_bus (port); }else { lct =drm_dp_calculate_rad (port, rad); mstb =drm_dp_add_mst_branch_device (lct, rad);
@@ -5406,22 +5406,26 @@ static const struct i2c_algorithm drm_dp/** * drm_dp_mst_register_i2c_bus() - register an I2C adapter for I2C-over-AUX -* @aux: DisplayPort AUX channel +* @port: The port to add the I2C bus on * * Returns 0 on success or a negative error code on failure. */ -static int drm_dp_mst_register_i2c_bus (struct drm_dp_aux *aux) +static int drm_dp_mst_register_i2c_bus (struct drm_dp_mst_port *port) { +struct drm_dp_aux *aux = &port->aux; +struct device *parent_dev = port->mgr->dev->dev; + aux->ddc.algo = &drm_dp_mst_i2c_algo; aux->ddc.algo_data = aux; aux->ddc.retries =3 ; aux->ddc.class =I2C_CLASS_DDC ; aux->ddc.owner =THIS_MODULE ; - aux->ddc.dev.parent = aux->dev; - aux->ddc.dev.of_node = aux->dev->of_node; +/* FIXME: set the kdev of the port's connector as parent */ + aux->ddc.dev.parent = parent_dev; + aux->ddc.dev.of_node = parent_dev->of_node; -strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (aux->dev), +strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (parent_dev),sizeof (aux->ddc.name));return i2c_add_adapter (&aux->ddc);
@@ -5429,11 +5433,11 @@ static int drm_dp_mst_register_i2c_bus(s/** * drm_dp_mst_unregister_i2c_bus() - unregister an I2C-over-AUX adapter -* @aux: DisplayPort AUX channel +* @port: The port to remove the I2C bus from */ -static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_aux *aux) +static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_mst_port *port) { -i2c_del_adapter (&aux->ddc); +i2c_del_adapter (&port->aux.ddc); }/**
Greg Kroah-Hartman
maintainerPATCH 189/204 khugepaged: retract_page_tables() remember to test exit
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 18e77600f7a1ed69f8ce46c9e11cad0985712dfa upstream.
Only once have I seen this scenario (and forgot even to notice what forced the eventual crash): a sequence of "BUG: Bad page map" alerts from vm_normal_page(), from zap_pte_range() servicing exit_mmap(); pmd:00000000, pte values corresponding to data in physical page 0.
The pte mappings being zapped in this case were supposed to be from a huge page of ext4 text (but could as well have been shmem): my belief is that it was racing with collapse_file()'s retract_page_tables(), found *pmd pointing to a page table, locked it, but *pmd had become 0 by the time start_pte was decided.
In most cases, that possibility is excluded by holding mmap lock; but exit_mmap() proceeds without mmap lock. Most of what's run by khugepaged checks khugepaged_test_exit() after acquiring mmap lock:khugepaged_collapse_pte_mapped_thps() and hugepage_vma_revalidate() do so, for example. But retract_page_tables() did not: fix that.
The fix is for retract_page_tables() to check khugepaged_test_exit(), after acquiring mmap lock, before doing anything to the page table. Getting the mmap lock serializes with __mmput(), which briefly takes and drops it in __khugepaged_exit(); then the khugepaged_test_exit() check on mm_users makes sure we don't touch the page table once exit_mmap() might reach it, since exit_mmap() will be proceeding without mmap lock, not expecting anyone to be racing with it.
--- mm/khugepaged.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
mm/khugepaged.c +14 -10
@@ -1433,6 +1433,7 @@ out:static void retract_page_tables (struct address_space *mapping,pgoff_t pgoff) {struct vm_area_struct *vma; +struct mm_struct *mm;unsigned long addr;pmd_t *pmd, _pmd;
@@ -1461,7 +1462,8 @@ static void retract_page_tables(struct acontinue ;if (vma->vm_end < addr +HPAGE_PMD_SIZE )continue ; - pmd =mm_find_pmd (vma->vm_mm, addr); + mm = vma->vm_mm; + pmd =mm_find_pmd (mm, addr);if (!pmd)continue ;/*
@@ -1471,17 +1473,19 @@ static void retract_page_tables(struct a* mmap_sem while holding page lock. Fault path does it in * reverse order. Trylock is a way to avoid deadlock. */ -if (down_write_trylock (&vma->vm_mm->mmap_sem)) { -spinlock_t *ptl =pmd_lock (vma->vm_mm, pmd); -/* assume page table is clear */ - _pmd =pmdp_collapse_flush (vma, addr, pmd); -spin_unlock (ptl); -up_write (&vma->vm_mm->mmap_sem); -mm_dec_nr_ptes (vma->vm_mm); -pte_free (vma->vm_mm,pmd_pgtable (_pmd)); +if (down_write_trylock (&mm->mmap_sem)) { +if (!khugepaged_test_exit (mm)) { +spinlock_t *ptl =pmd_lock (mm, pmd); +/* assume page table is clear */ + _pmd =pmdp_collapse_flush (vma, addr, pmd); +spin_unlock (ptl); +mm_dec_nr_ptes (mm); +pte_free (mm,pmd_pgtable (_pmd)); + } +up_write (&mm->mmap_sem); }else {/* Try again later */ -khugepaged_add_pte_mapped_thp (vma->vm_mm, addr); +khugepaged_add_pte_mapped_thp (mm, addr); } }i_mmap_unlock_write (mapping);
Greg Kroah-Hartman
maintainerPATCH 192/204 ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init()
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit ff5d18cb04f4ecccbcf05b7f83ab6df2a0d95c16 upstream.
Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver keeps the audio mclk enabled.
With the move of PMC clocks from clock driver into pmc driver, audio mclk enable from clock driver is removed and this should be taken care of by the audio driver.
tegra_asoc_utils_init() calls tegra_asoc_utils_set_rate() and audio mclk rate configuration is not needed during init and the rate is actually set during the ->hw_params() callback.
So, this patch removes tegra_asoc_utils_set_rate() call and just leaves the audio mclk enabled.
--- sound/soc/tegra/tegra_asoc_utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra_asoc_utils.c +9 -2
@@ -205,9 +205,16 @@ int tegra_asoc_utils_init(struct tegra_a data->clk_cdev1 = clk_out_1; } - ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 ); -if (ret) +/* +* FIXME: There is some unknown dependency between audio mclk disable +* and suspend-resume functionality on Tegra30, although audio mclk is +* only needed for audio. +*/ + ret =clk_prepare_enable (data->clk_cdev1); +if (ret) { +dev_err (data->dev,"Can't enable cdev1: %d\n" , ret);return ret; + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 203/204 drm/amd/display: Fix dmesg warning from setting abm level
In reply to Greg Kroah-HartmanFrom: Stylon Wang <[email protected]>
commit c5892a10218214d729699ab61bad6fc109baf0ce upstream.
[Why]
Setting abm level does not correctly update CRTC state. As a result no surface update is added to dc stream state and triggers warning.
[How]
Correctly update CRTC state when setting abm level property.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +23 -0
@@ -8458,6 +8458,29 @@ static int amdgpu_dm_atomic_check(structif (ret) goto fail; +/* Check connector changes */ +for_each_oldnew_connector_in_state (state, connector, old_con_state, new_con_state, i) { +struct dm_connector_state *dm_old_con_state =to_dm_connector_state (old_con_state); +struct dm_connector_state *dm_new_con_state =to_dm_connector_state (new_con_state); + +/* Skip connectors that are disabled or part of modeset already. */ +if (!old_con_state->crtc && !new_con_state->crtc) +continue ; + +if (!new_con_state->crtc) +continue ; + + new_crtc_state =drm_atomic_get_crtc_state (state, new_con_state->crtc); +if (IS_ERR (new_crtc_state)) { + ret =PTR_ERR (new_crtc_state); + goto fail; + } + +if (dm_old_con_state->abm_level != + dm_new_con_state->abm_level) + new_crtc_state->connectors_changed = true; + } +#if defined(CONFIG_DRM_AMD_DC_DCN )if (!compute_mst_dsc_configs_for_state (state, dm_state->context)) goto fail;
Greg Kroah-Hartman
maintainerPATCH 187/204 perf/x86/rapl: Fix missing psys sysfs attributes
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
[ Upstream commit 4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431 ]
This fixes a problem introduced by commit:
5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")
that perf event sysfs attributes for psys RAPL domain are missing.
--- arch/x86/events/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/rapl.c +1 -1
@@ -642,7 +642,7 @@ static const struct attribute_group *rapl_attr_update[] = { &rapl_events_pkg_group, &rapl_events_ram_group, &rapl_events_gpu_group, - &rapl_events_gpu_group, + &rapl_events_psys_group, NULL, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 191/204 ASoC: tegra: Add audio mclk parent configuration
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit 1e4e0bf136aa4b4aa59c1e6af19844bd6d807794 upstream.
Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver does the initial parent configuration for audio mclk and keeps it enabled by default.
With the move of PMC clocks from clock driver into PMC driver, audio clocks parent configuration can be specified through the device tree using assigned-clock-parents property and audio mclk control should be taken care of by the audio driver.
This patch has implementation for parent configuration when default parent configuration through assigned-clock-parents property is not specified in the device tree.
--- sound/soc/tegra/tegra_asoc_utils.c | 68 +++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 28 deletions(-)
sound/soc/tegra/tegra_asoc_utils.c +40 -28
@@ -60,8 +60,6 @@ int tegra_asoc_utils_set_rate(struct teg data->set_mclk =0 ;clk_disable_unprepare (data->clk_cdev1); -clk_disable_unprepare (data->clk_pll_a_out0); -clk_disable_unprepare (data->clk_pll_a); err =clk_set_rate (data->clk_pll_a, new_baseclock);if (err) {
@@ -77,18 +75,6 @@ int tegra_asoc_utils_set_rate(struct teg/* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */ - err =clk_prepare_enable (data->clk_pll_a); -if (err) { -dev_err (data->dev,"Can't enable pll_a: %d\n" , err); -return err; - } - - err =clk_prepare_enable (data->clk_pll_a_out0); -if (err) { -dev_err (data->dev,"Can't enable pll_a_out0: %d\n" , err); -return err; - } - err =clk_prepare_enable (data->clk_cdev1);if (err) {dev_err (data->dev,"Can't enable cdev1: %d\n" , err);
@@ -109,8 +95,6 @@ int tegra_asoc_utils_set_ac97_rate(strucint err;clk_disable_unprepare (data->clk_cdev1); -clk_disable_unprepare (data->clk_pll_a_out0); -clk_disable_unprepare (data->clk_pll_a);/* * AC97 rate is fixed at 24.576MHz and is used for both the host
@@ -130,18 +114,6 @@ int tegra_asoc_utils_set_ac97_rate(struc/* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */ - err =clk_prepare_enable (data->clk_pll_a); -if (err) { -dev_err (data->dev,"Can't enable pll_a: %d\n" , err); -return err; - } - - err =clk_prepare_enable (data->clk_pll_a_out0); -if (err) { -dev_err (data->dev,"Can't enable pll_a_out0: %d\n" , err); -return err; - } - err =clk_prepare_enable (data->clk_cdev1);if (err) {dev_err (data->dev,"Can't enable cdev1: %d\n" , err);
@@ -158,6 +130,7 @@ EXPORT_SYMBOL_GPL(tegra_asoc_utils_set_aint tegra_asoc_utils_init (struct tegra_asoc_utils_data *data,struct device *dev) { +struct clk *clk_out_1, *clk_extern1;int ret; data->dev = dev;
@@ -193,6 +166,45 @@ int tegra_asoc_utils_init(struct tegra_areturn PTR_ERR (data->clk_cdev1); } +/* +* If clock parents are not set in DT, configure here to use clk_out_1 +* as mclk and extern1 as parent for Tegra30 and higher. +*/ +if (!of_find_property (dev->of_node,"assigned-clock-parents" ,NULL ) && + data->soc >TEGRA_ASOC_UTILS_SOC_TEGRA20 ) { +dev_warn (data->dev, +"Configuring clocks for a legacy device-tree\n" ); +dev_warn (data->dev, +"Please update DT to use assigned-clock-parents\n" ); + clk_extern1 =devm_clk_get (dev,"extern1" ); +if (IS_ERR (clk_extern1)) { +dev_err (data->dev,"Can't retrieve clk extern1\n" ); +return PTR_ERR (clk_extern1); + } + + ret =clk_set_parent (clk_extern1, data->clk_pll_a_out0); +if (ret <0 ) { +dev_err (data->dev, +"Set parent failed for clk extern1\n" ); +return ret; + } + + clk_out_1 =devm_clk_get (dev,"pmc_clk_out_1" ); +if (IS_ERR (clk_out_1)) { +dev_err (data->dev,"Can't retrieve pmc_clk_out_1\n" ); +return PTR_ERR (clk_out_1); + } + + ret =clk_set_parent (clk_out_1, clk_extern1); +if (ret <0 ) { +dev_err (data->dev, +"Set parent failed for pmc_clk_out_1\n" ); +return ret; + } + + data->clk_cdev1 = clk_out_1; + } + ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 );if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 195/204 drm/panfrost: Use kvfree() to free bo->sgts
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 114427b8927a4def2942b2b886f7e4aeae289ccb upstream.
Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array() in panfrost_mmu_map_fault_addr().
--- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -1
@@ -46,7 +46,7 @@ static void panfrost_gem_free_object(strsg_free_table (&bo->sgts[i]); } } -kfree (bo->sgts); +kvfree (bo->sgts); }drm_gem_shmem_free_object (obj);
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(s pages =kvmalloc_array (bo->base.base.size >>PAGE_SHIFT ,sizeof (struct page *),GFP_KERNEL | __GFP_ZERO);if (!pages) { -kfree (bo->sgts); +kvfree (bo->sgts); bo->sgts =NULL ;mutex_unlock (&bo->base.pages_lock); ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 193/204 drm/radeon: fix fb_div check in ni_init_smc_spll_table()
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
clk_s is checked twice in a row in ni_init_smc_spll_table(). fb_div should be checked instead.
--- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/ni_dpm.c +1 -1
@@ -2124,7 +2124,7 @@ static int ni_init_smc_spll_table(structif (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT )) ret = -EINVAL ; -if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT )) +if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT )) ret = -EINVAL ;if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT ))
Greg Kroah-Hartman
maintainerPATCH 194/204 drm/i915/gt: Force the GT reset on shutdown
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 7c4541a37bbbf83c0f16f779e85eb61d9348ed29 upstream.
Before we return control to the system, and letting it reuse all the pages being accessed by HW, we must disable the HW. At the moment, we dare not reset the GPU if it will clobber the display, but once we know the display has been disabled, we can proceed with the reset as we shutdown the module. We know the next user must reinitialise the HW for their purpose.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt.c +5 -0
@@ -656,6 +656,11 @@ void intel_gt_driver_unregister(struct ivoid intel_gt_driver_release (struct intel_gt *gt) {struct i915_address_space *vm; +intel_wakeref_t wakeref; + +/* Scrub all HW state upon release */ + with_intel_runtime_pm(gt->uncore->rpm, wakeref) +__intel_gt_reset (gt,ALL_ENGINES ); vm =fetch_and_zero (>->vm);if (vm)/* FIXME being called twice on error paths :( */
Greg Kroah-Hartman
maintainerPATCH 200/204 drm: Added orientation quirk for ASUS tablet model T103HAF
In reply to Greg Kroah-HartmanFrom: Marius Iacob <[email protected]>
commit b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c upstream.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -121,6 +121,12 @@ static const struct dmi_system_id orient DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Asus T103HAF */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),
Greg Kroah-Hartman
maintainerPATCH 198/204 drm/omap: force runtime PM suspend on system suspend
In reply to Greg Kroah-HartmanFrom: Tomi Valkeinen <[email protected]>
commit ecfdedd7da5d54416db5ca0f851264dca8736f59 upstream.
Use SET_LATE_SYSTEM_SLEEP_PM_OPS in DSS submodules to force runtime PM suspend and resume.
We use suspend late version so that omapdrm's system suspend callback is called first, as that will disable all the display outputs after which it's safe to force DSS into suspend.
--- drivers/gpu/drm/omapdrm/dss/dispc.c | 1 + drivers/gpu/drm/omapdrm/dss/dsi.c | 1 + drivers/gpu/drm/omapdrm/dss/dss.c | 1 + drivers/gpu/drm/omapdrm/dss/venc.c | 1 + 4 files changed, 4 insertions(+)
drivers/gpu/drm/omapdrm/dss/dispc.c +1 -0
@@ -4936,6 +4936,7 @@ static int dispc_runtime_resume(struct dstatic const struct dev_pm_ops dispc_pm_ops = { .runtime_suspend = dispc_runtime_suspend, .runtime_resume = dispc_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dispchw_driver = {
drivers/gpu/drm/omapdrm/dss/dsi.c +1 -0
@@ -5467,6 +5467,7 @@ static int dsi_runtime_resume(struct devstatic const struct dev_pm_ops dsi_pm_ops = { .runtime_suspend = dsi_runtime_suspend, .runtime_resume = dsi_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dsihw_driver = {
drivers/gpu/drm/omapdrm/dss/dss.c +1 -0
@@ -1614,6 +1614,7 @@ static int dss_runtime_resume(struct devstatic const struct dev_pm_ops dss_pm_ops = { .runtime_suspend = dss_runtime_suspend, .runtime_resume = dss_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dsshw_driver = {
drivers/gpu/drm/omapdrm/dss/venc.c +1 -0
@@ -945,6 +945,7 @@ static int venc_runtime_resume(struct destatic const struct dev_pm_ops venc_pm_ops = { .runtime_suspend = venc_runtime_suspend, .runtime_resume = venc_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };static const struct of_device_id venc_of_match[] = {
Greg Kroah-Hartman
maintainerPATCH 199/204 drm/tidss: fix modeset init for DPI panels
In reply to Greg Kroah-HartmanFrom: Tomi Valkeinen <[email protected]>
commit a72a6a16d51034045cb6355924b62221a8221ca3 upstream.
The connector type for DISPC's DPI videoport was set the LVDS instead of DPI. This causes any DPI panel setup to fail with tidss, making all DPI panels unusable.
Fix this by using correct connector type.
--- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tidss/tidss_kms.c +1 -1
@@ -154,7 +154,7 @@ static int tidss_dispc_modeset_init(strubreak ;case DISPC_VP_DPI : enc_type =DRM_MODE_ENCODER_DPI ; - conn_type =DRM_MODE_CONNECTOR_LVDS ; + conn_type =DRM_MODE_CONNECTOR_DPI ;break ;default :WARN_ON (1 );
Greg Kroah-Hartman
maintainerPATCH 197/204 drm/amdgpu: fix ordering of psp suspend
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
The ordering of psp_tmr_terminate() and psp_asd_unload() got reversed when the patches were applied to stable.
This patch does not exist in Linus' tree because the ordering is correct there. It got reversed when the patches were applied to stable. This patch is for stable only.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -4
@@ -1679,15 +1679,15 @@ static int psp_suspend(void *handle) } } - ret =psp_tmr_terminate (psp); + ret =psp_asd_unload (psp);if (ret) { -DRM_ERROR ("Falied to terminate tmr\n" ); +DRM_ERROR ("Failed to unload asd\n" );return ret; } - ret =psp_asd_unload (psp); + ret =psp_tmr_terminate (psp);if (ret) { -DRM_ERROR ("Failed to unload asd\n" ); +DRM_ERROR ("Falied to terminate tmr\n" );return ret; }
Greg Kroah-Hartman
maintainerPATCH 188/204 sh: landisk: Add missing initialization of sh_io_port_base
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 ]
The Landisk setup code maps the CF IDE area using ioremap_prot(), and passes the resulting virtual addresses to the pata_platform driver, disguising them as I/O port addresses. Hence the pata_platform driver translates them again using ioport_map().
As CONFIG_GENERIC_IOMAP=n, and CONFIG_HAS_IOPORT_MAP=y, the SuperH-specific mapping code in arch/sh/kernel/ioport.c translates I/O port addresses to virtual addresses by adding sh_io_port_base, which defaults to -1, thus breaking the assumption of an identity mapping.
Fix this by setting sh_io_port_base to zero.
--- arch/sh/boards/mach-landisk/setup.c | 3 +++ 1 file changed, 3 insertions(+)
arch/sh/boards/mach-landisk/setup.c +3 -0
@@ -82,6 +82,9 @@ device_initcall(landisk_devices_setup);static void __init landisk_setup (char **cmdline_p) { +/* I/O port identity mapping */ +__set_io_port_base (0 ); +/* LED ON */ __raw_writeb (__raw_readb (PA_LED ) |0x03 ,PA_LED );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 163/204 selftests/bpf: Prevent runqslower from racing on building bpftool
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 6bcaf41f9613278cd5897fc80ab93033bda8efaa ]
runqslower's Makefile is building/installing bpftool into $(OUTPUT)/sbin/bpftool, which coincides with $(DEFAULT_BPFTOOL). In practice this means that often when building selftests from scratch (after make clean), selftests are racing with runqslower to simultaneously build bpftool and one of the two processes fail due to file being busy. Prevent this race by explicitly order-depending on $(BPFTOOL_DEFAULT).
--- tools/testing/selftests/bpf/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +3 -2
@@ -138,7 +138,9 @@ VMLINUX_BTF_PATHS := $(if $(O),$(O)/vmlinux) \ /boot/vmlinux-$(shell uname -r) VMLINUX_BTF := $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) -$(OUTPUT)/runqslower: $(BPFOBJ) +DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool + +$(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower \ OUTPUT=$(SCRATCH_DIR)/ VMLINUX_BTF=$(VMLINUX_BTF) \ BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) && \
@@ -160,7 +162,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c $(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/test_sysctl: cgroup_helpers.c -DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(BPFOBJ) | $(BUILD_DIR)/bpftool
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 161/204 x86/tsr: Fix tsc frequency enumeration bug on Lightning Mountain SoC
In reply to Greg Kroah-HartmanFrom: Dilip Kota <[email protected]>
[ Upstream commit 7d98585860d845e36ee612832a5ff021f201dbaf ]
Frequency descriptor of Lightning Mountain SoC doesn't have all the frequency entries so resulting in the below failure causing a kernel hang:
Error MSR_FSB_FREQ index 15 is unknown
tsc: Fast TSC calibration failed
So, add all the frequency entries in the Lightning Mountain SoC frequency descriptor.
--- arch/x86/kernel/tsc_msr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kernel/tsc_msr.c +7 -2
@@ -133,10 +133,15 @@ static const struct freq_desc freq_desc_ann = { .mask = 0x0f, }; -/* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz */ +/* +* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz +* Frequency step for Lightning Mountain SoC is fixed to 78 MHz, +* so all the frequency entries are 78000. +*/ static const struct freq_desc freq_desc_lgm = { .use_msr_plat = true, - .freqs = {78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 }, + .freqs = {78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 , +78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 }, .mask =0x0f , };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/204 x86/bugs/multihit: Fix mitigation reporting when VMX is not in use
In reply to Greg Kroah-HartmanFrom: Pawan Gupta <[email protected]>
[ Upstream commit f29dfa53cc8ae6ad93bae619bcc0bf45cab344f7 ]
On systems that have virtualization disabled or unsupported, sysfs mitigation for X86_BUG_ITLB_MULTIHIT is reported incorrectly as:
$ cat /sys/devices/system/cpu/vulnerabilities/itlb_multihit KVM: Vulnerable
System is not vulnerable to DoS attack from a rogue guest when virtualization is disabled or unsupported in the hardware. Change the mitigation reporting for these cases.
--- Documentation/admin-guide/hw-vuln/multihit.rst | 4 ++++ arch/x86/kernel/cpu/bugs.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Documentation/admin-guide/hw-vuln/multihit.rst +4 -0
@@ -80,6 +80,10 @@ The possible values in this file are: - The processor is not vulnerable. * - KVM: Mitigation: Split huge pages - Software changes mitigate this issue. + * - KVM: Mitigation: VMX unsupported + - KVM is not vulnerable because Virtual Machine Extensions (VMX) is not supported. + * - KVM: Mitigation: VMX disabled + - KVM is not vulnerable because Virtual Machine Extensions (VMX) is disabled. * - KVM: Vulnerable - The processor is vulnerable, but no mitigation enabled
arch/x86/kernel/cpu/bugs.c +7 -1
@@ -31,6 +31,7 @@#include <asm/intel-family.h> #include <asm/e820/api.h> #include <asm/hypervisor.h> +#include <asm/tlbflush.h> #include "cpu.h"
@@ -1556,7 +1557,12 @@ static ssize_t l1tf_show_state(char *buf)static ssize_t itlb_multihit_show_state (char *buf) { -if (itlb_multihit_kvm_mitigation) +if (!boot_cpu_has (X86_FEATURE_MSR_IA32_FEAT_CTL ) || + !boot_cpu_has (X86_FEATURE_VMX )) +return sprintf (buf,"KVM: Mitigation: VMX unsupported\n" ); +else if (!(cr4_read_shadow () &X86_CR4_VMXE )) +return sprintf (buf,"KVM: Mitigation: VMX disabled\n" ); +else if (itlb_multihit_kvm_mitigation)return sprintf (buf,"KVM: Mitigation: Split huge pages\n" );else return sprintf (buf,"KVM: Vulnerable\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 158/204 watchdog: initialize device before misc_register
In reply to Greg Kroah-HartmanFrom: Krzysztof Sobota <[email protected]>
[ Upstream commit cb36e29bb0e4b0c33c3d5866a0a4aebace4c99b7 ]
When watchdog device is being registered, it calls misc_register that makes watchdog available for systemd to open. This is a data race scenario, because when device is open it may still have device struct not initialized - this in turn causes a crash. This patch moves device initialization before misc_register call and it solves the problem printed below.
------------[ cut here ]------------ WARNING: CPU: 3 PID: 1 at lib/kobject.c:612 kobject_get+0x50/0x54 kobject: '(null)' ((ptrval)): is not initialized, yet kobject_get() is being called. Modules linked in: k2_reset_status(O) davinci_wdt(+) sfn_platform_hwbcn(O) fsmddg_sfn(O) clk_misc_mmap(O) clk_sw_bcn(O) fsp_reset(O) cma_mod(O) slave_sup_notif(O) fpga_master(O) latency(O+) evnotify(O) enable_arm_pmu(O) xge(O) rio_mport_cdev br_netfilter bridge stp llc nvrd_checksum(O) ipv6 CPU: 3 PID: 1 Comm: systemd Tainted: G O 4.19.113-g2579778-fsm4_k2 #1 Hardware name: Keystone [<c02126c4>] (unwind_backtrace) from [<c020da94>] (show_stack+0x18/0x1c) [<c020da94>] (show_stack) from [<c07f87d8>] (dump_stack+0xb4/0xe8) [<c07f87d8>] (dump_stack) from [<c0221f70>] (__warn+0xfc/0x114) [<c0221f70>] (__warn) from [<c0221fd8>] (warn_slowpath_fmt+0x50/0x74) [<c0221fd8>] (warn_slowpath_fmt) from [<c07fd394>] (kobject_get+0x50/0x54) [<c07fd394>] (kobject_get) from [<c0602ce8>] (get_device+0x1c/0x24) [<c0602ce8>] (get_device) from [<c06961e0>] (watchdog_open+0x90/0xf0) [<c06961e0>] (watchdog_open) from [<c06001dc>] (misc_open+0x130/0x17c) [<c06001dc>] (misc_open) from [<c0388228>] (chrdev_open+0xec/0x1a8) [<c0388228>] (chrdev_open) from [<c037fa98>] (do_dentry_open+0x204/0x3cc) [<c037fa98>] (do_dentry_open) from [<c0391e2c>] (path_openat+0x330/0x1148) [<c0391e2c>] (path_openat) from [<c0394518>] (do_filp_open+0x78/0xec) [<c0394518>] (do_filp_open) from [<c0381100>] (do_sys_open+0x130/0x1f4) [<c0381100>] (do_sys_open) from [<c0201000>] (ret_fast_syscall+0x0/0x28) Exception stack(0xd2ceffa8 to 0xd2cefff0) ffa0: b6f69968 00000000 ffffff9c b6ebd210 000a0001 00000000 ffc0: b6f69968 00000000 00000000 00000142 fffffffd ffffffff 00b65530 bed7bb78 ffe0: 00000142 bed7ba70 b6cc2503 b6cc41d6 ---[ end trace 7b16eb105513974f ]--- ------------[ cut here ]------------ WARNING: CPU: 3 PID: 1 at lib/refcount.c:153 kobject_get+0x24/0x54 refcount_t: increment on 0; use-after-free. Modules linked in: k2_reset_status(O) davinci_wdt(+) sfn_platform_hwbcn(O) fsmddg_sfn(O) clk_misc_mmap(O) clk_sw_bcn(O) fsp_reset(O) cma_mod(O) slave_sup_notif(O) fpga_master(O) latency(O+) evnotify(O) enable_arm_pmu(O) xge(O) rio_mport_cdev br_netfilter bridge stp llc nvrd_checksum(O) ipv6 CPU: 3 PID: 1 Comm: systemd Tainted: G W O 4.19.113-g2579778-fsm4_k2 #1 Hardware name: Keystone [<c02126c4>] (unwind_backtrace) from [<c020da94>] (show_stack+0x18/0x1c) [<c020da94>] (show_stack) from [<c07f87d8>] (dump_stack+0xb4/0xe8) [<c07f87d8>] (dump_stack) from [<c0221f70>] (__warn+0xfc/0x114) [<c0221f70>] (__warn) from [<c0221fd8>] (warn_slowpath_fmt+0x50/0x74) [<c0221fd8>] (warn_slowpath_fmt) from [<c07fd368>] (kobject_get+0x24/0x54) [<c07fd368>] (kobject_get) from [<c0602ce8>] (get_device+0x1c/0x24) [<c0602ce8>] (get_device) from [<c06961e0>] (watchdog_open+0x90/0xf0) [<c06961e0>] (watchdog_open) from [<c06001dc>] (misc_open+0x130/0x17c) [<c06001dc>] (misc_open) from [<c0388228>] (chrdev_open+0xec/0x1a8) [<c0388228>] (chrdev_open) from [<c037fa98>] (do_dentry_open+0x204/0x3cc) [<c037fa98>] (do_dentry_open) from [<c0391e2c>] (path_openat+0x330/0x1148) [<c0391e2c>] (path_openat) from [<c0394518>] (do_filp_open+0x78/0xec) [<c0394518>] (do_filp_open) from [<c0381100>] (do_sys_open+0x130/0x1f4) [<c0381100>] (do_sys_open) from [<c0201000>] (ret_fast_syscall+0x0/0x28) Exception stack(0xd2ceffa8 to 0xd2cefff0) ffa0: b6f69968 00000000 ffffff9c b6ebd210 000a0001 00000000 ffc0: b6f69968 00000000 00000000 00000142 fffffffd ffffffff 00b65530 bed7bb78 ffe0: 00000142 bed7ba70 b6cc2503 b6cc41d6 ---[ end trace 7b16eb1055139750 ]---
--- drivers/watchdog/watchdog_dev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/watchdog/watchdog_dev.c +9 -9
@@ -994,6 +994,15 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)if (IS_ERR_OR_NULL (watchdog_kworker))return -ENODEV ; +device_initialize (&wd_data->dev); + wd_data->dev.devt =MKDEV (MAJOR (watchdog_devt), wdd->id); + wd_data->dev.class = &watchdog_class; + wd_data->dev.parent = wdd->parent; + wd_data->dev.groups = wdd->groups; + wd_data->dev.release = watchdog_core_data_release; +dev_set_drvdata (&wd_data->dev, wdd); +dev_set_name (&wd_data->dev,"watchdog%d" , wdd->id); +kthread_init_work (&wd_data->work, watchdog_ping_work);hrtimer_init (&wd_data->timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL_HARD ); wd_data->timer.function = watchdog_timer_expired;
@@ -1014,15 +1023,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) } } -device_initialize (&wd_data->dev); - wd_data->dev.devt =MKDEV (MAJOR (watchdog_devt), wdd->id); - wd_data->dev.class = &watchdog_class; - wd_data->dev.parent = wdd->parent; - wd_data->dev.groups = wdd->groups; - wd_data->dev.release = watchdog_core_data_release; -dev_set_drvdata (&wd_data->dev, wdd); -dev_set_name (&wd_data->dev,"watchdog%d" , wdd->id); -/* Fill in the data structures */ cdev_init (&wd_data->cdev, &watchdog_fops);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 186/204 tools build feature: Quote CC and CXX for their arguments
In reply to Greg Kroah-HartmanFrom: Daniel Díaz <[email protected]>
[ Upstream commit fa5c893181ed2ca2f96552f50073786d2cfce6c0 ]
When using a cross-compilation environment, such as OpenEmbedded, the CC an CXX variables are set to something more than just a
command: there are arguments (such as --sysroot) that need to be passed on to the compiler so that the right set of headers and libraries are used.
For the particular case that our systems detected, CC is set to the following:
export CC="aarch64-linaro-linux-gcc --sysroot=/oe/build/tmp/work/machine/perf/1.0-r9/recipe-sysroot"
Without quotes, detection is as follows:
Auto-detecting system features:
... dwarf: [ OFF ]
... dwarf_getlocations: [ OFF ]
... glibc: [ OFF ]
... gtk2: [ OFF ]
... libbfd: [ OFF ] ... libcap: [ OFF ] ... libelf: [ OFF ] ... libnuma: [ OFF ] ... numa_num_possible_cpus: [ OFF ] ... libperl: [ OFF ] ... libpython: [ OFF ] ... libcrypto: [ OFF ] ... libunwind: [ OFF ]
... libdw-dwarf-unwind: [ OFF ]
... zlib: [ OFF ]
... lzma: [ OFF ]
... get_cpuid: [ OFF ]
... bpf: [ OFF ]
... libaio: [ OFF ]
... libzstd: [ OFF ]
... disassembler-four-args: [ OFF ]
Makefile.config:414: *** No gnu/libc-version.h found, please install glibc-dev[el]. Stop. Makefile.perf:230: recipe for target 'sub-make' failed
make[1]: *** [sub-make] Error 2
Makefile:69: recipe for target 'all' failed
make: *** [all] Error 2
With CC and CXX quoted, some of those features are now detected.
--- tools/build/Makefile.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/build/Makefile.feature +1 -1
@@ -8,7 +8,7 @@ endif feature_check = $(eval $(feature_check_code)) define feature_check_code - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC=$(CC) CXX=$(CXX) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) endef feature_set = $(eval $(feature_set_code))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/204 md-cluster: Fix potential error pointer dereference in resize_bitmaps()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e8abe1de43dac658dacbd04a4543e0c988a8d386 ]
The error handling calls md_bitmap_free(bitmap) which checks for NULL but will Oops if we pass an error pointer. Let's set "bitmap" to NULL on this error path.
--- drivers/md/md-cluster.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/md-cluster.c +1 -0
@@ -1139,6 +1139,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz bitmap =get_bitmap_from_slot (mddev, i);if (IS_ERR (bitmap)) {pr_err ("can't get bitmap from slot %d\n" , i); + bitmap =NULL ; goto out; } counts = &bitmap->counts;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 184/204 ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 5a25de6df789cc805a9b8ba7ab5deef5067af47e ]
Freeing chip on error may lead to an Oops at the next time the system goes to resume. Fix this by removing all snd_echo_free() calls on error.
--- sound/pci/echoaudio/echoaudio.c | 2 -- 1 file changed, 2 deletions(-)
sound/pci/echoaudio/echoaudio.c +0 -2
@@ -2158,7 +2158,6 @@ static int snd_echo_resume(struct device *dev)if (err <0 ) {kfree (commpage_bak);dev_err (dev,"resume init_hw err=%d\n" , err); -snd_echo_free (chip);return err; }
@@ -2185,7 +2184,6 @@ static int snd_echo_resume(struct device *dev)if (request_irq (pci->irq, snd_echo_interrupt,IRQF_SHARED ,KBUILD_MODNAME , chip)) {dev_err (chip->card->dev,"cannot grab irq\n" ); -snd_echo_free (chip);return -EBUSY ; } chip->irq = pci->irq;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/204 watchdog: rti-wdt: balance pm runtime enable calls
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit d5b29c2c5ba2bd5bbdb5b744659984185d17d079 ]
PM runtime should be disabled in the fail path of probe and when the driver is removed.
--- drivers/watchdog/rti_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/rti_wdt.c +2 -0
@@ -211,6 +211,7 @@ static int rti_wdt_probe(struct platform_device *pdev) err_iomap:pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);return ret; }
@@ -221,6 +222,7 @@ static int rti_wdt_remove(struct platform_device *pdev)watchdog_unregister_device (&wdt->wdd);pm_runtime_put (&pdev->dev); +pm_runtime_disable (&pdev->dev);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 157/204 nfs: nfs_file_write() should check for writeback errors
In reply to Greg Kroah-HartmanFrom: Scott Mayhew <[email protected]>
[ Upstream commit ce368536dd614452407dc31e2449eb84681a06af ]
The NFS_CONTEXT_ERROR_WRITE flag (as well as the check of said flag) was removed by commit 6fbda89b257f. The absence of an error check allows writes to be continually queued up for a server that may no longer be able to handle them. Fix it by adding an error check using the generic error reporting functions.
--- fs/nfs/file.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/nfs/file.c +9 -3
@@ -590,12 +590,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = { .page_mkwrite = nfs_vm_page_mkwrite, }; -static int nfs_need_check_write (struct file *filp,struct inode *inode) +static int nfs_need_check_write (struct file *filp,struct inode *inode, +int error) {struct nfs_open_context *ctx; ctx =nfs_file_open_context (filp); -if (nfs_ctx_key_to_expire (ctx, inode)) +if (nfs_error_is_fatal_on_server (error) || +nfs_ctx_key_to_expire (ctx, inode))return 1 ;return 0 ; }
@@ -606,6 +608,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)struct inode *inode =file_inode (file);unsigned long written =0 ;ssize_t result; +errseq_t since; +int error; result =nfs_key_timeout_notify (file, inode);if (result)
@@ -630,6 +634,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)if (iocb->ki_pos >i_size_read (inode))nfs_revalidate_mapping (inode, file->f_mapping); + since =filemap_sample_wb_err (file->f_mapping);nfs_start_io_write (inode); result =generic_write_checks (iocb, from);if (result >0 ) {
@@ -648,7 +653,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) goto out;/* Return error values */ -if (nfs_need_check_write (file, inode)) { + error =filemap_check_wb_err (file->f_mapping, since); +if (nfs_need_check_write (file, inode, error)) {int err =nfs_wb_all (inode);if (err <0 ) result = err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 182/204 mfd: dln2: Run event handler loop under spinlock
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 3d858942250820b9adc35f963a257481d6d4c81d ]
The event handler loop must be run with interrupts disabled. Otherwise we will have a warning:
[ 1970.785649] irq 31 handler lineevent_irq_handler+0x0/0x20 enabled interrupts [ 1970.792739] WARNING: CPU: 0 PID: 0 at kernel/irq/handle.c:159 __handle_irq_event_percpu+0x162/0x170 [ 1970.860732] RIP: 0010:__handle_irq_event_percpu+0x162/0x170 ... [ 1970.946994] Call Trace: [ 1970.949446] <IRQ> [ 1970.951471] handle_irq_event_percpu+0x2c/0x80 [ 1970.955921] handle_irq_event+0x23/0x43 [ 1970.959766] handle_simple_irq+0x57/0x70 [ 1970.963695] generic_handle_irq+0x42/0x50 [ 1970.967717] dln2_rx+0xc1/0x210 [dln2] [ 1970.971479] ? usb_hcd_unmap_urb_for_dma+0xa6/0x1c0 [ 1970.976362] __usb_hcd_giveback_urb+0x77/0xe0 [ 1970.980727] usb_giveback_urb_bh+0x8e/0xe0 [ 1970.984837] tasklet_action_common.isra.0+0x4a/0xe0
...
Recently xHCI driver switched to tasklets in the commit 36dc01657b49 ("usb: host: xhci: Support running urb giveback in tasklet context").
The handle_irq_event_* functions are expected to be called with interrupts disabled and they rightfully complain here because we run in tasklet context with interrupts enabled.
Use a event spinlock to protect event handler from being interrupted.
Note, that there are only two users of this GPIO and ADC drivers and both of them are using generic_handle_irq() which makes above happen.
--- drivers/mfd/dln2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mfd/dln2.c +4 -0
@@ -287,7 +287,11 @@ static void dln2_rx(struct urb *urb) len = urb->actual_length -sizeof (struct dln2_header );if (handle ==DLN2_HANDLE_EVENT ) { +unsigned long flags; + +spin_lock_irqsave (&dln2->event_cb_lock, flags);dln2_run_event_callbacks (dln2, id, echo, data, len); +spin_unlock_irqrestore (&dln2->event_cb_lock, flags); }else {/* URB will be re-submitted in _dln2_transfer (free_rx_slot) */ if (dln2_transfer_complete (dln2, urb, handle, echo))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/204 i2c: iproc: fix race between client unreg and isr
In reply to Greg Kroah-HartmanFrom: Dhananjay Phadke <[email protected]>
[ Upstream commit b1eef236f50ba6afea680da039ef3a2ca9c43d11 ]
When i2c client unregisters, synchronize irq before setting iproc_i2c->slave to NULL.
(1) disable_irq()
(2) Mask event enable bits in control reg
(3) Erase slave address (avoid further writes to rx fifo)
(4) Flush tx and rx FIFOs
(5) Clear pending event (interrupt) bits in status reg
(6) enable_irq()
(7) Set client pointer to NULL
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000318
[ 371.020421] pc : bcm_iproc_i2c_isr+0x530/0x11f0 [ 371.025098] lr : __handle_irq_event_percpu+0x6c/0x170 [ 371.030309] sp : ffff800010003e40 [ 371.033727] x29: ffff800010003e40 x28: 0000000000000060 [ 371.039206] x27: ffff800010ca9de0 x26: ffff800010f895df [ 371.044686] x25: ffff800010f18888 x24: ffff0008f7ff3600 [ 371.050165] x23: 0000000000000003 x22: 0000000001600000 [ 371.055645] x21: ffff800010f18888 x20: 0000000001600000 [ 371.061124] x19: ffff0008f726f080 x18: 0000000000000000 [ 371.066603] x17: 0000000000000000 x16: 0000000000000000 [ 371.072082] x15: 0000000000000000 x14: 0000000000000000 [ 371.077561] x13: 0000000000000000 x12: 0000000000000001 [ 371.083040] x11: 0000000000000000 x10: 0000000000000040 [ 371.088519] x9 : ffff800010f317c8 x8 : ffff800010f317c0 [ 371.093999] x7 : ffff0008f805b3b0 x6 : 0000000000000000 [ 371.099478] x5 : ffff0008f7ff36a4 x4 : ffff8008ee43d000 [ 371.104957] x3 : 0000000000000000 x2 : ffff8000107d64c0 [ 371.110436] x1 : 00000000c00000af x0 : 0000000000000000
[ 371.115916] Call trace: [ 371.118439] bcm_iproc_i2c_isr+0x530/0x11f0 [ 371.122754] __handle_irq_event_percpu+0x6c/0x170 [ 371.127606] handle_irq_event_percpu+0x34/0x88 [ 371.132189] handle_irq_event+0x40/0x120 [ 371.136234] handle_fasteoi_irq+0xcc/0x1a0 [ 371.140459] generic_handle_irq+0x24/0x38 [ 371.144594] __handle_domain_irq+0x60/0xb8 [ 371.148820] gic_handle_irq+0xc0/0x158 [ 371.152687] el1_irq+0xb8/0x140 [ 371.155927] arch_cpu_idle+0x10/0x18 [ 371.159615] do_idle+0x204/0x290 [ 371.162943] cpu_startup_entry+0x24/0x60 [ 371.166990] rest_init+0xb0/0xbc [ 371.170322] arch_call_rest_init+0xc/0x14 [ 371.174458] start_kernel+0x404/0x430
--- drivers/i2c/busses/i2c-bcm-iproc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-bcm-iproc.c +12 -1
@@ -1074,7 +1074,7 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave)if (!iproc_i2c->slave)return -EINVAL ; - iproc_i2c->slave =NULL ; +disable_irq (iproc_i2c->irq);/* disable all slave interrupts */ tmp =iproc_i2c_rd_reg (iproc_i2c,IE_OFFSET );
@@ -1087,6 +1087,17 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave) tmp &= ~BIT (S_CFG_EN_NIC_SMB_ADDR3_SHIFT );iproc_i2c_wr_reg (iproc_i2c,S_CFG_SMBUS_ADDR_OFFSET , tmp); +/* flush TX/RX FIFOs */ + tmp = (BIT (S_FIFO_RX_FLUSH_SHIFT ) |BIT (S_FIFO_TX_FLUSH_SHIFT )); +iproc_i2c_wr_reg (iproc_i2c,S_FIFO_CTRL_OFFSET , tmp); + +/* clear all pending slave interrupts */ +iproc_i2c_wr_reg (iproc_i2c,IS_OFFSET ,ISR_MASK_SLAVE ); + + iproc_i2c->slave =NULL ; + +enable_irq (iproc_i2c->irq); +return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 179/204 fs/ufs: avoid potential u32 multiplication overflow
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 88b2e9b06381551b707d980627ad0591191f7a2d ]
The 64 bit ino is being compared to the product of two u32 values, however, the multiplication is being performed using a 32 bit multiply so there is a potential of an overflow. To be fully safe, cast uspi->s_ncg to a u64 to ensure a 64 bit multiplication occurs to avoid any chance of overflow.
Addresses-Coverity: ("Unintentional integer overflow")
--- fs/ufs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ufs/super.c +1 -1
@@ -101,7 +101,7 @@ static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 genestruct ufs_sb_private_info *uspi =UFS_SB (sb)->s_uspi;struct inode *inode; -if (ino <UFS_ROOTINO || ino > uspi->s_ncg * uspi->s_ipg) +if (ino <UFS_ROOTINO || ino > (u64 )uspi->s_ncg * uspi->s_ipg)return ERR_PTR (-ESTALE ); inode =ufs_iget (sb, ino);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 180/204 test_kmod: avoid potential double free in trigger_config_run_type()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 0776d1231bec0c7ab43baf440a3f5ef5f49dd795 ]
Reset the member "test_fs" of the test configuration after a call of the function "kfree_const" to a null pointer so that a double memory release will not be performed.
--- lib/test_kmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/test_kmod.c +1 -1
@@ -745,7 +745,7 @@ static int trigger_config_run_type(struct kmod_test_device *test_dev,break ;case TEST_KMOD_FS_TYPE :kfree_const (config->test_fs); - config->test_driver =NULL ; + config->test_fs =NULL ; copied =config_copy_test_fs (config, test_str,strlen (test_str));break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 175/204 lib/test_lockup.c: fix return value of test_lockup_init()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 3adf3bae0d612357da516d39e1584f1547eb6e86 ]
Since filp_open() returns an error pointer, we should use IS_ERR() to check the return value and then return PTR_ERR() if failed to get the actual return value instead of always -EINVAL.
E.g. without this patch:
[root@localhost loongson]# ls no_such_file
ls: cannot access no_such_file: No such file or directory
[root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
modprobe: ERROR: could not insert 'test_lockup': Invalid argument
[root@localhost loongson]# dmesg | tail -1
[ 126.100596] test_lockup: cannot find file_path
With this patch:
[root@localhost loongson]# ls no_such_file
ls: cannot access no_such_file: No such file or directory
[root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
modprobe: ERROR: could not insert 'test_lockup': Unknown symbol in module, or unknown parameter (see dmesg) [root@localhost loongson]# dmesg | tail -1
[ 95.134362] test_lockup: failed to open no_such_file: -2
--- lib/test_lockup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/test_lockup.c +2 -2
@@ -512,8 +512,8 @@ static int __init test_lockup_init(void)if (test_file_path[0 ]) { test_file =filp_open (test_file_path,O_RDONLY ,0 );if (IS_ERR (test_file)) { -pr_err ("cannot find file_path\n" ); -return -EINVAL ; +pr_err ("failed to open %s: %ld\n" , test_file_path,PTR_ERR (test_file)); +return PTR_ERR (test_file); } test_inode =file_inode (test_file); } else if (test_lock_inode ||
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 176/204 fs/minix: set s_maxbytes correctly
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 32ac86efff91a3e4ef8c3d1cadd4559e23c8e73a ]
The minix filesystem leaves super_block::s_maxbytes at MAX_NON_LFS rather than setting it to the actual filesystem-specific limit. This is broken because it means userspace doesn't see the standard behavior like getting EFBIG and SIGXFSZ when exceeding the maximum file size.
Fix this by setting s_maxbytes correctly.
--- fs/minix/inode.c | 12 +++++++----- fs/minix/itree_v1.c | 2 +- fs/minix/itree_v2.c | 3 +-- fs/minix/minix.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-)
fs/minix/inode.c +7 -5
@@ -150,8 +150,10 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)return 0 ; } -static bool minix_check_superblock (struct minix_sb_info *sbi) +static bool minix_check_superblock (struct super_block *sb) { +struct minix_sb_info *sbi =minix_sb (sb); +if (sbi->s_imap_blocks ==0 || sbi->s_zmap_blocks ==0 )return false;
@@ -161,7 +163,7 @@ static bool minix_check_superblock(struct minix_sb_info *sbi)* of indirect blocks which places the limit well above U32_MAX. */ if (sbi->s_version ==MINIX_V1 && - sbi->s_max_size > (7 +512 +512 *512 ) *BLOCK_SIZE ) + sb->s_maxbytes > (7 +512 +512 *512 ) *BLOCK_SIZE )return false;return true;
@@ -202,7 +204,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) sbi->s_zmap_blocks = ms->s_zmap_blocks; sbi->s_firstdatazone = ms->s_firstdatazone; sbi->s_log_zone_size = ms->s_log_zone_size; - sbi->s_max_size = ms->s_max_size; + s->s_maxbytes = ms->s_max_size; s->s_magic = ms->s_magic;if (s->s_magic ==MINIX_SUPER_MAGIC ) { sbi->s_version =MINIX_V1 ;
@@ -233,7 +235,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) sbi->s_zmap_blocks = m3s->s_zmap_blocks; sbi->s_firstdatazone = m3s->s_firstdatazone; sbi->s_log_zone_size = m3s->s_log_zone_size; - sbi->s_max_size = m3s->s_max_size; + s->s_maxbytes = m3s->s_max_size; sbi->s_ninodes = m3s->s_ninodes; sbi->s_nzones = m3s->s_zones; sbi->s_dirsize =64 ;
@@ -245,7 +247,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) }else goto out_no_fs; -if (!minix_check_superblock (sbi)) +if (!minix_check_superblock (s)) goto out_illegal_sb;/*
fs/minix/itree_v1.c +1 -1
@@ -29,7 +29,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if (block >= (minix_sb (inode->i_sb)->s_max_size/BLOCK_SIZE )) { + }else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE ) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
fs/minix/itree_v2.c +1 -2
@@ -32,8 +32,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, sb->s_bdev); - }else if ((u64 )block * (u64 )sb->s_blocksize >= -minix_sb (sb)->s_max_size) { + }else if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
fs/minix/minix.h +0 -1
@@ -32,7 +32,6 @@ struct minix_sb_info {unsigned long s_zmap_blocks;unsigned long s_firstdatazone;unsigned long s_log_zone_size; -unsigned long s_max_size;int s_dirsize;int s_namelen;struct buffer_head ** s_imap;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 177/204 fs/minix: fix block limit check for V1 filesystems
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0a12c4a8069607247cb8edc3b035a664e636fd9a ]
The minix filesystem reads its maximum file size from its on-disk superblock. This value isn't necessarily a multiple of the block size. When it's not, the V1 block mapping code doesn't allow mapping the last possible block. Commit 6ed6a722f9ab ("minixfs: fix block limit check") fixed this in the V2 mapping code. Fix it in the V1 mapping code too.
--- fs/minix/itree_v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/minix/itree_v1.c +1 -1
@@ -29,7 +29,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE ) { + }else if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 153/204 libnvdimm/security: fix a typo
In reply to Greg Kroah-HartmanFrom: Jane Chu <[email protected]>
[ Upstream commit dad42d17558f316e9e807698cd4207359b636084 ]
commit d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") introduced a typo, causing a 'nvdimm->sec.flags' update being overwritten by the subsequent update meant for 'nvdimm->sec.ext_flags'.
--- drivers/nvdimm/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/security.c +1 -1
@@ -457,7 +457,7 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm)clear_bit (NDD_WORK_PENDING , &nvdimm->flags);put_device (&nvdimm->dev); nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_USER ); - nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); + nvdimm->sec.ext_flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); }void nvdimm_security_overwrite_query (struct work_struct *work)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 149/204 i2c: rcar: avoid race when unregistering slave
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit c7c9e914f9a0478fba4dc6f227cfd69cf84a4063 ]
Due to the lockless design of the driver, it is theoretically possible to access a NULL pointer, if a slave interrupt was running while we were unregistering the slave. To make this rock solid, disable the interrupt for a short time while we are clearing the interrupt_enable register. This patch is purely based on code inspection. The OOPS is super-hard to trigger because clearing SAR (the address) makes interrupts even more unlikely to happen as well. While here, reinit SCR to SDBS because this bit should always be set according to documentation. There is no effect, though, because the interface is disabled.
--- drivers/i2c/busses/i2c-rcar.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-rcar.c +5 -3
@@ -866,12 +866,14 @@ static int rcar_unreg_slave(struct i2c_client *slave)WARN_ON (!priv->slave); -/* disable irqs and ensure none is running before clearing ptr */ +/* ensure no irq is running before clearing ptr */ +disable_irq (priv->irq);rcar_i2c_write (priv,ICSIER ,0 ); -rcar_i2c_write (priv,ICSCR ,0 ); +rcar_i2c_write (priv,ICSSR ,0 ); +enable_irq (priv->irq); +rcar_i2c_write (priv,ICSCR ,SDBS );rcar_i2c_write (priv,ICSAR ,0 );/* Gen2: must be 0 if not using slave */ -synchronize_irq (priv->irq); priv->slave =NULL ;pm_runtime_put (rcar_i2c_priv_to_dev (priv));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 148/204 tools build feature: Use CC and CXX from parent
In reply to Greg Kroah-HartmanFrom: Thomas Hebb <[email protected]>
[ Upstream commit e3232c2f39acafd5a29128425bc30b9884642cfa ]
commit c8c188679ccf ("tools build: Use the same CC for feature detection and actual build") changed these assignments from unconditional (:=) to conditional (?=) so that they wouldn't clobber values from the environment. However, conditional assignment does not work properly for variables that Make implicitly sets, among which are CC and CXX. To quote tools/scripts/Makefile.include, which handles this properly:
# Makefiles suck: This macro sets a default value of $(2) for the
# variable named by $(1), unless the variable has been set by # environment or command line. This is necessary for CC and AR # because make sets default values, so the simpler ?= approach # won't work as expected.
In other words, the conditional assignments will not run even if the variables are not overridden in the environment; Make will set CC to "cc" and CXX to "g++" when it starts[1], meaning the variables are not empty by the time the conditional assignments are evaluated. This breaks cross-compilation when CROSS_COMPILE is set but CC isn't, since "cc" gets used for feature detection instead of the cross compiler (and likewise for CXX).
To fix the issue, just pass down the values of CC and CXX computed by the parent Makefile, which gets included by the Makefile that actually builds whatever we're detecting features for and so is guaranteed to have good values. This is a better solution anyway, since it means we aren't trying to replicate the logic of the parent build system and so don't risk it getting out of sync.
Leave PKG_CONFIG alone, since 1) there's no common logic to compute it in Makefile.include, and 2) it's not an implicit variable, so conditional assignment works properly.
[1] https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
--- tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
tools/build/Makefile.feature +1 -1
@@ -8,7 +8,7 @@ endif feature_check = $(eval $(feature_check_code)) define feature_check_code - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC=$(CC) CXX=$(CXX) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) endef feature_set = $(eval $(feature_set_code))
tools/build/feature/Makefile +0 -2
@@ -73,8 +73,6 @@ FILES= \ FILES := $(addprefix $(OUTPUT),$(FILES)) -CC ?= $(CROSS_COMPILE)gcc -CXX ?= $(CROSS_COMPILE)g++ PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config LLVM_CONFIG ?= llvm-config CLANG ?= clang
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 145/204 nvme: fix deadlock in disconnect during scan_work and/or ana_work
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit ecca390e80561debbfdb4dc96bf94595136889fa ]
A deadlock happens in the following scenario with multipath:
1) scan_work(nvme0) detects a new nsid while nvme0 is an optimized path to it, path nvme1 happens to be inaccessible.
2) Before scan_work is complete nvme0 disconnect is initiated nvme_delete_ctrl_sync() sets nvme0 state to NVME_CTRL_DELETING
3) scan_work(1) attempts to submit IO,
but nvme_path_is_optimized() observes nvme0 is not LIVE. Since nvme1 is a possible path IO is requeued and scan_work hangs.
--
Workqueue: nvme-wq nvme_scan_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: io_schedule+0x16/0x40 kernel: do_read_cache_page+0x438/0x830 kernel: read_cache_page+0x12/0x20 kernel: read_dev_sector+0x27/0xc0 kernel: read_lba+0xc1/0x220 kernel: efi_partition+0x1e6/0x708 kernel: check_partition+0x154/0x244 kernel: rescan_partitions+0xae/0x280 kernel: __blkdev_get+0x40f/0x560 kernel: blkdev_get+0x3d/0x140 kernel: __device_add_disk+0x388/0x480 kernel: device_add_disk+0x13/0x20 kernel: nvme_mpath_set_live+0x119/0x140 [nvme_core] kernel: nvme_update_ns_ana_state+0x5c/0x60 [nvme_core] kernel: nvme_set_ns_ana_state+0x1e/0x30 [nvme_core] kernel: nvme_parse_ana_log+0xa1/0x180 [nvme_core] kernel: nvme_mpath_add_disk+0x47/0x90 [nvme_core] kernel: nvme_validate_ns+0x396/0x940 [nvme_core] kernel: nvme_scan_work+0x24f/0x380 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x249/0x400 kernel: kthread+0x104/0x140
--
4) Delete also hangs in flush_work(ctrl->scan_work) from nvme_remove_namespaces().
Similiarly a deadlock with ana_work may happen: if ana_work has started and calls nvme_mpath_set_live and device_add_disk, it will trigger I/O. When we trigger disconnect I/O will block because our accessible (optimized) path is disconnecting, but the alternate path is inaccessible, so I/O blocks. Then disconnect tries to flush the ana_work and hangs.
[ 605.550896] Workqueue: nvme-wq nvme_ana_work [nvme_core] [ 605.552087] Call Trace: [ 605.552683] __schedule+0x2b9/0x6c0 [ 605.553507] schedule+0x42/0xb0 [ 605.554201] io_schedule+0x16/0x40 [ 605.555012] do_read_cache_page+0x438/0x830 [ 605.556925] read_cache_page+0x12/0x20 [ 605.557757] read_dev_sector+0x27/0xc0 [ 605.558587] amiga_partition+0x4d/0x4c5 [ 605.561278] check_partition+0x154/0x244 [ 605.562138] rescan_partitions+0xae/0x280 [ 605.563076] __blkdev_get+0x40f/0x560 [ 605.563830] blkdev_get+0x3d/0x140 [ 605.564500] __device_add_disk+0x388/0x480 [ 605.565316] device_add_disk+0x13/0x20 [ 605.566070] nvme_mpath_set_live+0x5e/0x130 [nvme_core] [ 605.567114] nvme_update_ns_ana_state+0x2c/0x30 [nvme_core] [ 605.568197] nvme_update_ana_state+0xca/0xe0 [nvme_core] [ 605.569360] nvme_parse_ana_log+0xa1/0x180 [nvme_core] [ 605.571385] nvme_read_ana_log+0x76/0x100 [nvme_core] [ 605.572376] nvme_ana_work+0x15/0x20 [nvme_core] [ 605.573330] process_one_work+0x1db/0x380 [ 605.574144] worker_thread+0x4d/0x400 [ 605.574896] kthread+0x104/0x140 [ 605.577205] ret_from_fork+0x35/0x40 [ 605.577955] INFO: task nvme:14044 blocked for more than 120 seconds. [ 605.579239] Tainted: G OE 5.3.5-050305-generic #201910071830 [ 605.580712] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 605.582320] nvme D 0 14044 14043 0x00000000 [ 605.583424] Call Trace: [ 605.583935] __schedule+0x2b9/0x6c0 [ 605.584625] schedule+0x42/0xb0 [ 605.585290] schedule_timeout+0x203/0x2f0 [ 605.588493] wait_for_completion+0xb1/0x120 [ 605.590066] __flush_work+0x123/0x1d0 [ 605.591758] __cancel_work_timer+0x10e/0x190 [ 605.593542] cancel_work_sync+0x10/0x20 [ 605.594347] nvme_mpath_stop+0x2f/0x40 [nvme_core] [ 605.595328] nvme_stop_ctrl+0x12/0x50 [nvme_core] [ 605.596262] nvme_do_delete_ctrl+0x3f/0x90 [nvme_core] [ 605.597333] nvme_sysfs_delete+0x5c/0x70 [nvme_core] [ 605.598320] dev_attr_store+0x17/0x30
Fix this by introducing a new state: NVME_CTRL_DELETE_NOIO, which will indicate the phase of controller deletion where I/O cannot be allowed to access the namespace. NVME_CTRL_DELETING still allows mpath I/O to be issued to the bottom device, and only after we flush the ana_work and scan_work (after nvme_stop_ctrl and nvme_prep_remove_namespaces) we change the state to NVME_CTRL_DELETING_NOIO. Also we prevent ana_work from re-firing by aborting early if we are not LIVE, so we should be safe here.
In addition, change the transport drivers to follow the updated state machine.
--- drivers/nvme/host/core.c | 15 +++++++++++++++ drivers/nvme/host/fabrics.c | 2 +- drivers/nvme/host/fabrics.h | 3 ++- drivers/nvme/host/fc.c | 1 + drivers/nvme/host/multipath.c | 18 +++++++++++++++--- drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 10 ++++++---- drivers/nvme/host/tcp.c | 15 +++++++++------ 8 files changed, 50 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +15 -0
@@ -368,6 +368,16 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,break ; }break ; +case NVME_CTRL_DELETING_NOIO : +switch (old_state) { +case NVME_CTRL_DELETING : +case NVME_CTRL_DEAD : + changed = true; +/* FALLTHRU */ +default : +break ; + } +break ;case NVME_CTRL_DEAD :switch (old_state) {case NVME_CTRL_DELETING :
@@ -405,6 +415,7 @@ static bool nvme_state_terminal(struct nvme_ctrl *ctrl)case NVME_CTRL_CONNECTING :return false;case NVME_CTRL_DELETING : +case NVME_CTRL_DELETING_NOIO :case NVME_CTRL_DEAD :return true;default :
@@ -3280,6 +3291,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, [NVME_CTRL_RESETTING] = "resetting", [NVME_CTRL_CONNECTING] = "connecting", [NVME_CTRL_DELETING] = "deleting", + [NVME_CTRL_DELETING_NOIO]= "deleting (no IO)", [NVME_CTRL_DEAD] = "dead", };
@@ -3860,6 +3872,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)if (ctrl->state ==NVME_CTRL_DEAD )nvme_kill_queues (ctrl); +/* this is a no-op when called from the controller reset handler */ +nvme_change_ctrl_state (ctrl,NVME_CTRL_DELETING_NOIO ); +down_write (&ctrl->namespaces_rwsem);list_splice_init (&ctrl->namespaces, &ns_list);up_write (&ctrl->namespaces_rwsem);
drivers/nvme/host/fabrics.c +1 -1
@@ -547,7 +547,7 @@ static struct nvmf_transport_ops *nvmf_lookup_transport(blk_status_t nvmf_fail_nonready_command (struct nvme_ctrl *ctrl,struct request *rq) { -if (ctrl->state !=NVME_CTRL_DELETING && +if (ctrl->state !=NVME_CTRL_DELETING_NOIO && ctrl->state !=NVME_CTRL_DEAD && !blk_noretry_request (rq) && !(rq->cmd_flags &REQ_NVME_MPATH ))return BLK_STS_RESOURCE ;
drivers/nvme/host/fabrics.h +2 -1
@@ -182,7 +182,8 @@ bool nvmf_ip_options_match(struct nvme_ctrl *ctrl,static inline bool nvmf_check_ready (struct nvme_ctrl *ctrl,struct request *rq,bool queue_live) { -if (likely (ctrl->state ==NVME_CTRL_LIVE )) +if (likely (ctrl->state ==NVME_CTRL_LIVE || + ctrl->state ==NVME_CTRL_DELETING ))return true;return __nvmf_check_ready (ctrl, rq, queue_live); }
drivers/nvme/host/fc.c +1 -0
@@ -800,6 +800,7 @@ nvme_fc_ctrl_connectivity_loss(struct nvme_fc_ctrl *ctrl)break ;case NVME_CTRL_DELETING : +case NVME_CTRL_DELETING_NOIO :default :/* no action to take - let it delete */ break ;
drivers/nvme/host/multipath.c +15 -3
@@ -167,9 +167,18 @@ void nvme_mpath_clear_ctrl_paths(struct nvme_ctrl *ctrl)static bool nvme_path_is_disabled (struct nvme_ns *ns) { -return ns->ctrl->state !=NVME_CTRL_LIVE || -test_bit (NVME_NS_ANA_PENDING , &ns->flags) || -test_bit (NVME_NS_REMOVING , &ns->flags); +/* +* We don't treat NVME_CTRL_DELETING as a disabled path as I/O should +* still be able to complete assuming that the controller is connected. +* Otherwise it will fail immediately and return to the requeue list. +*/ +if (ns->ctrl->state !=NVME_CTRL_LIVE && + ns->ctrl->state !=NVME_CTRL_DELETING ) +return true; +if (test_bit (NVME_NS_ANA_PENDING , &ns->flags) || +test_bit (NVME_NS_REMOVING , &ns->flags)) +return true; +return false; }static struct nvme_ns *__nvme_find_path (struct nvme_ns_head *head,int node)
@@ -575,6 +584,9 @@ static void nvme_ana_work(struct work_struct *work) { struct nvme_ctrl *ctrl = container_of(work, struct nvme_ctrl, ana_work); +if (ctrl->state !=NVME_CTRL_LIVE ) +return ; +nvme_read_ana_log (ctrl); }
drivers/nvme/host/nvme.h +1 -0
@@ -183,6 +183,7 @@ enum nvme_ctrl_state {NVME_CTRL_RESETTING ,NVME_CTRL_CONNECTING ,NVME_CTRL_DELETING , +NVME_CTRL_DELETING_NOIO , NVME_CTRL_DEAD, };
drivers/nvme/host/rdma.c +6 -4
@@ -1023,11 +1023,12 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new) changed =nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_LIVE );if (!changed) {/* -* state change failure is ok if we're in DELETING state, +* state change failure is ok if we started ctrl delete, * unless we're during creation of a new controller to * avoid races with teardown flow. */ -WARN_ON_ONCE (ctrl->ctrl.state !=NVME_CTRL_DELETING ); +WARN_ON_ONCE (ctrl->ctrl.state !=NVME_CTRL_DELETING && + ctrl->ctrl.state !=NVME_CTRL_DELETING_NOIO );WARN_ON_ONCE (new); ret = -EINVAL ; goto destroy_io;
@@ -1080,8 +1081,9 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)blk_mq_unquiesce_queue (ctrl->ctrl.admin_q);if (!nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_CONNECTING )) { -/* state change failure is ok if we're in DELETING state */ -WARN_ON_ONCE (ctrl->ctrl.state !=NVME_CTRL_DELETING ); +/* state change failure is ok if we started ctrl delete */ +WARN_ON_ONCE (ctrl->ctrl.state !=NVME_CTRL_DELETING && + ctrl->ctrl.state !=NVME_CTRL_DELETING_NOIO );return ; }
drivers/nvme/host/tcp.c +9 -6
@@ -1938,11 +1938,12 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_LIVE )) {/* -* state change failure is ok if we're in DELETING state, +* state change failure is ok if we started ctrl delete, * unless we're during creation of a new controller to * avoid races with teardown flow. */ -WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING ); +WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING && + ctrl->state !=NVME_CTRL_DELETING_NOIO );WARN_ON_ONCE (new); ret = -EINVAL ; goto destroy_io;
@@ -1998,8 +1999,9 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work)blk_mq_unquiesce_queue (ctrl->admin_q);if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_CONNECTING )) { -/* state change failure is ok if we're in DELETING state */ -WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING ); +/* state change failure is ok if we started ctrl delete */ +WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING && + ctrl->state !=NVME_CTRL_DELETING_NOIO );return ; }
@@ -2034,8 +2036,9 @@ static void nvme_reset_ctrl_work(struct work_struct *work)nvme_tcp_teardown_ctrl (ctrl, false);if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_CONNECTING )) { -/* state change failure is ok if we're in DELETING state */ -WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING ); +/* state change failure is ok if we started ctrl delete */ +WARN_ON_ONCE (ctrl->state !=NVME_CTRL_DELETING && + ctrl->state !=NVME_CTRL_DELETING_NOIO );return ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 144/204 clk: clk-atlas6: fix return value check in atlas6_clk_init()
In reply to Greg Kroah-HartmanFrom: Xu Wang <[email protected]>
[ Upstream commit 12b90b40854a8461a02ef19f6f4474cc88d64b66 ]
In case of error, the function clk_register() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().
--- drivers/clk/sirf/clk-atlas6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sirf/clk-atlas6.c +1 -1
@@ -135,7 +135,7 @@ static void __init atlas6_clk_init(struct device_node *np)for (i = pll1; i < maxclk; i++) { atlas6_clks[i] =clk_register (NULL , atlas6_clk_hw_array[i]); -BUG_ON (!atlas6_clks[i]); +BUG_ON (IS_ERR (atlas6_clks[i])); }clk_register_clkdev (atlas6_clks[cpu],NULL ,"cpu" );clk_register_clkdev (atlas6_clks[io],NULL ,"io" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 124/204 mmc: renesas_sdhi_internal_dmac: clean up the code for dma complete
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 2b26e34e9af3fa24fa1266e9ea2d66a1f7d62dc0 ]
To add end() operation in the future, clean the code of renesas_sdhi_internal_dmac_complete_tasklet_fn(). No behavior change.
--- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/mmc/host/renesas_sdhi_internal_dmac.c +13 -5
@@ -229,15 +229,12 @@ static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg) DTRAN_CTRL_DM_START); } -static void renesas_sdhi_internal_dmac_complete_tasklet_fn (unsigned long arg) +static bool renesas_sdhi_internal_dmac_complete (struct tmio_mmc_host *host) { -struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg;enum dma_data_direction dir; -spin_lock_irq (&host->lock); -if (!host->data) - goto out; +return false;if (host->data->flags &MMC_DATA_READ ) dir =DMA_FROM_DEVICE ;
@@ -250,6 +247,17 @@ static void renesas_sdhi_internal_dmac_complete_tasklet_fn(unsigned long arg)if (dir ==DMA_FROM_DEVICE )clear_bit (SDHI_INTERNAL_DMAC_RX_IN_USE , &global_flags); +return true; +} + +static void renesas_sdhi_internal_dmac_complete_tasklet_fn (unsigned long arg) +{ +struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg; + +spin_lock_irq (&host->lock); +if (!renesas_sdhi_internal_dmac_complete (host)) + goto out; +tmio_mmc_do_data_irq (host); out:spin_unlock_irq (&host->lock);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 136/204 selftests/powerpc: ptrace-pkey: Dont update expected UAMOR value
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 3563b9bea0ca7f53e4218b5e268550341a49f333 ]
With commit 4a4a5e5d2aad ("powerpc/pkeys: key allocation/deallocation must not change pkey registers") we are not updating UAMOR on key allocation. So don't update the expected uamor value in the test.
--- tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +8 -3
@@ -101,15 +101,20 @@ static int child(struct shared_info *info)*/ info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor); +/* +* if PKEY_DISABLE_EXECUTE succeeded we should update the expected_iamr +*/ if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1);else info->expected_iamr &= ~(1ul <<pkeyshift (pkey1)); - info->expected_iamr &= ~(1ul <<pkeyshift (pkey2) |1ul <<pkeyshift (pkey3)); +/* +* We allocated pkey2 and pkey 3 above. Clear the IAMR bits. +*/ + info->expected_iamr &= ~(1ul <<pkeyshift (pkey2)); + info->expected_iamr &= ~(1ul <<pkeyshift (pkey3)); - info->expected_uamor |=3ul <<pkeyshift (pkey1) | -3ul <<pkeyshift (pkey2);/* * Create an IAMR value different from expected value. * Kernel will reject an IAMR and UAMOR change.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 139/204 clk: qcom: clk-alpha-pll: remove unused/incorrect PLL_CAL_VAL
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit c8b9002f44e4a1d2771b2f59f6de900864b1f9d7 ]
0x44 isn't a register offset, it is the value that goes into CAL_L_VAL.
--- drivers/clk/qcom/clk-alpha-pll.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/qcom/clk-alpha-pll.c +0 -2
@@ -56,7 +56,6 @@#define PLL_STATUS (p) ((p)->offset + (p)->regs[PLL_OFF_STATUS])#define PLL_OPMODE (p) ((p)->offset + (p)->regs[PLL_OFF_OPMODE])#define PLL_FRAC (p) ((p)->offset + (p)->regs[PLL_OFF_FRAC]) -#define PLL_CAL_VAL (p) ((p)->offset + (p)->regs[PLL_OFF_CAL_VAL])const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS ] = { [CLK_ALPHA_PLL_TYPE_DEFAULT ] = {
@@ -115,7 +114,6 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { [PLL_OFF_STATUS] = 0x30, [PLL_OFF_OPMODE] = 0x38, [PLL_OFF_ALPHA_VAL ] =0x40 , - [PLL_OFF_CAL_VAL ] =0x44 , }, [CLK_ALPHA_PLL_TYPE_LUCID] = { [PLL_OFF_L_VAL ] =0x04 ,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 138/204 clk: qcom: gcc: fix sm8150 GPU and NPU clocks
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit 667f39b59b494d96ae70f4217637db2ebbee3df0 ]
Fix the parents and set BRANCH_HALT_SKIP. From the downstream driver it should be a 500us delay and not skip, however this matches what was done for other clocks that had 500us delay in downstream.
--- drivers/clk/qcom/gcc-sm8150.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/clk/qcom/gcc-sm8150.c +6 -2
@@ -1617,6 +1617,7 @@ static struct clk_branch gcc_gpu_cfg_ahb_clk = { };static struct clk_branch gcc_gpu_gpll0_clk_src = { + .halt_check =BRANCH_HALT_SKIP , .clkr = { .enable_reg =0x52004 , .enable_mask =BIT (15 ),
@@ -1632,13 +1633,14 @@ static struct clk_branch gcc_gpu_gpll0_clk_src = { };static struct clk_branch gcc_gpu_gpll0_div_clk_src = { + .halt_check =BRANCH_HALT_SKIP , .clkr = { .enable_reg =0x52004 , .enable_mask =BIT (16 ), .hw.init = &(struct clk_init_data ){ .name ="gcc_gpu_gpll0_div_clk_src" , .parent_hws = (const struct clk_hw *[]){ - &gcc_gpu_gpll0_clk_src.clkr.hw }, + &gpll0_out_even.clkr.hw }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_branch2_ops,
@@ -1729,6 +1731,7 @@ static struct clk_branch gcc_npu_cfg_ahb_clk = { };static struct clk_branch gcc_npu_gpll0_clk_src = { + .halt_check =BRANCH_HALT_SKIP , .clkr = { .enable_reg =0x52004 , .enable_mask =BIT (18 ),
@@ -1744,13 +1747,14 @@ static struct clk_branch gcc_npu_gpll0_clk_src = { };static struct clk_branch gcc_npu_gpll0_div_clk_src = { + .halt_check =BRANCH_HALT_SKIP , .clkr = { .enable_reg =0x52004 , .enable_mask =BIT (19 ), .hw.init = &(struct clk_init_data ){ .name ="gcc_npu_gpll0_div_clk_src" , .parent_hws = (const struct clk_hw *[]){ - &gcc_npu_gpll0_clk_src.clkr.hw }, + &gpll0_out_even.clkr.hw }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , .ops = &clk_branch2_ops,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 137/204 iommu/omap: Check for failure of a call to omap_iommu_dump_ctx
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit dee9d154f40c58d02f69acdaa5cfd1eae6ebc28b ]
It is possible for the call to omap_iommu_dump_ctx to return a negative error number, so check for the failure and return the error number rather than pass the negative value to simple_read_from_buffer.
Addresses-Coverity: ("Improper use of negative value")
--- drivers/iommu/omap-iommu-debug.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/omap-iommu-debug.c +3 -0
@@ -98,8 +98,11 @@ static ssize_t debug_read_regs(struct file *file, char __user *userbuf,mutex_lock (&iommu_debug_lock); bytes =omap_iommu_dump_ctx (obj, p, count); +if (bytes <0 ) + goto err; bytes =simple_read_from_buffer (userbuf, count, ppos, buf, bytes); +err:mutex_unlock (&iommu_debug_lock);kfree (buf);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/204 drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
commit 3b2a999582c467d1883716b37ffcc00178a13713 upstream.
Both of the two LVDS channels should be disabled for split mode in the encoder's ->disable() callback, because they are enabled in the encoder's ->enable() callback.
--- drivers/gpu/drm/imx/imx-ldb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/imx/imx-ldb.c +4 -3
@@ -303,18 +303,19 @@ static void imx_ldb_encoder_disable(stru {struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb; +int dual = ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ;int mux, ret;drm_panel_disable (imx_ldb_ch->panel); -if (imx_ldb_ch == &ldb->channel[0 ]) +if (imx_ldb_ch == &ldb->channel[0 ] || dual) ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK ; -else if (imx_ldb_ch == &ldb->channel[1 ]) +if (imx_ldb_ch == &ldb->channel[1 ] || dual) ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK ;regmap_write (ldb->regmap,IOMUXC_GPR2 , ldb->ldb_ctrl); -if (ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ) { +if (dual) {clk_disable_unprepare (ldb->clk[0 ]);clk_disable_unprepare (ldb->clk[1 ]); }
Greg Kroah-Hartman
maintainerPATCH 135/204 selftests/powerpc: ptrace-pkey: Update the test to mark an invalid pkey correctly
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 0eaa3b5ca7b5a76e3783639c828498343be66a01 ]
--- .../selftests/powerpc/ptrace/ptrace-pkey.c | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +12 -18
@@ -66,11 +66,6 @@ static int sys_pkey_alloc(unsigned long flags, unsigned long init_access_rights)return syscall (__NR_pkey_alloc, flags, init_access_rights); } -static int sys_pkey_free (int pkey) -{ -return syscall (__NR_pkey_free, pkey); -} -static int child (struct shared_info *info) {unsigned long reg;
@@ -100,7 +95,11 @@ static int child(struct shared_info *info) info->amr1 |=3ul <<pkeyshift (pkey1); info->amr2 |=3ul <<pkeyshift (pkey2); - info->invalid_amr |= info->amr2 |3ul <<pkeyshift (pkey3); +/* +* invalid amr value where we try to force write +* things which are deined by a uamor setting. +*/ + info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor);if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1);
@@ -111,17 +110,12 @@ static int child(struct shared_info *info) info->expected_uamor |=3ul <<pkeyshift (pkey1) |3ul <<pkeyshift (pkey2); - info->invalid_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); - info->invalid_uamor |=3ul <<pkeyshift (pkey1); -/* -* We won't use pkey3. We just want a plausible but invalid key to test -* whether ptrace will let us write to AMR bits we are not supposed to. -* -* This also tests whether the kernel restores the UAMOR permissions -* after a key is freed. +* Create an IAMR value different from expected value. +* Kernel will reject an IAMR and UAMOR change. */ -sys_pkey_free (pkey3); + info->invalid_iamr = info->expected_iamr | (1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2)); + info->invalid_uamor = info->expected_uamor & ~(0x3ul <<pkeyshift (pkey1));printf ("%-30s AMR: %016lx pkey1: %d pkey2: %d pkey3: %d\n" , user_write, info->amr1, pkey1, pkey2, pkey3);
@@ -196,9 +190,9 @@ static int parent(struct shared_info *info, pid_t pid)PARENT_SKIP_IF_UNSUPPORTED (ret, &info->child_sync);PARENT_FAIL_IF (ret, &info->child_sync); - info->amr1 = info->amr2 = info->invalid_amr = regs[0 ]; - info->expected_iamr = info->invalid_iamr = regs[1 ]; - info->expected_uamor = info->invalid_uamor = regs[2 ]; + info->amr1 = info->amr2 = regs[0 ]; + info->expected_iamr = regs[1 ]; + info->expected_uamor = regs[2 ];/* Wake up child so that it can set itself up. */ ret =prod_child (&info->child_sync);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 134/204 selftests/powerpc: ptrace-pkey: Rename variables to make it easier to follow code
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 9a11f12e0a6c374b3ef1ce81e32ce477d28eb1b8 ]
Rename variable to indicate that they are invalid values which we will use to test ptrace update of pkeys.
--- .../selftests/powerpc/ptrace/ptrace-pkey.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +13 -13
@@ -44,7 +44,7 @@ struct shared_info {unsigned long amr2;/* AMR value that ptrace should refuse to write to the child. */ -unsigned long amr3; +unsigned long invalid_amr;/* IAMR value the parent expects to read from the child. */ unsigned long expected_iamr;
@@ -57,8 +57,8 @@ struct shared_info {* (even though they're valid ones) because userspace doesn't have * access to those registers. */ -unsigned long new_iamr; -unsigned long new_uamor; +unsigned long invalid_iamr; +unsigned long invalid_uamor; };static int sys_pkey_alloc (unsigned long flags,unsigned long init_access_rights)
@@ -100,7 +100,7 @@ static int child(struct shared_info *info) info->amr1 |=3ul <<pkeyshift (pkey1); info->amr2 |=3ul <<pkeyshift (pkey2); - info->amr3 |= info->amr2 |3ul <<pkeyshift (pkey3); + info->invalid_amr |= info->amr2 |3ul <<pkeyshift (pkey3);if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1);
@@ -111,8 +111,8 @@ static int child(struct shared_info *info) info->expected_uamor |=3ul <<pkeyshift (pkey1) |3ul <<pkeyshift (pkey2); - info->new_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); - info->new_uamor |=3ul <<pkeyshift (pkey1); + info->invalid_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); + info->invalid_uamor |=3ul <<pkeyshift (pkey1);/* * We won't use pkey3. We just want a plausible but invalid key to test
@@ -196,9 +196,9 @@ static int parent(struct shared_info *info, pid_t pid)PARENT_SKIP_IF_UNSUPPORTED (ret, &info->child_sync);PARENT_FAIL_IF (ret, &info->child_sync); - info->amr1 = info->amr2 = info->amr3 = regs[0 ]; - info->expected_iamr = info->new_iamr = regs[1 ]; - info->expected_uamor = info->new_uamor = regs[2 ]; + info->amr1 = info->amr2 = info->invalid_amr = regs[0 ]; + info->expected_iamr = info->invalid_iamr = regs[1 ]; + info->expected_uamor = info->invalid_uamor = regs[2 ];/* Wake up child so that it can set itself up. */ ret =prod_child (&info->child_sync);
@@ -234,10 +234,10 @@ static int parent(struct shared_info *info, pid_t pid)return ret;/* Write invalid AMR value in child. */ - ret =ptrace_write_regs (pid,NT_PPC_PKEY , &info->amr3,1 ); + ret =ptrace_write_regs (pid,NT_PPC_PKEY , &info->invalid_amr,1 );PARENT_FAIL_IF (ret, &info->child_sync); -printf ("%-30s AMR: %016lx\n" , ptrace_write_running, info->amr3); +printf ("%-30s AMR: %016lx\n" , ptrace_write_running, info->invalid_amr);/* Wake up child so that it can verify it didn't change. */ ret =prod_child (&info->child_sync);
@@ -249,7 +249,7 @@ static int parent(struct shared_info *info, pid_t pid)/* Try to write to IAMR. */ regs[0 ] = info->amr1; - regs[1 ] = info->new_iamr; + regs[1 ] = info->invalid_iamr; ret =ptrace_write_regs (pid,NT_PPC_PKEY , regs,2 );PARENT_FAIL_IF (!ret, &info->child_sync);
@@ -257,7 +257,7 @@ static int parent(struct shared_info *info, pid_t pid) ptrace_write_running, regs[0], regs[1]);/* Try to write to IAMR and UAMOR. */ - regs[2 ] = info->new_uamor; + regs[2 ] = info->invalid_uamor; ret =ptrace_write_regs (pid,NT_PPC_PKEY , regs,3 );PARENT_FAIL_IF (!ret, &info->child_sync);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 132/204 f2fs: compress: fix to avoid memory leak on cc->cpages
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 02772fbfcba8597eef9d5c5f7f94087132d0c1d4 ]
Memory allocated for storing compressed pages' poitner should be released after f2fs_write_compressed_pages(), otherwise it will cause memory leak issue.
--- fs/f2fs/compress.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/compress.c +2 -0
@@ -1250,6 +1250,8 @@ int f2fs_write_multi_pages(struct compress_ctx *cc, err =f2fs_write_compressed_pages (cc, submitted, wbc, io_type); cops->destroy_compress_ctx (cc); +kfree (cc->cpages); + cc->cpages =NULL ;if (!err)return 0 ;f2fs_bug_on (F2FS_I_SB (cc->inode), err != -EAGAIN );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/204 perf probe: Fix wrong variable warning when the probe point is not found
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 11fd3eb874e73ee8069bcfd54e3c16fa7ce56fe6 upstream.
Fix a wrong "variable not found" warning when the probe point is not found in the debuginfo.
Since the debuginfo__find_probes() can return 0 even if it does not find given probe point in the debuginfo, fill_empty_trace_arg() can be called with tf.ntevs == 0 and it can emit a wrong warning. To fix this, reject ntevs == 0 in fill_empty_trace_arg().
E.g. without this patch;
# perf probe -x /lib64/libc-2.30.so -a "memcpy arg1=%di"
Failed to find the location of the '%di' variable at this address.
Perhaps it has been optimized out.
Use -V with the --range option to show '%di' location range.
Added new events:
probe_libc:memcpy (on memcpy in /usr/lib64/libc-2.30.so with arg1=%di)
probe_libc:memcpy (on memcpy in /usr/lib64/libc-2.30.so with arg1=%di)You can now use it in all perf tools, such as:
perf record -e probe_libc:memcpy -aR sleep 1
With this;
# perf probe -x /lib64/libc-2.30.so -a "memcpy arg1=%di"
Added new events:
probe_libc:memcpy (on memcpy in /usr/lib64/libc-2.30.so with arg1=%di)
probe_libc:memcpy (on memcpy in /usr/lib64/libc-2.30.so with arg1=%di)You can now use it in all perf tools, such as:
perf record -e probe_libc:memcpy -aR sleep 1
--- tools/perf/util/probe-finder.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/probe-finder.c +3 -0
@@ -1408,6 +1408,9 @@ static int fill_empty_trace_arg(struct pchar *type;int i, j, ret; +if (!ntevs) +return -ENOENT ; +for (i =0 ; i < pev->nargs; i++) { type =NULL ;for (j =0 ; j < ntevs; j++) {
Greg Kroah-Hartman
maintainerPATCH 98/204 drm/ingenic: Fix incorrect assumption about plane->index
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit ca43f274e03f91c533643299ae4984965ce03205 upstream.
plane->index is NOT the index of the color plane in a YUV frame. Actually, a YUV frame is represented by a single drm_plane, even though it contains three Y, U, V planes.
v2-v3: No change
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -1
@@ -384,7 +384,7 @@ static void ingenic_drm_plane_atomic_upd addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); width = state->src_w >>16 ; height = state->src_h >>16 ; - cpp = state->fb->format->cpp[plane->index]; + cpp = state->fb->format->cpp[0 ]; priv->dma_hwdesc->addr = addr; priv->dma_hwdesc->cmd = width * height * cpp /4 ;
Greg Kroah-Hartman
maintainerPATCH 96/204 remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load
In reply to Greg Kroah-HartmanFrom: Sibi Sankar <[email protected]>
commit 135b9e8d1cd8ba5ac9ad9bcf24b464b7b052e5b8 upstream.
The following mem abort is observed when one of the modem blob firmware size exceeds the allocated mpss region. Fix this by restricting the copy size to segment size using request_firmware_into_buf before load.
Err Logs:
Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0xd0/0x190 rproc_boot+0x404/0x550 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8
...
--- drivers/remoteproc/qcom_q6v5_mss.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +2 -3
@@ -1145,15 +1145,14 @@ static int q6v5_mpss_load(struct q6v5 *q }else if (phdr->p_filesz) {/* Replace "xxx.xxx" with "xxx.bxx" */ sprintf (fw_name + fw_name_len -3 ,"b%02d" , i); - ret =request_firmware (&seg_fw, fw_name, qproc->dev); + ret =request_firmware_into_buf (&seg_fw, fw_name, qproc->dev, + ptr, phdr->p_filesz);if (ret) {dev_err (qproc->dev,"failed to load %s\n" , fw_name);iounmap (ptr); goto release_firmware; } -memcpy (ptr, seg_fw->data, seg_fw->size); -release_firmware (seg_fw); }
Greg Kroah-Hartman
maintainerPATCH 92/204 perf intel-pt: Fix duplicate branch after CBR
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit a58a057ce65b52125dd355b7d8b0d540ea267a5f upstream.
CBR events can result in a duplicate branch event, because the state type defaults to a branch. Fix by clearing the state type.
Example: trace 'sleep' and hope for a frequency change
Before:
$ perf record -e intel_pt//u sleep 0.1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.034 MB perf.data ] $ perf script --itrace=bpe > before.txt
After:
$ perf script --itrace=bpe > after.txt
$ diff -u before.txt after.txt
# --- before.txt 2020-07-07 14:42:18.191508098 +0300
# +++ after.txt 2020-07-07 14:42:36.587891753 +0300
@@ -29673,7 +29673,6 @@
sleep 93431 [007] 15411.619905: 1 branches:u: 0 [unknown] ([unknown]) => 7f0818abb2e0 clock_nanosleep@@GLIBC_2.17+0x0 (/usr/lib/x86_64-linux-gnu/libc-2.31.so)
sleep 93431 [007] 15411.619905: 1 branches:u: 7f0818abb30c clock_nanosleep@@GLIBC_2.17+0x2c (/usr/lib/x86_64-linux-gnu/libc-2.31.so) => 0 [unknown] ([unknown])
sleep 93431 [007] 15411.720069: cbr: cbr: 15 freq: 1507 MHz ( 56%) 7f0818abb30c clock_nanosleep@@GLIBC_2.17+0x2c (/usr/lib/x86_64-linux-gnu/libc-2.31.so)
- sleep 93431 [007] 15411.720069: 1 branches:u: 7f0818abb30c clock_nanosleep@@GLIBC_2.17+0x2c (/usr/lib/x86_64-linux-gnu/libc-2.31.so) => 0 [unknown] ([unknown])
sleep 93431 [007] 15411.720076: 1 branches:u: 0 [unknown] ([unknown]) => 7f0818abb30e clock_nanosleep@@GLIBC_2.17+0x2e (/usr/lib/x86_64-linux-gnu/libc-2.31.so)
sleep 93431 [007] 15411.720077: 1 branches:u: 7f0818abb323 clock_nanosleep@@GLIBC_2.17+0x43 (/usr/lib/x86_64-linux-gnu/libc-2.31.so) => 7f0818ac0eb7 __nanosleep+0x17 (/usr/lib/x86_64-linux-gnu/libc-2.31.so)
sleep 93431 [007] 15411.720077: 1 branches:u: 7f0818ac0ebf __nanosleep+0x1f (/usr/lib/x86_64-linux-gnu/libc-2.31.so) => 55cb7e4c2827 rpl_nanosleep+0x97 (/usr/bin/sleep)--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +6 -2
@@ -1977,8 +1977,10 @@ next:* possibility of another CBR change that gets caught up * in the PSB+. */ -if (decoder->cbr != decoder->cbr_seen) +if (decoder->cbr != decoder->cbr_seen) { + decoder->state.type =0 ;return 0 ; + }break ;case INTEL_PT_PIP :
@@ -2019,8 +2021,10 @@ next:case INTEL_PT_CBR :intel_pt_calc_cbr (decoder); -if (decoder->cbr != decoder->cbr_seen) +if (decoder->cbr != decoder->cbr_seen) { + decoder->state.type =0 ;return 0 ; + }break ;case INTEL_PT_MODE_EXEC :
Greg Kroah-Hartman
maintainerPATCH 117/204 USB: serial: ftdi_sio: make process-packet buffer unsigned
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit ab4cc4ef6724ea588e835fc1e764c4b4407a70b7 ]
Use an unsigned type for the process-packet buffer argument and give it a more apt name.
--- drivers/usb/serial/ftdi_sio.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/usb/serial/ftdi_sio.c +11 -11
@@ -2480,12 +2480,12 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,#define FTDI_RS_ERR_MASK (FTDI_RS_BI | FTDI_RS_PE | FTDI_RS_FE | FTDI_RS_OE)static int ftdi_process_packet (struct usb_serial_port *port, -struct ftdi_private *priv,char *packet,int len) +struct ftdi_private *priv,unsigned char *buf,int len) { +unsigned char status; +unsigned char *ch;int i; -char status;char flag; -char *ch;if (len <2 ) {dev_dbg (&port->dev,"malformed packet\n" );
@@ -2495,7 +2495,7 @@ static int ftdi_process_packet(struct usb_serial_port *port,/* Compare new line status to the old one, signal if different/ N.B. packet may be processed more than once, but differences are only processed once. */ - status = packet[0 ] &FTDI_STATUS_B0_MASK ; + status = buf[0 ] &FTDI_STATUS_B0_MASK ;if (status != priv->prev_status) {char diff_status = status ^ priv->prev_status;
@@ -2521,7 +2521,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, }/* save if the transmitter is empty or not */ -if (packet[1 ] &FTDI_RS_TEMT ) +if (buf[1 ] &FTDI_RS_TEMT ) priv->transmit_empty =1 ;else priv->transmit_empty =0 ;
@@ -2535,29 +2535,29 @@ static int ftdi_process_packet(struct usb_serial_port *port,* data payload to avoid over-reporting. */ flag =TTY_NORMAL ; -if (packet[1 ] &FTDI_RS_ERR_MASK ) { +if (buf[1 ] &FTDI_RS_ERR_MASK ) {/* Break takes precedence over parity, which takes precedence * over framing errors */ -if (packet[1 ] &FTDI_RS_BI ) { +if (buf[1 ] &FTDI_RS_BI ) { flag =TTY_BREAK ; port->icount.brk++;usb_serial_handle_break (port); - }else if (packet[1 ] &FTDI_RS_PE ) { + }else if (buf[1 ] &FTDI_RS_PE ) { flag =TTY_PARITY ; port->icount.parity++; - }else if (packet[1 ] &FTDI_RS_FE ) { + }else if (buf[1 ] &FTDI_RS_FE ) { flag =TTY_FRAME ; port->icount.frame++; }/* Overrun is special, not associated with a char */ -if (packet[1 ] &FTDI_RS_OE ) { +if (buf[1 ] &FTDI_RS_OE ) { port->icount.overrun++;tty_insert_flip_char (&port->port,0 ,TTY_OVERRUN ); } } port->icount.rx += len; - ch = packet +2 ; + ch = buf +2 ;if (port->port.console && port->sysrq) {for (i =0 ; i < len; i++, ch++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 116/204 selftests/bpf: test_progs avoid minus shell exit codes
In reply to Greg Kroah-HartmanFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit b8c50df0cb3eb9008f8372e4ff0317eee993b8d1 ]
There are a number of places in test_progs that use minus-1 as the argument to exit(). This is confusing as a process exit status is masked to be a number between 0 and 255 as defined in man exit(3). Thus, users will see status 255 instead of minus-1.
This patch use positive exit code 3 instead of minus-1. These cases are put in the same group of infrastructure setup errors.
--- tools/testing/selftests/bpf/test_progs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/test_progs.c +5 -4
@@ -13,6 +13,7 @@#include <execinfo.h> /* backtrace */ #define EXIT_NO_TEST 2 +#define EXIT_ERR_SETUP_INFRA 3/* defined in test_progs.h */ struct test_env env = {};
@@ -113,13 +114,13 @@ static void reset_affinity() {if (err <0 ) {stdio_restore ();fprintf (stderr,"Failed to reset process affinity: %d!\n" , err); -exit (-1 ); +exit (EXIT_ERR_SETUP_INFRA ); } err =pthread_setaffinity_np (pthread_self (),sizeof (cpuset), &cpuset);if (err <0 ) {stdio_restore ();fprintf (stderr,"Failed to reset thread affinity: %d!\n" , err); -exit (-1 ); +exit (EXIT_ERR_SETUP_INFRA ); } }
@@ -128,7 +129,7 @@ static void save_netns(void) env.saved_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY );if (env.saved_netns_fd ==-1 ) {perror ("open(/proc/self/ns/net)" ); -exit (-1 ); +exit (EXIT_ERR_SETUP_INFRA ); } }
@@ -137,7 +138,7 @@ static void restore_netns(void)if (setns (env.saved_netns_fd,CLONE_NEWNET ) ==-1 ) {stdio_restore ();perror ("setns(CLONE_NEWNS)" ); -exit (-1 ); +exit (EXIT_ERR_SETUP_INFRA ); } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 114/204 bpf: selftests: Restore netns after each test
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 811d7e375d08312dba23f3b6bf7e58ec14aa5dcb ]
It is common for networking tests creating its netns and making its own setting under this new netns (e.g. changing tcp sysctl). If the test forgot to restore to the original netns, it would affect the result of other tests.
This patch saves the original netns at the beginning and then restores it after every test. Since the restore "setns()" is not expensive, it does it on all tests without tracking if a test has created a new netns or not.
The new restore_netns() could also be done in test__end_subtest() such that each subtest will get an automatic netns reset. However, the individual test would lose flexibility to have total control on netns for its own subtests. In some cases, forcing a test to do unnecessary netns re-configure for each subtest is time consuming. e.g. In my vm, forcing netns re-configure on each subtest in sk_assign.c increased the runtime from 1s to 8s. On top of that, test_progs.c is also doing per-test (instead of per-subtest) cleanup for cgroup. Thus, this patch also does per-test restore_netns(). The only existing per-subtest cleanup is reset_affinity() and no test is depending on this. Thus, it is removed from test__end_subtest() to give a consistent expectation to the individual tests. test_progs.c only ensures any affinity/netns/cgroup change made by an earlier test does not affect the following tests.
--- tools/testing/selftests/bpf/test_progs.c | 23 +++++++++++++++++++++-- tools/testing/selftests/bpf/test_progs.h | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_progs.c +21 -2
@@ -121,6 +121,24 @@ static void reset_affinity() { } } +static void save_netns (void ) +{ + env.saved_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY ); +if (env.saved_netns_fd ==-1 ) { +perror ("open(/proc/self/ns/net)" ); +exit (-1 ); + } +} + +static void restore_netns (void ) +{ +if (setns (env.saved_netns_fd,CLONE_NEWNET ) ==-1 ) { +stdio_restore (); +perror ("setns(CLONE_NEWNS)" ); +exit (-1 ); + } +} +void test__end_subtest () {struct prog_test_def *test = env.test;
@@ -138,8 +156,6 @@ void test__end_subtest() test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ? "FAIL" : "OK"); -reset_affinity (); -free (test->subtest_name); test->subtest_name =NULL ; }
@@ -732,6 +748,7 @@ int main(int argc, char **argv)return -1 ; } +save_netns ();stdio_hijack ();for (i =0 ; i < prog_test_cnt; i++) {struct prog_test_def *test = &prog_test_defs[i];
@@ -762,6 +779,7 @@ int main(int argc, char **argv) test->error_cnt ? "FAIL" : "OK");reset_affinity (); +restore_netns ();if (test->need_cgroup_cleanup)cleanup_cgroup_environment (); }
@@ -775,6 +793,7 @@ int main(int argc, char **argv)free_str_set (&env.subtest_selector.blacklist);free_str_set (&env.subtest_selector.whitelist);free (env.subtest_selector.num_set); +close (env.saved_netns_fd);if (env.succ_cnt + env.fail_cnt + env.skip_cnt ==0 )return EXIT_FAILURE ;
tools/testing/selftests/bpf/test_progs.h +2 -0
@@ -77,6 +77,8 @@ struct test_env {int sub_succ_cnt;/* successful sub-tests */ int fail_cnt;/* total failed tests + sub-tests */ int skip_cnt;/* skipped tests */ + +int saved_netns_fd; };extern struct test_env env;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 115/204 selftests/bpf: test_progs use another shell exit on non-actions
In reply to Greg Kroah-HartmanFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit 3220fb667842a9725cbb71656f406eadb03c094b ]
This is a follow up adjustment to commit 6c92bd5cd465 ("selftests/bpf:Test_progs indicate to shell on non-actions"), that returns shell exit indication EXIT_FAILURE (value 1) when user selects a non-existing test.
The problem with using EXIT_FAILURE is that a shell script cannot tell the difference between a non-existing test and the test failing.
This patch uses value 2 as shell exit indication. (Aside note unrecognized option parameters use value 64).
--- tools/testing/selftests/bpf/test_progs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_progs.c +3 -1
@@ -12,6 +12,8 @@#include <string.h> #include <execinfo.h> /* backtrace */ +#define EXIT_NO_TEST 2 +/* defined in test_progs.h */ struct test_env env = {};
@@ -796,7 +798,7 @@ int main(int argc, char **argv)close (env.saved_netns_fd);if (env.succ_cnt + env.fail_cnt + env.skip_cnt ==0 ) -return EXIT_FAILURE ; +return EXIT_NO_TEST ;return env.fail_cnt ?EXIT_FAILURE :EXIT_SUCCESS ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 113/204 selftests/bpf: Test_progs indicate to shell on non-actions
In reply to Greg Kroah-HartmanFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit 6c92bd5cd4650c39dd929565ee172984c680fead ]
When a user selects a non-existing test the summary is printed with indication 0 for all info types, and shell "success" (EXIT_SUCCESS) is indicated. This can be understood by a human end-user, but for shell scripting is it useful to indicate a shell failure (EXIT_FAILURE).
--- tools/testing/selftests/bpf/test_progs.c | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/bpf/test_progs.c +3 -0
@@ -776,5 +776,8 @@ int main(int argc, char **argv)free_str_set (&env.subtest_selector.whitelist);free (env.subtest_selector.num_set); +if (env.succ_cnt + env.fail_cnt + env.skip_cnt ==0 ) +return EXIT_FAILURE ; +return env.fail_cnt ?EXIT_FAILURE :EXIT_SUCCESS ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 109/204 media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit ded874ece29d3fe2abd3775810a06056067eb68c ]
This introduces two macros: RGA_COLOR_FMT_IS_YUV and RGA_COLOR_FMT_IS_RGB which allow quick checking of the colorspace familily of a RGA color format.
These macros are then used to refactor the logic for CSC mode selection. The two nested tests for input colorspace are simplified into a single one, with a logical and, making the whole more readable.
--- drivers/media/platform/rockchip/rga/rga-hw.c | 23 +++++++++----------- drivers/media/platform/rockchip/rga/rga-hw.h | 5 +++++ 2 files changed, 15 insertions(+), 13 deletions(-)
drivers/media/platform/rockchip/rga/rga-hw.c +10 -13
@@ -200,22 +200,19 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) dst_info.data.format = ctx->out.fmt->hw_format; dst_info.data.swap = ctx->out.fmt->color_swap; -if (ctx->in.fmt->hw_format >=RGA_COLOR_FMT_YUV422SP ) { -if (ctx->out.fmt->hw_format <RGA_COLOR_FMT_YUV422SP ) { -switch (ctx->in.colorspace) { -case V4L2_COLORSPACE_REC709 : - src_info.data.csc_mode = -RGA_SRC_CSC_MODE_BT709_R0 ; -break ; -default : - src_info.data.csc_mode = -RGA_SRC_CSC_MODE_BT601_R0 ; -break ; - } +if (RGA_COLOR_FMT_IS_YUV (ctx->in.fmt->hw_format) && +RGA_COLOR_FMT_IS_RGB (ctx->out.fmt->hw_format)) { +switch (ctx->in.colorspace) { +case V4L2_COLORSPACE_REC709 : + src_info.data.csc_mode =RGA_SRC_CSC_MODE_BT709_R0 ; +break ; +default : + src_info.data.csc_mode =RGA_SRC_CSC_MODE_BT601_R0 ; +break ; } } -if (ctx->out.fmt->hw_format >=RGA_COLOR_FMT_YUV422SP ) { +if (RGA_COLOR_FMT_IS_YUV (ctx->out.fmt->hw_format)) {switch (ctx->out.colorspace) {case V4L2_COLORSPACE_REC709 : dst_info.data.csc_mode =RGA_SRC_CSC_MODE_BT709_R0 ;
drivers/media/platform/rockchip/rga/rga-hw.h +5 -0
@@ -95,6 +95,11 @@#define RGA_COLOR_FMT_CP_8BPP 15#define RGA_COLOR_FMT_MASK 15 +#define RGA_COLOR_FMT_IS_YUV (fmt) \ + (((fmt) >= RGA_COLOR_FMT_YUV422SP) && ((fmt) < RGA_COLOR_FMT_CP_1BPP)) +#define RGA_COLOR_FMT_IS_RGB (fmt) \ + ((fmt) < RGA_COLOR_FMT_YUV422SP) +#define RGA_COLOR_NONE_SWAP 0#define RGA_COLOR_RB_SWAP 1#define RGA_COLOR_ALPHA_SWAP 2
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 111/204 IB/uverbs: Set IOVA on IB MR in uverbs layer
In reply to Greg Kroah-HartmanFrom: Yishai Hadas <[email protected]>
[ Upstream commit 04c0a5fcfcf65aade2fb238b6336445f1a99b646 ]
Set IOVA on IB MR in uverbs layer to let all drivers have it, this includes both reg/rereg MR flows.
As part of this change cleaned-up this setting from the drivers that already did it by themselves in their user flows.
--- drivers/infiniband/core/uverbs_cmd.c | 4 ++++ drivers/infiniband/hw/cxgb4/mem.c | 1 - drivers/infiniband/hw/mlx4/mr.c | 1 - 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/core/uverbs_cmd.c +4 -0
@@ -772,6 +772,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs) mr->uobject = uobj;atomic_inc (&pd->usecnt); mr->res.type =RDMA_RESTRACK_MR ; + mr->iova = cmd.hca_va;rdma_restrack_uadd (&mr->res); uobj->object = mr;
@@ -863,6 +864,9 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs)atomic_dec (&old_pd->usecnt); } +if (cmd.flags &IB_MR_REREG_TRANS ) + mr->iova = cmd.hca_va; +memset (&resp,0 ,sizeof (resp)); resp.lkey = mr->lkey; resp.rkey = mr->rkey;
drivers/infiniband/hw/cxgb4/mem.c +0 -1
@@ -399,7 +399,6 @@ static int finish_mem_reg(struct c4iw_mr *mhp, u32 stag) mmid = stag >>8 ; mhp->ibmr.rkey = mhp->ibmr.lkey = stag; mhp->ibmr.length = mhp->attr.len; - mhp->ibmr.iova = mhp->attr.va_fbo; mhp->ibmr.page_size =1U << (mhp->attr.page_size +12 );pr_debug ("mmid 0x%x mhp %p\n" , mmid, mhp);return xa_insert_irq (&mhp->rhp->mrs, mmid, mhp,GFP_KERNEL );
drivers/infiniband/hw/mlx4/mr.c +0 -1
@@ -439,7 +439,6 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; mr->ibmr.length = length; - mr->ibmr.iova = virt_addr; mr->ibmr.page_size =1U << shift;return &mr->ibmr;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 107/204 rtc: cpcap: fix range
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 3180cfabf6fbf982ca6d1a6eb56334647cc1416b ]
Unbreak CPCAP driver, which has one more bit in the day counter increasing the max. range from 2014 to 2058. The original commit introducing the range limit was obviously wrong, since the driver has only been written in 2017 (3 years after 14 bits would have run out).
--- drivers/rtc/rtc-cpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-cpcap.c +1 -1
@@ -261,7 +261,7 @@ static int cpcap_rtc_probe(struct platform_device *pdev)return PTR_ERR (rtc->rtc_dev); rtc->rtc_dev->ops = &cpcap_rtc_ops; - rtc->rtc_dev->range_max = (1 <<14 ) *SECS_PER_DAY -1 ; + rtc->rtc_dev->range_max = (timeu64_t) (DAY_MASK +1 ) *SECS_PER_DAY -1 ; err =cpcap_get_vendor (dev, rtc->regmap, &rtc->vendor);if (err)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 105/204 RDMA/ipoib: Return void from ipoib_ib_dev_stop()
In reply to Greg Kroah-HartmanFrom: Kamal Heib <[email protected]>
[ Upstream commit 95a5631f6c9f3045f26245e6045244652204dfdb ]
The return value from ipoib_ib_dev_stop() is always 0 - change it to be void.
--- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib.h +1 -1
@@ -515,7 +515,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev);int ipoib_ib_dev_open_default (struct net_device *dev);int ipoib_ib_dev_open (struct net_device *dev); -int ipoib_ib_dev_stop (struct net_device *dev); +void ipoib_ib_dev_stop (struct net_device *dev);void ipoib_ib_dev_up (struct net_device *dev);void ipoib_ib_dev_down (struct net_device *dev);int ipoib_ib_dev_stop_default (struct net_device *dev);
drivers/infiniband/ulp/ipoib/ipoib_ib.c +1 -3
@@ -846,7 +846,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev)return 0 ; } -int ipoib_ib_dev_stop (struct net_device *dev) +void ipoib_ib_dev_stop (struct net_device *dev) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
@@ -854,8 +854,6 @@ int ipoib_ib_dev_stop(struct net_device *dev)clear_bit (IPOIB_FLAG_INITIALIZED , &priv->flags);ipoib_flush_ah (dev); - -return 0 ; }int ipoib_ib_dev_open_default (struct net_device *dev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/204 mtd: rawnand: fsl_upm: Remove unused mtd var
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit ccc49eff77bee2885447a032948959a134029fe3 ]
The mtd var in fun_wait_rnb() is now unused, let's get rid of it and fix the warning resulting from this unused var.
--- drivers/mtd/nand/raw/fsl_upm.c | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/nand/raw/fsl_upm.c +0 -1
@@ -62,7 +62,6 @@ static int fun_chip_ready(struct nand_chip *chip)static void fun_wait_rnb (struct fsl_upm_nand *fun) {if (fun->rnb_gpio[fun->mchip_number] >=0 ) { -struct mtd_info *mtd =nand_to_mtd (&fun->chip);int cnt =1000000 ;while (--cnt && !fun_chip_ready (&fun->chip))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/204 perf probe: Fix memory leakage when the probe point is not found
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 12d572e785b15bc764e956caaa8a4c846fd15694 upstream.
Fix the memory leakage in debuginfo__find_trace_events() when the probe point is not found in the debuginfo. If there is no probe point found in the debuginfo, debuginfo__find_probes() will NOT return -ENOENT, but 0.
Thus the caller of debuginfo__find_probes() must check the tf.ntevs and release the allocated memory for the array of struct probe_trace_event.
The current code releases the memory only if the debuginfo__find_probes() hits an error but not checks tf.ntevs. In the result, the memory allocated on *tevs are not released if tf.ntevs == 0.
This fixes the memory leakage by checking tf.ntevs == 0 in addition to ret < 0.
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -1467,7 +1467,7 @@ int debuginfo__find_trace_events(structif (ret >=0 && tf.pf.skip_empty_arg) ret =fill_empty_trace_arg (pev, tf.tevs, tf.ntevs); -if (ret <0 ) { +if (ret <0 || tf.ntevs ==0 ) {for (i =0 ; i < tf.ntevs; i++)clear_probe_trace_event (&tf.tevs[i]);zfree (tevs);