5.8.3-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 1/232 ALSA: hda/realtek - Fix unused variable warning
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit e5b1d9776ad3817a8c90336038bf7a219425b57f upstream.
The previous fix forgot to remove the unused variable that triggers a
compile warning now:
sound/pci/hda/patch_realtek.c: In function 'alc285_fixup_hp_gpio_led':
sound/pci/hda/patch_realtek.c:4163:19: warning: unused variable 'spec' [-Wunused-variable]
Fix it.
--- sound/pci/hda/patch_realtek.c | 2 -- 1 file changed, 2 deletions(-)
sound/pci/hda/patch_realtek.c +0 -2
@@ -4171,8 +4171,6 @@ static void alc269_fixup_hp_gpio_led(strstatic void alc285_fixup_hp_gpio_led (struct hda_codec *codec,const struct hda_fixup *fix,int action) { -struct alc_spec *spec = codec->spec; -alc_fixup_hp_gpio_led (codec, action,0x04 ,0x01 ); }
Greg Kroah-Hartman
maintainerPATCH 10/232 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 12/232 PCI: qcom: Add support for tx term offset for rev 2.1.0
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
commit de3c4bf648975ea0b1d344d811e9b0748907b47c upstream.
Add tx term offset support to pcie qcom driver need in some revision of the ipq806x SoC. Ipq8064 needs tx term offset set to 7.
--- drivers/pci/controller/dwc/pcie-qcom.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-qcom.c +16 -1
@@ -45,7 +45,13 @@#define PCIE_CAP_CPL_TIMEOUT_DISABLE 0x10#define PCIE20_PARF_PHY_CTRL 0x40 +#define PHY_CTRL_PHY_TX0_TERM_OFFSET_MASK GENMASK(20, 16) +#define PHY_CTRL_PHY_TX0_TERM_OFFSET (x) ((x) << 16) +#define PCIE20_PARF_PHY_REFCLK 0x4C +#define PHY_REFCLK_SSP_EN BIT(16) +#define PHY_REFCLK_USE_PAD BIT(12) +#define PCIE20_PARF_DBI_BASE_ADDR 0x168#define PCIE20_PARF_SLV_ADDR_SPACE_SIZE 0x16C#define PCIE20_PARF_MHI_CLOCK_RESET_CTRL 0x174
@@ -354,9 +360,18 @@ static int qcom_pcie_init_2_1_0(struct qwritel (PHY_RX0_EQ (4 ), pcie->parf +PCIE20_PARF_CONFIG_BITS ); } +if (of_device_is_compatible (node,"qcom,pcie-ipq8064" )) { +/* set TX termination offset */ + val =readl (pcie->parf +PCIE20_PARF_PHY_CTRL ); + val &= ~PHY_CTRL_PHY_TX0_TERM_OFFSET_MASK ; + val |=PHY_CTRL_PHY_TX0_TERM_OFFSET (7 ); +writel (val, pcie->parf +PCIE20_PARF_PHY_CTRL ); + } +/* enable external reference clock */ val =readl (pcie->parf +PCIE20_PARF_PHY_REFCLK ); - val |=BIT (16 ); + val &= ~PHY_REFCLK_USE_PAD ; + val |=PHY_REFCLK_SSP_EN ;writel (val, pcie->parf +PCIE20_PARF_PHY_REFCLK ); ret =reset_control_deassert (res->phy_reset);
Greg Kroah-Hartman
maintainerPATCH 13/232 btrfs: allow use of global block reserve for balance item deletion
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
commit 3502a8c0dc1bd4b4970b59b06e348f22a1c05581 upstream.
On a filesystem with exhausted metadata, but still enough to start balance, it's possible to hit this error:
[324402.053842] BTRFS info (device loop0): 1 enospc errors during balance [324402.060769] BTRFS info (device loop0): balance: ended with status: -28 [324402.172295] BTRFS: error (device loop0) in reset_balance_state:3321: errno=-28 No space left
It fails inside reset_balance_state and turns the filesystem to read-only, which is unnecessary and should be fixed too, but the problem is caused by lack for space when the balance item is deleted. This is a one-time operation and from the same rank as unlink that is allowed to use the global block reserve. So do the same for the balance item.
Status of the filesystem (100GiB) just after the balance fails:
$ btrfs fi df mnt Data, single: total=80.01GiB, used=38.58GiB System, single: total=4.00MiB, used=16.00KiB Metadata, single: total=19.99GiB, used=19.48GiB GlobalReserve, single: total=512.00MiB, used=50.11MiB
--- fs/btrfs/volumes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
@@ -3231,7 +3231,7 @@ static int del_balance_item(struct btrfsif (!path)return -ENOMEM ; - trans =btrfs_start_transaction (root,0 ); + trans =btrfs_start_transaction_fallback_global_rsv (root,0 );if (IS_ERR (trans)) {btrfs_free_path (path);return PTR_ERR (trans);
Greg Kroah-Hartman
maintainerPATCH 16/232 btrfs: preallocate anon block device at first phase of snapshot creation
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 2dfb1e43f57dd3aeaa66f7cf05d068db2d4c8788 upstream.
[BUG]
When the anonymous block device pool is exhausted, subvolume/snapshot creation fails with EMFILE (Too many files open). This has been reported by a user. The allocation happens in the second phase during transaction commit where it's only way out is to abort the transaction
BTRFS: Transaction aborted (error -24)
WARNING: CPU: 17 PID: 17041 at fs/btrfs/transaction.c:1576 create_pending_snapshot+0xbc4/0xd10 [btrfs] RIP: 0010:create_pending_snapshot+0xbc4/0xd10 [btrfs] Call Trace: create_pending_snapshots+0x82/0xa0 [btrfs] btrfs_commit_transaction+0x275/0x8c0 [btrfs] btrfs_mksubvol+0x4b9/0x500 [btrfs] btrfs_ioctl_snap_create_transid+0x174/0x180 [btrfs] btrfs_ioctl_snap_create_v2+0x11c/0x180 [btrfs] btrfs_ioctl+0x11a4/0x2da0 [btrfs] do_vfs_ioctl+0xa9/0x640 ksys_ioctl+0x67/0x90 __x64_sys_ioctl+0x1a/0x20 do_syscall_64+0x5a/0x110 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ---[ end trace 33f2f83f3d5250e9 ]--- BTRFS: error (device sda1) in create_pending_snapshot:1576: errno=-24 unknown BTRFS info (device sda1): forced readonly BTRFS warning (device sda1): Skipping commit of aborted transaction. BTRFS: error (device sda1) in cleanup_transaction:1831: errno=-24 unknown
[CAUSE]
When the global anonymous block device pool is exhausted, the following call chain will fail, and lead to transaction abort:
btrfs_ioctl_snap_create_v2()
|- btrfs_ioctl_snap_create_transid()
|- btrfs_mksubvol()
|- btrfs_commit_transaction()
|- create_pending_snapshot()
|- btrfs_get_fs_root()
|- btrfs_init_fs_root()
|- get_anon_bdev()[FIX]
Although we can't enlarge the anonymous block device pool, at least we can preallocate anon_dev for subvolume/snapshot in the first phase, outside of transaction context and exactly at the moment the user calls the creation ioctl.
--- fs/btrfs/disk-io.c | 71 ++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/disk-io.h | 2 + fs/btrfs/ioctl.c | 21 +++++++++++++- fs/btrfs/transaction.c | 2 - fs/btrfs/transaction.h | 2 + 5 files changed, 89 insertions(+), 9 deletions(-)
fs/btrfs/disk-io.c +64 -7
@@ -1395,7 +1395,12 @@ alloc_fail: goto out; } -static int btrfs_init_fs_root (struct btrfs_root *root) +/* +* Initialize subvolume root in-memory structure +* +* @anon_dev: anonymous device to attach to the root, if zero, allocate new +*/ +static int btrfs_init_fs_root (struct btrfs_root *root,dev_t anon_dev) {int ret;unsigned int nofs_flag;
@@ -1434,9 +1439,13 @@ static int btrfs_init_fs_root(struct btr*/ if (is_fstree (root->root_key.objectid) &&btrfs_root_refs (&root->root_item) >0 ) { - ret =get_anon_bdev (&root->anon_dev); -if (ret) - goto fail; +if (!anon_dev) { + ret =get_anon_bdev (&root->anon_dev); +if (ret) + goto fail; + }else { + root->anon_dev = anon_dev; + } }mutex_lock (&root->objectid_mutex);
@@ -1541,8 +1550,27 @@ void btrfs_free_fs_info(struct btrfs_fs_ } -struct btrfs_root *btrfs_get_fs_root (struct btrfs_fs_info *fs_info, -u64 objectid,bool check_ref) +/* +* Get an in-memory reference of a root structure. +* +* For essential trees like root/extent tree, we grab it from fs_info directly. +* For subvolume trees, we check the cached filesystem roots first. If not +* found, then read it from disk and add it to cached fs roots. +* +* Caller should release the root by calling btrfs_put_root() after the usage. +* +* NOTE: Reloc and log trees can't be read by this function as they share the +* same root objectid. +* +* @objectid: root id +* @anon_dev: preallocated anonymous block device number for new roots, +* pass 0 for new allocation. +* @check_ref: whether to check root item references, If true, return -ENOENT +* for orphan roots +*/ +static struct btrfs_root *btrfs_get_root_ref (struct btrfs_fs_info *fs_info, +u64 objectid,dev_t anon_dev, +bool check_ref) {struct btrfs_root *root;struct btrfs_path *path;
@@ -1571,6 +1599,8 @@ struct btrfs_root *btrfs_get_fs_root(str again: root =btrfs_lookup_fs_root (fs_info, objectid);if (root) { +/* Shouldn't get preallocated anon_dev for cached roots */ +ASSERT (!anon_dev);if (check_ref &&btrfs_root_refs (&root->root_item) ==0 ) {btrfs_put_root (root);return ERR_PTR (-ENOENT );
@@ -1590,7 +1620,7 @@ again: goto fail; } - ret =btrfs_init_fs_root (root); + ret =btrfs_init_fs_root (root, anon_dev);if (ret) goto fail;
@@ -1623,6 +1653,33 @@ fail:return ERR_PTR (ret); } +/* +* Get in-memory reference of a root structure +* +* @objectid: tree objectid +* @check_ref: if set, verify that the tree exists and the item has at least +* one reference +*/ +struct btrfs_root *btrfs_get_fs_root (struct btrfs_fs_info *fs_info, +u64 objectid,bool check_ref) +{ +return btrfs_get_root_ref (fs_info, objectid,0 , check_ref); +} + +/* +* Get in-memory reference of a root structure, created as new, optionally pass +* the anonymous block device id +* +* @objectid: tree objectid +* @anon_dev: if zero, allocate a new anonymous block device or use the +* parameter value +*/ +struct btrfs_root *btrfs_get_new_fs_root (struct btrfs_fs_info *fs_info, +u64 objectid,dev_t anon_dev) +{ +return btrfs_get_root_ref (fs_info, objectid, anon_dev, true); +} +static int btrfs_congested_fn (void *congested_data,int bdi_bits) {struct btrfs_fs_info *info = (struct btrfs_fs_info *)congested_data;
fs/btrfs/disk-io.h +2 -0
@@ -67,6 +67,8 @@ void btrfs_free_fs_roots(struct btrfs_fsstruct btrfs_root *btrfs_get_fs_root (struct btrfs_fs_info *fs_info,u64 objectid,bool check_ref); +struct btrfs_root *btrfs_get_new_fs_root (struct btrfs_fs_info *fs_info, +u64 objectid,dev_t anon_dev);void btrfs_free_fs_info (struct btrfs_fs_info *fs_info);int btrfs_cleanup_fs_roots (struct btrfs_fs_info *fs_info);
fs/btrfs/ioctl.c +20 -1
@@ -566,6 +566,7 @@ static noinline int create_subvol(structstruct inode *inode;int ret;int err; +dev_t anon_dev =0 ;u64 objectid;u64 new_dirid =BTRFS_FIRST_FREE_OBJECTID ;u64 index =0 ;
@@ -578,6 +579,10 @@ static noinline int create_subvol(structif (ret) goto fail_free; + ret =get_anon_bdev (&anon_dev); +if (ret <0 ) + goto fail_free; +/* * Don't create subvolume whose level is not zero. Or qgroup will be * screwed up since it assumes subvolume qgroup's level to be 0.
@@ -660,12 +665,15 @@ static noinline int create_subvol(struct goto fail; key.offset = (u64)-1 ; - new_root =btrfs_get_fs_root (fs_info, objectid, true); + new_root =btrfs_get_new_fs_root (fs_info, objectid, anon_dev);if (IS_ERR (new_root)) { +free_anon_bdev (anon_dev); ret =PTR_ERR (new_root);btrfs_abort_transaction (trans, ret); goto fail; } +/* Freeing will be done in btrfs_put_root() of new_root */ + anon_dev =0 ;btrfs_record_root_in_trans (trans, new_root);
@@ -735,6 +743,8 @@ fail:return ret; fail_free: +if (anon_dev) +free_anon_bdev (anon_dev);kfree (root_item);return ret; }
@@ -762,6 +772,9 @@ static int create_snapshot(struct btrfs_if (!pending_snapshot)return -ENOMEM ; + ret =get_anon_bdev (&pending_snapshot->anon_dev); +if (ret <0 ) + goto free_pending; pending_snapshot->root_item =kzalloc (sizeof (struct btrfs_root_item ),GFP_KERNEL ); pending_snapshot->path =btrfs_alloc_path ();
@@ -823,10 +836,16 @@ static int create_snapshot(struct btrfs_d_instantiate (dentry, inode); ret =0 ; + pending_snapshot->anon_dev =0 ; fail: +/* Prevent double freeing of anon_dev */ +if (ret && pending_snapshot->snap) + pending_snapshot->snap->anon_dev =0 ;btrfs_put_root (pending_snapshot->snap);btrfs_subvolume_release_metadata (fs_info, &pending_snapshot->block_rsv); free_pending: +if (pending_snapshot->anon_dev) +free_anon_bdev (pending_snapshot->anon_dev);kfree (pending_snapshot->root_item);btrfs_free_path (pending_snapshot->path);kfree (pending_snapshot);
fs/btrfs/transaction.c +1 -1
@@ -1630,7 +1630,7 @@ static noinline int create_pending_snaps } key.offset = (u64)-1 ; - pending->snap =btrfs_get_fs_root (fs_info, objectid, true); + pending->snap =btrfs_get_new_fs_root (fs_info, objectid, pending->anon_dev);if (IS_ERR (pending->snap)) { ret =PTR_ERR (pending->snap);btrfs_abort_transaction (trans, ret);
fs/btrfs/transaction.h +2 -0
@@ -151,6 +151,8 @@ struct btrfs_pending_snapshot {struct btrfs_block_rsv block_rsv;/* extra metadata reservation for relocation */ int error; +/* Preallocated anonymous block device number */ +dev_t anon_dev;bool readonly;struct list_head list; };
Greg Kroah-Hartman
maintainerPATCH 2/232 smb3: warn on confusing error scenario with sec=krb5
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 0a018944eee913962bce8ffebbb121960d5125d9 upstream.
When mounting with Kerberos, users have been confused about the default error returned in scenarios in which either keyutils is not installed or the user did not properly acquire a krb5 ticket. Log a warning message in the case that "ENOKEY" is returned from the get_spnego_key upcall so that users can better understand why mount failed in those two cases.
--- fs/cifs/smb2pdu.c | 2 ++ 1 file changed, 2 insertions(+)
fs/cifs/smb2pdu.c +2 -0
@@ -1387,6 +1387,8 @@ SMB2_auth_kerberos(struct SMB2_sess_data spnego_key =cifs_get_spnego_key (ses);if (IS_ERR (spnego_key)) { rc =PTR_ERR (spnego_key); +if (rc == -ENOKEY ) +cifs_dbg (VFS ,"Verify user has a krb5 ticket and keyutils is installed\n" ); spnego_key =NULL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 20/232 btrfs: only commit delayed items at fsync if we are logging a directory
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 5aa7d1a7f4a2f8ca6be1f32415e9365d026e8fa7 upstream.
When logging an inode we are committing its delayed items if either the inode is a directory or if it is a new inode, created in the current transaction.
We need to do it for directories, since new directory indexes are stored as delayed items of the inode and when logging a directory we need to be able to access all indexes from the fs/subvolume tree in order to figure out which index ranges need to be logged.
However for new inodes that are not directories, we do not need to do it because the only type of delayed item they can have is the inode item, and we are guaranteed to always log an up to date version of the inode item:
*) for a full fsync we do it by committing the delayed inode and then
copying the item from the fs/subvolume tree with copy_inode_items_to_log();
*) for a fast fsync we always log the inode item based on the contents of
the in-memory struct btrfs_inode. We guarantee this is always done since commit e4545de5b035c7 ("Btrfs: fix fsync data loss after append write").
So stop running delayed items for a new inodes that are not directories, since that forces committing the delayed inode into the fs/subvolume tree, wasting time and adding contention to the tree when a full fsync is not required. We will only do it in case a fast fsync is needed.
This patch is part of a series that has the following patches:
1/4 btrfs: only commit the delayed inode when doing a full fsync 2/4 btrfs: only commit delayed items at fsync if we are logging a directory 3/4 btrfs: stop incremening log_batch for the log root tree when syncing log 4/4 btrfs: remove no longer needed use of log_writers for the log root tree
After the entire patchset applied I saw about 12% decrease on max latency reported by dbench. The test was done on a qemu vm, with 8 cores, 16Gb of ram, using kvm and using a raw NVMe device directly (no intermediary fs on the host). The test was invoked like the following:
mkfs.btrfs -f /dev/sdk
mount -o ssd -o nospace_cache /dev/sdk /mnt/sdk
dbench -D /mnt/sdk -t 300 8
umount /mnt/dsk
--- fs/btrfs/tree-log.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/btrfs/tree-log.c +5 -4
@@ -5122,7 +5122,6 @@ static int btrfs_log_inode(struct btrfs_const loff_t end, struct btrfs_log_ctx *ctx) { - struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_path *path;struct btrfs_path *dst_path;struct btrfs_key min_key;
@@ -5165,15 +5164,17 @@ static int btrfs_log_inode(struct btrfs_ max_key.offset = (u64)-1 ;/* -* Only run delayed items if we are a dir or a new file. +* Only run delayed items if we are a directory. We want to make sure +* all directory indexes hit the fs/subvolume tree so we can find them +* and figure out which index ranges have to be logged. +* * Otherwise commit the delayed inode only if the full sync flag is set, * as we want to make sure an up to date version is in the subvolume * tree so copy_inode_items_to_log() / copy_items() can find it and copy * it to the log tree. For a non full sync, we always log the inode item * based on the in-memory struct btrfs_inode which is always up to date. */ -if (S_ISDIR (inode->vfs_inode.i_mode) || - inode->generation > fs_info->last_trans_committed) +if (S_ISDIR (inode->vfs_inode.i_mode)) ret =btrfs_commit_inode_delayed_items (trans, inode);else if (test_bit (BTRFS_INODE_NEEDS_FULL_SYNC , &inode->runtime_flags)) ret =btrfs_commit_inode_delayed_inode (inode);
Greg Kroah-Hartman
maintainerPATCH 19/232 btrfs: stop incremening log_batch for the log root tree when syncing log
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 28a9579561bcb9082715e720eac93012e708ab94 upstream.
We are incrementing the log_batch atomic counter of the root log tree but we never use that counter, it's used only for the log trees of subvolume roots. We started doing it when we moved the log_batch and log_write counters from the global, per fs, btrfs_fs_info structure, into the btrfs_root structure in commit 7237f1833601dc ("Btrfs: fix tree logs parallel sync").
So just stop doing it for the log root tree and add a comment over the field declaration so inform it's used only for log trees of subvolume roots.
This patch is part of a series that has the following patches:
1/4 btrfs: only commit the delayed inode when doing a full fsync 2/4 btrfs: only commit delayed items at fsync if we are logging a directory 3/4 btrfs: stop incremening log_batch for the log root tree when syncing log 4/4 btrfs: remove no longer needed use of log_writers for the log root tree
After the entire patchset applied I saw about 12% decrease on max latency reported by dbench. The test was done on a qemu vm, with 8 cores, 16Gb of ram, using kvm and using a raw NVMe device directly (no intermediary fs on the host). The test was invoked like the following:
mkfs.btrfs -f /dev/sdk
mount -o ssd -o nospace_cache /dev/sdk /mnt/sdk
dbench -D /mnt/sdk -t 300 8
umount /mnt/dsk
--- fs/btrfs/ctree.h | 1 + fs/btrfs/tree-log.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/ctree.h +1 -0
@@ -1061,6 +1061,7 @@ struct btrfs_root {struct list_head log_ctxs[2 ];atomic_t log_writers;atomic_t log_commit[2 ]; +/* Used only for log trees of subvolumes, not for the log root tree */ atomic_t log_batch;int log_transid;/* No matter the commit succeeds or not*/
fs/btrfs/tree-log.c +0 -1
@@ -3116,7 +3116,6 @@ int btrfs_sync_log(struct btrfs_trans_habtrfs_init_log_ctx (&root_log_ctx,NULL );mutex_lock (&log_root_tree->log_mutex); -atomic_inc (&log_root_tree->log_batch);atomic_inc (&log_root_tree->log_writers); index2 = log_root_tree->log_transid %2 ;
Greg Kroah-Hartman
maintainerPATCH 3/232 SMB3: Fix mkdir when idsfromsid configured on mount
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit c8c412f976124d85b8ded85c6ac3f760c12b63a3 upstream.
mkdir uses a compounded create operation which was not setting the security descriptor on create of a directory. Fix so mkdir now sets the mode and owner info properly when idsfromsid and modefromsid are configured on the mount.
--- fs/cifs/smb2inode.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/smb2inode.c +1 -0
@@ -115,6 +115,7 @@ smb2_compound_op(const unsigned int xid, vars->oparms.fid = &fid; vars->oparms.reconnect = false; vars->oparms.mode = mode; + vars->oparms.cifs_sb = cifs_sb; rqst[num_rqst].rq_iov = &vars->open_iov[0 ]; rqst[num_rqst].rq_nvec =SMB2_CREATE_IOV_SIZE ;
Greg Kroah-Hartman
maintainerPATCH 5/232 genirq: Unlock irq descriptor after errors
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
commit f107cee94ba4d2c7357fde59a1d84346c73d4958 upstream.
In irq_set_irqchip_state(), the irq descriptor is not unlocked after an error is encountered. While that should never happen in practice, a buggy driver may trigger it. This would result in a lockup, so fix it.
--- kernel/irq/manage.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/irq/manage.c +5 -2
@@ -2735,8 +2735,10 @@ int irq_set_irqchip_state(unsigned int i do { chip = irq_data_get_irq_chip(data); - if (WARN_ON_ONCE(!chip)) - return -ENODEV; + if (WARN_ON_ONCE(!chip)) { + err = -ENODEV; + goto out_unlock; + } if (chip->irq_set_irqchip_state) break; #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
@@ -2749,6 +2751,7 @@ int irq_set_irqchip_state(unsigned int iif (data) err = chip->irq_set_irqchip_state (data, which, val); +out_unlock:irq_put_desc_busunlock (desc, flags);return err; }
Greg Kroah-Hartman
maintainerPATCH 8/232 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
@@ -2565,7 +2565,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
@@ -325,6 +325,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
@@ -28,6 +28,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 9/232 PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 45beb31d3afb651bb5c41897e46bd4fa9980c51c upstream.
We are seeing AMD Radeon Pro W5700 doesn't work when IOMMU is enabled:
iommu ivhd0: AMD-Vi: Event logged [IOTLB_INV_TIMEOUT device=63:00.0 address=0x42b5b01a0] iommu ivhd0: AMD-Vi: Event logged [IOTLB_INV_TIMEOUT device=63:00.0 address=0x42b5b01c0]
The error also makes graphics driver fail to probe the device.
It appears to be the same issue as commit 5e89cd303e3a ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") addresses, and indeed the same ATS quirk can workaround the issue.
See-also: 5e89cd303e3a ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken")
See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken")
See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208725
--- drivers/pci/quirks.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/quirks.c +4 -1
@@ -5207,7 +5207,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SE*/ static void quirk_amd_harvest_no_ats (struct pci_dev *pdev) { -if (pdev->device ==0x7340 && pdev->revision !=0xc5 ) +if ((pdev->device ==0x7312 && pdev->revision !=0x00 ) || + (pdev->device ==0x7340 && pdev->revision !=0xc5 ))return ;pci_info (pdev,"disabling ATS\n" );
@@ -5218,6 +5219,8 @@ static void quirk_amd_harvest_no_ats(strDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x98e4 , quirk_amd_harvest_no_ats);/* AMD Iceland dGPU */ DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6900 , quirk_amd_harvest_no_ats); +/* AMD Navi10 dGPU */ +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7312 , quirk_amd_harvest_no_ats);/* AMD Navi14 dGPU */ DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7340 , quirk_amd_harvest_no_ats);#endif /* CONFIG_PCI_ATS */
Greg Kroah-Hartman
maintainerPATCH 7/232 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 4/232 genirq/affinity: Make affinity setting if activated opt-in
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit f0c7baca180046824e07fc5f1326e83a8fd150c7 upstream.
John reported that on a RK3288 system the perf per CPU interrupts are all affine to CPU0 and provided the analysis:
"It looks like what happens is that because the interrupts are not per-CPU
in the hardware, armpmu_request_irq() calls irq_force_affinity() while the interrupt is deactivated and then request_irq() with IRQF_PERCPU | IRQF_NOBALANCING.
Now when irq_startup() runs with IRQ_STARTUP_NORMAL, it calls irq_setup_affinity() which returns early because IRQF_PERCPU and IRQF_NOBALANCING are set, leaving the interrupt on its original CPU."
This was broken by the recent commit which blocked interrupt affinity setting in hardware before activation of the interrupt. While this works in general, it does not work for this particular case. As contrary to the initial analysis not all interrupt chip drivers implement an activate callback, the safe cure is to make the deferred interrupt affinity setting at activation time opt-in.
Implement the necessary core logic and make the two irqchip implementations for which this is required opt-in. In hindsight this would have been the right thing to do, but ...
--- arch/x86/kernel/apic/vector.c | 4 ++++ drivers/irqchip/irq-gic-v3-its.c | 5 ++++- include/linux/irq.h | 13 +++++++++++++ kernel/irq/manage.c | 6 +++++- 4 files changed, 26 insertions(+), 2 deletions(-)
arch/x86/kernel/apic/vector.c +4 -0
@@ -560,6 +560,10 @@ static int x86_vector_alloc_irqs(struct* as that can corrupt the affinity move state. */ irqd_set_handle_enforce_irqctx (irqd); + +/* Don't invoke affinity setter on deactivated interrupts */ +irqd_set_affinity_on_activate (irqd); +/* * Legacy vectors are already assigned when the IOAPIC * takes them over. They stay on the same vector. This is
drivers/irqchip/irq-gic-v3-its.c +4 -1
@@ -3523,6 +3523,7 @@ static int its_irq_domain_alloc(struct imsi_alloc_info_t *info = args;struct its_device *its_dev = info->scratchpad[0 ].ptr;struct its_node *its = its_dev->its; +struct irq_data *irqd;irq_hw_number_t hwirq;int err;int i;
@@ -3542,7 +3543,9 @@ static int its_irq_domain_alloc(struct iirq_domain_set_hwirq_and_chip (domain, virq + i, hwirq + i, &its_irq_chip, its_dev); -irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq + i))); + irqd =irq_get_irq_data (virq + i); +irqd_set_single_target (irqd); +irqd_set_affinity_on_activate (irqd);pr_debug ("ID:%d pID:%d vID:%d\n" , (int )(hwirq + i - its_dev->event_map.lpi_base), (int )(hwirq + i), virq + i);
include/linux/irq.h +13 -0
@@ -213,6 +213,8 @@ struct irq_data {* required * IRQD_HANDLE_ENFORCE_IRQCTX - Enforce that handle_irq_*() is only invoked * from actual interrupt context. +* IRQD_AFFINITY_ON_ACTIVATE - Affinity is set on activation. Don't call +* irq_chip::irq_set_affinity() when deactivated. */ enum {IRQD_TRIGGER_MASK =0xf ,
@@ -237,6 +239,7 @@ enum {IRQD_CAN_RESERVE = (1 <<26 ),IRQD_MSI_NOMASK_QUIRK = (1 <<27 ),IRQD_HANDLE_ENFORCE_IRQCTX = (1 <<28 ), + IRQD_AFFINITY_ON_ACTIVATE = (1 << 29), };#define __irqd_to_state (d) ACCESS_PRIVATE((d)->common, state_use_accessors)
@@ -421,6 +424,16 @@ static inline bool irqd_msi_nomask_quirkreturn __irqd_to_state (d) &IRQD_MSI_NOMASK_QUIRK ; } +static inline void irqd_set_affinity_on_activate (struct irq_data *d) +{ +__irqd_to_state (d) |=IRQD_AFFINITY_ON_ACTIVATE ; +} + +static inline bool irqd_affinity_on_activate (struct irq_data *d) +{ +return __irqd_to_state (d) &IRQD_AFFINITY_ON_ACTIVATE ; +} +#undef __irqd_to_statestatic inline irq_hw_number_t irqd_to_hwirq (struct irq_data *d)
kernel/irq/manage.c +5 -1
@@ -320,12 +320,16 @@ static bool irq_set_affinity_deactivatedstruct irq_desc *desc =irq_data_to_desc (data);/* +* Handle irq chips which can handle affinity only in activated +* state correctly +* * If the interrupt is not yet activated, just store the affinity * mask and do not call the chip driver at all. On activation the * driver has to make sure anyway that the interrupt is in a * useable state so startup works. */ -if (!IS_ENABLED (CONFIG_IRQ_DOMAIN_HIERARCHY ) ||irqd_is_activated (data)) +if (!IS_ENABLED (CONFIG_IRQ_DOMAIN_HIERARCHY ) || +irqd_is_activated (data) || !irqd_affinity_on_activate (data))return false;cpumask_copy (desc->irq_common_data.affinity, mask);
Greg Kroah-Hartman
maintainerPATCH 6/232 genirq/PM: Always unlock IRQ descriptor in rearm_wake_irq()
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
commit e27b1636e9337d1a1d174b191e53d0f86421a822 upstream.
rearm_wake_irq() does not unlock the irq descriptor if the interrupt is not suspended or if wakeup is not enabled on it.
Restucture the exit conditions so the unlock is always ensured.
--- kernel/irq/pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/irq/pm.c +6 -2
@@ -185,14 +185,18 @@ void rearm_wake_irq(unsigned int irq)unsigned long flags;struct irq_desc *desc =irq_get_desc_buslock (irq, &flags,IRQ_GET_DESC_CHECK_GLOBAL ); -if (!desc || !(desc->istate &IRQS_SUSPENDED ) || - !irqd_is_wakeup_set (&desc->irq_data)) +if (!desc)return ; +if (!(desc->istate &IRQS_SUSPENDED ) || + !irqd_is_wakeup_set (&desc->irq_data)) + goto unlock; + desc->istate &= ~IRQS_SUSPENDED ;irqd_set (&desc->irq_data,IRQD_WAKEUP_ARMED );__enable_irq (desc); +unlock:irq_put_desc_busunlock (desc, flags); }
Greg Kroah-Hartman
maintainerPATCH 26/232 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
@@ -1686,12 +1686,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
@@ -4150,7 +4150,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 37/232 btrfs: fix memory leaks after failure to lookup checksums during inode logging
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 4f26433e9b3eb7a55ed70d8f882ae9cd48ba448b upstream.
While logging an inode, at copy_items(), if we fail to lookup the checksums for an extent we release the destination path, free the ins_data array and then return immediately. However a previous iteration of the for loop may have added checksums to the ordered_sums list, in which case we leak the memory used by them.
So fix this by making sure we iterate the ordered_sums list and free all its checksums before returning.
--- fs/btrfs/tree-log.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
fs/btrfs/tree-log.c +2 -6
@@ -4027,11 +4027,8 @@ static noinline int copy_items(struct bt fs_info->csum_root, ds + cs, ds + cs + cl -1 , &ordered_sums, 0); -if (ret) { -btrfs_release_path (dst_path); -kfree (ins_data); -return ret; - } +if (ret) +break ; } } }
@@ -4044,7 +4041,6 @@ static noinline int copy_items(struct bt* we have to do this after the loop above to avoid changing the * log tree while trying to change the log tree. */ - ret =0 ;while (!list_empty (&ordered_sums)) { struct btrfs_ordered_sum *sums = list_entry(ordered_sums.next, struct btrfs_ordered_sum,
Greg Kroah-Hartman
maintainerPATCH 28/232 btrfs: avoid possible signal interruption of btrfs_drop_snapshot() on relocation tree
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit f3e3d9cc35252a70a2fd698762c9687718268ec6 upstream.
[BUG]
There is a bug report about bad signal timing could lead to read-only fs during balance:
BTRFS info (device xvdb): balance: start -d -m -s
BTRFS info (device xvdb): relocating block group 73001861120 flags metadata BTRFS info (device xvdb): found 12236 extents, stage: move data extents BTRFS info (device xvdb): relocating block group 71928119296 flags data BTRFS info (device xvdb): found 3 extents, stage: move data extents BTRFS info (device xvdb): found 3 extents, stage: update data pointers BTRFS info (device xvdb): relocating block group 60922265600 flags metadata
BTRFS: error (device xvdb) in btrfs_drop_snapshot:5505: errno=-4 unknown BTRFS info (device xvdb): forced readonly
BTRFS info (device xvdb): balance: ended with status: -4
[CAUSE]
The direct cause is the -EINTR from the following call chain when a fatal signal is pending:
relocate_block_group()
|- clean_dirty_subvols()
|- btrfs_drop_snapshot()
|- btrfs_start_transaction()
|- btrfs_delayed_refs_rsv_refill()
|- btrfs_reserve_metadata_bytes()
|- __reserve_metadata_bytes()
|- wait_reserve_ticket()
|- prepare_to_wait_event();
|- ticket->error = -EINTR;Normally this behavior is fine for most btrfs_start_transaction() callers, as they need to catch any other error, same for the signal, and exit ASAP.
However for balance, especially for the clean_dirty_subvols() case, we're already doing cleanup works, getting -EINTR from btrfs_drop_snapshot() could cause a lot of unexpected problems.
Quoted 1 line
From the mentioned forced read-only report, to later balance error due
to half dropped reloc trees.
[FIX]
Fix this problem by using btrfs_join_transaction() if btrfs_drop_snapshot() is called from relocation context.
Since btrfs_join_transaction() won't get interrupted by signal, we can continue the cleanup.
--- fs/btrfs/extent-tree.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/btrfs/extent-tree.c +8 -1
@@ -5298,7 +5298,14 @@ int btrfs_drop_snapshot(struct btrfs_roo goto out; } - trans =btrfs_start_transaction (tree_root,0 ); +/* +* Use join to avoid potential EINTR from transaction start. See +* wait_reserve_ticket and the whole reservation callchain. +*/ +if (for_reloc) + trans =btrfs_join_transaction (tree_root); +else + trans =btrfs_start_transaction (tree_root,0 );if (IS_ERR (trans)) { err =PTR_ERR (trans); goto out_free;
Greg Kroah-Hartman
maintainercover 5.8.3-rc1 review
This is the start of the stable review cycle for the 5.8.3 release. There are 232 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 22 Aug 2020 09:15:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.3-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.8.3-rc1
hersen wu <[email protected]>
drm/amd/display: dchubbub p-state warning during surface planes switch
Stylon Wang <[email protected]>
drm/amd/display: Fix dmesg warning from setting abm level
Sandeep Raghuraman <[email protected]>
drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume
Xin Xiong <[email protected]>
drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
Marius Iacob <[email protected]>
drm: Added orientation quirk for ASUS tablet model T103HAF
Tomi Valkeinen <[email protected]>
drm/tidss: fix modeset init for DPI panels
Tomi Valkeinen <[email protected]>
drm/omap: force runtime PM suspend on system suspend
Imre Deak <[email protected]>
drm/dp_mst: Fix the DDC I2C device unregistration of an MST port
Imre Deak <[email protected]>
drm/dp_mst: Fix timeout handling of MST down messages
Imre Deak <[email protected]>
drm/dp_mst: Fix the DDC I2C device registration of an MST port
Denis Efremov <[email protected]>
drm/panfrost: Use kvfree() to free bo->sgts
Chris Wilson <[email protected]>
drm/i915/gt: Force the GT reset on shutdown
Denis Efremov <[email protected]>
drm/radeon: fix fb_div check in ni_init_smc_spll_table()
Geert Uytterhoeven <[email protected]>
sh: fault: Fix duplicate printing of "PC:"
Geert Uytterhoeven <[email protected]>
sh: landisk: Add missing initialization of sh_io_port_base
Zhang Rui <[email protected]>
perf/x86/rapl: Fix missing psys sysfs attributes
Daniel Díaz <[email protected]>
tools build feature: Quote CC and CXX for their arguments
Vincent Whitchurch <[email protected]>
perf bench mem: Always memset source before memcpy
Dinghao Liu <[email protected]>
ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
Ondrej Mosnacek <[email protected]>
crypto: algif_aead - fix uninitialized ctx->init
Andy Shevchenko <[email protected]>
mfd: dln2: Run event handler loop under spinlock
Dhananjay Phadke <[email protected]>
i2c: iproc: fix race between client unreg and isr
Tiezhu Yang <[email protected]>
test_kmod: avoid potential double free in trigger_config_run_type()
Colin Ian King <[email protected]>
fs/ufs: avoid potential u32 multiplication overflow
Eric Biggers <[email protected]>
fs/minix: remove expected error message in block_to_path()
Eric Biggers <[email protected]>
fs/minix: fix block limit check for V1 filesystems
Eric Biggers <[email protected]>
fs/minix: set s_maxbytes correctly
Tiezhu Yang <[email protected]>
lib/test_lockup.c: fix return value of test_lockup_init()
Trond Myklebust <[email protected]>
NFS: Fix flexfiles read failover
Jeffrey Mitchell <[email protected]>
nfs: Fix getxattr kernel panic and memory overflow
Wang Hai <[email protected]>
net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
Krzysztof Kozlowski <[email protected]>
s390/Kconfig: add missing ZCRYPT dependency to VFIO_AP
Wang Hai <[email protected]>
s390/test_unwind: fix possible memleak in test_unwind()
Dan Carpenter <[email protected]>
drm/vmwgfx: Fix two list_for_each loop exit tests
Dan Carpenter <[email protected]>
drm/vmwgfx: Use correct vmw_legacy_display_unit pointer
Dan Carpenter <[email protected]>
vdpa: Fix pointer math bug in vdpasim_get_config()
Christophe Leroy <[email protected]>
recordmcount: Fix build failure on non arm64
Michael S. Tsirkin <[email protected]>
vdpa_sim: init iommu lock
Andrii Nakryiko <[email protected]>
selftests/bpf: Fix silent Makefile output
Jin Yao <[email protected]>
perf record: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set
Colin Ian King <[email protected]>
Input: sentelic - fix error return when fsp_reg_write fails
Andrii Nakryiko <[email protected]>
selftests/bpf: Prevent runqslower from racing on building bpftool
Pawan Gupta <[email protected]>
x86/bugs/multihit: Fix mitigation reporting when VMX is not in use
Dilip Kota <[email protected]>
x86/tsr: Fix tsc frequency enumeration bug on Lightning Mountain SoC
Muchun Song <[email protected]>
kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
Dan Carpenter <[email protected]>
md-cluster: Fix potential error pointer dereference in resize_bitmaps()
Tero Kristo <[email protected]>
watchdog: rti-wdt: balance pm runtime enable calls
Krzysztof Sobota <[email protected]>
watchdog: initialize device before misc_register
Scott Mayhew <[email protected]>
nfs: nfs_file_write() should check for writeback errors
Ewan D. Milne <[email protected]>
scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
Jin Yao <[email protected]>
perf evsel: Don't set sample_regs_intr/sample_regs_user for dummy event
Stafford Horne <[email protected]>
openrisc: Fix oops caused when dumping stack
Jane Chu <[email protected]>
libnvdimm/security: ensure sysfs poll thread woke up and fetch updated attr
Jane Chu <[email protected]>
libnvdimm/security: fix a typo
Nicolas Saenz Julienne <[email protected]>
clk: bcm2835: Do not use prediv with bcm2711's PLLs
Geert Uytterhoeven <[email protected]>
clk: hsdk: Fix bad dependency on IOMEM
Zhihao Cheng <[email protected]>
ubifs: Fix wrong orphan node deletion in ubifs_jnl_update|rename
Zhihao Cheng <[email protected]>
ubi: fastmap: Free fastmap next anchor peb during detach
Zhihao Cheng <[email protected]>
ubi: fastmap: Don't produce the initial next anchor PEB when fastmap is disabled
Scott Mayhew <[email protected]>
nfs: ensure correct writeback errors are returned on close()
Wolfram Sang <[email protected]>
i2c: rcar: avoid race when unregistering slave
Thomas Hebb <[email protected]>
tools build feature: Use CC and CXX from parent
Jiri Olsa <[email protected]>
perf tools: Fix term parsing for raw syntax
Rayagonda Kokatanur <[email protected]>
pwm: bcm-iproc: handle clk_get_rate() return
Qais Yousef <[email protected]>
sched/uclamp: Fix a deadlock when enabling uclamp static key
Sagi Grimberg <[email protected]>
nvme: fix deadlock in disconnect during scan_work and/or ana_work
Xu Wang <[email protected]>
clk: clk-atlas6: fix return value check in atlas6_clk_init()
Konrad Dybcio <[email protected]>
clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk
Wei Hu <[email protected]>
PCI: hv: Fix a timing issue which causes kdump to fail occasionally
Chao Yu <[email protected]>
f2fs: compress: fix to update isize when overwriting compressed file
Wolfram Sang <[email protected]>
i2c: rcar: slave: only send STOP event when we have been addressed
Jacob Pan <[email protected]>
iommu/vt-d: Disable multiple GPASID-dev bind
Jacob Pan <[email protected]>
iommu/vt-d: Warn on out-of-range invalidation address
Liu Yi L <[email protected]>
iommu/vt-d: Enforce PASID devTLB field mask
Liu Yi L <[email protected]>
iommu/vt-d: Handle non-page aligned address
Jonathan Marek <[email protected]>
clk: qcom: clk-alpha-pll: remove unused/incorrect PLL_CAL_VAL
Jonathan Marek <[email protected]>
clk: qcom: gcc: fix sm8150 GPU and NPU clocks
Colin Ian King <[email protected]>
iommu/omap: Check for failure of a call to omap_iommu_dump_ctx
Aneesh Kumar K.V <[email protected]>
selftests/powerpc: ptrace-pkey: Don't update expected UAMOR value
Aneesh Kumar K.V <[email protected]>
selftests/powerpc: ptrace-pkey: Update the test to mark an invalid pkey correctly
Aneesh Kumar K.V <[email protected]>
selftests/powerpc: ptrace-pkey: Rename variables to make it easier to follow code
Cristian Ciocaltea <[email protected]>
clk: actions: Fix h_clk for Actions S500 SoC
Chao Yu <[email protected]>
f2fs: compress: fix to avoid memory leak on cc->cpages
Tyler Hicks <[email protected]>
ima: Fail rule parsing when appraise_flag=blacklist is unsupportable
Ming Lei <[email protected]>
dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue()
Steve Longerbeam <[email protected]>
gpu: ipu-v3: image-convert: Wait for all EOFs before completing a tile
Steve Longerbeam <[email protected]>
gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq handlers
Herbert Xu <[email protected]>
crypto: caam - Remove broken arc4 support
Sudeep Holla <[email protected]>
rtc: pl031: fix set_alarm by adding back call to alarm_irq_enable
Yan-Hsuan Chuang <[email protected]>
rtw88: pci: disable aspm for platform inter-op with module parameter
Yoshihiro Shimoda <[email protected]>
mmc: renesas_sdhi_internal_dmac: clean up the code for dma complete
Mark Zhang <[email protected]>
RDMA/counter: Allow manually bind QPs with different pids to same counter
Mark Zhang <[email protected]>
RDMA/counter: Only bind user QPs in auto mode
Vladimir Oltean <[email protected]>
devres: keep both device name and resource name in pretty name
Herbert Xu <[email protected]>
crypto: af_alg - Fix regression on empty requests
Johan Hovold <[email protected]>
USB: serial: ftdi_sio: fix break and sysrq handling
Johan Hovold <[email protected]>
USB: serial: ftdi_sio: clean up receive processing
Johan Hovold <[email protected]>
USB: serial: ftdi_sio: make process-packet buffer unsigned
Jesper Dangaard Brouer <[email protected]>
selftests/bpf: test_progs avoid minus shell exit codes
Jesper Dangaard Brouer <[email protected]>
selftests/bpf: test_progs use another shell exit on non-actions
Martin KaFai Lau <[email protected]>
bpf: selftests: Restore netns after each test
Jesper Dangaard Brouer <[email protected]>
selftests/bpf: Test_progs indicate to shell on non-actions
Qais Yousef <[email protected]>
sched/uclamp: Protect uclamp fast path code with static key
Yishai Hadas <[email protected]>
IB/uverbs: Set IOVA on IB MR in uverbs layer
Paul Kocialkowski <[email protected]>
media: rockchip: rga: Only set output CSC mode for RGB input
Paul Kocialkowski <[email protected]>
media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic
Dafna Hirschfeld <[email protected]>
media: staging: rkisp1: rsz: set default format if the given format is not RKISP1_ISP_SD_SRC
Dafna Hirschfeld <[email protected]>
media: staging: rkisp1: rename macros 'RKISP1_DIR_*' to 'RKISP1_ISP_SD_*'
Dafna Hirschfeld <[email protected]>
media: staging: rkisp1: remove macro RKISP1_DIR_SINK_SRC
Sebastian Reichel <[email protected]>
rtc: cpcap: fix range
Jason Gunthorpe <[email protected]>
RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah()
Kamal Heib <[email protected]>
RDMA/ipoib: Return void from ipoib_ib_dev_stop()
Chen Tao <[email protected]>
drm/amdgpu/debugfs: fix memory leak when pm_runtime_get_sync failed
Qiushi Wu <[email protected]>
platform/chrome: cros_ec_ishtp: Fix a double-unlock issue
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: ECC error handling on EDU transfers
Boris Brezillon <[email protected]>
mtd: rawnand: fsl_upm: Remove unused mtd var
Eric Dumazet <[email protected]>
octeontx2-af: change (struct qmem)->entry_sz from u8 to u16
Charles Keepax <[email protected]>
mfd: arizona: Ensure 32k clock is put on driver unbind and error
Herbert Xu <[email protected]>
crypto: algif_aead - Only wake up when ctx->more is zero
Paul Cercueil <[email protected]>
drm/ingenic: Fix incorrect assumption about plane->index
Liu Ying <[email protected]>
drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
Dan Williams <[email protected]>
libnvdimm: Validate command family indices
Sibi Sankar <[email protected]>
remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load
Sibi Sankar <[email protected]>
remoteproc: qcom_q6v5_mss: Validate MBA firmware size before load
Sibi Sankar <[email protected]>
remoteproc: qcom: q6v5: Update running state before requesting stop
Bob Peterson <[email protected]>
gfs2: Never call gfs2_block_zero_range with an open transaction
Andreas Gruenbacher <[email protected]>
gfs2: Fix refcount leak in gfs2_glock_poke
Adrian Hunter <[email protected]>
perf intel-pt: Fix duplicate branch after CBR
Adrian Hunter <[email protected]>
perf intel-pt: Fix FUP packet state
Masami Hiramatsu <[email protected]>
perf probe: Fix memory leakage when the probe point is not found
Masami Hiramatsu <[email protected]>
perf probe: Fix wrong variable warning when the probe point is not found
Masami Hiramatsu <[email protected]>
bootconfig: Fix to find the initargs correctly
Kees Cook <[email protected]>
module: Correctly truncate sysfs sections output
Johannes Thumshirn <[email protected]>
dm: don't call report zones for more than the user requested
John Dorminy <[email protected]>
dm ebs: Fix incorrect checking for REQ_OP_FLUSH
Anton Blanchard <[email protected]>
pseries: Fix 64 bit logical memory block panic
Jeff Layton <[email protected]>
ceph: handle zero-length feature mask in session messages
Jeff Layton <[email protected]>
ceph: set sec_context xattr on symlink creation
Ahmad Fatoum <[email protected]>
watchdog: f71808e_wdt: clear watchdog timeout occurred flag
Ahmad Fatoum <[email protected]>
watchdog: f71808e_wdt: remove use of wrong watchdog_info option
Ahmad Fatoum <[email protected]>
watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
Steven Rostedt (VMware) <[email protected]>
tracing: Use trace_sched_process_free() instead of exit() for pid tracing
Kevin Hao <[email protected]>
tracing/hwlat: Honor the tracing_cpumask
Muchun Song <[email protected]>
kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler
Chengming Zhou <[email protected]>
ftrace: Setup correct FTRACE_FL_REGS flags for module
Jia He <[email protected]>
mm/memory_hotplug: fix unpaired mem_hotplug_begin/done
Mike Kravetz <[email protected]>
cma: don't quit at first error when activating reserved areas
Michal Koutný <[email protected]>
mm/page_counter.c: fix protection usage propagation
Junxiao Bi <[email protected]>
ocfs2: change slot number type s16 to u16
Peter Zijlstra <[email protected]>
mm: fix kthread_use_mm() vs TLB invalidate
David Hildenbrand <[email protected]>
mm/shuffle: don't move pages between zones and don't read garbage memmaps
Mike Kravetz <[email protected]>
hugetlbfs: remove call to huge_pte_alloc without i_mmap_rwsem
Hugh Dickins <[email protected]>
khugepaged: retract_page_tables() remember to test exit
Hugh Dickins <[email protected]>
khugepaged: collapse_pte_mapped_thp() protect the pmd lock
Peter Xu <[email protected]>
mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
Hugh Dickins <[email protected]>
khugepaged: collapse_pte_mapped_thp() flush the right range
Mikulas Patocka <[email protected]>
ext2: fix missing percpu_counter_inc
Mike Rapoport <[email protected]>
MIPS: SGI-IP27: always enable NUMA in Kconfig
Paul Cercueil <[email protected]>
MIPS: qi_lb60: Fix routing to audio amplifier
Huacai Chen <[email protected]>
MIPS: CPU#0 is not hotpluggable
Lukas Wunner <[email protected]>
driver core: Avoid binding drivers to dead devices
Vincent Duvert <[email protected]>
appletalk: Fix atalk_proc_init() return path
Johannes Berg <[email protected]>
mac80211: fix misplaced while instead of if
Coly Li <[email protected]>
bcache: use disk_{start,end}_io_acct() to count I/O for bcache device
Coly Li <[email protected]>
bcache: fix bio_{start,end}_io_acct with proper device
Coly Li <[email protected]>
bcache: avoid nr_stripes overflow in bcache_device_init()
Coly Li <[email protected]>
bcache: fix overflow in offset_to_stripe()
Coly Li <[email protected]>
bcache: allocate meta data pages as compound pages
ChangSyun Peng <[email protected]>
md/raid5: Fix Force reconstruct-write io stuck in degraded raid5
Kees Cook <[email protected]>
selftests/seccomp: Set NNP for TSYNC ESRCH flag test
Kees Cook <[email protected]>
net/compat: Add missing sock updates for SCM_RIGHTS
Kees Cook <[email protected]>
pidfd: Add missing sock updates for pidfd_getfd()
Zenghui Yu <[email protected]>
irqchip/gic-v4.1: Ensure accessing the correct RD when writing INVALLR
Huacai Chen <[email protected]>
irqchip/loongson-liointc: Fix misuse of gc->mask_cache
Jonathan McDowell <[email protected]>
net: stmmac: dwmac1000: provide multicast filter fallback
Jonathan McDowell <[email protected]>
net: ethernet: stmmac: Disable hardware multicast filter
Eugeniu Rosca <[email protected]>
media: vsp1: dl: Fix NULL pointer dereference on unbind
Mansur Alisha Shaik <[email protected]>
media: venus: fix multiple encoder crash
Paul Cercueil <[email protected]>
pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ
Paul Cercueil <[email protected]>
pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH
Michael Ellerman <[email protected]>
powerpc: Fix circular dependency between percpu.h and mmu.h
Michael Ellerman <[email protected]>
powerpc: Allow 4224 bytes of stack expansion for the signal frame
Christophe Leroy <[email protected]>
powerpc/ptdump: Fix build failure in hashpagetable.c
Paul Aurich <[email protected]>
cifs: Fix leak when handling lease break for cached root fid
Max Filippov <[email protected]>
xtensa: fix xtensa_pmu_setup prototype
Max Filippov <[email protected]>
xtensa: add missing exclusive access state management
Lorenzo Bianconi <[email protected]>
iio: imu: st_lsm6dsx: reset hw ts after resume
Alexandru Ardelean <[email protected]>
iio: dac: ad5592r: fix unbalanced mutex unlocks in ad5592r_read_raw()
Christian Eggers <[email protected]>
dt-bindings: iio: io-channel-mux: Fix compatible string in example code
Shaokun Zhang <[email protected]>
arm64: perf: Correct the event index in sysfs
Sibi Sankar <[email protected]>
arm64: dts: qcom: sc7180: Drop the unused non-MSA SID
Boleyn Su <[email protected]>
btrfs: check correct variable after allocation in btrfs_backref_iter_alloc
Pavel Machek <[email protected]>
btrfs: fix return value mixup in btrfs_get_extent
Josef Bacik <[email protected]>
btrfs: make sure SB_I_VERSION doesn't get unset by remount
Qu Wenruo <[email protected]>
btrfs: trim: fix underflow in trim length to prevent access beyond device boundary
Filipe Manana <[email protected]>
btrfs: fix memory leaks after failure to lookup checksums during inode logging
Qu Wenruo <[email protected]>
btrfs: inode: fix NULL pointer dereference if inode doesn't need compression
Josef Bacik <[email protected]>
btrfs: only search for left_info if there is no right_info in try_merge_free_space
David Sterba <[email protected]>
btrfs: fix messages after changing compression level by remount
Josef Bacik <[email protected]>
btrfs: don't show full path of bind mounts in subvol=
Filipe Manana <[email protected]>
btrfs: fix race between page release and a fast fsync
Josef Bacik <[email protected]>
btrfs: don't WARN if we abort a transaction with EROFS
Josef Bacik <[email protected]>
btrfs: sysfs: use NOFS for device creation
Josef Bacik <[email protected]>
btrfs: return EROFS for BTRFS_FS_STATE_ERROR cases
Qu Wenruo <[email protected]>
btrfs: avoid possible signal interruption of btrfs_drop_snapshot() on relocation tree
David Sterba <[email protected]>
btrfs: add missing check for nocow and compression inode flags
Qu Wenruo <[email protected]>
btrfs: relocation: review the call sites which can be interrupted by signal
Josef Bacik <[email protected]>
btrfs: move the chunk_mutex in btrfs_read_chunk_tree
Josef Bacik <[email protected]>
btrfs: open device without device_list_mutex
Johannes Thumshirn <[email protected]>
btrfs: pass checksum type via BTRFS_IOC_FS_INFO ioctl
Anand Jain <[email protected]>
btrfs: don't traverse into the seed devices in show_devname
Filipe Manana <[email protected]>
btrfs: remove no longer needed use of log_writers for the log root tree
Filipe Manana <[email protected]>
btrfs: only commit delayed items at fsync if we are logging a directory
Filipe Manana <[email protected]>
btrfs: stop incremening log_batch for the log root tree when syncing log
Filipe Manana <[email protected]>
btrfs: only commit the delayed inode when doing a full fsync
Tom Rix <[email protected]>
btrfs: ref-verify: fix memory leak in add_block_entry
Qu Wenruo <[email protected]>
btrfs: preallocate anon block device at first phase of snapshot creation
Qu Wenruo <[email protected]>
btrfs: don't allocate anonymous block device for user invisible roots
Qu Wenruo <[email protected]>
btrfs: free anon block device right after subvolume deletion
David Sterba <[email protected]>
btrfs: allow use of global block reserve for balance item deletion
Ansuel Smith <[email protected]>
PCI: qcom: Add support for tx term offset for rev 2.1.0
Ansuel Smith <[email protected]>
PCI: qcom: Define some PARF params needed for ipq8064 SoC
Rajat Jain <[email protected]>
PCI: Add device even if driver attach failed
Kai-Heng Feng <[email protected]>
PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken
Ashok Raj <[email protected]>
PCI/ATS: Add pci_pri_supported() to check device or associated PF
Rafael J. Wysocki <[email protected]>
PCI: hotplug: ACPI: Fix context refcounting in acpiphp_grab_context()
Guenter Roeck <[email protected]>
genirq/PM: Always unlock IRQ descriptor in rearm_wake_irq()
Guenter Roeck <[email protected]>
genirq: Unlock irq descriptor after errors
Thomas Gleixner <[email protected]>
genirq/affinity: Make affinity setting if activated opt-in
Steve French <[email protected]>
SMB3: Fix mkdir when idsfromsid configured on mount
Steve French <[email protected]>
smb3: warn on confusing error scenario with sec=krb5
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Fix unused variable warning
-------------
Diffstat:
Documentation/admin-guide/hw-vuln/multihit.rst | 4 + .../bindings/iio/multiplexer/io-channel-mux.txt | 2 +- Makefile | 4 +- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- arch/arm64/kernel/perf_event.c | 13 +- arch/mips/Kconfig | 1 + arch/mips/boot/dts/ingenic/qi_lb60.dts | 2 +- arch/mips/kernel/topology.c | 2 +- arch/openrisc/kernel/stacktrace.c | 18 ++- arch/powerpc/include/asm/percpu.h | 4 +- arch/powerpc/mm/fault.c | 7 +- arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- arch/s390/Kconfig | 1 + arch/s390/lib/test_unwind.c | 1 + arch/sh/boards/mach-landisk/setup.c | 3 + arch/sh/mm/fault.c | 1 - arch/x86/events/rapl.c | 2 +- arch/x86/kernel/apic/vector.c | 4 + arch/x86/kernel/cpu/bugs.c | 8 +- arch/x86/kernel/tsc_msr.c | 9 +- arch/xtensa/include/asm/thread_info.h | 4 + arch/xtensa/kernel/asm-offsets.c | 3 + arch/xtensa/kernel/entry.S | 11 ++ arch/xtensa/kernel/perf_event.c | 2 +- crypto/af_alg.c | 11 +- crypto/algif_aead.c | 10 +- crypto/algif_skcipher.c | 11 +- drivers/acpi/nfit/core.c | 11 +- drivers/acpi/nfit/nfit.h | 1 - drivers/base/dd.c | 4 +- drivers/clk/Kconfig | 2 +- drivers/clk/actions/owl-s500.c | 2 +- drivers/clk/bcm/clk-bcm2835.c | 25 +++- drivers/clk/qcom/clk-alpha-pll.c | 2 - drivers/clk/qcom/gcc-sdm660.c | 3 + drivers/clk/qcom/gcc-sm8150.c | 8 +- drivers/clk/sirf/clk-atlas6.c | 2 +- drivers/crypto/caam/caamalg.c | 29 ----- drivers/crypto/caam/compat.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 11 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 69 +++++++++- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 +- drivers/gpu/drm/drm_dp_mst_topology.c | 41 +++--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/i915/gt/intel_gt.c | 5 + drivers/gpu/drm/imx/imx-ldb.c | 7 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- 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 + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- drivers/gpu/ipu-v3/ipu-image-convert.c | 145 +++++++++++++-------- drivers/i2c/busses/i2c-bcm-iproc.c | 13 +- drivers/i2c/busses/i2c-rcar.c | 15 ++- drivers/iio/dac/ad5592r-base.c | 4 +- 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 +- drivers/infiniband/core/counters.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 4 + drivers/infiniband/hw/cxgb4/mem.c | 1 - drivers/infiniband/hw/mlx4/mr.c | 1 - drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 67 +++++----- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + drivers/input/mouse/sentelic.c | 2 +- drivers/iommu/intel/dmar.c | 21 ++- drivers/iommu/intel/iommu.c | 7 +- drivers/iommu/intel/svm.c | 22 ++-- drivers/iommu/omap-iommu-debug.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 15 ++- drivers/irqchip/irq-loongson-liointc.c | 10 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/journal.c | 4 +- drivers/md/bcache/request.c | 14 +- drivers/md/bcache/super.c | 14 +- drivers/md/bcache/writeback.c | 14 +- drivers/md/bcache/writeback.h | 19 ++- drivers/md/dm-ebs-target.c | 2 +- drivers/md/dm-rq.c | 3 - drivers/md/dm.c | 3 +- drivers/md/md-cluster.c | 1 + drivers/md/raid5.c | 3 +- drivers/media/platform/qcom/venus/pm_helpers.c | 4 + drivers/media/platform/rockchip/rga/rga-hw.c | 29 +++-- drivers/media/platform/rockchip/rga/rga-hw.h | 5 + drivers/media/platform/vsp1/vsp1_dl.c | 2 + drivers/mfd/arizona-core.c | 18 +++ drivers/mfd/dln2.c | 4 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 18 ++- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 26 ++++ drivers/mtd/nand/raw/fsl_upm.c | 1 - drivers/mtd/ubi/fastmap-wl.c | 5 + drivers/mtd/ubi/wl.c | 3 +- drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- drivers/net/ethernet/qualcomm/emac/emac.c | 17 ++- .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 + drivers/net/wireless/realtek/rtw88/pci.c | 9 ++ drivers/nvdimm/bus.c | 16 +++ drivers/nvdimm/security.c | 13 +- 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 ++- drivers/pci/ats.c | 15 +++ drivers/pci/bus.c | 6 +- drivers/pci/controller/dwc/pcie-qcom.c | 41 +++++- drivers/pci/controller/pci-hyperv.c | 71 +++++----- drivers/pci/hotplug/acpiphp_glue.c | 14 +- drivers/pci/quirks.c | 5 +- drivers/pinctrl/pinctrl-ingenic.c | 9 +- drivers/platform/chrome/cros_ec_ishtp.c | 4 +- drivers/pwm/pwm-bcm-iproc.c | 9 +- drivers/remoteproc/qcom_q6v5.c | 2 + drivers/remoteproc/qcom_q6v5_mss.c | 11 +- drivers/rtc/rtc-cpcap.c | 2 +- drivers/rtc/rtc-pl031.c | 1 + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/staging/media/rkisp1/rkisp1-common.h | 3 + drivers/staging/media/rkisp1/rkisp1-isp.c | 46 +++---- drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- drivers/usb/serial/ftdi_sio.c | 57 ++++---- drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- drivers/watchdog/f71808e_wdt.c | 13 +- drivers/watchdog/rti_wdt.c | 2 + drivers/watchdog/watchdog_dev.c | 18 +-- fs/btrfs/backref.c | 2 +- fs/btrfs/ctree.h | 4 +- fs/btrfs/disk-io.c | 78 ++++++++++- fs/btrfs/disk-io.h | 2 + fs/btrfs/extent-io-tree.h | 2 + fs/btrfs/extent-tree.c | 23 +++- fs/btrfs/extent_io.c | 18 ++- fs/btrfs/free-space-cache.c | 4 +- fs/btrfs/inode.c | 20 ++- fs/btrfs/ioctl.c | 67 ++++++++-- fs/btrfs/ref-verify.c | 2 + fs/btrfs/relocation.c | 12 +- fs/btrfs/scrub.c | 2 +- fs/btrfs/super.c | 51 +++++--- fs/btrfs/sysfs.c | 3 + fs/btrfs/transaction.c | 7 +- fs/btrfs/transaction.h | 2 + fs/btrfs/tree-log.c | 43 ++---- fs/btrfs/volumes.c | 48 ++++++- fs/ceph/dir.c | 4 + fs/ceph/mds_client.c | 6 +- fs/cifs/smb2inode.c | 1 + fs/cifs/smb2misc.c | 73 ++++++++--- fs/cifs/smb2pdu.c | 2 + fs/ext2/ialloc.c | 3 +- fs/f2fs/compress.c | 2 + fs/f2fs/data.c | 4 + fs/gfs2/bmap.c | 69 +++++----- fs/gfs2/glock.c | 4 +- fs/minix/inode.c | 12 +- fs/minix/itree_v1.c | 12 +- fs/minix/itree_v2.c | 13 +- fs/minix/minix.h | 1 - fs/nfs/file.c | 17 ++- fs/nfs/flexfilelayout/flexfilelayout.c | 50 +++++-- fs/nfs/nfs4file.c | 5 +- fs/nfs/nfs4proc.c | 2 - fs/nfs/nfs4xdr.c | 6 +- fs/nfs/pnfs.c | 4 +- fs/nfs/pnfs.h | 2 +- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/suballoc.c | 4 +- fs/ocfs2/super.c | 4 +- fs/ubifs/journal.c | 10 +- fs/ufs/super.c | 2 +- include/crypto/if_alg.h | 4 +- include/linux/fs.h | 10 ++ include/linux/hugetlb.h | 8 +- include/linux/intel-iommu.h | 4 +- include/linux/irq.h | 13 ++ include/linux/libnvdimm.h | 2 + include/linux/pci-ats.h | 4 + include/net/sock.h | 4 + include/uapi/linux/btrfs.h | 14 +- include/uapi/linux/ndctl.h | 4 + init/main.c | 14 +- kernel/irq/manage.c | 13 +- kernel/irq/pm.c | 8 +- kernel/kprobes.c | 24 +++- kernel/kthread.c | 7 +- kernel/module.c | 22 +++- kernel/pid.c | 7 +- kernel/sched/core.c | 81 +++++++++++- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/sched.h | 47 ++++++- kernel/trace/ftrace.c | 15 ++- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_hwlat.c | 5 +- lib/devres.c | 11 +- lib/test_kmod.c | 2 +- lib/test_lockup.c | 4 +- mm/cma.c | 23 ++-- mm/hugetlb.c | 39 +++--- mm/khugepaged.c | 70 +++++----- mm/memory_hotplug.c | 5 +- mm/page_counter.c | 6 +- mm/rmap.c | 2 +- mm/shuffle.c | 18 +-- net/appletalk/atalk_proc.c | 2 + net/compat.c | 1 + net/core/sock.c | 21 +++ net/mac80211/sta_info.c | 2 +- scripts/recordmcount.c | 2 + security/integrity/ima/ima_policy.c | 15 ++- sound/pci/echoaudio/echoaudio.c | 2 - sound/pci/hda/patch_realtek.c | 2 - tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 2 - tools/perf/bench/mem-functions.c | 21 +-- tools/perf/builtin-record.c | 4 +- tools/perf/tests/parse-events.c | 37 +++++- tools/perf/util/evsel.c | 6 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 29 ++--- tools/perf/util/parse-events.c | 28 ++++ tools/perf/util/parse-events.h | 2 + tools/perf/util/parse-events.l | 19 +-- tools/perf/util/probe-finder.c | 5 +- tools/testing/selftests/bpf/Makefile | 49 +++---- tools/testing/selftests/bpf/test_progs.c | 33 ++++- tools/testing/selftests/bpf/test_progs.h | 2 + .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 55 ++++---- tools/testing/selftests/seccomp/seccomp_bpf.c | 5 + 244 files changed, 2095 insertions(+), 909 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 47/232 xtensa: add missing exclusive access state management
From: Max Filippov <[email protected]>
commit a0fc1436f1f4f84e93144480bf30e0c958d135b6 upstream.
The result of the s32ex opcode is recorded in the ATOMCTL special register and must be retrieved with the getex opcode. Context switch between s32ex and getex may trash the ATOMCTL register and result in duplicate update or missing update of the atomic variable. Add atomctl8 field to the struct thread_info and use getex to swap ATOMCTL bit 8 as a part of context switch.
Clear exclusive access monitor on kernel entry.
--- arch/xtensa/include/asm/thread_info.h | 4 ++++ arch/xtensa/kernel/asm-offsets.c | 3 +++ arch/xtensa/kernel/entry.S | 11 +++++++++++ 3 files changed, 18 insertions(+)
arch/xtensa/include/asm/thread_info.h +4 -0
@@ -55,6 +55,10 @@ struct thread_info {mm_segment_t addr_limit;/* thread address space */ unsigned long cpenable; +#if XCHAL_HAVE_EXCLUSIVE +/* result of the most recent exclusive store */ +unsigned long atomctl8; +#endif /* Allocate storage for extra user states and coprocessor states. */ #if XTENSA_HAVE_COPROCESSORS
arch/xtensa/kernel/asm-offsets.c +3 -0
@@ -93,6 +93,9 @@ int main(void) DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra)); DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp));DEFINE (THREAD_CPENABLE , offsetof (struct thread_info , cpenable)); +#if XCHAL_HAVE_EXCLUSIVE +DEFINE (THREAD_ATOMCTL8 , offsetof (struct thread_info , atomctl8)); +#endif #if XTENSA_HAVE_COPROCESSORS DEFINE(THREAD_XTREGS_CP0, offsetof(struct thread_info, xtregs_cp.cp0)); DEFINE(THREAD_XTREGS_CP1, offsetof(struct thread_info, xtregs_cp.cp1));
arch/xtensa/kernel/entry.S +11 -0
@@ -374,6 +374,11 @@ common_exception: s32i a2, a1, PT_LCOUNT #endif +#if XCHAL_HAVE_EXCLUSIVE + /* Clear exclusive access monitor set by interrupted code */ + clrex +#endif + /* It is now save to restore the EXC_TABLE_FIXUP variable. */ rsr a2, exccause
@@ -2020,6 +2025,12 @@ ENTRY(_switch_to) s32i a3, a4, THREAD_CPENABLE #endif +#if XCHAL_HAVE_EXCLUSIVE + l32i a3, a5, THREAD_ATOMCTL8 + getex a3 + s32i a3, a4, THREAD_ATOMCTL8 +#endif + /* Flush register file. */ spill_registers_kernel
Greg Kroah-Hartman
maintainerPATCH 48/232 xtensa: fix xtensa_pmu_setup prototype
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit 6d65d3769d1910379e1cfa61ebf387efc6bfb22c upstream.
Fix the following build error in configurations with CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS=y:
arch/xtensa/kernel/perf_event.c:420:29: error: passing argument 3 of ‘cpuhp_setup_state’ from incompatible pointer type
--- arch/xtensa/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/perf_event.c +1 -1
@@ -399,7 +399,7 @@ static struct pmu xtensa_pmu = { .read = xtensa_pmu_read, }; -static int xtensa_pmu_setup (int cpu) +static int xtensa_pmu_setup (unsigned int cpu) {unsigned i;
Greg Kroah-Hartman
maintainerPATCH 50/232 powerpc/ptdump: Fix build failure in hashpagetable.c
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 7c466b0807960edc13e4b855be85ea765df9a6cd upstream.
H_SUCCESS is only defined when CONFIG_PPC_PSERIES is defined.
!= H_SUCCESS means != 0. Modify the test accordingly.
--- arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/ptdump/hashpagetable.c +1 -1
@@ -258,7 +258,7 @@ static int pseries_find(unsigned long eafor (i =0 ; i <HPTES_PER_GROUP ; i +=4 , hpte_group +=4 ) { lpar_rc =plpar_pte_read_4 (0 , hpte_group, (void *)ptes); -if (lpar_rc !=H_SUCCESS ) +if (lpar_rc)continue ;for (j =0 ; j <4 ; j++) { if (HPTE_V_COMPARE(ptes[j].v, want_v) &&
Greg Kroah-Hartman
maintainerPATCH 51/232 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
@@ -267,6 +267,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)
@@ -274,7 +277,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
@@ -299,7 +302,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 53/232 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 55/232 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 32/232 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
@@ -4502,15 +4502,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 31/232 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 77/232 khugepaged: collapse_pte_mapped_thp() flush the right range
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 723a80dafed5c95889d48baab9aa433a6ffa0b4e upstream.
pmdp_collapse_flush() should be given the start address at which the huge page is mapped, haddr: it was given addr, which at that point has been used as a local variable, incremented to the end address of the extent.
Found by source inspection while chasing a hugepage locking bug, which I then could not explain by this. At first I thought this was very bad; then saw that all of the page translations that were not flushed would actually still point to the right pages afterwards, so harmless; then realized that I know nothing of how different architectures and models cache intermediate paging structures, so maybe it matters after all - particularly since the page table concerned is immediately freed.
Much easier to fix than to think about.
--- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/khugepaged.c +1 -1
@@ -1502,7 +1502,7 @@ void collapse_pte_mapped_thp(struct mm_s/* step 4: collapse pmd */ ptl =pmd_lock (vma->vm_mm, pmd); - _pmd =pmdp_collapse_flush (vma, addr, pmd); + _pmd =pmdp_collapse_flush (vma, haddr, pmd);spin_unlock (ptl);mm_dec_nr_ptes (mm);pte_free (mm,pmd_pgtable (_pmd));
Greg Kroah-Hartman
maintainerPATCH 76/232 ext2: fix missing percpu_counter_inc
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit bc2fbaa4d3808aef82dd1064a8e61c16549fe956 upstream.
sbi->s_freeinodes_counter is only decreased by the ext2 code, it is never increased. This patch fixes it.
Note that sbi->s_freeinodes_counter is only used in the algorithm that tries to find the group for new allocations, so this bug is not easily visible (the only visibility is that the group finding algorithm selects inoptinal result).
--- fs/ext2/ialloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext2/ialloc.c +2 -1
@@ -80,6 +80,7 @@ static void ext2_release_inode(struct suif (dir)le16_add_cpu (&desc->bg_used_dirs_count,-1 );spin_unlock (sb_bgl_lock (EXT2_SB (sb), group)); +percpu_counter_inc (&EXT2_SB (sb)->s_freeinodes_counter);if (dir)percpu_counter_dec (&EXT2_SB (sb)->s_dirs_counter);mark_buffer_dirty (bh);
@@ -528,7 +529,7 @@ got: goto fail; } -percpu_counter_add (&sbi->s_freeinodes_counter,-1 ); +percpu_counter_dec (&sbi->s_freeinodes_counter);if (S_ISDIR (mode))percpu_counter_inc (&sbi->s_dirs_counter);
Greg Kroah-Hartman
maintainerPATCH 78/232 mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 75802ca66354a39ab8e35822747cd08b3384a99a upstream.
This is found by code observation only.
Firstly, the worst case scenario should assume the whole range was covered by pmd sharing. The old algorithm might not work as expected for ranges like (1g-2m, 1g+2m), where the adjusted range should be (0, 1g+2m) but the expected range should be (0, 2g).
Since at it, remove the loop since it should not be required. With that, the new code should be faster too when the invalidating range is huge.
Mike said:
: With range (1g-2m, 1g+2m) within a vma (0, 2g) the existing code will only : adjust to (0, 1g+2m) which is incorrect.
:
: We should cc stable. The original reason for adjusting the range was to : prevent data corruption (getting wrong page). Since the range is not : always adjusted correctly, the potential for corruption still exists. :
: However, I am fairly confident that adjust_range_if_pmd_sharing_possible : is only gong to be called in two cases:
:
: 1) for a single page
: 2) for range == entire vma
:
: In those cases, the current code should produce the correct results. :
: To be safe, let's just cc stable.
--- mm/hugetlb.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
mm/hugetlb.c +10 -14
@@ -5313,25 +5313,21 @@ static bool vma_shareable(struct vm_areavoid adjust_range_if_pmd_sharing_possible (struct vm_area_struct *vma,unsigned long *start,unsigned long *end) { -unsigned long check_addr; +unsigned long a_start, a_end;if (!(vma->vm_flags &VM_MAYSHARE ))return ; -for (check_addr = *start; check_addr < *end; check_addr +=PUD_SIZE ) { -unsigned long a_start = check_addr &PUD_MASK ; -unsigned long a_end = a_start +PUD_SIZE ; +/* Extend the range to be PUD aligned for a worst case scenario */ + a_start =ALIGN_DOWN (*start,PUD_SIZE ); + a_end =ALIGN (*end,PUD_SIZE ); -/* -* If sharing is possible, adjust start/end if necessary. -*/ -if (range_in_vma (vma, a_start, a_end)) { -if (a_start < *start) - *start = a_start; -if (a_end > *end) - *end = a_end; - } - } +/* +* Intersect the range with the vma range, since pmd sharing won't be +* across vma after all +*/ + *start =max (vma->vm_start, a_start); + *end =min (vma->vm_end, a_end); }/*
Greg Kroah-Hartman
maintainerPATCH 61/232 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 ),
@@ -642,10 +643,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 65/232 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
@@ -1776,7 +1776,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 67/232 bcache: avoid nr_stripes overflow in bcache_device_init()
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
commit 65f0f017e7be8c70330372df23bcb2a407ecf02d upstream.
For some block devices which large capacity (e.g. 8TB) but small io_opt size (e.g. 8 sectors), in bcache_device_init() the stripes number calcu- lated by,
DIV_ROUND_UP_ULL(sectors, d->stripe_size);
might be overflow to the unsigned int bcache_device->nr_stripes.
This patch uses the uint64_t variable to store DIV_ROUND_UP_ULL() and after the value is checked to be available in unsigned int range, sets it to bache_device->nr_stripes. Then the overflow is avoided.
--- drivers/md/bcache/super.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/md/bcache/super.c +6 -6
@@ -826,19 +826,19 @@ static int bcache_device_init(struct bcastruct request_queue *q;const size_t max_stripes =min_t (size_t,INT_MAX ,SIZE_MAX /sizeof (atomic_t)); -size_t n; +uint64_t n;int idx;if (!d->stripe_size) d->stripe_size =1 <<31 ; - d->nr_stripes =DIV_ROUND_UP_ULL (sectors, d->stripe_size); - -if (!d->nr_stripes || d->nr_stripes > max_stripes) { -pr_err ("nr_stripes too large or invalid: %u (start sector beyond end of disk?)\n" , - (unsigned int )d->nr_stripes); + n =DIV_ROUND_UP_ULL (sectors, d->stripe_size); +if (!n || n > max_stripes) { +pr_err ("nr_stripes too large or invalid: %llu (start sector beyond end of disk?)\n" , + n);return -ENOMEM ; } + d->nr_stripes = n; n = d->nr_stripes *sizeof (atomic_t); d->stripe_sectors_dirty =kvzalloc (n,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 66/232 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 107/232 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 105/232 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 106/232 gfs2: Fix refcount leak in gfs2_glock_poke
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit c07bfb4d8fa1ee11c6d18b093d0bb6c8832d3626 upstream.
In gfs2_glock_poke, make sure gfs2_holder_uninit is called on the local glock holder. Without that, we're leaking a glock and a pid reference.
--- fs/gfs2/glock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/gfs2/glock.c +3 -1
@@ -790,9 +790,11 @@ static void gfs2_glock_poke(struct gfs2_struct gfs2_holder gh;int error; - error =gfs2_glock_nq_init (gl,LM_ST_SHARED , flags, &gh); +gfs2_holder_init (gl,LM_ST_SHARED , flags, &gh); + error =gfs2_glock_nq (&gh);if (!error)gfs2_glock_dq (&gh); +gfs2_holder_uninit (&gh); }static bool gfs2_try_evict (struct gfs2_glock *gl)
Greg Kroah-Hartman
maintainerPATCH 109/232 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
@@ -407,6 +407,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 110/232 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
@@ -1144,15 +1144,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 108/232 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 94/232 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 134/232 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 138/232 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 125/232 media: staging: rkisp1: rename macros RKISP1_DIR_* to RKISP1_ISP_SD_*
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit c247818a873adcb8488021eed38c330ea8b288a3 ]
The macros 'RKISP1_DIR_*' are flags that indicate on which pads of the isp subdevice the media bus code is supported. So the prefix RKISP1_ISP_SD_ is better.
--- drivers/staging/media/rkisp1/rkisp1-isp.c | 46 +++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/staging/media/rkisp1/rkisp1-isp.c +23 -23
@@ -23,8 +23,8 @@#define RKISP1_ISP_DEV_NAME RKISP1_DRIVER_NAME "_isp" -#define RKISP1_DIR_SRC BIT(0) -#define RKISP1_DIR_SINK BIT(1) +#define RKISP1_ISP_SD_SRC BIT(0) +#define RKISP1_ISP_SD_SINK BIT(1)/* * NOTE: MIPI controller and input MUX are also configured in this file.
@@ -61,119 +61,119 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = { { .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, .pixel_enc = V4L2_PIXEL_ENC_YUV, - .direction = RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 10, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 10, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 10, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 10, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 12, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 12, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 12, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 12, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 8, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 8, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 8, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 8, - .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, + .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR, .bus_width = 16, - .direction = RKISP1_DIR_SINK, + .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB, .bus_width = 16, - .direction = RKISP1_DIR_SINK, + .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY, .bus_width = 16, - .direction = RKISP1_DIR_SINK, + .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY, .bus_width = 16, - .direction = RKISP1_DIR_SINK, + .direction = RKISP1_ISP_SD_SINK, }, };
@@ -573,9 +573,9 @@ static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,int pos =0 ;if (code->pad ==RKISP1_ISP_PAD_SINK_VIDEO ) { - dir =RKISP1_DIR_SINK ; + dir =RKISP1_ISP_SD_SINK ; }else if (code->pad ==RKISP1_ISP_PAD_SOURCE_VIDEO ) { - dir =RKISP1_DIR_SRC ; + dir =RKISP1_ISP_SD_SRC ; }else {if (code->index >0 )return -EINVAL ;
@@ -660,7 +660,7 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp, src_fmt->code = format->code; mbus_info =rkisp1_isp_mbus_info_get (src_fmt->code); -if (!mbus_info || !(mbus_info->direction &RKISP1_DIR_SRC )) { +if (!mbus_info || !(mbus_info->direction &RKISP1_ISP_SD_SRC )) { src_fmt->code =RKISP1_DEF_SRC_PAD_FMT ; mbus_info =rkisp1_isp_mbus_info_get (src_fmt->code); }
@@ -744,7 +744,7 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp, which); sink_fmt->code = format->code; mbus_info =rkisp1_isp_mbus_info_get (sink_fmt->code); -if (!mbus_info || !(mbus_info->direction &RKISP1_DIR_SINK )) { +if (!mbus_info || !(mbus_info->direction &RKISP1_ISP_SD_SINK )) { sink_fmt->code =RKISP1_DEF_SINK_PAD_FMT ; mbus_info =rkisp1_isp_mbus_info_get (sink_fmt->code); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 150/232 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
@@ -1353,6 +1353,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 148/232 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 129/232 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
@@ -770,6 +770,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;
@@ -861,6 +862,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 147/232 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 168/232 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 167/232 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
@@ -362,6 +362,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 :
@@ -399,6 +409,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 :
@@ -3344,6 +3355,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", };
@@ -3911,6 +3923,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
@@ -825,6 +825,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)
@@ -574,6 +583,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
@@ -186,6 +186,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
@@ -1082,11 +1082,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;
@@ -1139,8 +1140,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
@@ -1929,11 +1929,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;
@@ -1989,8 +1990,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 ; }
@@ -2025,8 +2027,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 175/232 ubi: fastmap: Free fastmap next anchor peb during detach
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit c3fc1a3919e35a9d8157ed3ae6fd0a478293ba2c ]
ubi_wl_entry related with the fm_next_anchor PEB is not freed during detach, which causes a memory leak.
Don't forget to release fm_next_anchor PEB while detaching ubi from mtd when CONFIG_MTD_UBI_FASTMAP is enabled.
--- drivers/mtd/ubi/fastmap-wl.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mtd/ubi/fastmap-wl.c +5 -0
@@ -381,6 +381,11 @@ static void ubi_fastmap_close(struct ubi_device *ubi) ubi->fm_anchor =NULL ; } +if (ubi->fm_next_anchor) { +return_unused_peb (ubi, ubi->fm_next_anchor); + ubi->fm_next_anchor =NULL ; + } +if (ubi->fm) {for (i =0 ; i < ubi->fm->used_blocks; i++)kfree (ubi->fm->e[i]);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/232 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 179/232 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 180/232 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 177/232 clk: hsdk: Fix bad dependency on IOMEM
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit bd8548d0dcdab514e08e35a3451667486d879dae ]
CONFIG_IOMEM does not exist. The correct symbol to depend on is CONFIG_HAS_IOMEM.
--- drivers/clk/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/Kconfig +1 -1
@@ -50,7 +50,7 @@ source "drivers/clk/versatile/Kconfig" config CLK_HSDK bool "PLL Driver for HSDK platform" depends on OF || COMPILE_TEST - depends on IOMEM + depends on HAS_IOMEM help This driver supports the HSDK core, system, ddr, tunnel and hdmi PLLs control.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 176/232 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 173/232 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 172/232 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 169/232 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 184/232 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 170/232 perf tools: Fix term parsing for raw syntax
In reply to Greg Kroah-HartmanFrom: Jiri Olsa <[email protected]>
[ Upstream commit 4929e95a1400e45b4b5a87fd3ce10273444187d4 ]
Jin Yao reported issue with possible conflict between raw events and term values in pmu event syntax.
Currently following syntax is resolved as raw event with 0xead value:
uncore_imc_free_running/read/
instead of using 'read' term from uncore_imc_free_running pmu, because 'read' is correct raw event syntax with 0xead value.
To solve this issue we do following:
- check existing terms during rXXXX syntax processing and make them priority in case of conflict
- allow pmu/r0x1234/ syntax to be able to specify conflicting raw event (implemented in previous patch)
Also add automated tests for this and perf_pmu__parse_cleanup call to parse_events_terms, so the test gets properly cleaned up.
--- tools/perf/tests/parse-events.c | 37 ++++++++++++++++++++++++++++++++- tools/perf/util/parse-events.c | 28 +++++++++++++++++++++++++ tools/perf/util/parse-events.h | 2 ++ tools/perf/util/parse-events.l | 19 ++++++++++------- 4 files changed, 77 insertions(+), 9 deletions(-)
tools/perf/tests/parse-events.c +36 -1
@@ -631,6 +631,34 @@ static int test__checkterms_simple(struct list_head *terms)TEST_ASSERT_VAL ("wrong val" , term->val.num ==1 );TEST_ASSERT_VAL ("wrong config" , !strcmp (term->config,"umask" )); +/* +* read +* +* The perf_pmu__test_parse_init injects 'read' term into +* perf_pmu_events_list, so 'read' is evaluated as read term +* and not as raw event with 'ead' hex value. +*/ + term = list_entry(term->list.next, struct parse_events_term, list); +TEST_ASSERT_VAL ("wrong type term" , + term->type_term ==PARSE_EVENTS__TERM_TYPE_USER ); +TEST_ASSERT_VAL ("wrong type val" , + term->type_val ==PARSE_EVENTS__TERM_TYPE_NUM ); +TEST_ASSERT_VAL ("wrong val" , term->val.num ==1 ); +TEST_ASSERT_VAL ("wrong config" , !strcmp (term->config,"read" )); + +/* +* r0xead +* +* To be still able to pass 'ead' value with 'r' syntax, +* we added support to parse 'r0xHEX' event. +*/ + term = list_entry(term->list.next, struct parse_events_term, list); +TEST_ASSERT_VAL ("wrong type term" , + term->type_term ==PARSE_EVENTS__TERM_TYPE_CONFIG ); +TEST_ASSERT_VAL ("wrong type val" , + term->type_val ==PARSE_EVENTS__TERM_TYPE_NUM ); +TEST_ASSERT_VAL ("wrong val" , term->val.num ==0xead ); +TEST_ASSERT_VAL ("wrong config" , !term->config);return 0 ; }
@@ -1776,7 +1804,7 @@ struct terms_test {static struct terms_test test__terms[] = { [0 ] = { - .str ="config=10,config1,config2=3,umask=1" , + .str ="config=10,config1,config2=3,umask=1,read,r0xead" , .check = test__checkterms_simple, }, };
@@ -1836,6 +1864,13 @@ static int test_term(struct terms_test *t)INIT_LIST_HEAD (&terms); +/* +* The perf_pmu__test_parse_init prepares perf_pmu_events_list +* which gets freed in parse_events_terms. +*/ +if (perf_pmu__test_parse_init ()) +return -1 ; + ret =parse_events_terms (&terms, t->str);if (ret) { pr_debug("failed to parse terms '%s', err %d\n",
tools/perf/util/parse-events.c +28 -0
@@ -2017,6 +2017,32 @@ static void perf_pmu__parse_init(void)perf_pmu__parse_cleanup (); } +/* +* This function injects special term in +* perf_pmu_events_list so the test code +* can check on this functionality. +*/ +int perf_pmu__test_parse_init (void ) +{ +struct perf_pmu_event_symbol *list; + + list =malloc (sizeof (*list) *1 ); +if (!list) +return -ENOMEM ; + + list->type =PMU_EVENT_SYMBOL ; + list->symbol =strdup ("read" ); + +if (!list->symbol) { +free (list); +return -ENOMEM ; + } + + perf_pmu_events_list = list; + perf_pmu_events_list_num =1 ; +return 0 ; +} +enum perf_pmu_event_symbol_type perf_pmu__parse_check (const char *name) {
@@ -2078,6 +2104,8 @@ int parse_events_terms(struct list_head *terms, const char *str)int ret; ret =parse_events__scanner (str, &parse_state); +perf_pmu__parse_cleanup (); +if (!ret) {list_splice (parse_state.terms, terms);zfree (&parse_state.terms);
tools/perf/util/parse-events.h +2 -0
@@ -253,4 +253,6 @@ static inline bool is_sdt_event(char *str __maybe_unused) }#endif /* HAVE_LIBELF_SUPPORT */ +int perf_pmu__test_parse_init (void ); +#endif /* __PERF_PARSE_EVENTS_H */
tools/perf/util/parse-events.l +11 -8
@@ -41,14 +41,6 @@ static int value(yyscan_t scanner, int base) return __value(yylval, text, base, PE_VALUE); } -static int raw(yyscan_t scanner) -{ - YYSTYPE *yylval = parse_events_get_lval(scanner); - char *text = parse_events_get_text(scanner); - - return __value(yylval, text + 1, 16, PE_RAW); -} - static int str(yyscan_t scanner, int token) { YYSTYPE *yylval = parse_events_get_lval(scanner);
@@ -72,6 +64,17 @@ static int str(yyscan_t scanner, int token) return token; } +static int raw(yyscan_t scanner) +{ + YYSTYPE *yylval = parse_events_get_lval(scanner); + char *text = parse_events_get_text(scanner); + + if (perf_pmu__parse_check(text) == PMU_EVENT_SYMBOL) + return str(scanner, PE_NAME); + + return __value(yylval, text + 1, 16, PE_RAW); +} + static bool isbpf_suffix(char *text) { int len = strlen(text);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 171/232 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
@@ -74,8 +74,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 158/232 iommu/vt-d: Handle non-page aligned address
In reply to Greg Kroah-HartmanFrom: Liu Yi L <[email protected]>
[ Upstream commit 288d08e78008828416ffaa85ef274b4e29ef3dae ]
Address information for device TLB invalidation comes from userspace when device is directly assigned to a guest with vIOMMU support. VT-d requires page aligned address. This patch checks and enforce address to be page aligned, otherwise reserved bits can be set in the invalidation descriptor. Unrecoverable fault will be reported due to non-zero value in the reserved bits.
--- drivers/iommu/intel/dmar.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/iommu/intel/dmar.c +19 -2
@@ -1459,9 +1459,26 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid,* Max Invs Pending (MIP) is set to 0 for now until we have DIT in * ECAP. */ - desc.qw1 |= addr & ~mask; -if (size_order) +if (addr &GENMASK_ULL (size_order +VTD_PAGE_SHIFT ,0 )) +pr_warn_ratelimited ("Invalidate non-aligned address %llx, order %d\n" , + addr, size_order); + +/* Take page address */ + desc.qw1 =QI_DEV_EIOTLB_ADDR (addr); + +if (size_order) { +/* +* Existing 0s in address below size_order may be the least +* significant bit, we must set them to 1s to avoid having +* smaller size than desired. +*/ + desc.qw1 |=GENMASK_ULL (size_order +VTD_PAGE_SHIFT -1 , +VTD_PAGE_SHIFT ); +/* Clear size_order bit to indicate size */ + desc.qw1 &= ~mask; +/* Set the S bit to indicate flushing more than 1 page */ desc.qw1 |=QI_DEV_EIOTLB_SIZE ; + }qi_submit_sync (iommu, &desc,1 ,0 ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 166/232 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 207/232 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 182/232 perf evsel: Dont set sample_regs_intr/sample_regs_user for dummy event
In reply to Greg Kroah-HartmanFrom: Jin Yao <[email protected]>
[ Upstream commit c4735d990268399da9133b0ad445e488ece009ad ]
Since commit 0a892c1c9472 ("perf record: Add dummy event during system wide synthesis"), a dummy event is added to capture mmaps.
But if we run perf-record as,
# perf record -e cycles:p -IXMM0 -a -- sleep 1 Error: dummy:HG: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'
The issue is, if we enable the extended regs (-IXMM0), but the pmu->capabilities is not set with PERF_PMU_CAP_EXTENDED_REGS, the kernel will return -EOPNOTSUPP error.
See following code:
/* in kernel/events/core.c */
static int perf_try_init_event(struct pmu *pmu, struct perf_event *event)
{
....
if (!(pmu->capabilities & PERF_PMU_CAP_EXTENDED_REGS) &&
has_extended_regs(event))
ret = -EOPNOTSUPP;
....
}For software dummy event, the PMU should not be set with PERF_PMU_CAP_EXTENDED_REGS. But unfortunately now, the dummy event has possibility to be set with PERF_REG_EXTENDED_MASK bit.
In evsel__config, /* tools/perf/util/evsel.c */
if (opts->sample_intr_regs) {
attr->sample_regs_intr = opts->sample_intr_regs;
}If we use -IXMM0, the attr>sample_regs_intr will be set with PERF_REG_EXTENDED_MASK bit.
It doesn't make sense to set attr->sample_regs_intr for a software dummy event.
This patch adds dummy event checking before setting attr->sample_regs_intr and attr->sample_regs_user.
After:
# ./perf record -e cycles:p -IXMM0 -a -- sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.413 MB perf.data (45 samples) ]
Committer notes:
Adrian said this when providing his Acked-by:
"
This is fine. It will not break PT.
no_aux_samples is useful for evsels that have been added by the code rather than requested by the user. For old kernels PT adds sched_switch tracepoint to track context switches (before the current context switch event was added) and having auxiliary sample information unnecessarily uses up space in the perf buffer.
"
--- tools/perf/util/evsel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/evsel.c +4 -2
@@ -1014,12 +1014,14 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,if (callchain && callchain->enabled && !evsel->no_aux_samples)evsel__config_callchain (evsel, opts, callchain); -if (opts->sample_intr_regs && !evsel->no_aux_samples) { +if (opts->sample_intr_regs && !evsel->no_aux_samples && + !evsel__is_dummy_event (evsel)) { attr->sample_regs_intr = opts->sample_intr_regs;evsel__set_sample_bit (evsel,REGS_INTR ); } -if (opts->sample_user_regs && !evsel->no_aux_samples) { +if (opts->sample_user_regs && !evsel->no_aux_samples && + !evsel__is_dummy_event (evsel)) { attr->sample_regs_user |= opts->sample_user_regs;evsel__set_sample_bit (evsel,REGS_USER ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 183/232 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
@@ -2112,7 +2112,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 157/232 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 174/232 ubi: fastmap: Dont produce the initial next anchor PEB when fastmap is disabled
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit 3b185255bb2f34fa6927619b9ef27f192a3d9f5a ]
Following process triggers a memleak caused by forgetting to release the initial next anchor PEB (CONFIG_MTD_UBI_FASTMAP is disabled):
1. attach -> __erase_worker -> produce the initial next anchor PEB
2. detach -> ubi_fastmap_close (Do nothing, it should have released the initial next anchor PEB)
Don't produce the initial next anchor PEB in __erase_worker() when fastmap is disabled.
--- drivers/mtd/ubi/wl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/ubi/wl.c +2 -1
@@ -1086,7 +1086,8 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk)if (!err) {spin_lock (&ubi->wl_lock); -if (!ubi->fm_next_anchor && e->pnum <UBI_FM_MAX_START ) { +if (!ubi->fm_disabled && !ubi->fm_next_anchor && + e->pnum <UBI_FM_MAX_START ) {/* Abort anchor production, if needed it will be * enabled again in the wear leveling started below. */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 231/232 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
@@ -8686,6 +8686,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 208/232 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
Re: [PATCH 5.8 137/232] USB: serial: ftdi_sio: fix break and sysrq handling
In reply to Greg Kroah-HartmanThis was never intended for stable as it is not a critical fix and has never worked properly in the first place. Please drop this one and the preparatory clean ups from all stable trees.
Johan
Greg Kroah-Hartman
maintainerRe: [PATCH 5.8 137/232] USB: serial: ftdi_sio: fix break and sysrq handling
Quoted 3 lines · Johan Hovold
This was never intended for stable as it is not a critical fix and has never worked properly in the first place. Please drop this one and the preparatory clean ups from all stable trees.
Ok, but the "fix this thing" and the "Fixes:" tag really did imply this was actually fixing something :)
I'll drop it from everywhere, thanks.
greg k-h
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.3 release. There are 232 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 22 Aug 2020 09:15:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.8.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.8:
11 builds: 11 pass, 0 fail
26 boots: 26 pass, 0 fail
60 tests: 60 pass, 0 failLinux version: 5.8.3-rc1-g201fff807310
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
RE: [PATCH 5.8 164/232] PCI: hv: Fix a timing issue which causes kdump to fail occasionally
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]> Sent: Thursday, August 20, 2020 2:20 AM
Quoted 26 lines
From: Wei Hu <[email protected]>
[ Upstream commit
d6af2ed29c7c1c311b96dac989dcb991e90ee195]Kdump could fail sometime on Hyper-V guest because the retry in
hv_pci_enter_d0()releases child device structures inhv_pci_bus_exit().Although there is a second asynchronous device relations message sending from the host, if this message arrives to the guest after
hv_send_resource_allocated()is called, the retry would fail.Fix the problem by moving retry to
hv_pci_probe()and start the retry fromhv_pci_query_relations()call. This will cause a device relations message to arrive to the guest synchronously; the guest would then be able to rebuild the child device structures before callinghv_send_resource_allocated().Link:
https://lore.kernel.org/linux-hyperv/[email protected]/Fixes c81992e7f4aa ("PCI: hv: Retry PCI bus D0 entry on invalid device state")Signed-off-by Wei Hu <[email protected]>[[email protected]: fixed a comment and commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Reviewed-by Michael Kelley <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 4 lines
--- drivers/pci/controller/pci-hyperv.c | 71 +++++++++++++++-------------- 1 file changed, 37 insertions(+), 34 deletions(-)
This patch came through three days ago, and I indicated then that we don't want it backported to 5.8 and earlier.
Michael
Greg Kroah-Hartman
maintainerPATCH 228/232 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 219/232 sh: fault: Fix duplicate printing of "PC:"
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 845d9156febcd6b3b20c0c2c8d73b461b48e844c ]
Somewhere along the patch handling path, both the old "printk(KERN_ALERT ....)" and the new "pr_alert(...)" were retained, leading to the duplicate printing of "PC:".
Drop the old one.
--- arch/sh/mm/fault.c | 1 - 1 file changed, 1 deletion(-)
arch/sh/mm/fault.c +0 -1
@@ -208,7 +208,6 @@ show_fault_oops(struct pt_regs *regs, unsigned long address)if (!oops_may_print ())return ; -printk (KERN_ALERT "PC:" ); pr_alert("BUG: unable to handle kernel %s at %08lx\n", address < PAGE_SIZE ? "NULL pointer dereference" : "paging request",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 227/232 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 230/232 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 224/232 drm/dp_mst: Fix timeout handling of MST down messages
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
commit 58c1721787be8a6ff28b4e5b6ce395915476871e upstream.
This fixes the following use-after-free problem in case an MST down message times out, while waiting for the response for it:
[ 449.022841] [drm:drm_dp_mst_wait_tx_reply.isra.26] timedout msg send 0000000080ba7fa2 2 0 [ 449.022898] ------------[ cut here ]------------ [ 449.022903] list_add corruption. prev->next should be next (ffff88847dae32c0), but was 6b6b6b6b6b6b6b6b. (prev=ffff88847db1c140). [ 449.022931] WARNING: CPU: 2 PID: 22 at lib/list_debug.c:28 __list_add_valid+0x4d/0x70 [ 449.022935] Modules linked in: asix usbnet mii snd_hda_codec_hdmi mei_hdcp i915 x86_pkg_temp_thermal coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_intel snd_intel_dspcfg snd_hda_codec snd_hwdep e1000e snd_hda_core ptp snd_pcm pps_core mei_me mei intel_lpss_pci prime_numbers [ 449.022966] CPU: 2 PID: 22 Comm: kworker/2:0 Not tainted 5.7.0-rc3-CI-Patchwork_17536+ #1 [ 449.022970] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake U DDR4 SODIMM RVP, BIOS TGLSFWI1.R00.2457.A16.1912270059 12/27/2019 [ 449.022976] Workqueue: events_long drm_dp_mst_link_probe_work [ 449.022982] RIP: 0010:__list_add_valid+0x4d/0x70 [ 449.022987] Code: c3 48 89 d1 48 c7 c7 f0 e7 32 82 48 89 c2 e8 3a 49 b7 ff 0f 0b 31 c0 c3 48 89 c1 4c 89 c6 48 c7 c7 40 e8 32 82 e8 23 49 b7 ff <0f> 0b 31 c0 c3 48 89 f2 4c 89 c1 48 89 fe 48 c7 c7 90 e8 32 82 e8 [ 449.022991] RSP: 0018:ffffc900001abcb0 EFLAGS: 00010286 [ 449.022995] RAX: 0000000000000000 RBX: ffff88847dae2d58 RCX: 0000000000000001 [ 449.022999] RDX: 0000000080000001 RSI: ffff88849d914978 RDI: 00000000ffffffff [ 449.023002] RBP: ffff88847dae32c0 R08: ffff88849d914978 R09: 0000000000000000 [ 449.023006] R10: ffffc900001abcb8 R11: 0000000000000000 R12: ffff888490d98400 [ 449.023009] R13: ffff88847dae3230 R14: ffff88847db1c140 R15: ffff888490d98540 [ 449.023013] FS: 0000000000000000(0000) GS:ffff88849ff00000(0000) knlGS:0000000000000000 [ 449.023017] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 449.023021] CR2: 00007fb96fafdc63 CR3: 0000000005610004 CR4: 0000000000760ee0 [ 449.023025] PKRU: 55555554 [ 449.023028] Call Trace: [ 449.023034] drm_dp_queue_down_tx+0x59/0x110 [ 449.023041] ? rcu_read_lock_sched_held+0x4d/0x80 [ 449.023050] ? kmem_cache_alloc_trace+0x2a6/0x2d0 [ 449.023060] drm_dp_send_link_address+0x74/0x870 [ 449.023065] ? __slab_free+0x3e1/0x5c0 [ 449.023071] ? lockdep_hardirqs_on+0xe0/0x1c0 [ 449.023078] ? lockdep_hardirqs_on+0xe0/0x1c0 [ 449.023097] drm_dp_check_and_send_link_address+0x9a/0xc0 [ 449.023106] drm_dp_mst_link_probe_work+0x9e/0x160 [ 449.023117] process_one_work+0x268/0x600 [ 449.023124] ? __schedule+0x307/0x8d0 [ 449.023139] worker_thread+0x37/0x380 [ 449.023149] ? process_one_work+0x600/0x600 [ 449.023153] kthread+0x140/0x160 [ 449.023159] ? kthread_park+0x80/0x80 [ 449.023169] ret_from_fork+0x24/0x50
--- drivers/gpu/drm/drm_dp_mst_topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -1
@@ -1197,7 +1197,8 @@ static int drm_dp_mst_wait_tx_reply(stru/* remove from q */ if (txmsg->state ==DRM_DP_SIDEBAND_TX_QUEUED || - txmsg->state ==DRM_DP_SIDEBAND_TX_START_SEND ) + txmsg->state ==DRM_DP_SIDEBAND_TX_START_SEND || + txmsg->state ==DRM_DP_SIDEBAND_TX_SENT )list_del (&txmsg->next); } out:
Greg Kroah-Hartman
maintainerPATCH 225/232 drm/dp_mst: Fix the DDC I2C device unregistration of an MST port
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
commit 7d11507605a75fcb2159b93d1fe8213b363a2c20 upstream.
The WARN below triggers during the removal of an MST port. The problem is that the parent device's (the connector's kdev) sysfs directory is removed recursively when the connector is unregistered (even though the I2C device holds a reference on the parent device). To fix this set first the Peer Device Type to none which will remove the I2C device.
Note that atm, inconsistently, the parent of the I2C device is initially set to the DRM kdev and after a Connection Status Notification the parent may be reset to be the connector's kdev. This problem is addressed by the next patch.
[ 4462.989299] ------------[ cut here ]------------ [ 4463.014940] sysfs group 'power' not found for kobject 'i2c-24' [ 4463.034664] WARNING: CPU: 0 PID: 970 at fs/sysfs/group.c:281 sysfs_remove_group+0x71/0x80 [ 4463.044357] Modules linked in: snd_hda_intel i915 drm_kms_helper(O) drm netconsole snd_hda_codec_hdmi mei_hdcp x86_pkg_temp_thermal coretemp crct10dif_pclmul snd_intel_dspcf g crc32_pclmul snd_hda_codec snd_hwdep ghash_clmulni_intel snd_hda_core asix usbnet kvm_intel mii i2c_algo_bit snd_pcm syscopyarea sysfillrect e1000e sysimgblt fb_sys_fops prim e_numbers ptp pps_core i2c_i801 r8169 mei_me realtek mei [last unloaded: drm] [ 4463.044399] CPU: 0 PID: 970 Comm: kworker/0:2 Tainted: G O 5.7.0+ #172 [ 4463.044402] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake U DDR4 SODIMM RVP [ 4463.044423] Workqueue: events drm_dp_delayed_destroy_work [drm_kms_helper] [ 4463.044428] RIP: 0010:sysfs_remove_group+0x71/0x80 [ 4463.044431] Code: 48 89 df 5b 5d 41 5c e9 cd b6 ff ff 48 89 df e8 95 b4 ff ff eb cb 49 8b 14 24 48 8b 75 00 48 c7 c7 20 0f 3f 82 e8 9f c5 d7 ff <0f> 0b 5b 5d 41 5c c3 0f 1f 84 00 00 00 00 00 48 85 f6 74 31 41 54 [ 4463.044433] RSP: 0018:ffffc900018bfbf0 EFLAGS: 00010282 [ 4463.044436] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001 [ 4463.044439] RDX: 0000000080000001 RSI: ffff88849e828f38 RDI: 00000000ffffffff [ 4463.052970] [drm:drm_atomic_get_plane_state [drm]] Added [PLANE:100:plane 2B] 00000000c2160caa state to 00000000d172564a [ 4463.070533] RBP: ffffffff820cea20 R08: ffff88847f4b8958 R09: 0000000000000000 [ 4463.070535] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88848a725018 [ 4463.070537] R13: 0000000000000000 R14: ffffffff827090e0 R15: 0000000000000002 [ 4463.070539] FS: 0000000000000000(0000) GS:ffff88849e800000(0000) knlGS:0000000000000000 [ 4463.070541] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 4463.070543] CR2: 00007fdf8a756538 CR3: 0000000489684001 CR4: 0000000000760ef0 [ 4463.070545] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 4463.070547] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 4463.070549] PKRU: 55555554 [ 4463.070551] Call Trace: [ 4463.070560] device_del+0x84/0x400 [ 4463.070571] cdev_device_del+0x10/0x30 [ 4463.070578] put_i2c_dev+0x69/0x80 [ 4463.070584] i2cdev_detach_adapter+0x2e/0x60 [ 4463.070591] notifier_call_chain+0x34/0x90 [ 4463.070599] blocking_notifier_call_chain+0x3f/0x60 [ 4463.070606] device_del+0x7c/0x400 [ 4463.087817] ? lockdep_init_map_waits+0x57/0x210 [ 4463.087825] device_unregister+0x11/0x60 [ 4463.087829] i2c_del_adapter+0x249/0x310 [ 4463.087846] drm_dp_port_set_pdt+0x6b/0x2c0 [drm_kms_helper] [ 4463.087862] drm_dp_delayed_destroy_work+0x2af/0x350 [drm_kms_helper] [ 4463.087876] process_one_work+0x268/0x600 [ 4463.105438] ? __schedule+0x30c/0x920 [ 4463.105451] worker_thread+0x37/0x380 [ 4463.105457] ? process_one_work+0x600/0x600 [ 4463.105462] kthread+0x140/0x160 [ 4463.105466] ? kthread_park+0x80/0x80 [ 4463.105474] ret_from_fork+0x24/0x50
--- drivers/gpu/drm/drm_dp_mst_topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -1
@@ -4642,12 +4642,13 @@ static void drm_dp_tx_work(struct work_sstatic inline void drm_dp_delayed_destroy_port (struct drm_dp_mst_port *port) { +drm_dp_port_set_pdt (port,DP_PEER_DEVICE_NONE , port->mcs); +if (port->connector) {drm_connector_unregister (port->connector);drm_connector_put (port->connector); } -drm_dp_port_set_pdt (port,DP_PEER_DEVICE_NONE , port->mcs);drm_dp_mst_put_port_malloc (port); }
Greg Kroah-Hartman
maintainerPATCH 222/232 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 226/232 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
@@ -4915,6 +4915,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
@@ -902,6 +902,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 221/232 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
@@ -616,6 +616,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 232/232 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 223/232 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]"
@@ -1966,7 +1966,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);
@@ -1981,7 +1981,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);
@@ -5346,22 +5346,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);
@@ -5369,11 +5373,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/232 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 210/232 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 209/232 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 211/232 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
@@ -1078,7 +1078,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 );
@@ -1091,6 +1091,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 212/232 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 213/232 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 214/232 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 215/232 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 191/232 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
@@ -141,7 +141,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) && \
@@ -163,7 +165,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 193/232 perf record: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set
In reply to Greg Kroah-HartmanFrom: Jin Yao <[email protected]>
[ Upstream commit 1101c872c8c7869c78dc106ae820040f36807eda ]
We received an error report that perf-record caused 'Segmentation fault' on a newly system (e.g. on the new installed ubuntu).
(gdb) backtrace
#0 __read_once_size (size=4, res=<synthetic pointer>, p=0x14) at /root/0-jinyao/acme/tools/include/linux/compiler.h:139 #1 atomic_read (v=0x14) at /root/0-jinyao/acme/tools/include/asm/../../arch/x86/include/asm/atomic.h:28 #2 refcount_read (r=0x14) at /root/0-jinyao/acme/tools/include/linux/refcount.h:65 #3 perf_mmap__read_init (map=map@entry=0x0) at mmap.c:177 #4 0x0000561ce5c0de39 in perf_evlist__poll_thread (arg=0x561ce68584d0) at util/sideband_evlist.c:62 #5 0x00007fad78491609 in start_thread (arg=<optimized out>) at pthread_create.c:477 #6 0x00007fad7823c103 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
The root cause is, evlist__add_bpf_sb_event() just returns 0 if HAVE_LIBBPF_SUPPORT is not defined (inline function path). So it will not create a valid evsel for side-band event.
But perf-record still creates BPF side band thread to process the side-band event, then the error happpens.
We can reproduce this issue by removing the libelf-dev. e.g.
1. apt-get remove libelf-dev
2. perf record -a -- sleep 1
root@test:~# ./perf record -a -- sleep 1 perf: Segmentation fault Obtained 6 stack frames. ./perf(+0x28eee8) [0x5562d6ef6ee8] /lib/x86_64-linux-gnu/libc.so.6(+0x46210) [0x7fbfdc65f210] ./perf(+0x342e74) [0x5562d6faae74] ./perf(+0x257e39) [0x5562d6ebfe39] /lib/x86_64-linux-gnu/libpthread.so.0(+0x9609) [0x7fbfdc990609] /lib/x86_64-linux-gnu/libc.so.6(clone+0x43) [0x7fbfdc73b103] Segmentation fault (core dumped)
To fix this issue,
1. We either install the missing libraries to let HAVE_LIBBPF_SUPPORT be defined.
e.g. apt-get install libelf-dev and install other related libraries.
2. Use this patch to skip the side-band event setup if HAVE_LIBBPF_SUPPORT is not set.
Committer notes:
The side band thread is not used just with BPF, it is also used with --switch-output-event, so narrow the ifdef to the BPF specific part.
--- tools/perf/builtin-record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -1489,7 +1489,7 @@ static int record__setup_sb_evlist(struct record *rec)evlist__set_cb (rec->sb_evlist, record__process_signal_event, rec); rec->thread_id =pthread_self (); } - +#ifdef HAVE_LIBBPF_SUPPORT if (!opts->no_bpf_event) {if (rec->sb_evlist ==NULL ) { rec->sb_evlist =evlist__new ();
@@ -1505,7 +1505,7 @@ static int record__setup_sb_evlist(struct record *rec) return -1; } } - +#endif if (perf_evlist__start_sb_thread (rec->sb_evlist, &rec->opts.target)) {pr_debug ("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n" ); opts->no_bpf_event = true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 196/232 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 195/232 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
@@ -331,6 +331,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 187/232 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 190/232 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 229/232 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
@@ -4262,11 +4262,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 ) {
@@ -4282,6 +4282,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 217/232 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
@@ -665,7 +665,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 192/232 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 206/232 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 218/232 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 216/232 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 194/232 selftests/bpf: Fix silent Makefile output
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit d5ca590525cfbd87ca307dcf498a566e2e7c1767 ]
99aacebecb75 ("selftests: do not use .ONESHELL") removed .ONESHELL, which changes how Makefile "silences" multi-command target recipes. selftests/bpf's Makefile relied (a somewhat unknowingly) on .ONESHELL behavior of silencing all commands within the recipe if the first command contains @ symbol. Removing .ONESHELL exposed this hack.
This patch fixes the issue by explicitly silencing each command with $(Q).
Also explicitly define fallback rule for building *.o from *.c, instead of relying on non-silent inherited rule. This was causing a non-silent output for bench.o object file.
--- tools/testing/selftests/bpf/Makefile | 44 +++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/Makefile +24 -20
@@ -102,7 +102,7 @@ endif OVERRIDE_TARGETS := 1 override define CLEAN $(call msg,CLEAN) - $(RM) -r $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(EXTRA_CLEAN) + $(Q)$(RM) -r $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(EXTRA_CLEAN) endef include ../lib.mk
@@ -122,17 +122,21 @@ $(notdir $(TEST_GEN_PROGS) \ $(TEST_GEN_PROGS_EXTENDED) \ $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ; +$(OUTPUT)/%.o: %.c + $(call msg,CC,,$@) + $(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@ + $(OUTPUT)/%:%.c $(call msg,BINARY,,$@) - $(LINK.c) $^ $(LDLIBS) -o $@ + $(Q)$(LINK.c) $^ $(LDLIBS) -o $@ $(OUTPUT)/urandom_read: urandom_read.c $(call msg,BINARY,,$@) - $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -Wl,--build-id + $(Q)$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -Wl,--build-id $(OUTPUT)/test_stub.o: test_stub.c $(BPFOBJ) $(call msg,CC,,$@) - $(CC) -c $(CFLAGS) -o $@ $< + $(Q)$(CC) -c $(CFLAGS) -o $@ $< VMLINUX_BTF_PATHS := $(if $(O),$(O)/vmlinux) \ $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \
@@ -180,11 +184,11 @@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ $(BUILD_DIR)/libbpf $(BUILD_DIR)/bpftool $(INCLUDE_DIR): $(call msg,MKDIR,,$@) - mkdir -p $@ + $(Q)mkdir -p $@ $(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) | $(BPFTOOL) $(INCLUDE_DIR) $(call msg,GEN,,$@) - $(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@ + $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@ # Get Clang's default includes on this system, as opposed to those seen by # '-target bpf'. This fixes "missing" files on some architectures/distros,
@@ -222,28 +226,28 @@ $(OUTPUT)/flow_dissector_load.o: flow_dissector_load.h # $4 - LDFLAGS define CLANG_BPF_BUILD_RULE $(call msg,CLNG-LLC,$(TRUNNER_BINARY),$2) - ($(CLANG) $3 -O2 -target bpf -emit-llvm \ + $(Q)($(CLANG) $3 -O2 -target bpf -emit-llvm \ -c $1 -o - || echo "BPF obj compilation failed") | \ $(LLC) -mattr=dwarfris -march=bpf -mcpu=v3 $4 -filetype=obj -o $2 endef # Similar to CLANG_BPF_BUILD_RULE, but with disabled alu32 define CLANG_NOALU32_BPF_BUILD_RULE $(call msg,CLNG-LLC,$(TRUNNER_BINARY),$2) - ($(CLANG) $3 -O2 -target bpf -emit-llvm \ + $(Q)($(CLANG) $3 -O2 -target bpf -emit-llvm \ -c $1 -o - || echo "BPF obj compilation failed") | \ $(LLC) -march=bpf -mcpu=v2 $4 -filetype=obj -o $2 endef # Similar to CLANG_BPF_BUILD_RULE, but using native Clang and bpf LLC define CLANG_NATIVE_BPF_BUILD_RULE $(call msg,CLNG-BPF,$(TRUNNER_BINARY),$2) - ($(CLANG) $3 -O2 -emit-llvm \ + $(Q)($(CLANG) $3 -O2 -emit-llvm \ -c $1 -o - || echo "BPF obj compilation failed") | \ $(LLC) -march=bpf -mcpu=v3 $4 -filetype=obj -o $2 endef # Build BPF object using GCC define GCC_BPF_BUILD_RULE $(call msg,GCC-BPF,$(TRUNNER_BINARY),$2) - $(BPF_GCC) $3 $4 -O2 -c $1 -o $2 + $(Q)$(BPF_GCC) $3 $4 -O2 -c $1 -o $2 endef SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c
@@ -285,7 +289,7 @@ ifeq ($($(TRUNNER_OUTPUT)-dir),) $(TRUNNER_OUTPUT)-dir := y $(TRUNNER_OUTPUT): $$(call msg,MKDIR,,$$@) - mkdir -p $$@ + $(Q)mkdir -p $$@ endif # ensure we set up BPF objects generation rule just once for a given
@@ -305,7 +309,7 @@ $(TRUNNER_BPF_SKELS): $(TRUNNER_OUTPUT)/%.skel.h: \ $(TRUNNER_OUTPUT)/%.o \ | $(BPFTOOL) $(TRUNNER_OUTPUT) $$(call msg,GEN-SKEL,$(TRUNNER_BINARY),$$@) - $$(BPFTOOL) gen skeleton $$< > $$@ + $(Q)$$(BPFTOOL) gen skeleton $$< > $$@ endif # ensure we set up tests.h header generation rule just once
@@ -329,7 +333,7 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ $(TRUNNER_BPF_SKELS) \ $$(BPFOBJ) | $(TRUNNER_OUTPUT) $$(call msg,TEST-OBJ,$(TRUNNER_BINARY),$$@) - cd $$(@D) && $$(CC) -I. $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F) + $(Q)cd $$(@D) && $$(CC) -I. $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F) $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \ %.c \
@@ -337,20 +341,20 @@ $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \ $(TRUNNER_TESTS_HDR) \ $$(BPFOBJ) | $(TRUNNER_OUTPUT) $$(call msg,EXT-OBJ,$(TRUNNER_BINARY),$$@) - $$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@ + $(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@ # only copy extra resources if in flavored build $(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT) ifneq ($2,) $$(call msg,EXT-COPY,$(TRUNNER_BINARY),$(TRUNNER_EXTRA_FILES)) - cp -a $$^ $(TRUNNER_OUTPUT)/ + $(Q)cp -a $$^ $(TRUNNER_OUTPUT)/ endif $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS) \ $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ) \ | $(TRUNNER_BINARY)-extras $$(call msg,BINARY,,$$@) - $$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) -o $$@ + $(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) -o $$@ endef
@@ -403,17 +407,17 @@ verifier/tests.h: verifier/*.c ) > verifier/tests.h) $(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT) $(call msg,BINARY,,$@) - $(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@ + $(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@ # Make sure we are able to include and link libbpf against c++. $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ) $(call msg,CXX,,$@) - $(CXX) $(CFLAGS) $^ $(LDLIBS) -o $@ + $(Q)$(CXX) $(CFLAGS) $^ $(LDLIBS) -o $@ # Benchmark runner $(OUTPUT)/bench_%.o: benchs/bench_%.c bench.h $(call msg,CC,,$@) - $(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@ + $(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@ $(OUTPUT)/bench_rename.o: $(OUTPUT)/test_overhead.skel.h $(OUTPUT)/bench_trigger.o: $(OUTPUT)/trigger_bench.skel.h $(OUTPUT)/bench_ringbufs.o: $(OUTPUT)/ringbuf_bench.skel.h \
@@ -426,7 +430,7 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o $(OUTPUT)/testing_helpers.o \ $(OUTPUT)/bench_trigger.o \ $(OUTPUT)/bench_ringbufs.o $(call msg,BINARY,,$@) - $(CC) $(LDFLAGS) -o $@ $(filter %.a %.o,$^) $(LDLIBS) + $(Q)$(CC) $(LDFLAGS) -o $@ $(filter %.a %.o,$^) $(LDLIBS) EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) \ prog_tests/tests.h map_tests/tests.h verifier/tests.h \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 205/232 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 220/232 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 204/232 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 203/232 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 202/232 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
@@ -474,13 +474,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
Sasha Levin
maintainerRe: [PATCH 5.8 164/232] PCI: hv: Fix a timing issue which causes kdump to fail occasionally
In reply to Michael KelleyQuoted 32 lines · Michael Kelley
From: Greg Kroah-Hartman <[email protected]> Sent: Thursday, August 20, 2020 2:20 AM
Quoted 26 lines
From: Wei Hu <[email protected]>
[ Upstream commit
d6af2ed29c7c1c311b96dac989dcb991e90ee195]Kdump could fail sometime on Hyper-V guest because the retry in
hv_pci_enter_d0()releases child device structures inhv_pci_bus_exit().Although there is a second asynchronous device relations message sending from the host, if this message arrives to the guest after
hv_send_resource_allocated()is called, the retry would fail.Fix the problem by moving retry to
hv_pci_probe()and start the retry fromhv_pci_query_relations()call. This will cause a device relations message to arrive to the guest synchronously; the guest would then be able to rebuild the child device structures before callinghv_send_resource_allocated().Link:
https://lore.kernel.org/linux-hyperv/[email protected]/Fixes c81992e7f4aa ("PCI: hv: Retry PCI bus D0 entry on invalid device state")Signed-off-by Wei Hu <[email protected]>[[email protected]: fixed a comment and commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Reviewed-by Michael Kelley <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 4 lines
--- drivers/pci/controller/pci-hyperv.c | 71 +++++++++++++++-------------- 1 file changed, 37 insertions(+), 34 deletions(-)
Quoted 2 lines
This patch came through three days ago, and I indicated then that we don't want it backported to 5.8 and earlier.
Uh, I re-added it by mistake, sorry.
Signature · 2 lines
Thanks, Sasha
Greg Kroah-Hartman
maintainerPATCH 200/232 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 178/232 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;
@@ -2238,6 +2254,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 201/232 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 199/232 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 198/232 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 197/232 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
@@ -522,7 +522,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 155/232 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 163/232 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
@@ -3432,6 +3432,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 164/232 PCI: hv: Fix a timing issue which causes kdump to fail occasionally
In reply to Greg Kroah-HartmanFrom: Wei Hu <[email protected]>
[ Upstream commit d6af2ed29c7c1c311b96dac989dcb991e90ee195 ]
Kdump could fail sometime on Hyper-V guest because the retry in hv_pci_enter_d0() releases child device structures in hv_pci_bus_exit().
Although there is a second asynchronous device relations message sending from the host, if this message arrives to the guest after hv_send_resource_allocated() is called, the retry would fail.
Fix the problem by moving retry to hv_pci_probe() and start the retry from hv_pci_query_relations() call. This will cause a device relations message to arrive to the guest synchronously; the guest would then be able to rebuild the child device structures before calling hv_send_resource_allocated().
--- drivers/pci/controller/pci-hyperv.c | 71 +++++++++++++++-------------- 1 file changed, 37 insertions(+), 34 deletions(-)
drivers/pci/controller/pci-hyperv.c +37 -34
@@ -2759,10 +2759,8 @@ static int hv_pci_enter_d0(struct hv_device *hdev)struct pci_bus_d0_entry *d0_entry;struct hv_pci_compl comp_pkt;struct pci_packet *pkt; -bool retry = true;int ret; -enter_d0_retry:/* * Tell the host that the bus is ready to use, and moved into the * powered-on state. This includes telling the host which region
@@ -2789,38 +2787,6 @@ static int hv_pci_enter_d0(struct hv_device *hdev)if (ret) goto exit; -/* -* In certain case (Kdump) the pci device of interest was -* not cleanly shut down and resource is still held on host -* side, the host could return invalid device status. -* We need to explicitly request host to release the resource -* and try to enter D0 again. -*/ -if (comp_pkt.completion_status <0 && retry) { - retry = false; - -dev_err (&hdev->device,"Retrying D0 Entry\n" ); - -/* -* Hv_pci_bus_exit() calls hv_send_resource_released() -* to free up resources of its child devices. -* In the kdump kernel we need to set the -* wslot_res_allocated to 255 so it scans all child -* devices to release resources allocated in the -* normal kernel before panic happened. -*/ - hbus->wslot_res_allocated =255 ; - - ret =hv_pci_bus_exit (hdev, true); - -if (ret ==0 ) { -kfree (pkt); - goto enter_d0_retry; - } -dev_err (&hdev->device, -"Retrying D0 failed with ret %d\n" , ret); - } -if (comp_pkt.completion_status <0 ) { dev_err(&hdev->device, "PCI Pass-through VSP failed D0 Entry with status %x\n",
@@ -3058,6 +3024,7 @@ static int hv_pci_probe(struct hv_device *hdev,struct hv_pcibus_device *hbus;u16 dom_req, dom;char *name; +bool enter_d0_retry = true;int ret;/*
@@ -3178,11 +3145,47 @@ static int hv_pci_probe(struct hv_device *hdev,if (ret) goto free_fwnode; +retry: ret =hv_pci_query_relations (hdev);if (ret) goto free_irq_domain; ret =hv_pci_enter_d0 (hdev); +/* +* In certain case (Kdump) the pci device of interest was +* not cleanly shut down and resource is still held on host +* side, the host could return invalid device status. +* We need to explicitly request host to release the resource +* and try to enter D0 again. +* Since the hv_pci_bus_exit() call releases structures +* of all its child devices, we need to start the retry from +* hv_pci_query_relations() call, requesting host to send +* the synchronous child device relations message before this +* information is needed in hv_send_resources_allocated() +* call later. +*/ +if (ret == -EPROTO && enter_d0_retry) { + enter_d0_retry = false; + +dev_err (&hdev->device,"Retrying D0 Entry\n" ); + +/* +* Hv_pci_bus_exit() calls hv_send_resources_released() +* to free up resources of its child devices. +* In the kdump kernel we need to set the +* wslot_res_allocated to 255 so it scans all child +* devices to release resources allocated in the +* normal kernel before panic happened. +*/ + hbus->wslot_res_allocated =255 ; + ret =hv_pci_bus_exit (hdev, true); + +if (ret ==0 ) + goto retry; + +dev_err (&hdev->device, +"Retrying D0 failed with ret %d\n" , ret); + }if (ret) goto free_irq_domain;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 188/232 kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
[ Upstream commit 10de795a5addd1962406796a6e13ba6cc0fc6bee ]
Fix compiler warning(as show below) for !CONFIG_KPROBES_ON_FTRACE.
kernel/kprobes.c: In function 'kill_kprobe':kernel/kprobes.c:1116:33: warning: statement with no effect [-Wunused-value]
1116 | #define disarm_kprobe_ftrace(p) (-ENODEV)
| ^kernel/kprobes.c:2154:3: note: in expansion of macro 'disarm_kprobe_ftrace'
2154 | disarm_kprobe_ftrace(p);
--- kernel/kprobes.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
kernel/kprobes.c +14 -3
@@ -1079,9 +1079,20 @@ static int disarm_kprobe_ftrace(struct kprobe *p) ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled); }#else /* !CONFIG_KPROBES_ON_FTRACE */ -#define prepare_kprobe (p) arch_prepare_kprobe(p) -#define arm_kprobe_ftrace (p) (-ENODEV) -#define disarm_kprobe_ftrace (p) (-ENODEV) +static inline int prepare_kprobe (struct kprobe *p) +{ +return arch_prepare_kprobe (p); +} + +static inline int arm_kprobe_ftrace (struct kprobe *p) +{ +return -ENODEV ; +} + +static inline int disarm_kprobe_ftrace (struct kprobe *p) +{ +return -ENODEV ; +}#endif /* Arm a kprobe with text_mutex */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/232 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 161/232 iommu/vt-d: Disable multiple GPASID-dev bind
In reply to Greg Kroah-HartmanFrom: Jacob Pan <[email protected]>
[ Upstream commit d315e9e684d1efd4cb2e8cd70b8d71dec02fcf1f ]
For the unlikely use case where multiple aux domains from the same pdev are attached to a single guest and then bound to a single process (thus same PASID) within that guest, we cannot easily support this case by refcounting the number of users. As there is only one SL page table per PASID while we have multiple aux domains thus multiple SL page tables for the same PASID.
Extra unbinding guest PASID can happen due to race between normal and exception cases. Termination of one aux domain may affect others unless we actively track and switch aux domains to ensure the validity of SL page tables and TLB states in the shared PASID entry.
Support for sharing second level PGDs across domains can reduce the complexity but this is not available due to the limitations on VFIO container architecture. We can revisit this decision once sharing PGDs are available.
Overall, the complexity and potential glitch do not warrant this unlikely use case thereby removed by this patch.
--- drivers/iommu/intel/svm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/iommu/intel/svm.c +9 -13
@@ -277,20 +277,16 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, goto out; } +/* +* Do not allow multiple bindings of the same device-PASID since +* there is only one SL page tables per PASID. We may revisit +* once sharing PGD across domains are supported. +*/ for_each_svm_dev (sdev, svm, dev) { -/* -* For devices with aux domains, we should allow -* multiple bind calls with the same PASID and pdev. -*/ -if (iommu_dev_feature_enabled (dev, -IOMMU_DEV_FEAT_AUX )) { - sdev->users++; - }else { -dev_warn_ratelimited (dev, -"Already bound with PASID %u\n" , - svm->pasid); - ret = -EBUSY ; - } +dev_warn_ratelimited (dev, +"Already bound with PASID %u\n" , + svm->pasid); + ret = -EBUSY ; goto out; } }else {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/232 iommu/vt-d: Warn on out-of-range invalidation address
In reply to Greg Kroah-HartmanFrom: Jacob Pan <[email protected]>
[ Upstream commit 1ff00279655d95ae9c285c39878aedf9ff008d25 ]
For guest requested IOTLB invalidation, address and mask are provided as part of the invalidation data. VT-d HW silently ignores any address bits below the mask. SW shall also allow such case but give warning if address does not align with the mask. This patch relax the fault handling from error to warning and proceed with invalidation request with the given mask.
--- drivers/iommu/intel/iommu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iommu/intel/iommu.c +2 -3
@@ -5452,13 +5452,12 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev,switch (BIT (cache_type)) {case IOMMU_CACHE_INV_TYPE_IOTLB : +/* HW will ignore LSB bits based on address mask */ if (inv_info->granularity ==IOMMU_INV_GRANU_ADDR && size && (inv_info->addr_info.addr & ((BIT (VTD_PAGE_SHIFT + size)) -1 ))) { -pr_err_ratelimited ("Address out of range, 0x%llx, size order %llu\n" , +pr_err_ratelimited ("User address not aligned, 0x%llx, size order %llu\n" , inv_info->addr_info.addr, size); - ret = -ERANGE ; - goto out_unlock; }/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/232 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
@@ -381,8 +381,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 185/232 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/232 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 165/232 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 156/232 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 123/232 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 132/232 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 ; }
@@ -643,6 +659,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];
@@ -673,6 +690,7 @@ int main(int argc, char **argv) test->error_cnt ? "FAIL" : "OK");reset_affinity (); +restore_netns ();if (test->need_cgroup_cleanup)cleanup_cgroup_environment (); }
@@ -686,6 +704,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
@@ -78,6 +78,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 131/232 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
@@ -687,5 +687,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 130/232 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
@@ -794,6 +794,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)
@@ -990,10 +1010,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;/*
@@ -1021,6 +1069,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 ;
@@ -1036,6 +1093,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);
@@ -7442,6 +7512,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 128/232 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 153/232 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 127/232 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 154/232 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 68/232 bcache: fix bio_{start,end}_io_acct with proper device
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
commit a2f32ee8fd853cec8860f883d98afc3a339546de upstream.
Commit 85750aeb748f ("bcache: use bio_{start,end}_io_acct") moves the io account code to the location after bio_set_dev(bio, dc->bdev) in cached_dev_make_request(). Then the account is performed incorrectly on backing device, indeed the I/O should be counted to bcache device like /dev/bcache0.
With the mistaken I/O account, iostat does not display I/O counts for bcache device and all the numbers go to backing device. In writeback mode, the hard drive may have 340K+ IOPS which is impossible and wrong for spinning disk.
This patch introduces bch_bio_start_io_acct() and bch_bio_end_io_acct(), which switches bio->bi_disk to bcache device before calling bio_start_io_acct() or bio_end_io_acct(). Now the I/Os are counted to bcache device, and bcache device, cache device and backing device have their correct I/O count information back.
--- drivers/md/bcache/request.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/md/bcache/request.c +27 -4
@@ -617,6 +617,28 @@ static void cache_lookup(struct closure/* Common code for the make_request functions */ +static inline void bch_bio_start_io_acct (struct gendisk *acct_bi_disk, +struct bio *bio, +unsigned long *start_time) +{ +struct gendisk *saved_bi_disk = bio->bi_disk; + + bio->bi_disk = acct_bi_disk; + *start_time =bio_start_io_acct (bio); + bio->bi_disk = saved_bi_disk; +} + +static inline void bch_bio_end_io_acct (struct gendisk *acct_bi_disk, +struct bio *bio, +unsigned long start_time) +{ +struct gendisk *saved_bi_disk = bio->bi_disk; + + bio->bi_disk = acct_bi_disk; +bio_end_io_acct (bio, start_time); + bio->bi_disk = saved_bi_disk; +} +static void request_endio (struct bio *bio) {struct closure *cl = bio->bi_private;
@@ -668,7 +690,7 @@ static void backing_request_endio(structstatic void bio_complete (struct search *s) {if (s->orig_bio) { -bio_end_io_acct (s->orig_bio, s->start_time); +bch_bio_end_io_acct (s->d->disk, s->orig_bio, s->start_time);trace_bcache_request_end (s->d, s->orig_bio); s->orig_bio->bi_status = s->iop.status;bio_endio (s->orig_bio);
@@ -728,7 +750,7 @@ static inline struct search *search_allo s->recoverable =1 ; s->write =op_is_write (bio_op (bio)); s->read_dirty_data =0 ; - s->start_time =bio_start_io_acct (bio); +bch_bio_start_io_acct (d->disk, bio, &s->start_time); s->iop.c = d->c; s->iop.bio =NULL ;
@@ -1080,7 +1102,7 @@ static void detached_dev_end_io(struct b bio->bi_end_io = ddip->bi_end_io; bio->bi_private = ddip->bi_private; -bio_end_io_acct (bio, ddip->start_time); +bch_bio_end_io_acct (ddip->d->disk, bio, ddip->start_time);if (bio->bi_status) { struct cached_dev *dc = container_of(ddip->d,
@@ -1105,7 +1127,8 @@ static void detached_dev_do_request(stru*/ ddip =kzalloc (sizeof (struct detached_dev_io_private ),GFP_NOIO ); ddip->d = d; - ddip->start_time =bio_start_io_acct (bio); +bch_bio_start_io_acct (d->disk, bio, &ddip->start_time); + ddip->bi_end_io = bio->bi_end_io; ddip->bi_private = bio->bi_private; bio->bi_end_io = detached_dev_end_io;
Greg Kroah-Hartman
maintainerPATCH 101/232 bootconfig: Fix to find the initargs correctly
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 477d08478170469d10b533624342d13701e24b34 upstream.
Since the parse_args() stops parsing at '--', bootconfig_params() will never get the '--' as param and initargs_found never be true. In the result, if we pass some init arguments via the bootconfig, those are always appended to the kernel command line with '--' even if the kernel command line already has '--'.
To fix this correctly, check the return value of parse_args() and set initargs_found true if the return value is not an error but a valid address.
--- init/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
init/main.c +8 -6
@@ -387,8 +387,6 @@ static int __init bootconfig_params(char {if (strcmp (param,"bootconfig" ) ==0 ) { bootconfig_found = true; - }else if (strcmp (param,"--" ) ==0 ) { - initargs_found = true; }return 0 ; }
@@ -399,19 +397,23 @@ static void __init setup_boot_config(conconst char *msg;int pos;u32 size, csum; -char *data, *copy; +char *data, *copy, *err;int ret;/* Cut out the bootconfig data even if we have no bootconfig option */ data =get_boot_config_from_initrd (&size, &csum);strlcpy (tmp_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -parse_args ("bootconfig" , tmp_cmdline,NULL ,0 ,0 ,0 ,NULL , - bootconfig_params); + err =parse_args ("bootconfig" , tmp_cmdline,NULL ,0 ,0 ,0 ,NULL , + bootconfig_params); -if (!bootconfig_found) +if (IS_ERR (err) || !bootconfig_found)return ; +/* parse_args() stops at '--' and returns an address */ +if (err) + initargs_found = true; +if (!data) {pr_err ("'bootconfig' found on command line, but no bootconfig found\n" );return ;
Greg Kroah-Hartman
maintainerPATCH 111/232 libnvdimm: Validate command family indices
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit 92fe2aa859f52ce6aa595ca97fec110dc7100e63 upstream.
The ND_CMD_CALL format allows for a general passthrough of passlisted commands targeting a given command set. However there is no validation of the family index relative to what the bus supports.
- Update the NFIT bus implementation (the only one that supports ND_CMD_CALL passthrough) to also passlist the valid set of command family indices.
- Update the generic __nd_ioctl() path to validate that field on behalf of all implementations.
--- drivers/acpi/nfit/core.c | 11 +++++++++-- drivers/acpi/nfit/nfit.h | 1 - drivers/nvdimm/bus.c | 16 ++++++++++++++++ include/linux/libnvdimm.h | 2 ++ include/uapi/linux/ndctl.h | 4 ++++ 5 files changed, 31 insertions(+), 3 deletions(-)
drivers/acpi/nfit/core.c +9 -2
@@ -1823,6 +1823,7 @@ static void populate_shutdown_status(strstatic int acpi_nfit_add_dimm (struct acpi_nfit_desc *acpi_desc,struct nfit_mem *nfit_mem,u32 device_handle) { +struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc;struct acpi_device *adev, *adev_dimm;struct device *dev = acpi_desc->dev;unsigned long dsm_mask, label_mask;
@@ -1834,6 +1835,7 @@ static int acpi_nfit_add_dimm(struct acp/* nfit test assumes 1:1 relationship between commands and dsms */ nfit_mem->dsm_mask = acpi_desc->dimm_cmd_force_en; nfit_mem->family =NVDIMM_FAMILY_INTEL ; +set_bit (NVDIMM_FAMILY_INTEL , &nd_desc->dimm_family_mask);if (dcr->valid_fields &ACPI_NFIT_CONTROL_MFG_INFO_VALID ) sprintf(nfit_mem->id, "%04x-%02x-%04x-%08x",
@@ -1886,10 +1888,13 @@ static int acpi_nfit_add_dimm(struct acp* Note, that checking for function0 (bit0) tells us if any commands * are reachable through this GUID. */ +clear_bit (NVDIMM_FAMILY_INTEL , &nd_desc->dimm_family_mask);for (i =0 ; i <=NVDIMM_FAMILY_MAX ; i++) -if (acpi_check_dsm (adev_dimm->handle,to_nfit_uuid (i),1 ,1 )) +if (acpi_check_dsm (adev_dimm->handle,to_nfit_uuid (i),1 ,1 )) { +set_bit (i, &nd_desc->dimm_family_mask);if (family <0 || i == default_dsm_family) family = i; + }/* limit the supported commands to those that are publicly documented */ nfit_mem->family = family;
@@ -2153,6 +2158,9 @@ static void acpi_nfit_init_dsms(struct a nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en; nd_desc->bus_dsm_mask = acpi_desc->bus_nfit_cmd_force_en; +set_bit (ND_CMD_CALL , &nd_desc->cmd_mask); +set_bit (NVDIMM_BUS_FAMILY_NFIT , &nd_desc->bus_family_mask); + adev =to_acpi_dev (acpi_desc);if (!adev)return ;
@@ -2160,7 +2168,6 @@ static void acpi_nfit_init_dsms(struct afor (i =ND_CMD_ARS_CAP ; i <=ND_CMD_CLEAR_ERROR ; i++)if (acpi_check_dsm (adev->handle, guid,1 ,1ULL << i))set_bit (i, &nd_desc->cmd_mask); -set_bit (ND_CMD_CALL , &nd_desc->cmd_mask); dsm_mask = (1 << ND_CMD_ARS_CAP) |
drivers/acpi/nfit/nfit.h +0 -1
@@ -33,7 +33,6 @@ | ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \ | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED) -#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV#define NVDIMM_CMD_MAX 31#define NVDIMM_STANDARD_CMDMASK \
drivers/nvdimm/bus.c +16 -0
@@ -1037,9 +1037,25 @@ static int __nd_ioctl(struct nvdimm_bus dimm_name ="bus" ; } +/* Validate command family support against bus declared support */ if (cmd ==ND_CMD_CALL ) { +unsigned long *mask; +if (copy_from_user (&pkg, p,sizeof (pkg)))return -EFAULT ; + +if (nvdimm) { +if (pkg.nd_family >NVDIMM_FAMILY_MAX ) +return -EINVAL ; + mask = &nd_desc->dimm_family_mask; + }else { +if (pkg.nd_family >NVDIMM_BUS_FAMILY_MAX ) +return -EINVAL ; + mask = &nd_desc->bus_family_mask; + } + +if (!test_bit (pkg.nd_family, mask)) +return -EINVAL ; } if (!desc ||
include/linux/libnvdimm.h +2 -0
@@ -78,6 +78,8 @@ struct nvdimm_bus_descriptor {const struct attribute_group **attr_groups;unsigned long bus_dsm_mask;unsigned long cmd_mask; +unsigned long dimm_family_mask; +unsigned long bus_family_mask;struct module *module;char *provider_name;struct device_node *of_node;
include/uapi/linux/ndctl.h +4 -0
@@ -245,6 +245,10 @@ struct nd_cmd_pkg {#define NVDIMM_FAMILY_MSFT 3#define NVDIMM_FAMILY_HYPERV 4#define NVDIMM_FAMILY_PAPR 5 +#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_PAPR + +#define NVDIMM_BUS_FAMILY_NFIT 0 +#define NVDIMM_BUS_FAMILY_MAX NVDIMM_BUS_FAMILY_NFIT#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\ struct nd_cmd_pkg)
Greg Kroah-Hartman
maintainerPATCH 114/232 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 117/232 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 118/232 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
@@ -1918,6 +1918,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; }
@@ -2124,6 +2140,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);
@@ -2141,6 +2158,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);
@@ -2188,6 +2209,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 152/232 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 119/232 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
@@ -681,8 +681,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 120/232 drm/amdgpu/debugfs: fix memory leak when pm_runtime_get_sync failed
In reply to Greg Kroah-HartmanFrom: Chen Tao <[email protected]>
[ Upstream commit 3e4aeff36e9212a939290c0ca70d4931c4ad1950 ]
Fix memory leak in amdgpu_debugfs_gpr_read not freeing data when pm_runtime_get_sync failed.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +7 -4
@@ -973,7 +973,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, r =pm_runtime_get_sync (adev->ddev->dev);if (r <0 ) -return r; + goto err; r =amdgpu_virt_enable_access_debugfs (adev);if (r <0 )
@@ -1003,7 +1003,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, value = data[result >>2 ]; r =put_user (value, (uint32_t *)buf);if (r) { - result = r; +amdgpu_virt_disable_access_debugfs (adev); goto err; }
@@ -1012,11 +1012,14 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, size -=4 ; } -err: -pm_runtime_put_autosuspend (adev->ddev->dev);kfree (data);amdgpu_virt_disable_access_debugfs (adev);return result; + +err: +pm_runtime_put_autosuspend (adev->ddev->dev); +kfree (data); +return r; }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 121/232 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 96/232 ceph: handle zero-length feature mask in session messages
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 02e37571f9e79022498fd0525c073b07e9d9ac69 upstream.
Most session messages contain a feature mask, but the MDS will routinely send a REJECT message with one that is zero-length.
Commit 0fa8263367db ("ceph: fix endianness bug when handling MDS session feature bits") fixed the decoding of the feature mask, but failed to account for the MDS sending a zero-length feature mask. This causes REJECT message decoding to fail.
Skip trying to decode a feature mask if the word count is zero.
Cc: [email protected]
URL: https://tracker.ceph.com/issues/46823
--- fs/ceph/mds_client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ceph/mds_client.c +4 -2
@@ -3279,8 +3279,10 @@ static void handle_session(struct ceph_m goto bad;/* version >= 3, feature bits */ ceph_decode_32_safe (&p, end, len, bad); -ceph_decode_64_safe (&p, end, features, bad); - p += len -sizeof (features); +if (len) { +ceph_decode_64_safe (&p, end, features, bad); + p += len -sizeof (features); + } }mutex_lock (&mdsc->mutex);