clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1
Subsystems (12)
Sasha Levin
maintainerPATCH 1/32 clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1
From: Codrin Ciubotariu <[email protected]>
[ Upstream commit 1573eebeaa8055777eb753f9b4d1cbe653380c38 ]
In clk_generated_determine_rate(), if the divisor is greater than GENERATED_MAX_DIV + 1, then the wrong best_rate will be returned. If clk_generated_set_rate() will be called later with this wrong rate, it will return -EINVAL, so the generated clock won't change its value. Do no let the divisor be greater than GENERATED_MAX_DIV + 1.
--- drivers/clk/at91/clk-generated.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/at91/clk-generated.c +2 -0
@@ -153,6 +153,8 @@ static int clk_generated_determine_rate(struct clk_hw *hw,continue ; div =DIV_ROUND_CLOSEST (parent_rate, req->rate); +if (div >GENERATED_MAX_DIV +1 ) + div =GENERATED_MAX_DIV +1 ;clk_generated_best_diff (req, parent, parent_rate, div, &best_diff, &best_rate);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/32 clk: sprd: Select REGMAP_MMIO to avoid compile errors
From: Chunyan Zhang <[email protected]>
[ Upstream commit c9a67cbb5189e966c70451562b2ca4c3876ab546 ]
Make REGMAP_MMIO selected to avoid undefined reference to regmap symbols.
--- drivers/clk/sprd/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clk/sprd/Kconfig +1 -0
@@ -2,6 +2,7 @@ config SPRD_COMMON_CLK tristate "Clock support for Spreadtrum SoCs" depends on ARCH_SPRD || COMPILE_TEST default ARCH_SPRD + select REGMAP_MMIO if SPRD_COMMON_CLK
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/32 clk: renesas: cpg-mssr: Fix reset control race condition
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit e1f1ae8002e4b06addc52443fcd975bbf554ae92 ]
The module reset code in the Renesas CPG/MSSR driver uses read-modify-write (RMW) operations to write to a Software Reset Register (SRCRn), and simple writes to write to a Software Reset Clearing Register (SRSTCLRn), as was mandated by the R-Car Gen2 and Gen3 Hardware User's Manuals.
However, this may cause a race condition when two devices are reset in
parallel: if the reset for device A completes in the middle of the RMW operation for device B, device A may be reset again, causing subtle failures (e.g. i2c timeouts):
thread A thread B
-------- --------
val = SRCRn
val |= bit A
SRCRn = val
delay
val = SRCRn (bit A is set)
SRSTCLRn = bit A
(bit A in SRCRn is cleared)
val |= bit B
SRCRn = val (bit A and B are set)
This can be reproduced on e.g. Salvator-XS using:
$ while true; do i2cdump -f -y 4 0x6A b > /dev/null; done &
$ while true; do i2cdump -f -y 2 0x10 b > /dev/null; done & i2c-rcar e6510000.i2c: error -110 : 40000002
i2c-rcar e66d8000.i2c: error -110 : 40000002According to the R-Car Gen3 Hardware Manual Errata for Rev. 0.80 of Feb 28, 2018, reflected in Rev. 1.00 of the R-Car Gen3 Hardware User's Manual, writes to SRCRn do not require read-modify-write cycles.
Note that the R-Car Gen2 Hardware User's Manual has not been updated yet, and still says a read-modify-write sequence is required. According to the hardware team, the reset hardware block is the same on both R-Car Gen2 and Gen3, though.
Hence fix the issue by replacing the read-modify-write operations on SRCRn by simple writes.
--- drivers/clk/renesas/renesas-cpg-mssr.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/clk/renesas/renesas-cpg-mssr.c +2 -14
@@ -535,17 +535,11 @@ static int cpg_mssr_reset(struct reset_controller_dev *rcdev,unsigned int reg = id /32 ;unsigned int bit = id %32 ;u32 bitmask =BIT (bit); -unsigned long flags; -u32 value;dev_dbg (priv->dev,"reset %u%02u\n" , reg, bit);/* Reset module */ -spin_lock_irqsave (&priv->rmw_lock, flags); - value =readl (priv->base +SRCR (reg)); - value |= bitmask; -writel (value, priv->base +SRCR (reg)); -spin_unlock_irqrestore (&priv->rmw_lock, flags); +writel (bitmask, priv->base +SRCR (reg));/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ udelay (35 );
@@ -562,16 +556,10 @@ static int cpg_mssr_assert(struct reset_controller_dev *rcdev, unsigned long id)unsigned int reg = id /32 ;unsigned int bit = id %32 ;u32 bitmask =BIT (bit); -unsigned long flags; -u32 value;dev_dbg (priv->dev,"assert %u%02u\n" , reg, bit); -spin_lock_irqsave (&priv->rmw_lock, flags); - value =readl (priv->base +SRCR (reg)); - value |= bitmask; -writel (value, priv->base +SRCR (reg)); -spin_unlock_irqrestore (&priv->rmw_lock, flags); +writel (bitmask, priv->base +SRCR (reg));return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/32 xtensa: fix build for cores with coprocessors
In reply to Sasha LevinFrom: Max Filippov <[email protected]>
[ Upstream commit e3cacb73e626d885b8cf24103fed0ae26518e3c4 ]
Assembly entry/return abstraction change didn't add asmmacro.h include statement to coprocessor.S, resulting in references to undefined macros abi_entry and abi_ret on cores that define XTENSA_HAVE_COPROCESSORS. Fix that by including asm/asmmacro.h from the coprocessor.S.
--- arch/xtensa/kernel/coprocessor.S | 1 + 1 file changed, 1 insertion(+)
arch/xtensa/kernel/coprocessor.S +1 -0
@@ -14,6 +14,7 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> +#include <asm/asmmacro.h> #include <asm/processor.h> #include <asm/coprocessor.h> #include <asm/thread_info.h>
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/32 xen/pciback: remove set but not used variable 'old_state'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 09e088a4903bd0dd911b4f1732b250130cdaffed ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/xen/xen-pciback/conf_space_capability.c: In function pm_ctrl_write:drivers/xen/xen-pciback/conf_space_capability.c:119:25: warning:
variable old_state set but not used [-Wunused-but-set-variable]
It is never used so can be removed.
--- drivers/xen/xen-pciback/conf_space_capability.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/xen/xen-pciback/conf_space_capability.c +1 -2
@@ -116,13 +116,12 @@ static int pm_ctrl_write(struct pci_dev *dev, int offset, u16 new_value, {int err;u16 old_value; -pci_power_t new_state, old_state; +pci_power_t new_state; err =pci_read_config_word (dev, offset, &old_value);if (err) goto out; - old_state = (pci_power_t)(old_value &PCI_PM_CTRL_STATE_MASK ); new_state = (pci_power_t)(new_value &PCI_PM_CTRL_STATE_MASK ); new_value &=PM_OK_BITS ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/32 irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail
In reply to Sasha LevinFrom: Nianyao Tang <[email protected]>
[ Upstream commit 34f8eb92ca053cbba2887bb7e4dbf2b2cd6eb733 ]
In its_vpe_init, when its_alloc_vpe_table fails, we should free vpt_page allocated just before, instead of vpe->vpt_page. Let's fix it.
--- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +1 -1
@@ -2883,7 +2883,7 @@ static int its_vpe_init(struct its_vpe *vpe)if (!its_alloc_vpe_table (vpe_id)) {its_vpe_id_free (vpe_id); -its_free_pending_table (vpe->vpt_page); +its_free_pending_table (vpt_page);return -ENOMEM ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/32 irqchip/irq-imx-gpcv2: Forward irq type to parent
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit 9a446ef08f3bfc0c3deb9c6be840af2528ef8cf8 ]
The GPCv2 is a stacked IRQ controller below the ARM GIC. It doesn't care about the IRQ type itself, but needs to forward the type to the parent IRQ controller, so this one can be configured correctly.
--- drivers/irqchip/irq-imx-gpcv2.c | 1 + 1 file changed, 1 insertion(+)
drivers/irqchip/irq-imx-gpcv2.c +1 -0
@@ -131,6 +131,7 @@ static struct irq_chip gpcv2_irqchip_data_chip = { .irq_unmask = imx_gpcv2_irq_unmask, .irq_set_wake = imx_gpcv2_irq_set_wake, .irq_retrigger = irq_chip_retrigger_hierarchy, + .irq_set_type = irq_chip_set_type_parent,#ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent,#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/32 perf header: Fix divide by zero error if f_header.attr_size==0
In reply to Sasha LevinFrom: Vince Weaver <[email protected]>
[ Upstream commit 7622236ceb167aa3857395f9bdaf871442aa467e ]
So I have been having lots of trouble with hand-crafted perf.data files causing segfaults and the like, so I have started fuzzing the perf tool.
First issue found:
If f_header.attr_size is 0 in the perf.data file, then perf will crash with a divide-by-zero error.
Committer note:
Added a pr_err() to tell the user why the command failed.
--- tools/perf/util/header.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/util/header.c +7 -0
@@ -3285,6 +3285,13 @@ int perf_session__read_header(struct perf_session *session) data->file.path); } +if (f_header.attr_size ==0 ) { +pr_err ("ERROR: The %s file's attr size field is 0 which is unexpected.\n" +"Was the 'perf record' command properly terminated?\n" , + data->file.path); +return -EINVAL ; + } + nr_attrs = f_header.attrs.size / f_header.attr_size;lseek (fd, f_header.attrs.offset,SEEK_SET );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/32 perf header: Fix use of unitialized value warning
In reply to Sasha LevinFrom: Numfor Mbiziwo-Tiapo <[email protected]>
[ Upstream commit 20f9781f491360e7459c589705a2e4b1f136bee9 ]
When building our local version of perf with MSAN (Memory Sanitizer) and running the perf record command, MSAN throws a use of uninitialized value warning in "tools/perf/util/util.c:333:6".
This warning stems from the "buf" variable being passed into "write". It originated as the variable "ev" with the type union perf_event* defined in the "perf_event__synthesize_attr" function in "tools/perf/util/header.c".
In the "perf_event__synthesize_attr" function they allocate space with a malloc call using ev, then go on to only assign some of the member variables before passing "ev" on as a parameter to the "process" function therefore "ev" contains uninitialized memory. Changing the malloc call to zalloc to initialize all the members of "ev" which gets rid of the warning.
To reproduce this warning, build perf by running:
make -C tools/perf CLANG=1 CC=clang EXTRA_CFLAGS="-fsanitize=memory\
-fsanitize-memory-track-origins"
(Additionally, llvm might have to be installed and clang might have to be specified as the compiler - export CC=/usr/bin/clang)
then running:tools/perf/perf record -o - ls / | tools/perf/perf --no-pager annotate\
-i - --stdio
Please see the cover letter for why false positive warnings may be generated.
--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -3372,7 +3372,7 @@ int perf_event__synthesize_attr(struct perf_tool *tool, size +=sizeof (struct perf_event_header ); size += ids *sizeof (u64); - ev =malloc (size); + ev =zalloc (size);if (ev ==NULL )return -ENOMEM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/32 libata: zpodd: Fix small read overflow in zpodd_get_mech_type()
In reply to Sasha LevinFrom: Kees Cook <[email protected]>
[ Upstream commit 71d6c505b4d9e6f76586350450e785e3d452b346 ]
Jeffrin reported a KASAN issue:
BUG: KASAN: global-out-of-bounds in ata_exec_internal_sg+0x50f/0xc70
Read of size 16 at addr ffffffff91f41f80 by task scsi_eh_1/149
...
The buggy address belongs to the variable:
cdb.48319+0x0/0x40Much like commit 18c9a99bce2a ("libata: zpodd: small read overflow in eject_tray()"), this fixes a cdb[] buffer length, this time in zpodd_get_mech_type():
We read from the cdb[] buffer in ata_exec_internal_sg(). It has to be ATAPI_CDB_LEN (16) bytes long, but this buffer is only 12 bytes.
--- drivers/ata/libata-zpodd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-zpodd.c +1 -1
@@ -56,7 +56,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)unsigned int ret;struct rm_feature_desc *desc;struct ata_taskfile tf; -static const char cdb[] = {GPCMD_GET_CONFIGURATION , +static const char cdb[ATAPI_CDB_LEN ] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/32 drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit f4cc743a98136df3c3763050a0e8223b52d9a960 ]
If DRM_LVDS_ENCODER=y but CONFIG_DRM_KMS_HELPER=m, build fails:
drivers/gpu/drm/bridge/lvds-encoder.o: In function `lvds_encoder_probe':
lvds-encoder.c:(.text+0x155): undefined reference to `devm_drm_panel_bridge_add'
--- drivers/gpu/drm/bridge/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/Kconfig +1 -0
@@ -46,6 +46,7 @@ config DRM_DUMB_VGA_DAC config DRM_LVDS_ENCODER tristate "Transparent parallel to LVDS encoder support" depends on OF + select DRM_KMS_HELPER select DRM_PANEL_BRIDGE help Support for transparent parallel to LVDS encoders that don't require
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 12/32 Btrfs: fix deadlock between fiemap and transaction commits
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit a6d155d2e363f26290ffd50591169cb96c2a609e ]
The fiemap handler locks a file range that can have unflushed delalloc, and after locking the range, it tries to attach to a running transaction. If the running transaction started its commit, that is, it is in state TRANS_STATE_COMMIT_START, and either the filesystem was mounted with the flushoncommit option or the transaction is creating a snapshot for the subvolume that contains the file that fiemap is operating on, we end up deadlocking. This happens because fiemap is blocked on the transaction, waiting for it to complete, and the transaction is waiting for the flushed dealloc to complete, which requires locking the file range that the fiemap task already locked. The following stack traces serve as an example of when this deadlock happens:
(...)
[404571.515510] Workqueue: btrfs-endio-write btrfs_endio_write_helper [btrfs] [404571.515956] Call Trace: [404571.516360] ? __schedule+0x3ae/0x7b0 [404571.516730] schedule+0x3a/0xb0 [404571.517104] lock_extent_bits+0x1ec/0x2a0 [btrfs] [404571.517465] ? remove_wait_queue+0x60/0x60 [404571.517832] btrfs_finish_ordered_io+0x292/0x800 [btrfs] [404571.518202] normal_work_helper+0xea/0x530 [btrfs] [404571.518566] process_one_work+0x21e/0x5c0 [404571.518990] worker_thread+0x4f/0x3b0 [404571.519413] ? process_one_work+0x5c0/0x5c0 [404571.519829] kthread+0x103/0x140 [404571.520191] ? kthread_create_worker_on_cpu+0x70/0x70 [404571.520565] ret_from_fork+0x3a/0x50 [404571.520915] kworker/u8:6 D 0 31651 2 0x80004000 [404571.521290] Workqueue: btrfs-flush_delalloc btrfs_flush_delalloc_helper [btrfs] (...) [404571.537000] fsstress D 0 13117 13115 0x00004000 [404571.537263] Call Trace: [404571.537524] ? __schedule+0x3ae/0x7b0 [404571.537788] schedule+0x3a/0xb0 [404571.538066] wait_current_trans+0xc8/0x100 [btrfs] [404571.538349] ? remove_wait_queue+0x60/0x60 [404571.538680] start_transaction+0x33c/0x500 [btrfs] [404571.539076] btrfs_check_shared+0xa3/0x1f0 [btrfs] [404571.539513] ? extent_fiemap+0x2ce/0x650 [btrfs] [404571.539866] extent_fiemap+0x2ce/0x650 [btrfs] [404571.540170] do_vfs_ioctl+0x526/0x6f0 [404571.540436] ksys_ioctl+0x70/0x80 [404571.540734] __x64_sys_ioctl+0x16/0x20 [404571.540997] do_syscall_64+0x60/0x1d0 [404571.541279] entry_SYSCALL_64_after_hwframe+0x49/0xbe (...) [404571.543729] btrfs D 0 14210 14208 0x00004000 [404571.544023] Call Trace: [404571.544275] ? __schedule+0x3ae/0x7b0 [404571.544526] ? wait_for_completion+0x112/0x1a0 [404571.544795] schedule+0x3a/0xb0 [404571.545064] schedule_timeout+0x1ff/0x390 [404571.545351] ? lock_acquire+0xa6/0x190 [404571.545638] ? wait_for_completion+0x49/0x1a0 [404571.545890] ? wait_for_completion+0x112/0x1a0 [404571.546228] wait_for_completion+0x131/0x1a0 [404571.546503] ? wake_up_q+0x70/0x70 [404571.546775] btrfs_wait_ordered_extents+0x27c/0x400 [btrfs] [404571.547159] btrfs_commit_transaction+0x3b0/0xae0 [btrfs] [404571.547449] ? btrfs_mksubvol+0x4a4/0x640 [btrfs] [404571.547703] ? remove_wait_queue+0x60/0x60 [404571.547969] btrfs_mksubvol+0x605/0x640 [btrfs] [404571.548226] ? __sb_start_write+0xd4/0x1c0 [404571.548512] ? mnt_want_write_file+0x24/0x50 [404571.548789] btrfs_ioctl_snap_create_transid+0x169/0x1a0 [btrfs] [404571.549048] btrfs_ioctl_snap_create_v2+0x11d/0x170 [btrfs] [404571.549307] btrfs_ioctl+0x133f/0x3150 [btrfs] [404571.549549] ? mem_cgroup_charge_statistics+0x4c/0xd0 [404571.549792] ? mem_cgroup_commit_charge+0x84/0x4b0 [404571.550064] ? __handle_mm_fault+0xe3e/0x11f0 [404571.550306] ? do_raw_spin_unlock+0x49/0xc0 [404571.550608] ? _raw_spin_unlock+0x24/0x30 [404571.550976] ? __handle_mm_fault+0xedf/0x11f0 [404571.551319] ? do_vfs_ioctl+0xa2/0x6f0 [404571.551659] ? btrfs_ioctl_get_supported_features+0x30/0x30 [btrfs] [404571.552087] do_vfs_ioctl+0xa2/0x6f0 [404571.552355] ksys_ioctl+0x70/0x80 [404571.552621] __x64_sys_ioctl+0x16/0x20 [404571.552864] do_syscall_64+0x60/0x1d0 [404571.553104] entry_SYSCALL_64_after_hwframe+0x49/0xbe (...)
If we were joining the transaction instead of attaching to it, we would not risk a deadlock because a join only blocks if the transaction is in a state greater then or equals to TRANS_STATE_COMMIT_DOING, and the delalloc flush performed by a transaction is done before it reaches that state, when it is in the state TRANS_STATE_COMMIT_START. However a transaction join is intended for use cases where we do modify the filesystem, and fiemap only needs to peek at delayed references from the current transaction in order to determine if extents are shared, and, besides that, when there is no current transaction or when it blocks to wait for a current committing transaction to complete, it creates a new transaction without reserving any space. Such unnecessary transactions, besides doing unnecessary IO, can cause transaction aborts (-ENOSPC) and unnecessary rotation of the precious backup roots.
So fix this by adding a new transaction join variant, named join_nostart, which behaves like the regular join, but it does not create a transaction when none currently exists or after waiting for a committing transaction to complete.
--- fs/btrfs/backref.c | 2 +- fs/btrfs/transaction.c | 22 ++++++++++++++++++---- fs/btrfs/transaction.h | 3 +++ 3 files changed, 22 insertions(+), 5 deletions(-)
fs/btrfs/backref.c +1 -1
@@ -1485,7 +1485,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr) goto out; } - trans =btrfs_attach_transaction (root); + trans =btrfs_join_transaction_nostart (root);if (IS_ERR (trans)) {if (PTR_ERR (trans) != -ENOENT &&PTR_ERR (trans) != -EROFS ) { ret =PTR_ERR (trans);
fs/btrfs/transaction.c +18 -4
@@ -28,15 +28,18 @@ static const unsigned int btrfs_blocked_trans_types[TRANS_STATE_MAX] = { [TRANS_STATE_COMMIT_START] = (__TRANS_START | __TRANS_ATTACH), [TRANS_STATE_COMMIT_DOING ] = (__TRANS_START | __TRANS_ATTACH | - __TRANS_JOIN), + __TRANS_JOIN | + __TRANS_JOIN_NOSTART), [TRANS_STATE_UNBLOCKED ] = (__TRANS_START | __TRANS_ATTACH | __TRANS_JOIN | - __TRANS_JOIN_NOLOCK), + __TRANS_JOIN_NOLOCK | + __TRANS_JOIN_NOSTART), [TRANS_STATE_COMPLETED ] = (__TRANS_START | __TRANS_ATTACH | __TRANS_JOIN | - __TRANS_JOIN_NOLOCK), + __TRANS_JOIN_NOLOCK | + __TRANS_JOIN_NOSTART), };void btrfs_put_transaction (struct btrfs_transaction *transaction)
@@ -531,7 +534,8 @@ start_transaction(struct btrfs_root *root, unsigned int num_items, ret =join_transaction (fs_info, type);if (ret == -EBUSY ) {wait_current_trans (fs_info); -if (unlikely (type ==TRANS_ATTACH )) +if (unlikely (type ==TRANS_ATTACH || + type ==TRANS_JOIN_NOSTART )) ret = -ENOENT ; } }while (ret == -EBUSY );
@@ -647,6 +651,16 @@ struct btrfs_trans_handle *btrfs_join_transaction_nolock(struct btrfs_root *root BTRFS_RESERVE_NO_FLUSH, true); } +/* +* Similar to regular join but it never starts a transaction when none is +* running or after waiting for the current one to finish. +*/ +struct btrfs_trans_handle *btrfs_join_transaction_nostart (struct btrfs_root *root) +{ +return start_transaction (root,0 ,TRANS_JOIN_NOSTART , +BTRFS_RESERVE_NO_FLUSH , true); +} +/* * btrfs_attach_transaction() - catch the running transaction *
fs/btrfs/transaction.h +3 -0
@@ -97,11 +97,13 @@ struct btrfs_transaction {#define __TRANS_JOIN (1U << 11)#define __TRANS_JOIN_NOLOCK (1U << 12)#define __TRANS_DUMMY (1U << 13) +#define __TRANS_JOIN_NOSTART (1U << 14)#define TRANS_START (__TRANS_START | __TRANS_FREEZABLE)#define TRANS_ATTACH (__TRANS_ATTACH)#define TRANS_JOIN (__TRANS_JOIN | __TRANS_FREEZABLE)#define TRANS_JOIN_NOLOCK (__TRANS_JOIN_NOLOCK) +#define TRANS_JOIN_NOSTART (__TRANS_JOIN_NOSTART)#define TRANS_EXTWRITERS (__TRANS_START | __TRANS_ATTACH)
@@ -187,6 +189,7 @@ struct btrfs_trans_handle *btrfs_start_transaction_fallback_global_rsv( int min_factor);struct btrfs_trans_handle *btrfs_join_transaction (struct btrfs_root *root);struct btrfs_trans_handle *btrfs_join_transaction_nolock (struct btrfs_root *root); +struct btrfs_trans_handle *btrfs_join_transaction_nostart (struct btrfs_root *root);struct btrfs_trans_handle *btrfs_attach_transaction (struct btrfs_root *root);struct btrfs_trans_handle *btrfs_attach_transaction_barrier (struct btrfs_root *root);
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 12/32] Btrfs: fix deadlock between fiemap and transaction commits
Quoted 5 lines · Sasha Levin
From: Filipe Manana <[email protected]>
[ Upstream commit
a6d155d2e363f26290ffd50591169cb96c2a609e]Fixes 03628cdbc64db6 ("Btrfs: do not start a transaction during fiemap")
The commit is a regression fix during the 5.2 cycle, how it could end up in a 4.19 stable candidate?
$ git describe 03628cdbc64db6 v5.1-rc7-201-g03628cdbc64d
$ git describe --contains 03628cdbc64db6 v5.2-rc1~163^2~26
And it does not belong to 5.2 either, git cherry-pick on top of 5.2 fails.
I think such sanity check can be done automatically so the patches don't accidentally land in trees where don't belong.
Greg KH
maintainerRe: [PATCH AUTOSEL 4.19 12/32] Btrfs: fix deadlock between fiemap and transaction commits
Quoted 13 lines · David Sterba
Quoted 5 lines · Sasha Levin
From: Filipe Manana <[email protected]>
[ Upstream commit
a6d155d2e363f26290ffd50591169cb96c2a609e]Fixes 03628cdbc64db6 ("Btrfs: do not start a transaction during fiemap")The commit is a regression fix during the 5.2 cycle, how it could end up in a 4.19 stable candidate?
$ git describe 03628cdbc64db6 v5.1-rc7-201-g03628cdbc64d
Quoted 8 lines
$ git describe --contains 03628cdbc64db6 v5.2-rc1~163^2~26And it does not belong to 5.2 either, git cherry-pick on top of 5.2 fails.
I think such sanity check can be done automatically so the patches don't accidentally land in trees where don't belong.
Commit 03628cdbc64d ("Btrfs: do not start a transaction during fiemap") was tagged for the stable trees, and ended up in the following releases:
4.14.121 4.19.45 5.0.18 5.1.4 5.2
so yes, it does need to go back to all of those locations if this patch really does fix the issue there.
thanks,
greg k-h
Re: [PATCH AUTOSEL 4.19 12/32] Btrfs: fix deadlock between fiemap and transaction commits
Quoted 24 lines · Greg KH
Quoted 13 lines · David Sterba
Quoted 5 lines · Sasha Levin
From: Filipe Manana <[email protected]>
[ Upstream commit
a6d155d2e363f26290ffd50591169cb96c2a609e]Fixes 03628cdbc64db6 ("Btrfs: do not start a transaction during fiemap")The commit is a regression fix during the 5.2 cycle, how it could end up in a 4.19 stable candidate?
$ git describe 03628cdbc64db6 v5.1-rc7-201-g03628cdbc64dQuoted 8 lines
$ git describe --contains 03628cdbc64db6 v5.2-rc1~163^2~26And it does not belong to 5.2 either, git cherry-pick on top of 5.2 fails.
I think such sanity check can be done automatically so the patches don't accidentally land in trees where don't belong.
Quoted 5 lines
Commit
03628cdbc64d("Btrfs: do not start a transaction during fiemap") was tagged for the stable trees, and ended up in the following releases:4.14.121 4.19.45 5.0.18 5.1.4 5.2so yes, it does need to go back to all of those locations if this patch really does fix the issue there.
You're right, I did not notice the CC tag when examining the patches.
Sasha Levin
maintainerPATCH 13/32 scsi: hpsa: correct scsi command status issue after reset
In reply to Sasha LevinFrom: Don Brace <[email protected]>
[ Upstream commit eeebce1862970653cdf5c01e98bc669edd8f529a ]
--- drivers/scsi/hpsa.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +11 -1
@@ -2320,6 +2320,8 @@ static int handle_ioaccel_mode2_error(struct ctlr_info *h,case IOACCEL2_SERV_RESPONSE_COMPLETE :switch (c2->error_data.status) {case IOACCEL2_STATUS_SR_TASK_COMP_GOOD : +if (cmd) + cmd->result =0 ;break ;case IOACCEL2_STATUS_SR_TASK_COMP_CHK_COND : cmd->result |=SAM_STAT_CHECK_CONDITION ;
@@ -2479,8 +2481,10 @@ static void process_ioaccel2_completion(struct ctlr_info *h,/* check for good status */ if (likely (c2->error_data.serv_response ==0 && - c2->error_data.status ==0 )) + c2->error_data.status ==0 )) { + cmd->result =0 ;return hpsa_cmd_free_and_done (h, c, cmd); + }/* * Any RAID offload error results in retry which will use
@@ -5617,6 +5621,12 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd) } c =cmd_tagged_alloc (h, cmd); +/* +* This is necessary because the SML doesn't zero out this field during +* error recovery. +*/ + cmd->result =0 ; +/* * Call alternate submit routine for I/O accelerated commands. * Retries always go down the normal I/O path.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/32 scsi: qla2xxx: Fix possible fcport null-pointer dereferences
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit e82f04ec6ba91065fd33a6201ffd7cab840e1475 ]
In qla2x00_alloc_fcport(), fcport is assigned to NULL in the error handling code on line 4880:
fcport = NULL;
Then fcport is used on lines 4883-4886:
INIT_WORK(&fcport->del_work, qla24xx_delete_sess_fn); INIT_WORK(&fcport->reg_work, qla_register_fcport_fn); INIT_LIST_HEAD(&fcport->gnl_entry); INIT_LIST_HEAD(&fcport->list);
Thus, possible null-pointer dereferences may occur.
To fix these bugs, qla2x00_alloc_fcport() directly returns NULL in the error handling code.
These bugs are found by a static analysis tool STCheck written by us.
--- drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -4732,7 +4732,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags)ql_log (ql_log_warn, vha,0xd049 ,"Failed to allocate ct_sns request.\n" );kfree (fcport); - fcport =NULL ; +return NULL ; }INIT_WORK (&fcport->del_work, qla24xx_delete_sess_fn);INIT_LIST_HEAD (&fcport->gnl_entry);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/32 exit: make setting exit_state consistent
In reply to Sasha LevinFrom: Christian Brauner <[email protected]>
[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state") we unconditionally set exit_state to EXIT_ZOMBIE before calling into do_notify_parent(). This was done to eliminate a race when querying exit_state in do_notify_pidfd().
Back then we decided to do the absolute minimal thing to fix this and not touch the rest of the exit_notify() function where exit_state is set.
Since this fix has not caused any issues change the setting of exit_state to EXIT_DEAD in the autoreap case to account for the fact hat exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned but also explicitly requested in [1] and makes the whole code more consistent.
/* References */
[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
--- kernel/exit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/exit.c +3 -2
@@ -732,9 +732,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead) autoreap = true; } - tsk->exit_state = autoreap ?EXIT_DEAD :EXIT_ZOMBIE ; -if (tsk->exit_state ==EXIT_DEAD ) +if (autoreap) { + tsk->exit_state =EXIT_DEAD ;list_add (&tsk->ptrace_entry, &dead); + }/* mt-exec, de_thread() is waiting for group leader */ if (unlikely (tsk->signal->notify_count <0 ))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/32 drm/amdgpu: fix a potential information leaking bug
In reply to Sasha LevinFrom: Wang Xiayang <[email protected]>
[ Upstream commit 929e571c04c285861e0bb049a396a2bdaea63282 ]
Coccinelle reports a path that the array "data" is never initialized. The path skips the checks in the conditional branches when either of callback functions, read_wave_vgprs and read_wave_sgprs, is not registered. Later, the uninitialized "data" array is read in the while-loop below and passed to put_user().
Fix the path by allocating the array with kcalloc().
The patch is simplier than adding a fall-back branch that explicitly calls memset(data, 0, ...). Also it does not need the multiplication 1024*sizeof(*data) as the size parameter for memset() though there is no risk of integer overflow.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -707,7 +707,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, thread = (*pos &GENMASK_ULL (59 ,52 )) >>52 ; bank = (*pos &GENMASK_ULL (61 ,60 )) >>60 ; - data =kmalloc_array (1024 ,sizeof (*data),GFP_KERNEL ); + data =kcalloc (1024 ,sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 17/32 ata: libahci: do not complain in case of deferred probe
In reply to Sasha LevinFrom: Miquel Raynal <[email protected]>
[ Upstream commit 090bb803708198e5ab6b0046398c7ed9f4d12d6b ]
Retrieving PHYs can defer the probe, do not spawn an error when -EPROBE_DEFER is returned, it is normal behavior.
--- drivers/ata/libahci_platform.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libahci_platform.c +3 -0
@@ -313,6 +313,9 @@ static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port, hpriv->phys[port] =NULL ; rc =0 ;break ; +case -EPROBE_DEFER : +/* Do not complain yet */ +break ;default : dev_err(dev,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/32 kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit cb4819934a7f9b87876f11ed05b8624c0114551b ]
KBUILD_EXTRA_SYMBOLS makes sense only when building external modules. Moreover, the modpost sets 'external_module' if the -e option is given.
I replaced $(patsubst %, -e %,...) with simpler $(addprefix -e,...) while I was here.
--- scripts/Makefile.modpost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.modpost +1 -1
@@ -75,7 +75,7 @@ modpost = scripts/mod/modpost \ $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,) \ $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \ $(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \ - $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \ + $(if $(KBUILD_EXTMOD),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/32 kbuild: Check for unknown options with cc-option usage in Kconfig and clang
In reply to Sasha LevinFrom: Stephen Boyd <[email protected]>
[ Upstream commit e8de12fb7cde2c85bc31097cd098da79a4818305 ]
If the particular version of clang a user has doesn't enable -Werror=unknown-warning-option by default, even though it is the default[1], then make sure to pass the option to the Kconfig cc-option command so that testing options from Kconfig files works properly. Otherwise, depending on the default values setup in the clang toolchain we will silently assume options such as -Wmaybe-uninitialized are supported by clang, when they really aren't.
A compilation issue only started happening for me once commit 589834b3a009 ("kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS") was applied on top of commit b303c6df80c9 ("kbuild:
compute false-positive -Wmaybe-uninitialized cases in Kconfig"). This leads kbuild to try and test for the existence of the -Wmaybe-uninitialized flag with the cc-option command in scripts/Kconfig.include, and it doesn't see an error returned from the option test so it sets the config value to Y. Then the Makefile tries to pass the unknown option on the command line and -Werror=unknown-warning-option catches the invalid option and breaks the build. Before commit 589834b3a009 ("kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS") the build works fine, but any cc-option test of a warning option in Kconfig files silently evaluates to true, even if the warning option flag isn't supported on clang.
Note: This doesn't change cc-option usages in Makefiles because those use a different rule that includes KBUILD_CFLAGS by default (see the __cc-option command in scripts/Kbuild.incluide). The KBUILD_CFLAGS variable already has the -Werror=unknown-warning-option flag set. Thanks to Doug for pointing out the different rule.
[1] https://clang.llvm.org/docs/DiagnosticsReference.html#wunknown-warning-option
--- scripts/Kconfig.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Kconfig.include +1 -1
@@ -20,7 +20,7 @@ success = $(if-success,$(1),y,n) # $(cc-option,<flag>) # Return y if the compiler supports <flag>, n otherwise -cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null) +cc-option = $(success,$(CC) -Werror $(CLANG_FLAGS) $(1) -E -x c /dev/null -o /dev/null) # $(ld-option,<flag>) # Return y if the linker supports <flag>, n otherwise
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/32 arm64/efi: fix variable 'si' set but not used
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit f1d4836201543e88ebe70237e67938168d5fab19 ]
GCC throws out this warning on arm64.
drivers/firmware/efi/libstub/arm-stub.c: In function 'efi_entry':drivers/firmware/efi/libstub/arm-stub.c:132:22: warning: variable 'si' set but not used [-Wunused-but-set-variable]
Fix it by making free_screen_info() a static inline function.
--- arch/arm64/include/asm/efi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/include/asm/efi.h +5 -1
@@ -94,7 +94,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, ((protocol##_t *)instance)->f(instance, ##__VA_ARGS__) #define alloc_screen_info(x...) &screen_info -#define free_screen_info(x...) + +static inline void free_screen_info (efi_system_table_t *sys_table_arg, +struct screen_info *si) +{ +}/* redeclare as 'hidden' so the compiler will generate relative references */ extern struct screen_info screen_info __attribute__((__visibility__("hidden")));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/32 drm/vgem: fix cache synchronization on arm/arm64
In reply to Sasha LevinFrom: Rob Clark <[email protected]>
[ Upstream commit 7e9e5ead55beacc11116b3fb90b0de6e7cf55a69 ]
drm_cflush_pages() is no-op on arm/arm64. But instead we can use dma_sync API.
Fixes failures w/ vgem_test.
--- drivers/gpu/drm/vgem/vgem_drv.c | 130 ++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 47 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +83 -47
@@ -47,10 +47,16 @@ static struct vgem_device {struct platform_device *platform; } *vgem_device; +static void sync_and_unpin (struct drm_vgem_gem_object *bo); +static struct page **pin_and_sync (struct drm_vgem_gem_object *bo); +static void vgem_gem_free_object (struct drm_gem_object *obj) {struct drm_vgem_gem_object *vgem_obj =to_vgem_bo (obj); +if (!obj->import_attach) +sync_and_unpin (vgem_obj); +kvfree (vgem_obj->pages);mutex_destroy (&vgem_obj->pages_lock);
@@ -78,40 +84,15 @@ static vm_fault_t vgem_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ;mutex_lock (&obj->pages_lock); +if (!obj->pages) +pin_and_sync (obj);if (obj->pages) {get_page (obj->pages[page_offset]); vmf->page = obj->pages[page_offset]; ret =0 ; }mutex_unlock (&obj->pages_lock); -if (ret) { -struct page *page; - - page =shmem_read_mapping_page ( -file_inode (obj->base.filp)->i_mapping, - page_offset); -if (!IS_ERR (page)) { - vmf->page = page; - ret =0 ; - }else switch (PTR_ERR (page)) { -case -ENOSPC : -case -ENOMEM : - ret =VM_FAULT_OOM ; -break ; -case -EBUSY : - ret =VM_FAULT_RETRY ; -break ; -case -EFAULT : -case -EINVAL : - ret =VM_FAULT_SIGBUS ; -break ; -default : -WARN_ON (PTR_ERR (page)); - ret =VM_FAULT_SIGBUS ; -break ; - } - }return ret; }
@@ -277,32 +258,93 @@ static const struct file_operations vgem_driver_fops = { .release = drm_release, }; -static struct page **vgem_pin_pages (struct drm_vgem_gem_object *bo) +/* Called under pages_lock, except in free path (where it can't race): */ +static void sync_and_unpin (struct drm_vgem_gem_object *bo) { -mutex_lock (&bo->pages_lock); -if (bo->pages_pin_count++ ==0 ) { -struct page **pages; +struct drm_device *dev = bo->base.dev; + +if (bo->table) { +dma_sync_sg_for_cpu (dev->dev, bo->table->sgl, + bo->table->nents,DMA_BIDIRECTIONAL ); +sg_free_table (bo->table); +kfree (bo->table); + bo->table =NULL ; + } + +if (bo->pages) { +drm_gem_put_pages (&bo->base, bo->pages, true, true); + bo->pages =NULL ; + } +} + +static struct page **pin_and_sync (struct drm_vgem_gem_object *bo) +{ +struct drm_device *dev = bo->base.dev; +int npages = bo->base.size >>PAGE_SHIFT ; +struct page **pages; +struct sg_table *sgt; + +WARN_ON (!mutex_is_locked (&bo->pages_lock)); + + pages =drm_gem_get_pages (&bo->base); +if (IS_ERR (pages)) { + bo->pages_pin_count--; +mutex_unlock (&bo->pages_lock); +return pages; + } - pages =drm_gem_get_pages (&bo->base); -if (IS_ERR (pages)) { - bo->pages_pin_count--; -mutex_unlock (&bo->pages_lock); -return pages; - } + sgt =drm_prime_pages_to_sg (pages, npages); +if (IS_ERR (sgt)) { +dev_err (dev->dev, +"failed to allocate sgt: %ld\n" , +PTR_ERR (bo->table)); +drm_gem_put_pages (&bo->base, pages, false, false); +mutex_unlock (&bo->pages_lock); +return ERR_CAST (bo->table); + } + +/* +* Flush the object from the CPU cache so that importers +* can rely on coherent indirect access via the exported +* dma-address. +*/ +dma_sync_sg_for_device (dev->dev, sgt->sgl, + sgt->nents,DMA_BIDIRECTIONAL ); + + bo->pages = pages; + bo->table = sgt; + +return pages; +} + +static struct page **vgem_pin_pages (struct drm_vgem_gem_object *bo) +{ +struct page **pages; - bo->pages = pages; +mutex_lock (&bo->pages_lock); +if (bo->pages_pin_count++ ==0 && !bo->pages) { + pages =pin_and_sync (bo); + }else { +WARN_ON (!bo->pages); + pages = bo->pages; }mutex_unlock (&bo->pages_lock); -return bo->pages; +return pages; }static void vgem_unpin_pages (struct drm_vgem_gem_object *bo) { +/* +* We shouldn't hit this for imported bo's.. in the import +* case we don't own the scatter-table +*/ +WARN_ON (bo->base.import_attach); +mutex_lock (&bo->pages_lock);if (--bo->pages_pin_count ==0 ) { -drm_gem_put_pages (&bo->base, bo->pages, true, true); - bo->pages =NULL ; +WARN_ON (!bo->table); +sync_and_unpin (bo); }mutex_unlock (&bo->pages_lock); }
@@ -310,18 +352,12 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)static int vgem_prime_pin (struct drm_gem_object *obj) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj); -long n_pages = obj->size >>PAGE_SHIFT ;struct page **pages; pages =vgem_pin_pages (bo);if (IS_ERR (pages))return PTR_ERR (pages); -/* Flush the object from the CPU cache so that importers can rely -* on coherent indirect access via the exported dma-address. -*/ -drm_clflush_pages (pages, n_pages); -return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 22/32 arm64: unwind: Prohibit probing on return_address()
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit ee07b93e7721ccd5d5b9fa6f0c10cb3fe2f1f4f9 ]
Prohibit probing on return_address() and subroutines which is called from return_address(), since the it is invoked from trace_hardirqs_off() which is also kprobe blacklisted.
--- arch/arm64/kernel/return_address.c | 3 +++ arch/arm64/kernel/stacktrace.c | 3 +++ 2 files changed, 6 insertions(+)
arch/arm64/kernel/return_address.c +3 -0
@@ -11,6 +11,7 @@#include <linux/export.h> #include <linux/ftrace.h> +#include <linux/kprobes.h> #include <asm/stack_pointer.h> #include <asm/stacktrace.h>
@@ -32,6 +33,7 @@ static int save_return_addr(struct stackframe *frame, void *d)return 0 ; } } +NOKPROBE_SYMBOL (save_return_addr);void *return_address (unsigned int level) {
@@ -55,3 +57,4 @@ void *return_address(unsigned int level)return NULL ; }EXPORT_SYMBOL_GPL (return_address); +NOKPROBE_SYMBOL (return_address);
arch/arm64/kernel/stacktrace.c +3 -0
@@ -18,6 +18,7 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/ftrace.h> +#include <linux/kprobes.h> #include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/sched/task_stack.h>
@@ -85,6 +86,7 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)return 0 ; } +NOKPROBE_SYMBOL (unwind_frame); void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame,int (*fn)(struct stackframe *,void *),void *data)
@@ -99,6 +101,7 @@ void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame,break ; } } +NOKPROBE_SYMBOL (walk_stackframe);#ifdef CONFIG_STACKTRACE struct stack_trace_data {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/32 arm64/mm: fix variable 'pud' set but not used
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 7d4e2dcf311d3b98421d1f119efe5964cafa32fc ]
GCC throws a warning,
arch/arm64/mm/mmu.c: In function 'pud_free_pmd_page':arch/arm64/mm/mmu.c:1033:8: warning: variable 'pud' set but not used [-Wunused-but-set-variable]
pud_t pud;
^~~because pud_table() is a macro and compiled away. Fix it by making it a static inline function and for pud_sect() as well.
--- arch/arm64/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/pgtable.h +2 -2
@@ -419,8 +419,8 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PMD_TYPE_SECT)#if defined(CONFIG_ARM64_64K_PAGES ) ||CONFIG_PGTABLE_LEVELS <3 -#define pud_sect (pud) (0) -#define pud_table (pud) (1) +static inline bool pud_sect (pud_t pud) {return false; } +static inline bool pud_table (pud_t pud) {return true; }#else #define pud_sect (pud) ((pud_val(pud) & PUD_TYPE_MASK) == \ PUD_TYPE_SECT)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/32 IB/core: Add mitigation for Spectre V1
In reply to Sasha LevinFrom: "Luck, Tony" <[email protected]>
[ Upstream commit 61f259821dd3306e49b7d42a3f90fb5a4ff3351b ]
Some processors may mispredict an array bounds check and speculatively access memory that they should not. With a user supplied array index we like to play things safe by masking the value with the array size before it is used as an index.
--- drivers/infiniband/core/user_mad.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/core/user_mad.c +5 -1
@@ -49,6 +49,7 @@#include <linux/sched.h> #include <linux/semaphore.h> #include <linux/slab.h> +#include <linux/nospec.h> #include <linux/uaccess.h>
@@ -868,11 +869,14 @@ static int ib_umad_unreg_agent(struct ib_umad_file *file, u32 __user *arg)if (get_user (id, arg))return -EFAULT ; +if (id >=IB_UMAD_MAX_AGENTS ) +return -EINVAL ;mutex_lock (&file->port->file_mutex);mutex_lock (&file->mutex); -if (id >=IB_UMAD_MAX_AGENTS || !__get_agent (file, id)) { + id =array_index_nospec (id,IB_UMAD_MAX_AGENTS ); +if (!__get_agent (file, id)) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/32 IB/mlx5: Fix MR registration flow to use UMR properly
In reply to Sasha LevinFrom: Guy Levi <[email protected]>
[ Upstream commit e5366d309a772fef264ec85e858f9ea46f939848 ]
Driver shouldn't allow to use UMR to register a MR when umr_modify_atomic_disabled is set. Otherwise it will always end up with a failure in the post send flow which sets the UMR WQE to modify atomic access right.
--- drivers/infiniband/hw/mlx5/mr.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/infiniband/hw/mlx5/mr.c +9 -18
@@ -51,22 +51,12 @@ static void clean_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr);static void dereg_mr (struct mlx5_ib_dev *dev,struct mlx5_ib_mr *mr);static int mr_cache_max_order (struct mlx5_ib_dev *dev);static int unreg_umr (struct mlx5_ib_dev *dev,struct mlx5_ib_mr *mr); -static bool umr_can_modify_entity_size (struct mlx5_ib_dev *dev) -{ -return !MLX5_CAP_GEN (dev->mdev, umr_modify_entity_size_disabled); -}static bool umr_can_use_indirect_mkey (struct mlx5_ib_dev *dev) {return !MLX5_CAP_GEN (dev->mdev, umr_indirect_mkey_disabled); } -static bool use_umr (struct mlx5_ib_dev *dev,int order) -{ -return order <=mr_cache_max_order (dev) && -umr_can_modify_entity_size (dev); -} -static int destroy_mkey (struct mlx5_ib_dev *dev,struct mlx5_ib_mr *mr) {int err =mlx5_core_destroy_mkey (dev->mdev, &mr->mmkey);
@@ -1302,7 +1292,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, {struct mlx5_ib_dev *dev =to_mdev (pd->device);struct mlx5_ib_mr *mr =NULL ; -bool populate_mtts = false; +bool use_umr;struct ib_umem *umem;int page_shift;int npages;
@@ -1335,29 +1325,30 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,if (err <0 )return ERR_PTR (err); -if (use_umr (dev, order)) { + use_umr = !MLX5_CAP_GEN (dev->mdev, umr_modify_entity_size_disabled) && + (!MLX5_CAP_GEN (dev->mdev, umr_modify_atomic_disabled) || + !MLX5_CAP_GEN (dev->mdev, atomic)); + +if (order <=mr_cache_max_order (dev) && use_umr) { mr =alloc_mr_from_cache (pd, umem, virt_addr, length, ncont, page_shift, order, access_flags);if (PTR_ERR (mr) == -EAGAIN ) {mlx5_ib_dbg (dev,"cache empty for order %d\n" , order); mr =NULL ; } - populate_mtts = false; }else if (!MLX5_CAP_GEN (dev->mdev, umr_extended_translation_offset)) {if (access_flags &IB_ACCESS_ON_DEMAND ) { err = -EINVAL ;pr_err ("Got MR registration for ODP MR > 512MB, not supported for Connect-IB\n" ); goto error; } - populate_mtts = true; + use_umr = false; }if (!mr) { -if (!umr_can_modify_entity_size (dev)) - populate_mtts = true;mutex_lock (&dev->slow_path_mutex); mr =reg_create (NULL , pd, virt_addr, length, umem, ncont, - page_shift, access_flags, populate_mtts); + page_shift, access_flags, !use_umr);mutex_unlock (&dev->slow_path_mutex); }
@@ -1375,7 +1366,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,update_odp_mr (mr);#endif -if (!populate_mtts) { +if (use_umr) {int update_xlt_flags =MLX5_IB_UPD_XLT_ENABLE ;if (access_flags &IB_ACCESS_ON_DEMAND )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/32 IB/mad: Fix use-after-free in ib mad completion handling
In reply to Sasha LevinFrom: Jack Morgenstein <[email protected]>
[ Upstream commit 770b7d96cfff6a8bf6c9f261ba6f135dc9edf484 ]
We encountered a use-after-free bug when unloading the driver:
[ 3562.116059] BUG: KASAN: use-after-free in ib_mad_post_receive_mads+0xddc/0xed0 [ib_core] [ 3562.117233] Read of size 4 at addr ffff8882ca5aa868 by task kworker/u13:2/23862 [ 3562.118385] [ 3562.119519] CPU: 2 PID: 23862 Comm: kworker/u13:2 Tainted: G OE 5.1.0-for-upstream-dbg-2019-05-19_16-44-30-13 #1 [ 3562.121806] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu2 04/01/2014 [ 3562.123075] Workqueue: ib-comp-unb-wq ib_cq_poll_work [ib_core] [ 3562.124383] Call Trace: [ 3562.125640] dump_stack+0x9a/0xeb [ 3562.126911] print_address_description+0xe3/0x2e0 [ 3562.128223] ? ib_mad_post_receive_mads+0xddc/0xed0 [ib_core] [ 3562.129545] __kasan_report+0x15c/0x1df [ 3562.130866] ? ib_mad_post_receive_mads+0xddc/0xed0 [ib_core] [ 3562.132174] kasan_report+0xe/0x20 [ 3562.133514] ib_mad_post_receive_mads+0xddc/0xed0 [ib_core] [ 3562.134835] ? find_mad_agent+0xa00/0xa00 [ib_core] [ 3562.136158] ? qlist_free_all+0x51/0xb0 [ 3562.137498] ? mlx4_ib_sqp_comp_worker+0x1970/0x1970 [mlx4_ib] [ 3562.138833] ? quarantine_reduce+0x1fa/0x270 [ 3562.140171] ? kasan_unpoison_shadow+0x30/0x40 [ 3562.141522] ib_mad_recv_done+0xdf6/0x3000 [ib_core] [ 3562.142880] ? _raw_spin_unlock_irqrestore+0x46/0x70 [ 3562.144277] ? ib_mad_send_done+0x1810/0x1810 [ib_core] [ 3562.145649] ? mlx4_ib_destroy_cq+0x2a0/0x2a0 [mlx4_ib] [ 3562.147008] ? _raw_spin_unlock_irqrestore+0x46/0x70 [ 3562.148380] ? debug_object_deactivate+0x2b9/0x4a0 [ 3562.149814] __ib_process_cq+0xe2/0x1d0 [ib_core] [ 3562.151195] ib_cq_poll_work+0x45/0xf0 [ib_core] [ 3562.152577] process_one_work+0x90c/0x1860 [ 3562.153959] ? pwq_dec_nr_in_flight+0x320/0x320 [ 3562.155320] worker_thread+0x87/0xbb0 [ 3562.156687] ? __kthread_parkme+0xb6/0x180 [ 3562.158058] ? process_one_work+0x1860/0x1860 [ 3562.159429] kthread+0x320/0x3e0 [ 3562.161391] ? kthread_park+0x120/0x120 [ 3562.162744] ret_from_fork+0x24/0x30 ... [ 3562.187615] Freed by task 31682: [ 3562.188602] save_stack+0x19/0x80 [ 3562.189586] __kasan_slab_free+0x11d/0x160 [ 3562.190571] kfree+0xf5/0x2f0 [ 3562.191552] ib_mad_port_close+0x200/0x380 [ib_core] [ 3562.192538] ib_mad_remove_device+0xf0/0x230 [ib_core] [ 3562.193538] remove_client_context+0xa6/0xe0 [ib_core] [ 3562.194514] disable_device+0x14e/0x260 [ib_core] [ 3562.195488] __ib_unregister_device+0x79/0x150 [ib_core] [ 3562.196462] ib_unregister_device+0x21/0x30 [ib_core] [ 3562.197439] mlx4_ib_remove+0x162/0x690 [mlx4_ib] [ 3562.198408] mlx4_remove_device+0x204/0x2c0 [mlx4_core] [ 3562.199381] mlx4_unregister_interface+0x49/0x1d0 [mlx4_core] [ 3562.200356] mlx4_ib_cleanup+0xc/0x1d [mlx4_ib] [ 3562.201329] __x64_sys_delete_module+0x2d2/0x400 [ 3562.202288] do_syscall_64+0x95/0x470 [ 3562.203277] entry_SYSCALL_64_after_hwframe+0x49/0xbe
The problem was that the MAD PD was deallocated before the MAD CQ. There was completion work pending for the CQ when the PD got deallocated. When the mad completion handling reached procedure ib_mad_post_receive_mads(), we got a use-after-free bug in the following line of code in that procedure:
sg_list.lkey = qp_info->port_priv->pd->local_dma_lkey;
(the pd pointer in the above line is no longer valid, because the pd has been deallocated).
We fix this by allocating the PD before the CQ in procedure ib_mad_port_open(), and deallocating the PD after freeing the CQ in procedure ib_mad_port_close().
Since the CQ completion work queue is flushed during ib_free_cq(), no completions will be pending for that CQ when the PD is later deallocated.
Note that freeing the CQ before deallocating the PD is the practice in the ULPs.
--- drivers/infiniband/core/mad.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/infiniband/core/mad.c +10 -10
@@ -3182,18 +3182,18 @@ static int ib_mad_port_open(struct ib_device *device,if (has_smi) cq_size *=2 ; + port_priv->pd =ib_alloc_pd (device,0 ); +if (IS_ERR (port_priv->pd)) { +dev_err (&device->dev,"Couldn't create ib_mad PD\n" ); + ret =PTR_ERR (port_priv->pd); + goto error3; + } + port_priv->cq =ib_alloc_cq (port_priv->device, port_priv, cq_size,0 ,IB_POLL_WORKQUEUE );if (IS_ERR (port_priv->cq)) {dev_err (&device->dev,"Couldn't create ib_mad CQ\n" ); ret =PTR_ERR (port_priv->cq); - goto error3; - } - - port_priv->pd =ib_alloc_pd (device,0 ); -if (IS_ERR (port_priv->pd)) { -dev_err (&device->dev,"Couldn't create ib_mad PD\n" ); - ret =PTR_ERR (port_priv->pd); goto error4; }
@@ -3236,11 +3236,11 @@ static int ib_mad_port_open(struct ib_device *device, error7:destroy_mad_qp (&port_priv->qp_info[0 ]); error6: -ib_dealloc_pd (port_priv->pd); -error4:ib_free_cq (port_priv->cq);cleanup_recv_queue (&port_priv->qp_info[1 ]);cleanup_recv_queue (&port_priv->qp_info[0 ]); +error4: +ib_dealloc_pd (port_priv->pd); error3:kfree (port_priv);
@@ -3270,8 +3270,8 @@ static int ib_mad_port_close(struct ib_device *device, int port_num)destroy_workqueue (port_priv->wq);destroy_mad_qp (&port_priv->qp_info[1 ]);destroy_mad_qp (&port_priv->qp_info[0 ]); -ib_dealloc_pd (port_priv->pd);ib_free_cq (port_priv->cq); +ib_dealloc_pd (port_priv->pd);cleanup_recv_queue (&port_priv->qp_info[1 ]);cleanup_recv_queue (&port_priv->qp_info[0 ]);/* XXX: Handle deallocation of MAD registration tables */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/32 drm: msm: Fix add_gpu_components
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 9ca7ad6c7706edeae331c1632d0c63897418ebad ]
add_gpu_components() adds found GPU nodes from the DT to the match list, regardless of the status of the nodes. This is a problem, because if the nodes are disabled, they should not be on the match list because they will not be matched. This prevents display from initing if a GPU node is defined, but it's status is disabled.
Fix this by checking the node's status before adding it to the match list.
--- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +2 -1
@@ -1284,7 +1284,8 @@ static int add_gpu_components(struct device *dev,if (!np)return 0 ; -drm_of_component_match_add (dev, matchptr, compare_of, np); +if (of_device_is_available (np)) +drm_of_component_match_add (dev, matchptr, compare_of, np);of_node_put (np);
Signature · 6 lines
2.20.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 28/32 drm/exynos: fix missing decrement of retry counter
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 1bbbab097a05276e312dd2462791d32b21ceb1ee ]
Currently the retry counter is not being decremented, leading to a potential infinite spin if the scalar_reads don't change state.
Addresses-Coverity: ("Infinite loop")
--- drivers/gpu/drm/exynos/exynos_drm_scaler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_scaler.c +2 -2
@@ -108,12 +108,12 @@ static inline int scaler_reset(struct scaler_context *scaler)scaler_write (SCALER_CFG_SOFT_RESET ,SCALER_CFG );do {cpu_relax (); - }while (retry >1 && + }while (--retry >1 &&scaler_read (SCALER_CFG ) &SCALER_CFG_SOFT_RESET );do {cpu_relax ();scaler_write (1 ,SCALER_INT_EN ); - }while (retry >0 &&scaler_read (SCALER_INT_EN ) !=1 ); + }while (--retry >0 &&scaler_read (SCALER_INT_EN ) !=1 );return retry ?0 : -EIO ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 29/32 Revert "kmemleak: allow to coexist with fault injection"
In reply to Sasha LevinFrom: Yang Shi <[email protected]>
[ Upstream commit df9576def004d2cd5beedc00cb6e8901427634b9 ]
When running ltp's oom test with kmemleak enabled, the below warning was triggerred since kernel detects __GFP_NOFAIL & ~__GFP_DIRECT_RECLAIM is passed in:
WARNING: CPU: 105 PID: 2138 at mm/page_alloc.c:4608 __alloc_pages_nodemask+0x1c31/0x1d50 Modules linked in: loop dax_pmem dax_pmem_core ip_tables x_tables xfs virtio_net net_failover virtio_blk failover ata_generic virtio_pci virtio_ring virtio libata CPU: 105 PID: 2138 Comm: oom01 Not tainted 5.2.0-next-20190710+ #7 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.10.2-0-g5f4c7b1-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:__alloc_pages_nodemask+0x1c31/0x1d50 ... kmemleak_alloc+0x4e/0xb0 kmem_cache_alloc+0x2a7/0x3e0 mempool_alloc_slab+0x2d/0x40 mempool_alloc+0x118/0x2b0 bio_alloc_bioset+0x19d/0x350 get_swap_bio+0x80/0x230 __swap_writepage+0x5ff/0xb20
The mempool_alloc_slab() clears __GFP_DIRECT_RECLAIM, however kmemleak has __GFP_NOFAIL set all the time due to d9570ee3bd1d4f2 ("kmemleak:
allow to coexist with fault injection"). But, it doesn't make any sense to have __GFP_NOFAIL and ~__GFP_DIRECT_RECLAIM specified at the same time.
According to the discussion on the mailing list, the commit should be reverted for short term solution. Catalin Marinas would follow up with a better solution for longer term.
The failure rate of kmemleak metadata allocation may increase in some circumstances, but this should be expected side effect.
--- mm/kmemleak.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/kmemleak.c +1 -1
@@ -126,7 +126,7 @@/* GFP bitmask for kmemleak internal allocations */ #define gfp_kmemleak_mask (gfp) (((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \ __GFP_NORETRY | __GFP_NOMEMALLOC | \ - __GFP_NOWARN | __GFP_NOFAIL) + __GFP_NOWARN)/* scanning area inside a memory block */ struct kmemleak_scan_area {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/32 ocfs2: remove set but not used variable 'last_hash'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 7bc36e3ce91471b6377c8eadc0a2f220a2280083 ]
Fixes gcc '-Wunused-but-set-variable' warning:
fs/ocfs2/xattr.c: In function ocfs2_xattr_bucket_find:
fs/ocfs2/xattr.c:3828:6: warning: variable last_hash set but not used [-Wunused-but-set-variable]
It's never used and can be removed.
--- fs/ocfs2/xattr.c | 3 --- 1 file changed, 3 deletions(-)
fs/ocfs2/xattr.c +0 -3
@@ -3833,7 +3833,6 @@ static int ocfs2_xattr_bucket_find(struct inode *inode,u16 blk_per_bucket =ocfs2_blocks_per_xattr_bucket (inode->i_sb);int low_bucket =0 , bucket, high_bucket;struct ocfs2_xattr_bucket *search; -u32 last_hash;u64 blkno, lower_blkno =0 ; search =ocfs2_xattr_bucket_new (inode);
@@ -3877,8 +3876,6 @@ static int ocfs2_xattr_bucket_find(struct inode *inode,if (xh->xh_count) xe = &xh->xh_entries[le16_to_cpu (xh->xh_count) -1 ]; - last_hash =le32_to_cpu (xe->xe_name_hash); -/* record lower_blkno which may be the insert place. */ lower_blkno = blkno;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/32 coredump: split pipe command whitespace before expanding template
In reply to Sasha LevinFrom: Paul Wise <[email protected]>
[ Upstream commit 315c69261dd3fa12dbc830d4fa00d1fad98d3b03 ]
Save the offsets of the start of each argument to avoid having to update pointers to each argument after every corename krealloc and to avoid having to duplicate the memory for the dump command.
Executable names containing spaces were previously being expanded from %e or %E and then split in the middle of the filename. This is incorrect behaviour since an argument list can represent arguments with spaces.
The splitting could lead to extra arguments being passed to the core dump handler that it might have interpreted as options or ignored completely.
Core dump handlers that are not aware of this Linux kernel issue will be using %e or %E without considering that it may be split and so they will be vulnerable to processes with spaces in their names breaking their argument list. If their internals are otherwise well written, such as if they are written in shell but quote arguments, they will work better after this change than before. If they are not well written, then there is a slight chance of breakage depending on the details of the code but they will already be fairly broken by the split filenames.
Core dump handlers that are aware of this Linux kernel issue will be placing %e or %E as the last item in their core_pattern and then aggregating all of the remaining arguments into one, separated by spaces. Alternatively they will be obtaining the filename via other methods. Both of these will be compatible with the new arrangement.
A side effect from this change is that unknown template types (for example %z) result in an empty argument to the dump handler instead of the argument being dropped. This is a desired change as:
It is easier for dump handlers to process empty arguments than dropped ones, especially if they are written in shell or don't pass each template item with a preceding command-line option in order to differentiate between individual template types. Most core_patterns in the wild do not use options so they can confuse different template types (especially numeric ones) if an earlier one gets dropped in old kernels. If the kernel introduces a new template type and a core_pattern uses it, the core dump handler might not expect that the argument can be dropped in old kernels.
For example, this can result in security issues when %d is dropped in old kernels. This happened with the corekeeper package in Debian and resulted in the interface between corekeeper and Linux having to be rewritten to use command-line options to differentiate between template types.
The core_pattern for most core dump handlers is written by the handler author who would generally not insert unknown template types so this change should be compatible with all the core dump handlers that exist.
--- fs/coredump.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-)
fs/coredump.c +39 -5
@@ -7,6 +7,7 @@#include <linux/stat.h> #include <linux/fcntl.h> #include <linux/swap.h> +#include <linux/ctype.h> #include <linux/string.h> #include <linux/init.h> #include <linux/pagemap.h>
@@ -187,11 +188,13 @@ static int cn_print_exe_file(struct core_name *cn)* name into corename, which must have space for at least * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator. */ -static int format_corename (struct core_name *cn,struct coredump_params *cprm) +static int format_corename (struct core_name *cn,struct coredump_params *cprm, +size_t **argv,int *argc) {const struct cred *cred =current_cred ();const char *pat_ptr = core_pattern;int ispipe = (*pat_ptr =='|' ); +bool was_space = false;int pid_in_pattern =0 ;int err =0 ;
@@ -201,12 +204,35 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)return -ENOMEM ; cn->corename[0 ] ='\0' ; -if (ispipe) +if (ispipe) { +int argvs =sizeof (core_pattern) /2 ; + (*argv) =kmalloc_array (argvs,sizeof (**argv),GFP_KERNEL ); +if (!(*argv)) +return -ENOMEM ; + (*argv)[(*argc)++] =0 ; ++pat_ptr; + }/* Repeat as long as we have more pattern to process and more output space */ while (*pat_ptr) { +/* +* Split on spaces before doing template expansion so that +* %e and %E don't get split if they have spaces in them +*/ +if (ispipe) { +if (isspace (*pat_ptr)) { + was_space = true; + pat_ptr++; +continue ; + }else if (was_space) { + was_space = false; + err =cn_printf (cn,"%c" ,'\0' ); +if (err) +return err; + (*argv)[(*argc)++] = cn->used; + } + }if (*pat_ptr !='%' ) { err =cn_printf (cn,"%c" , *pat_ptr++); }else {
@@ -546,6 +572,8 @@ void do_coredump(const siginfo_t *siginfo)struct cred *cred;int retval =0 ;int ispipe; +size_t *argv =NULL ; +int argc =0 ;struct files_struct *displaced;/* require nonrelative corefile path and be extra careful */ bool need_suid_safe = false;
@@ -592,9 +620,10 @@ void do_coredump(const siginfo_t *siginfo) old_cred =override_creds (cred); - ispipe =format_corename (&cn, &cprm); + ispipe =format_corename (&cn, &cprm, &argv, &argc);if (ispipe) { +int argi;int dump_count;char **helper_argv;struct subprocess_info *sub_info;
@@ -637,12 +666,16 @@ void do_coredump(const siginfo_t *siginfo) goto fail_dropcount; } - helper_argv =argv_split (GFP_KERNEL , cn.corename,NULL ); + helper_argv =kmalloc_array (argc +1 ,sizeof (*helper_argv), +GFP_KERNEL );if (!helper_argv) {printk (KERN_WARNING "%s failed to allocate memory\n" , __func__); goto fail_dropcount; } +for (argi =0 ; argi < argc; argi++) + helper_argv[argi] = cn.corename + argv[argi]; + helper_argv[argi] =NULL ; retval = -ENOMEM ; sub_info = call_usermodehelper_setup(helper_argv[0],
@@ -652,7 +685,7 @@ void do_coredump(const siginfo_t *siginfo) retval =call_usermodehelper_exec (sub_info,UMH_WAIT_EXEC ); -argv_free (helper_argv); +kfree (helper_argv);if (retval) {printk (KERN_INFO "Core dump to |%s pipe failed\n" , cn.corename);
@@ -766,6 +799,7 @@ void do_coredump(const siginfo_t *siginfo)if (ispipe)atomic_dec (&core_dump_count); fail_unlock: +kfree (argv);kfree (cn.corename);coredump_finish (mm, core_dumped);revert_creds (old_cred);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/32 asm-generic: fix -Wtype-limits compiler warnings
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit cbedfe11347fe418621bd188d58a206beb676218 ]
Commit d66acc39c7ce ("bitops: Optimise get_order()") introduced a compilation warning because "rx_frag_size" is an "ushort" while PAGE_SHIFT here is 16.
The commit changed the get_order() to be a multi-line macro where compilers insist to check all statements in the macro even when __builtin_constant_p(rx_frag_size) will return false as "rx_frag_size" is a module parameter.
In file included from ./arch/powerpc/include/asm/page_64.h:107,
from ./arch/powerpc/include/asm/page.h:242,
from ./arch/powerpc/include/asm/mmu.h:132,
from ./arch/powerpc/include/asm/lppaca.h:47,
from ./arch/powerpc/include/asm/paca.h:17,
from ./arch/powerpc/include/asm/current.h:13,
from ./include/linux/thread_info.h:21,
from ./arch/powerpc/include/asm/processor.h:39,
from ./include/linux/prefetch.h:15,
from drivers/net/ethernet/emulex/benet/be_main.c:14:
drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_rx_cqs_create':
./include/asm-generic/getorder.h:54:9: warning: comparison is always
true due to limited range of data type [-Wtype-limits]
(((n) < (1UL << PAGE_SHIFT)) ? 0 : \
^
drivers/net/ethernet/emulex/benet/be_main.c:3138:33: note: in expansion
of macro 'get_order'
adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
^~~~~~~~~Fix it by moving all of this multi-line macro into a proper function, and killing __get_order() off.
--- include/asm-generic/getorder.h | 50 ++++++++++++++-------------------- 1 file changed, 20 insertions(+), 30 deletions(-)
include/asm-generic/getorder.h +20 -30
@@ -7,24 +7,6 @@#include <linux/compiler.h> #include <linux/log2.h> -/* -* Runtime evaluation of get_order() -*/ -static inline __attribute_const__ -int __get_order(unsigned long size) -{ -int order; - - size--; - size >>=PAGE_SHIFT ; -#if BITS_PER_LONG ==32 - order =fls (size); -#else - order =fls64 (size); -#endif -return order; -} -/** * get_order - Determine the allocation order of a memory size * @size: The size for which to get the order
@@ -43,19 +25,27 @@ int __get_order(unsigned long size)* to hold an object of the specified size. * * The result is undefined if the size is 0. -* -* This function may be used to initialise variables with compile time -* evaluations of constants. */ -#define get_order (n) \ -( \ - __builtin_constant_p(n) ? ( \ - ((n) == 0UL) ? BITS_PER_LONG - PAGE_SHIFT : \ - (((n) < (1UL << PAGE_SHIFT)) ? 0 : \ - ilog2((n) - 1) - PAGE_SHIFT + 1) \ - ) : \ - __get_order(n) \ -) +static inline __attribute_const__ int get_order(unsigned long size) +{ +if (__builtin_constant_p (size)) { +if (!size) +return BITS_PER_LONG -PAGE_SHIFT ; + +if (size < (1UL <<PAGE_SHIFT )) +return 0 ; + +return ilog2 ((size) -1 ) -PAGE_SHIFT +1 ; + } + + size--; + size >>=PAGE_SHIFT ; +#if BITS_PER_LONG ==32 +return fls (size); +#else +return fls64 (size); +#endif +}#endif /* __ASSEMBLY__ */
Signature · 1 line
2.20.1