5.2.11-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 9/162 ASoC: samsung: odroid: fix an use-after-free issue for codec
In reply to Greg Kroah-Hartman[ Upstream commit 9b6d104a6b150bd4d3e5b039340e1f6b20c2e3c1 ]
The codec variable is still being used after the of_node_put() call, which may result in use-after-free.
--- sound/soc/samsung/odroid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/samsung/odroid.c +4 -2
@@ -275,9 +275,8 @@ static int odroid_audio_probe(struct platform_device *pdev) }of_node_put (cpu); -of_node_put (codec);if (ret <0 ) -return ret; + goto err_put_node; ret =snd_soc_of_get_dai_link_codecs (dev, codec, codec_link);if (ret <0 )
@@ -308,6 +307,7 @@ static int odroid_audio_probe(struct platform_device *pdev) goto err_put_clk_i2s; } +of_node_put (codec);return 0 ; err_put_clk_i2s:
@@ -317,6 +317,8 @@ err_put_sclk: err_put_cpu_dai:of_node_put (cpu_dai);snd_soc_of_put_dai_link_codecs (codec_link); +err_put_node: +of_node_put (codec);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/162 ASoC: samsung: odroid: fix a double-free issue for cpu_dai
In reply to Greg Kroah-Hartman[ Upstream commit 2abee12c0ab1924a69993d2c063a39a952e7d836 ]
The cpu_dai variable is still being used after the of_node_put() call, which may result in double-free:
of_node_put(cpu_dai); ---> released here
ret = devm_snd_soc_register_card(dev, card);
if (ret < 0) {
...
goto err_put_clk_i2s; --> jump to err_put_clk_i2s...
err_put_clk_i2s:
clk_put(priv->clk_i2s_bus);
err_put_sclk:
clk_put(priv->sclk_i2s);
err_put_cpu_dai:
of_node_put(cpu_dai); --> double-free here--- sound/soc/samsung/odroid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/samsung/odroid.c +1 -1
@@ -299,7 +299,6 @@ static int odroid_audio_probe(struct platform_device *pdev) ret =PTR_ERR (priv->clk_i2s_bus); goto err_put_sclk; } -of_node_put (cpu_dai); ret =devm_snd_soc_register_card (dev, card);if (ret <0 ) {
@@ -307,6 +306,7 @@ static int odroid_audio_probe(struct platform_device *pdev) goto err_put_clk_i2s; } +of_node_put (cpu_dai);of_node_put (codec);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 1/162 ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai()
In reply to Greg Kroah-Hartman[ Upstream commit 52db6685932e326ed607644ab7ebdae8c194adda ]
props->xxx_dai might be NULL when DPCM.
This patch cares it for debug.
--- include/sound/simple_card_utils.h | 4 ++++ 1 file changed, 4 insertions(+)
include/sound/simple_card_utils.h +4 -0
@@ -149,6 +149,10 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, {struct device *dev =simple_priv_to_dev (priv); +/* dai might be NULL */ +if (!dai) +return ; +if (dai->name)dev_dbg (dev,"%s dai name = %s\n" , name, dai->name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/162 ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook
In reply to Greg Kroah-Hartman[ Upstream commit aa2ba991c4206d5b778dcaa7b4997396e79f8e90 ]
The Irbis NB41 netbook has its internal mic on IN2, inverted jack-detect and stereo speakers, add a quirk for this.
--- sound/soc/intel/boards/bytcht_es8316.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/bytcht_es8316.c +8 -0
@@ -436,6 +436,14 @@ static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = {/* Please keep this list alphabetically sorted */ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { + {/* Irbis NB41 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"IRBIS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"NB41" ), + }, + .driver_data = (void *)(BYT_CHT_ES8316_INTMIC_IN2_MAP + |BYT_CHT_ES8316_JD_INVERTED ), + }, {/* Teclast X98 Plus II */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"TECLAST" ),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/162 ASoC: simple-card: fix an use-after-free in simple_for_each_link()
In reply to Greg Kroah-Hartman[ Upstream commit 27862d5a3325bc531ec15e3c607e44aa0fd57f6f ]
The codec variable is still being used after the of_node_put() call, which may result in use-after-free.
--- sound/soc/generic/simple-card.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/generic/simple-card.c +2 -2
@@ -378,8 +378,6 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, goto error; } -of_node_put (codec); -/* get convert-xxx property */ memset (&adata,0 ,sizeof (adata));for_each_child_of_node (node, np)
@@ -401,11 +399,13 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, ret =func_noml (priv, np, codec, li, is_top);if (ret <0 ) { +of_node_put (codec);of_node_put (np); goto error; } } +of_node_put (codec); node =of_get_next_child (top, node); }while (!is_top && node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/162 ASoC: simple-card: fix an use-after-free in simple_dai_link_of_dpcm()
In reply to Greg Kroah-Hartman[ Upstream commit 724808ad556c15e9473418d082f8aae81dd267f6 ]
The node variable is still being used after the of_node_put() call, which may result in use-after-free.
--- sound/soc/generic/simple-card.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
sound/soc/generic/simple-card.c +11 -11
@@ -138,8 +138,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, li->link++; -of_node_put (node); -/* For single DAI link & old style of DT node */ if (is_top) prefix =PREFIX ;
@@ -161,17 +159,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_cpu (np, dai_link, &is_single_links);if (ret) -return ret; + goto out_put_node; ret =asoc_simple_parse_clk_cpu (dev, np, dai_link, dai);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_set_dailink_name (dev, dai_link,"fe.%s" , dai_link->cpu_dai_name);if (ret <0 ) -return ret; + goto out_put_node;asoc_simple_canonicalize_cpu (dai_link, is_single_links); }else {
@@ -194,17 +192,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_codec (np, dai_link);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_parse_clk_codec (dev, np, dai_link, dai);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_set_dailink_name (dev, dai_link,"be.%s" , codecs->dai_name);if (ret <0 ) -return ret; + goto out_put_node;/* check "prefix" from top node */ snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
@@ -222,19 +220,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_tdm (np, dai);if (ret) -return ret; + goto out_put_node; ret =asoc_simple_parse_daifmt (dev, node, codec, prefix, &dai_link->dai_fmt);if (ret <0 ) -return ret; + goto out_put_node; dai_link->dpcm_playback =1 ; dai_link->dpcm_capture =1 ; dai_link->ops = &simple_ops; dai_link->init = asoc_simple_dai_init; -return 0 ; +out_put_node: +of_node_put (node); +return ret; } static int simple_dai_link_of(struct asoc_simple_priv *priv,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/162 ASoC: audio-graph-card: fix use-after-free in graph_dai_link_of_dpcm()
In reply to Greg Kroah-Hartman[ Upstream commit aa2e362cb6b3f5ca88093ada01e1a0ace8a517b2 ]
After calling of_node_put() on the ports, port, and node variables, they are still being used, which may result in use-after-free. Fix this issue by calling of_node_put() after the last usage.
--- sound/soc/generic/audio-graph-card.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
sound/soc/generic/audio-graph-card.c +13 -13
@@ -222,10 +222,6 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,dev_dbg (dev,"link_of DPCM (%pOF)\n" , ep); -of_node_put (ports); -of_node_put (port); -of_node_put (node); -if (li->cpu) {int is_single_links =0 ;
@@ -243,17 +239,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_cpu (ep, dai_link, &is_single_links);if (ret) -return ret; + goto out_put_node; ret =asoc_simple_parse_clk_cpu (dev, ep, dai_link, dai);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_set_dailink_name (dev, dai_link,"fe.%s" , dai_link->cpu_dai_name);if (ret <0 ) -return ret; + goto out_put_node;/* card->num_links includes Codec */ asoc_simple_canonicalize_cpu (dai_link, is_single_links);
@@ -277,17 +273,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_codec (ep, dai_link);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_parse_clk_codec (dev, ep, dai_link, dai);if (ret <0 ) -return ret; + goto out_put_node; ret =asoc_simple_set_dailink_name (dev, dai_link,"be.%s" , codecs->dai_name);if (ret <0 ) -return ret; + goto out_put_node;/* check "prefix" from top node */ snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
@@ -307,19 +303,23 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ret =asoc_simple_parse_tdm (ep, dai);if (ret) -return ret; + goto out_put_node; ret =asoc_simple_parse_daifmt (dev, cpu_ep, codec_ep,NULL , &dai_link->dai_fmt);if (ret <0 ) -return ret; + goto out_put_node; dai_link->dpcm_playback =1 ; dai_link->dpcm_capture =1 ; dai_link->ops = &graph_ops; dai_link->init = asoc_simple_dai_init; -return 0 ; +out_put_node: +of_node_put (ports); +of_node_put (port); +of_node_put (node); +return ret; } static int graph_dai_link_of(struct asoc_simple_priv *priv,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/162 ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()
In reply to Greg Kroah-Hartman[ Upstream commit c152f8491a8d9a4b25afd65a86eb5e55e2a8c380 ]
After calling of_node_put() on the node variable, it is still being used, which may result in use-after-free.
Fix this issue by calling of_node_put() after the last usage.
--- sound/soc/generic/audio-graph-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/generic/audio-graph-card.c +3 -1
@@ -63,6 +63,7 @@ static int graph_get_dai_id(struct device_node *ep)struct device_node *endpoint;struct of_endpoint info;int i, id; +u32 *reg;int ret;/* use driver specified DAI ID if exist */
@@ -83,8 +84,9 @@ static int graph_get_dai_id(struct device_node *ep)return info.id; node =of_get_parent (ep); + reg =of_get_property (node,"reg" ,NULL );of_node_put (node); -if (of_get_property (node,"reg" ,NULL )) +if (reg)return info.port; } node =of_graph_get_port_parent (ep);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/162 ASoC: audio-graph-card: add missing const at graph_get_dai_id()
In reply to Greg Kroah-Hartman[ Upstream commit ec3042ad39d4e2ddbc3a3344f90bb10d8feb53bc ]
commit c152f8491a8d9 ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") fixups use-after-free issue,
but, it need to use "const" for reg. This patch adds it.
We will have below without this patch
LINUX/sound/soc/generic/audio-graph-card.c: In function 'graph_get_dai_id':LINUX/sound/soc/generic/audio-graph-card.c:87:7: warning: assignment discards\
'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
reg = of_get_property(node, "reg", NULL);
--- sound/soc/generic/audio-graph-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/generic/audio-graph-card.c +1 -1
@@ -63,7 +63,7 @@ static int graph_get_dai_id(struct device_node *ep)struct device_node *endpoint;struct of_endpoint info;int i, id; -u32 *reg; +const u32 *reg;int ret;/* use driver specified DAI ID if exist */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/162 regulator: axp20x: fix DCDCA and DCDCD for AXP806
In reply to Greg Kroah-Hartman[ Upstream commit 1ef55fed9219963359a7b3bc7edca8517c6e45ac ]
Refactoring of the driver introduced bugs in AXP806's DCDCA and DCDCD regulator definitions.
In DCDCA case, AXP806_DCDCA_1120mV_STEPS was obtained by subtracting 0x47 and 0x33. This should be 0x14 (hex) and not 14 (dec).
In DCDCD case, axp806_dcdcd_ranges[] contains two ranges with same start and end macros, which is clearly wrong. Second range starts at 1.6V so it should use AXP806_DCDCD_1600mV_[START|END] macros. They are already defined but unused.
--- drivers/regulator/axp20x-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/axp20x-regulator.c +3 -3
@@ -240,7 +240,7 @@#define AXP806_DCDCA_600mV_END \ (AXP806_DCDCA_600mV_START + AXP806_DCDCA_600mV_STEPS)#define AXP806_DCDCA_1120mV_START 0x33 -#define AXP806_DCDCA_1120mV_STEPS 14 +#define AXP806_DCDCA_1120mV_STEPS 20#define AXP806_DCDCA_1120mV_END \ (AXP806_DCDCA_1120mV_START + AXP806_DCDCA_1120mV_STEPS)#define AXP806_DCDCA_NUM_VOLTAGES 72
@@ -774,8 +774,8 @@ static const struct regulator_linear_range axp806_dcdcd_ranges[] = { AXP806_DCDCD_600mV_END, 20000),REGULATOR_LINEAR_RANGE (1600000 , - AXP806_DCDCD_600mV_START, - AXP806_DCDCD_600mV_END, + AXP806_DCDCD_1600mV_START, + AXP806_DCDCD_1600mV_END, 100000), };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/162 regulator: axp20x: fix DCDC5 and DCDC6 for AXP803
In reply to Greg Kroah-Hartman[ Upstream commit 8f46e22b5ac692b48d04bb722547ca17b66dda02 ]
Refactoring of axp20x driver introduced a bug in AXP803's DCDC6 regulator definition. AXP803_DCDC6_1120mV_STEPS was obtained by subtracting 0x47 and 0x33. This should be 0x14 (hex) and not 14 (dec).
Refactoring also carried over a bug in DCDC5 regulator definition. Number of possible voltages must be for 1 bigger than maximum valid voltage index, because 0 is also valid and it means lowest voltage.
--- drivers/regulator/axp20x-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +2 -2
@@ -174,14 +174,14 @@#define AXP803_DCDC5_1140mV_STEPS 35#define AXP803_DCDC5_1140mV_END \ (AXP803_DCDC5_1140mV_START + AXP803_DCDC5_1140mV_STEPS) -#define AXP803_DCDC5_NUM_VOLTAGES 68 +#define AXP803_DCDC5_NUM_VOLTAGES 69#define AXP803_DCDC6_600mV_START 0x00#define AXP803_DCDC6_600mV_STEPS 50#define AXP803_DCDC6_600mV_END \ (AXP803_DCDC6_600mV_START + AXP803_DCDC6_600mV_STEPS)#define AXP803_DCDC6_1120mV_START 0x33 -#define AXP803_DCDC6_1120mV_STEPS 14 +#define AXP803_DCDC6_1120mV_STEPS 20#define AXP803_DCDC6_1120mV_END \ (AXP803_DCDC6_1120mV_START + AXP803_DCDC6_1120mV_STEPS)#define AXP803_DCDC6_NUM_VOLTAGES 72
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 5.2.11-stable review
This is the start of the stable review cycle for the 5.2.11 release. There are 162 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 Thu 29 Aug 2019 07:25:02 AM UTC. 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.2.11-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.2.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.2.11-rc1
David Howells <[email protected]>
rxrpc: Fix read-after-free in rxrpc_queue_local()
David Howells <[email protected]>
rxrpc: Fix local endpoint refcounting
Alastair D'Silva <[email protected]>
powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB
Jens Axboe <[email protected]>
io_uring: add need_resched() check in inner poll loop
Jens Axboe <[email protected]>
io_uring: don't enter poll loop if we have CQEs pending
Jens Axboe <[email protected]>
io_uring: fix potential hang with polled IO
Dan Carpenter <[email protected]>
dm zoned: fix potential NULL dereference in dmz_do_reclaim()
Kaike Wan <[email protected]>
IB/hfi1: Drop stale TID RDMA packets
Darrick J. Wong <[email protected]>
xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT
Andrey Ryabinin <[email protected]>
mm/kasan: fix false positive invalid-free reports with CONFIG_KASAN_SW_TAGS=y
Henry Burns <[email protected]>
mm/zsmalloc.c: fix race condition in zs_destroy_pool
Henry Burns <[email protected]>
mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely
Vlastimil Babka <[email protected]>
mm, page_owner: handle THP splits correctly
Roman Gushchin <[email protected]>
mm: memcontrol: flush percpu vmevents before releasing memcg
Roman Gushchin <[email protected]>
mm: memcontrol: flush percpu vmstats before releasing memcg
David Rientjes <[email protected]>
mm, page_alloc: move_freepages should not examine struct page of reserved memory
Henry Burns <[email protected]>
mm/z3fold.c: fix race between migration and destruction
Michael Kelley <[email protected]>
genirq: Properly pair kobject_del() with kobject_add()
Dmitry Fomichev <[email protected]>
dm zoned: properly handle backing device failure
Dmitry Fomichev <[email protected]>
dm zoned: improve error handling in i/o map code
Dmitry Fomichev <[email protected]>
dm zoned: improve error handling in reclaim
Mikulas Patocka <[email protected]>
dm table: fix invalid memory accesses with too high sector number
ZhangXiaoxu <[email protected]>
dm space map metadata: fix missing store of apply_bops() return value
Wenwen Wang <[email protected]>
dm raid: add missing cleanup in raid_ctr()
Mikulas Patocka <[email protected]>
dm integrity: fix a crash due to BUG_ON in __journal_read_write()
ZhangXiaoxu <[email protected]>
dm btree: fix order of block initialization in btree_split_beneath
Bryan Gurney <[email protected]>
dm dust: use dust block size for badblocklist index
Dmitry Fomichev <[email protected]>
dm kcopyd: always complete failed jobs
Jason Xing <[email protected]>
psi: get poll_work to run when calling poll syscall next time
Kaike Wan <[email protected]>
IB/hfi1: Drop stale TID RDMA packets that cause TIDErr
Kaike Wan <[email protected]>
IB/hfi1: Add additional checks when handling TID RDMA WRITE DATA packet
Kaike Wan <[email protected]>
IB/hfi1: Add additional checks when handling TID RDMA READ RESP packet
Kaike Wan <[email protected]>
IB/hfi1: Unsafe PSN checking for TID RDMA READ Resp packet
John Hubbard <[email protected]>
x86/boot: Fix boot regression caused by bootparam sanitizing
John Hubbard <[email protected]>
x86/boot: Save fields explicitly, zero out everything else
Tom Lendacky <[email protected]>
x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h
Thomas Gleixner <[email protected]>
x86/apic: Handle missing global clockevent gracefully
Sean Christopherson <[email protected]>
x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386
Oleg Nesterov <[email protected]>
userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx
Dexuan Cui <[email protected]>
Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE
Bartosz Golaszewski <[email protected]>
gpiolib: never report open-drain/source lines as 'input' to user-space
Adrian Hunter <[email protected]>
scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()
Lyude Paul <[email protected]>
drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX
Alex Deucher <[email protected]>
drm/amdgpu/gfx9: update pg_flags after determining if gfx off is possible
Ilya Dryomov <[email protected]>
libceph: fix PG split vs OSD (re)connect race
Jeff Layton <[email protected]>
ceph: don't try fill file_lock on unsuccessful GETFILELOCK reply
Erqi Chen <[email protected]>
ceph: clear page dirty before invalidate page
Dinh Nguyen <[email protected]>
clk: socfpga: stratix10: fix rate caclulationg for cnt_clks
Mikulas Patocka <[email protected]>
Revert "dm bufio: fix deadlock with loop device"
Paolo Bonzini <[email protected]>
Revert "KVM: x86/mmu: Zap only the relevant pages when removing a memslot"
Jason Gerecke <[email protected]>
HID: wacom: Correct distance scale for 2nd-gen Intuos devices
Aaron Armstrong Skomra <[email protected]>
HID: wacom: correct misreported EKR ring values
Johannes Berg <[email protected]>
iwlwifi: mvm: disable TX-AMSDU on older NICs
Naresh Kamboju <naresh.kamboju () linaro ! org>
selftests: kvm: Adding config fragments
Marc Zyngier <[email protected]>
KVM: arm: Don't write junk to CP15 registers on reset
Marc Zyngier <[email protected]>
KVM: arm64: Don't write junk to sysregs on reset
Paul Walmsley <[email protected]>
dt-bindings: riscv: fix the schema compatible string for the HiFive Unleashed board
Jin Yao <[email protected]>
perf pmu-events: Fix missing "cpu_clk_unhalted.core" event
He Zhe <[email protected]>
perf cpumap: Fix writing to illegal memory in handling cpumap mask
He Zhe <[email protected]>
perf ftrace: Fix failure to set cpumask when only one cpu is present
Paolo Valente <[email protected]>
block, bfq: handle NULL return value by bfq_init_rq()
He Zhe <[email protected]>
block: aoe: Fix kernel crash due to atomic sleep when exiting
Colin Ian King <[email protected]>
drm/vmwgfx: fix memory leak when too many retries have occurred
Valdis Kletnieks <[email protected]>
x86/lib/cpu: Address missing prototypes warning
Jens Axboe <[email protected]>
libata: add SG safety checks in SFF pio transfers
Jens Axboe <[email protected]>
libata: have ata_scsi_rw_xlat() fail invalid passthrough requests
Trond Myklebust <[email protected]>
NFSv4: Ensure state recovery handles ETIMEDOUT correctly
Jiangfeng Xiao <[email protected]>
net: hisilicon: Fix dma_map_single failed on arm64
Jiangfeng Xiao <[email protected]>
net: hisilicon: fix hip04-xmit never return TX_BUSY
Jiangfeng Xiao <[email protected]>
net: hisilicon: make hip04_tx_reclaim non-reentrant
Likun Gao <[email protected]>
drm/amdgpu: pin the csb buffer on hw init for gfx v8
Jose Abreu <[email protected]>
net: stmmac: tc: Do not return a fragment entry
Jose Abreu <[email protected]>
net: stmmac: Fix issues when number of Queues >= 4
Christophe JAILLET <[email protected]>
net: cxgb3_main: Fix a resource leak in a error path in 'init_one()'
Gustavo A. R. Silva <[email protected]>
ata: rb532_cf: Fix unused variable warning in rb532_pata_driver_probe
Vasily Gorbik <[email protected]>
s390: put _stext and _etext into .text section
Vasily Gorbik <[email protected]>
s390/mm: fix dump_pagetables top level page table walking
Vasily Gorbik <[email protected]>
s390/protvirt: avoid memory sharing for diag 308 set/store
Suren Baghdasaryan <[email protected]>
sched/psi: Do not require setsched permission from the trigger creator
Peter Zijlstra <[email protected]>
sched/psi: Reduce psimon FIFO priority
Dietmar Eggemann <[email protected]>
sched/deadline: Fix double accounting of rq/running bw in push & pull
Sebastien Tisserant <[email protected]>
SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL
Pavel Shilovsky <[email protected]>
SMB3: Fix potential memory leak when processing compound chain
Douglas Anderson <[email protected]>
drm/rockchip: Suspend DP late
Nicolas Saenz Julienne <[email protected]>
HID: input: fix a4tech horizontal wheel custom usage
István Váradi <[email protected]>
HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52
Trond Myklebust <[email protected]>
NFS: Fix regression whereby fscache errors are appearing on 'nofsc' mounts
Trond Myklebust <[email protected]>
NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()
Trond Myklebust <[email protected]>
NFSv4.1: Only reap expired delegations
Trond Myklebust <[email protected]>
NFSv4.1: Fix open stateid recovery
Trond Myklebust <[email protected]>
NFSv4: When recovering state fails with EAGAIN, retry the same recovery
Trond Myklebust <[email protected]>
NFSv4: Fix a credential refcount leak in nfs41_check_delegation_stateid
YueHaibing <[email protected]>
enetc: Select PHYLIB while CONFIG_FSL_ENETC_VF is set
Wang Xiayang <[email protected]>
net/ethernet/qlogic/qed: force the string buffer NULL-terminated
Vijendar Mukunda <[email protected]>
ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma driver
Wang Xiayang <[email protected]>
can: peak_usb: force the string buffer NULL-terminated
Wang Xiayang <[email protected]>
can: sja1000: force the string buffer NULL-terminated
Jarkko Nikula <[email protected]>
spi: pxa2xx: Add support for Intel Tiger Lake
Jiri Olsa <[email protected]>
perf bench numa: Fix cpu0 binding
Jia-Ju Bai <[email protected]>
net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed()
Juliana Rodrigueiro <[email protected]>
isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack
YueHaibing <[email protected]>
enetc: Fix build error without PHYLIB
Gregory Greenman <[email protected]>
iwlwifi: mvm: send LQ command always ASYNC
Johannes Berg <[email protected]>
iwlwifi: fix locking in delayed GTK setting
Shahar S Matityahu <[email protected]>
iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef
Shahar S Matityahu <[email protected]>
iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug override ifdef
Mordechay Goodstein <[email protected]>
iwlwifi: mvm: avoid races in rate init and rate perform
Jean Delvare <[email protected]>
nvmem: Use the same permissions for eeprom as for nvmem
David Howells <[email protected]>
rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet
David Howells <[email protected]>
rxrpc: Fix potential deadlock
Jozsef Kadlecsik <[email protected]>
netfilter: ipset: Fix rename concurrency with listing
Stefano Brivio <[email protected]>
netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets
Stefano Brivio <[email protected]>
netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too
Martin Blumenstingl <[email protected]>
net: stmmac: manage errors returned by of_get_mac_address()
Jia-Ju Bai <[email protected]>
mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl()
Ben Segal <[email protected]>
habanalabs: fix F/W download in BE architecture
Jia-Ju Bai <[email protected]>
isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain()
Michal Kalderon <[email protected]>
qed: RDMA - Fix the hw_ver returned in device attributes
Bob Ham <[email protected]>
net: usb: qmi_wwan: Add the BroadMobi BM818 card
Peter Ujfalusi <[email protected]>
ASoC: ti: davinci-mcasp: Correct slot_width posed constraint
Cheng-Yi Chiang <[email protected]>
ASoC: rockchip: Fix mono capture
Peter Ujfalusi <[email protected]>
ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master mode
Manikanta Pubbisetty <[email protected]>
{nl,mac}80211: fix interface combinations on crypto controlled devices
Navid Emamdoost <[email protected]>
st_nci_hci_connectivity_event_received: null check the allocation
Navid Emamdoost <[email protected]>
st21nfca_connectivity_event_received: null check the allocation
Andrii Nakryiko <[email protected]>
libbpf: silence GCC8 warning about string truncation
Jan Sebastian Götte <[email protected]>
Staging: fbtft: Fix GPIO handling
Ricard Wanderlof <[email protected]>
ASoC: Fail card instantiation if DAI format setup fails
YueHaibing <[email protected]>
can: gw: Fix error path of cgw_module_init
Weitao Hou <[email protected]>
can: mcp251x: add error check when wq alloc failed
Rasmus Villemoes <[email protected]>
can: dev: call netif_carrier_off() in register_candev()
Ilya Maximets <[email protected]>
libbpf: fix using uninitialized ioctl results
Eric Dumazet <[email protected]>
selftests/bpf: add another gso_segs access
Ido Schimmel <[email protected]>
selftests: forwarding: gre_multipath: Fix flower filters
Ido Schimmel <[email protected]>
selftests: forwarding: gre_multipath: Enable IPv4 forwarding
Maxime Chevallier <[email protected]>
net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links
Thomas Falcon <[email protected]>
bonding: Force slave speed check after link state recovery for 802.3ad
Wenwen Wang <[email protected]>
ASoC: dapm: fix a memory leak bug
Ilya Leoshkevich <[email protected]>
selftests/bpf: fix sendmsg6_prog on s390
John Fastabend <[email protected]>
bpf: sockmap, only create entry if ulp is not already enabled
John Fastabend <[email protected]>
bpf: sockmap, synchronize_rcu before free'ing map
John Fastabend <[email protected]>
bpf: sockmap, sock_map_delete needs to use xchg
Lubomir Rintel <[email protected]>
spi: pxa2xx: Balance runtime PM enable/disable on error
Masahiro Yamada <[email protected]>
ASoC: SOF: use __u32 instead of uint32_t in uapi headers
Charles Keepax <[email protected]>
ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks
Wenwen Wang <[email protected]>
netfilter: ebtables: fix a memory leak bug in compat
Andrii Nakryiko <[email protected]>
libbpf: sanitize VAR to conservative 1-byte INT
Vladimir Kondratiev <[email protected]>
mips: fix cacheinfo
Thomas Bogendoerfer <[email protected]>
MIPS: kernel: only use i8253 clocksource with periodic clockevent
Ilya Trukhanov <[email protected]>
HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT
Filipe Laíns <[email protected]>
HID: logitech-hidpp: add USB PID for a few more supported mice
Hans de Goede <[email protected]>
ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook
Wen Yang <[email protected]>
ASoC: samsung: odroid: fix a double-free issue for cpu_dai
Wen Yang <[email protected]>
ASoC: samsung: odroid: fix an use-after-free issue for codec
Jernej Skrabec <[email protected]>
regulator: axp20x: fix DCDC5 and DCDC6 for AXP803
Jernej Skrabec <[email protected]>
regulator: axp20x: fix DCDCA and DCDCD for AXP806
Kuninori Morimoto <[email protected]>
ASoC: audio-graph-card: add missing const at graph_get_dai_id()
Wen Yang <[email protected]>
ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()
Wen Yang <[email protected]>
ASoC: audio-graph-card: fix use-after-free in graph_dai_link_of_dpcm()
Wen Yang <[email protected]>
ASoC: simple-card: fix an use-after-free in simple_for_each_link()
Wen Yang <[email protected]>
ASoC: simple-card: fix an use-after-free in simple_dai_link_of_dpcm()
Kuninori Morimoto <[email protected]>
ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 7 ++ .../devicetree/bindings/riscv/sifive.yaml | 2 +- Makefile | 4 +- arch/arm/kvm/coproc.c | 23 +++-- arch/arm64/kvm/sys_regs.c | 32 ++++--- arch/mips/kernel/cacheinfo.c | 2 + arch/mips/kernel/i8253.c | 3 +- arch/powerpc/kernel/misc_64.S | 4 +- arch/s390/boot/ipl_parm.c | 2 - arch/s390/kernel/ipl.c | 9 -- arch/s390/kernel/vmlinux.lds.S | 10 +- arch/s390/mm/dump_pagetables.c | 12 +-- arch/x86/include/asm/bootparam_utils.h | 63 ++++++++++--- arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/nospec-branch.h | 2 +- arch/x86/kernel/apic/apic.c | 68 +++++++++++--- arch/x86/kernel/cpu/amd.c | 66 ++++++++++++++ arch/x86/kvm/mmu.c | 33 +------ arch/x86/lib/cpu.c | 1 + arch/x86/power/cpu.c | 86 +++++++++++++++--- block/bfq-iosched.c | 14 ++- drivers/ata/libata-scsi.c | 21 +++++ drivers/ata/libata-sff.c | 6 ++ drivers/ata/pata_rb532_cf.c | 1 - drivers/block/aoe/aoedev.c | 13 ++- drivers/clk/socfpga/clk-periph-s10.c | 2 +- drivers/gpio/gpiolib.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 ++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 - drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 24 +++-- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +- drivers/hid/hid-a4tech.c | 30 +++++- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-hidpp.c | 32 ++++++- drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-tmff.c | 12 +++ drivers/hid/wacom_wac.c | 4 +- drivers/hv/channel.c | 2 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 77 ++++++---------- drivers/isdn/hardware/mISDN/hfcsusb.c | 13 ++- drivers/md/dm-bufio.c | 4 +- drivers/md/dm-dust.c | 11 ++- drivers/md/dm-integrity.c | 15 +++ drivers/md/dm-kcopyd.c | 5 +- drivers/md/dm-raid.c | 2 +- drivers/md/dm-table.c | 5 +- drivers/md/dm-zoned-metadata.c | 59 +++++++++--- drivers/md/dm-zoned-reclaim.c | 44 +++++++-- drivers/md/dm-zoned-target.c | 67 ++++++++++++-- drivers/md/dm-zoned.h | 10 ++ drivers/md/persistent-data/dm-btree.c | 31 ++++--- drivers/md/persistent-data/dm-space-map-metadata.c | 2 +- drivers/misc/habanalabs/firmware_if.c | 19 +--- drivers/net/bonding/bond_main.c | 9 ++ drivers/net/can/dev.c | 2 + drivers/net/can/sja1000/peak_pcmcia.c | 2 +- drivers/net/can/spi/mcp251x.c | 49 +++++----- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 5 +- drivers/net/ethernet/freescale/enetc/Kconfig | 2 + drivers/net/ethernet/hisilicon/hip04_eth.c | 28 +++--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 4 + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 +- drivers/net/phy/phy_led_triggers.c | 3 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 53 ++++++++--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 65 ++++++++++--- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 7 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 8 +- drivers/nfc/st-nci/se.c | 2 + drivers/nfc/st21nfca/se.c | 2 + drivers/nvmem/nvmem-sysfs.c | 15 ++- drivers/regulator/axp20x-regulator.c | 10 +- drivers/scsi/ufs/ufshcd.c | 3 + drivers/spi/spi-pxa2xx.c | 14 ++- drivers/staging/fbtft/fb_bd663474.c | 2 +- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_s6d1121.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- drivers/staging/fbtft/fb_ssd1331.c | 4 +- drivers/staging/fbtft/fb_upd161704.c | 2 +- drivers/staging/fbtft/fbtft-bus.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 4 +- fs/ceph/addr.c | 5 +- fs/ceph/locks.c | 3 +- fs/cifs/smb2ops.c | 39 +++++--- fs/io_uring.c | 66 ++++++++++---- fs/nfs/delegation.c | 23 +++-- fs/nfs/fscache.c | 7 +- fs/nfs/fscache.h | 2 +- fs/nfs/nfs4_fs.h | 3 +- fs/nfs/nfs4client.c | 5 +- fs/nfs/nfs4proc.c | 70 ++++++++------ fs/nfs/nfs4state.c | 43 +++++++-- fs/nfs/super.c | 1 + fs/userfaultfd.c | 25 ++--- fs/xfs/xfs_iops.c | 1 + include/net/cfg80211.h | 15 +++ include/sound/simple_card_utils.h | 4 + include/trace/events/rxrpc.h | 6 +- include/uapi/sound/sof/fw.h | 16 ++-- include/uapi/sound/sof/header.h | 14 +-- kernel/irq/irqdesc.c | 15 ++- kernel/sched/deadline.c | 8 -- kernel/sched/psi.c | 12 ++- mm/huge_memory.c | 4 + mm/kasan/common.c | 10 +- mm/memcontrol.c | 60 ++++++++++++ mm/page_alloc.c | 19 +--- mm/z3fold.c | 89 ++++++++++++++++++ mm/zsmalloc.c | 78 +++++++++++++++- net/bridge/netfilter/ebtables.c | 4 +- net/can/gw.c | 48 +++++++--- net/ceph/osd_client.c | 9 +- net/core/sock_map.c | 19 +++- net/mac80211/util.c | 7 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +- net/netfilter/ipset/ip_set_core.c | 2 +- net/netfilter/ipset/ip_set_hash_ipmac.c | 6 +- net/rxrpc/af_rxrpc.c | 4 +- net/rxrpc/ar-internal.h | 6 +- net/rxrpc/input.c | 16 +++- net/rxrpc/local_object.c | 101 +++++++++++++-------- net/rxrpc/peer_event.c | 2 +- net/rxrpc/peer_object.c | 18 ++++ net/rxrpc/sendmsg.c | 1 + net/wireless/core.c | 6 +- net/wireless/nl80211.c | 4 +- net/wireless/util.c | 27 +++++- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- sound/soc/generic/audio-graph-card.c | 30 +++--- sound/soc/generic/simple-card.c | 26 +++--- sound/soc/intel/boards/bytcht_es8316.c | 8 ++ sound/soc/rockchip/rockchip_i2s.c | 5 +- sound/soc/samsung/odroid.c | 8 +- sound/soc/soc-core.c | 7 +- sound/soc/soc-dapm.c | 10 +- sound/soc/ti/davinci-mcasp.c | 46 ++++++++-- tools/lib/bpf/libbpf.c | 9 +- tools/lib/bpf/xsk.c | 11 +-- tools/perf/bench/numa.c | 6 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/pmu-events/jevents.c | 1 + tools/perf/util/cpumap.c | 5 +- tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +- tools/testing/selftests/bpf/verifier/ctx_skb.c | 11 +++ tools/testing/selftests/kvm/config | 3 + .../selftests/net/forwarding/gre_multipath.sh | 28 +++--- 161 files changed, 1815 insertions(+), 703 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 13/162 HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT
[ Upstream commit 65f11c72780fa9d598df88def045ccb6a885cf80 ]
Enable force feedback for the Thrustmaster Dual Trigger 2 in 1 Rumble Force gamepad. Compared to other Thrustmaster devices, left and right rumble motors here are swapped.
--- drivers/hid/hid-tmff.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/hid/hid-tmff.c +12 -0
@@ -22,6 +22,8 @@#include "hid-ids.h" +#define THRUSTMASTER_DEVICE_ID_2_IN_1_DT 0xb320 +static const signed short ff_rumble[] = {FF_RUMBLE ,-1
@@ -76,6 +78,7 @@ static int tmff_play(struct input_dev *dev, void *data,struct hid_field *ff_field = tmff->ff_field;int x, y;int left, right;/* Rumbling */ +int motor_swap;switch (effect->type) {case FF_CONSTANT :
@@ -100,6 +103,13 @@ static int tmff_play(struct input_dev *dev, void *data, ff_field->logical_minimum, ff_field->logical_maximum); +/* 2-in-1 strong motor is left */ +if (hid->product ==THRUSTMASTER_DEVICE_ID_2_IN_1_DT ) { + motor_swap = left; + left = right; + right = motor_swap; + } +dbg_hid ("(left,right)=(%08x, %08x)\n" , left, right); ff_field->value[0 ] = left; ff_field->value[1 ] = right;
@@ -226,6 +236,8 @@ static const struct hid_device_id tm_devices[] = { .driver_data = (unsigned long)ff_rumble }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304), /* FireStorm Dual Power 2 (and 3) */ .driver_data = (unsigned long)ff_rumble }, + { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, THRUSTMASTER_DEVICE_ID_2_IN_1_DT), /* Dual Trigger 2-in-1 */ + .driver_data = (unsigned long)ff_rumble }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323), /* Dual Trigger 3-in-1 (PC Mode) */ .driver_data = (unsigned long)ff_rumble }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324), /* Dual Trigger 3-in-1 (PS3 Mode) */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/162 bpf: sockmap, synchronize_rcu before freeing map
In reply to Greg Kroah-Hartman[ Upstream commit 2bb90e5cc90e1d09f631aeab041a9cf913a5bbe5 ]
We need to have a synchronize_rcu before free'ing the sockmap because any outstanding psock references will have a pointer to the map and when they use this could trigger a use after free.
--- net/core/sock_map.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/sock_map.c +2 -0
@@ -252,6 +252,8 @@ static void sock_map_free(struct bpf_map *map)raw_spin_unlock_bh (&stab->lock);rcu_read_unlock (); +synchronize_rcu (); +bpf_map_area_free (stab->sks);kfree (stab); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/162 bpf: sockmap, only create entry if ulp is not already enabled
In reply to Greg Kroah-Hartman[ Upstream commit 0e858739c2d2eedeeac1d35bfa0ec3cc2a7190d8 ]
Sockmap does not currently support adding sockets after TLS has been enabled. There never was a real use case for this so it was never added. But, we lost the test for ULP at some point so add it here and fail the socket insert if TLS is enabled. Future work could make sockmap support this use case but fixup the bug here.
--- net/core/sock_map.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/sock_map.c +3 -0
@@ -339,6 +339,7 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx, struct sock *sk, u64 flags) { struct bpf_stab *stab = container_of(map, struct bpf_stab, map); +struct inet_connection_sock *icsk =inet_csk (sk);struct sk_psock_link *link;struct sk_psock *psock;struct sock *osk;
@@ -349,6 +350,8 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx,return -EINVAL ;if (unlikely (idx >= map->max_entries))return -E2BIG ; +if (unlikely (icsk->icsk_ulp_data)) +return -EINVAL ; link =sk_psock_init_link ();if (!link)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/162 ASoC: dapm: fix a memory leak bug
In reply to Greg Kroah-Hartman[ Upstream commit 45004d66f2a28d78f543fb2ffbc133e31dc2d162 ]
In snd_soc_dapm_new_control_unlocked(), a kernel buffer is allocated in dapm_cnew_widget() to hold the new dapm widget. Then, different actions are taken according to the id of the widget, i.e., 'w->id'. If any failure occurs during this process, snd_soc_dapm_new_control_unlocked() should be terminated by going to the 'request_failed' label. However, the allocated kernel buffer is not freed on this code path, leading to a memory leak bug.
To fix the above issue, free the buffer before returning from snd_soc_dapm_new_control_unlocked() through the 'request_failed' label.
--- sound/soc/soc-dapm.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/soc-dapm.c +2 -0
@@ -3705,6 +3705,8 @@ request_failed:dev_err (dapm->dev,"ASoC: Failed to request %s: %d\n" , w->name, ret); +kfree_const (w->sname); +kfree (w);return ERR_PTR (ret); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/162 bonding: Force slave speed check after link state recovery for 802.3ad
In reply to Greg Kroah-Hartman[ Upstream commit 12185dfe44360f814ac4ead9d22ad2af7511b2e9 ]
The following scenario was encountered during testing of logical partition mobility on pseries partitions with bonded ibmvnic adapters in LACP mode.
1. Driver receives a signal that the device has been swapped, and it needs to reset to initialize the new device.
2. Driver reports loss of carrier and begins initialization.
3. Bonding driver receives NETDEV_CHANGE notifier and checks the slave's current speed and duplex settings. Because these are unknown at the time, the bond sets its link state to BOND_LINK_FAIL and handles the speed update, clearing AD_PORT_LACP_ENABLE.
4. Driver finishes recovery and reports that the carrier is on.
5. Bond receives a new notification and checks the speed again. The speeds are valid but miimon has not altered the link state yet. AD_PORT_LACP_ENABLE remains off.
Because the slave's link state is still BOND_LINK_FAIL, no further port checks are made when it recovers. Though the slave devices are operational and have valid speed and duplex settings, the bond will not send LACPDU's. The simplest fix I can see is to force another speed check in bond_miimon_commit. This way the bond will update AD_PORT_LACP_ENABLE if needed when transitioning from BOND_LINK_FAIL to BOND_LINK_UP.
--- drivers/net/bonding/bond_main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/bonding/bond_main.c +9 -0
@@ -2205,6 +2205,15 @@ static void bond_miimon_commit(struct bonding *bond)bond_for_each_slave (bond, slave, iter) {switch (slave->new_link) {case BOND_LINK_NOCHANGE : +/* For 802.3ad mode, check current slave speed and +* duplex again in case its port was disabled after +* invalid speed/duplex reporting but recovered before +* link monitoring could make a decision on the actual +* link status +*/ +if (BOND_MODE (bond) ==BOND_MODE_8023AD && + slave->link ==BOND_LINK_UP ) +bond_3ad_adapter_speed_duplex_changed (slave);continue ;case BOND_LINK_UP :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/162 selftests: forwarding: gre_multipath: Enable IPv4 forwarding
In reply to Greg Kroah-Hartman[ Upstream commit efa7b79f675da0efafe3f32ba0d6efe916cf4867 ]
The test did not enable IPv4 forwarding during its setup phase, which causes the test to fail on machines where IPv4 forwarding is disabled.
--- tools/testing/selftests/net/forwarding/gre_multipath.sh | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/net/forwarding/gre_multipath.sh +4 -0
@@ -187,12 +187,16 @@ setup_prepare() sw1_create sw2_create h2_create + + forwarding_enable } cleanup() { pre_cleanup + forwarding_restore + h2_destroy sw2_destroy sw1_destroy
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/162 net: mvpp2: Dont check for 3 consecutive Idle frames for 10G links
In reply to Greg Kroah-Hartman[ Upstream commit bba18318e7d1d5c8b0bbafd65010a0cee3c65608 ]
PPv2's XLGMAC can wait for 3 idle frames before triggering a link up event. This can cause the link to be stuck low when there's traffic on the interface, so disable this feature.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +3 -3
@@ -4580,9 +4580,9 @@ static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,else ctrl0 &= ~MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN ; - ctrl4 &= ~MVPP22_XLG_CTRL4_MACMODSELECT_GMAC ; - ctrl4 |=MVPP22_XLG_CTRL4_FWD_FC |MVPP22_XLG_CTRL4_FWD_PFC | -MVPP22_XLG_CTRL4_EN_IDLE_CHECK ; + ctrl4 &= ~(MVPP22_XLG_CTRL4_MACMODSELECT_GMAC | +MVPP22_XLG_CTRL4_EN_IDLE_CHECK ); + ctrl4 |=MVPP22_XLG_CTRL4_FWD_FC |MVPP22_XLG_CTRL4_FWD_PFC ;if (old_ctrl0 != ctrl0)writel (ctrl0, port->base +MVPP22_XLG_CTRL0_REG );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/162 selftests: forwarding: gre_multipath: Fix flower filters
In reply to Greg Kroah-Hartman[ Upstream commit 1be79d89b7ae96e004911bd228ce8c2b5cc6415f ]
The TC filters used in the test do not work with veth devices because the outer Ethertype is 802.1Q and not IPv4. The test passes with mlxsw netdevs since the hardware always looks at "The first Ethertype that does not point to either: VLAN, CNTAG or configurable Ethertype".
Fix this by matching on the VLAN ID instead, but on the ingress side. The reason why this is not performed at egress is explained in the commit cited below.
--- .../selftests/net/forwarding/gre_multipath.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
tools/testing/selftests/net/forwarding/gre_multipath.sh +12 -12
@@ -93,18 +93,10 @@ sw1_create() ip route add vrf v$ol1 192.0.2.16/28 \ nexthop dev g1a \ nexthop dev g1b - - tc qdisc add dev $ul1 clsact - tc filter add dev $ul1 egress pref 111 prot ipv4 \ - flower dst_ip 192.0.2.66 action pass - tc filter add dev $ul1 egress pref 222 prot ipv4 \ - flower dst_ip 192.0.2.82 action pass } sw1_destroy() { - tc qdisc del dev $ul1 clsact - ip route del vrf v$ol1 192.0.2.16/28 ip route del vrf v$ol1 192.0.2.82/32 via 192.0.2.146
@@ -139,10 +131,18 @@ sw2_create() ip route add vrf v$ol2 192.0.2.0/28 \ nexthop dev g2a \ nexthop dev g2b + + tc qdisc add dev $ul2 clsact + tc filter add dev $ul2 ingress pref 111 prot 802.1Q \ + flower vlan_id 111 action pass + tc filter add dev $ul2 ingress pref 222 prot 802.1Q \ + flower vlan_id 222 action pass } sw2_destroy() { + tc qdisc del dev $ul2 clsact + ip route del vrf v$ol2 192.0.2.0/28 ip route del vrf v$ol2 192.0.2.81/32 via 192.0.2.145
@@ -215,15 +215,15 @@ multipath4_test() nexthop dev g1a weight $weight1 \ nexthop dev g1b weight $weight2 - local t0_111=$(tc_rule_stats_get $ul1 111 egress) - local t0_222=$(tc_rule_stats_get $ul1 222 egress) + local t0_111=$(tc_rule_stats_get $ul2 111 ingress) + local t0_222=$(tc_rule_stats_get $ul2 222 ingress) ip vrf exec v$h1 \ $MZ $h1 -q -p 64 -A 192.0.2.1 -B 192.0.2.18 \ -d 1msec -t udp "sp=1024,dp=0-32768" - local t1_111=$(tc_rule_stats_get $ul1 111 egress) - local t1_222=$(tc_rule_stats_get $ul1 222 egress) + local t1_111=$(tc_rule_stats_get $ul2 111 ingress) + local t1_222=$(tc_rule_stats_get $ul2 222 ingress) local d111=$((t1_111 - t0_111)) local d222=$((t1_222 - t0_222))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/162 selftests/bpf: add another gso_segs access
In reply to Greg Kroah-Hartman[ Upstream commit be69483bf4f3abaaca5d5ba460dbb50239463552 ]
Use BPF_REG_1 for source and destination of gso_segs read, to exercise "bpf: fix access to skb_shared_info->gso_segs" fix.
--- tools/testing/selftests/bpf/verifier/ctx_skb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/testing/selftests/bpf/verifier/ctx_skb.c +11 -0
@@ -974,6 +974,17 @@ .result = ACCEPT, .prog_type = BPF_PROG_TYPE_CGROUP_SKB, }, +{ + "read gso_segs from CGROUP_SKB", + .insns = { +BPF_LDX_MEM (BPF_W ,BPF_REG_1 ,BPF_REG_1 , + offsetof(struct __sk_buff , gso_segs)), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .result =ACCEPT , + .prog_type = BPF_PROG_TYPE_CGROUP_SKB, +}, {"write gso_segs from CGROUP_SKB" , .insns = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/162 libbpf: fix using uninitialized ioctl results
In reply to Greg Kroah-Hartman[ Upstream commit decb705e01a5d325c9876b9674043cde4b54f0db ]
'channels.max_combined' initialized only on ioctl success and errno is only valid on ioctl failure.
The code doesn't produce any runtime issues, but makes memory sanitizers angry:
Conditional jump or move depends on uninitialised value(s)
at 0x55C056F: xsk_get_max_queues (xsk.c:336)
by 0x55C05B2: xsk_create_bpf_maps (xsk.c:354)
by 0x55C089F: xsk_setup_xdp_prog (xsk.c:447)
by 0x55C0E57: xsk_socket__create (xsk.c:601)
Uninitialised value was created by a stack allocation
at 0x55C04CD: xsk_get_max_queues (xsk.c:318)Additionally fixed warning on uninitialized bytes in ioctl arguments:
Syscall param ioctl(SIOCETHTOOL) points to uninitialised byte(s)
at 0x648D45B: ioctl (in /usr/lib64/libc-2.28.so)
by 0x55C0546: xsk_get_max_queues (xsk.c:330)
by 0x55C05B2: xsk_create_bpf_maps (xsk.c:354)
by 0x55C089F: xsk_setup_xdp_prog (xsk.c:447)
by 0x55C0E57: xsk_socket__create (xsk.c:601)
Address 0x1ffefff378 is on thread 1's stack
in frame #1, created by xsk_get_max_queues (xsk.c:318)
Uninitialised value was created by a stack allocation
at 0x55C04CD: xsk_get_max_queues (xsk.c:318)--- tools/lib/bpf/xsk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
tools/lib/bpf/xsk.c +3 -4
@@ -327,15 +327,14 @@ static int xsk_load_xdp_prog(struct xsk_socket *xsk)static int xsk_get_max_queues (struct xsk_socket *xsk) { -struct ethtool_channels channels; -struct ifreq ifr; +struct ethtool_channels channels = { .cmd =ETHTOOL_GCHANNELS }; +struct ifreq ifr = {};int fd, err, ret; fd =socket (AF_INET ,SOCK_DGRAM ,0 );if (fd <0 )return -errno; - channels.cmd =ETHTOOL_GCHANNELS ; ifr.ifr_data = (void *)&channels;strncpy (ifr.ifr_name, xsk->ifname,IFNAMSIZ -1 ); ifr.ifr_name[IFNAMSIZ -1 ] ='\0' ;
@@ -345,7 +344,7 @@ static int xsk_get_max_queues(struct xsk_socket *xsk) goto out; } -if (channels.max_combined ==0 || errno ==EOPNOTSUPP ) +if (err || channels.max_combined ==0 )/* If the device says it has no channels, then all traffic * is sent to a single stream, so max queues = 1. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/162 MIPS: kernel: only use i8253 clocksource with periodic clockevent
In reply to Greg Kroah-Hartman[ Upstream commit a07e3324538a989b7cdbf2c679be6a7f9df2544f ]
i8253 clocksource needs a free running timer. This could only be used, if i8253 clockevent is set up as periodic.
--- arch/mips/kernel/i8253.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/i8253.c +2 -1
@@ -32,7 +32,8 @@ void __init setup_pit_timer(void)static int __init init_pit_clocksource (void ) { -if (num_possible_cpus () >1 )/* PIT does not scale! */ +if (num_possible_cpus () >1 ||/* PIT does not scale! */ + !clockevent_state_periodic (&i8253_clockevent))return 0 ;return clocksource_i8253_init ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/162 can: dev: call netif_carrier_off() in register_candev()
In reply to Greg Kroah-Hartman[ Upstream commit c63845609c4700488e5eacd6ab4d06d5d420e5ef ]
CONFIG_CAN_LEDS is deprecated. When trying to use the generic netdev trigger as suggested, there's a small inconsistency with the link
property: The LED is on initially, stays on when the device is brought up, and then turns off (as expected) when the device is brought down.
Make sure the LED always reflects the state of the CAN device.
--- drivers/net/can/dev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/can/dev.c +2 -0
@@ -1249,6 +1249,8 @@ int register_candev(struct net_device *dev)return -EINVAL ; dev->rtnl_link_ops = &can_link_ops; +netif_carrier_off (dev); +return register_netdev (dev); }EXPORT_SYMBOL_GPL (register_candev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/162 can: mcp251x: add error check when wq alloc failed
In reply to Greg Kroah-Hartman[ Upstream commit 375f755899b8fc21196197e02aab26257df26e85 ]
add error check when workqueue alloc failed, and remove redundant code to make it clear.
--- drivers/net/can/spi/mcp251x.c | 49 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 27 deletions(-)
drivers/net/can/spi/mcp251x.c +22 -27
@@ -664,17 +664,6 @@ static int mcp251x_power_enable(struct regulator *reg, int enable)return regulator_disable (reg); } -static void mcp251x_open_clean (struct net_device *net) -{ -struct mcp251x_priv *priv =netdev_priv (net); -struct spi_device *spi = priv->spi; - -free_irq (spi->irq, priv); -mcp251x_hw_sleep (spi); -mcp251x_power_enable (priv->transceiver,0 ); -close_candev (net); -} -static int mcp251x_stop (struct net_device *net) {struct mcp251x_priv *priv =netdev_priv (net);
@@ -940,37 +929,43 @@ static int mcp251x_open(struct net_device *net) flags | IRQF_ONESHOT, DEVICE_NAME, priv);if (ret) {dev_err (&spi->dev,"failed to acquire irq %d\n" , spi->irq); -mcp251x_power_enable (priv->transceiver,0 ); -close_candev (net); - goto open_unlock; + goto out_close; } priv->wq =alloc_workqueue ("mcp251x_wq" ,WQ_FREEZABLE |WQ_MEM_RECLAIM ,0 ); +if (!priv->wq) { + ret = -ENOMEM ; + goto out_clean; + }INIT_WORK (&priv->tx_work, mcp251x_tx_work_handler);INIT_WORK (&priv->restart_work, mcp251x_restart_work_handler); ret =mcp251x_hw_reset (spi); -if (ret) { -mcp251x_open_clean (net); - goto open_unlock; - } +if (ret) + goto out_free_wq; ret =mcp251x_setup (net, spi); -if (ret) { -mcp251x_open_clean (net); - goto open_unlock; - } +if (ret) + goto out_free_wq; ret =mcp251x_set_normal_mode (spi); -if (ret) { -mcp251x_open_clean (net); - goto open_unlock; - } +if (ret) + goto out_free_wq;can_led_event (net,CAN_LED_EVENT_OPEN );netif_wake_queue (net); +mutex_unlock (&priv->mcp_lock); -open_unlock: +return 0 ; + +out_free_wq: +destroy_workqueue (priv->wq); +out_clean: +free_irq (spi->irq, priv); +mcp251x_hw_sleep (spi); +out_close: +mcp251x_power_enable (priv->transceiver,0 ); +close_candev (net);mutex_unlock (&priv->mcp_lock);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/162 can: gw: Fix error path of cgw_module_init
In reply to Greg Kroah-Hartman[ Upstream commit b7a14297f102b6e2ce6f16feffebbb9bde1e9b55 ]
This patch add error path for cgw_module_init to avoid possible crash if some error occurs.
--- net/can/gw.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-)
net/can/gw.c +33 -15
@@ -1046,32 +1046,50 @@ static __init int cgw_module_init(void)pr_info ("can: netlink gateway (rev " CAN_GW_VERSION ") max_hops=%d\n" , max_hops); -register_pernet_subsys (&cangw_pernet_ops); + ret =register_pernet_subsys (&cangw_pernet_ops); +if (ret) +return ret; + + ret = -ENOMEM ; cgw_cache =kmem_cache_create ("can_gw" ,sizeof (struct cgw_job ),0 ,0 ,NULL ); -if (!cgw_cache) -return -ENOMEM ; + goto out_cache_create;/* set notifier */ notifier.notifier_call = cgw_notifier; -register_netdevice_notifier (¬ifier); + ret =register_netdevice_notifier (¬ifier); +if (ret) + goto out_register_notifier; ret =rtnl_register_module (THIS_MODULE ,PF_CAN ,RTM_GETROUTE ,NULL , cgw_dump_jobs,0 ); -if (ret) { -unregister_netdevice_notifier (¬ifier); -kmem_cache_destroy (cgw_cache); -return -ENOBUFS ; - } - -/* Only the first call to rtnl_register_module can fail */ -rtnl_register_module (THIS_MODULE ,PF_CAN ,RTM_NEWROUTE , - cgw_create_job,NULL ,0 ); -rtnl_register_module (THIS_MODULE ,PF_CAN ,RTM_DELROUTE , - cgw_remove_job,NULL ,0 ); +if (ret) + goto out_rtnl_register1; + + ret =rtnl_register_module (THIS_MODULE ,PF_CAN ,RTM_NEWROUTE , + cgw_create_job,NULL ,0 ); +if (ret) + goto out_rtnl_register2; + ret =rtnl_register_module (THIS_MODULE ,PF_CAN ,RTM_DELROUTE , + cgw_remove_job,NULL ,0 ); +if (ret) + goto out_rtnl_register3;return 0 ; + +out_rtnl_register3: +rtnl_unregister (PF_CAN ,RTM_NEWROUTE ); +out_rtnl_register2: +rtnl_unregister (PF_CAN ,RTM_GETROUTE ); +out_rtnl_register1: +unregister_netdevice_notifier (¬ifier); +out_register_notifier: +kmem_cache_destroy (cgw_cache); +out_cache_create: +unregister_pernet_subsys (&cangw_pernet_ops); + +return ret; } static __exit void cgw_module_exit(void)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/162 ASoC: Fail card instantiation if DAI format setup fails
In reply to Greg Kroah-Hartman[ Upstream commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b ]
If the DAI format setup fails, there is no valid communication format between CPU and CODEC, so fail card instantiation, rather than continue with a card that will most likely not function properly.
--- sound/soc/soc-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/soc-core.c +5 -2
@@ -1605,8 +1605,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, } } -if (dai_link->dai_fmt) -snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); +if (dai_link->dai_fmt) { + ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); +if (ret) +return ret; + } ret =soc_post_component_init (rtd, dai_link->name);if (ret)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/162 libbpf: silence GCC8 warning about string truncation
In reply to Greg Kroah-Hartman[ Upstream commit cb8ffde5694ae5fffb456eae932aac442aa3a207 ]
Despite a proper NULL-termination after strncpy(..., ..., IFNAMSIZ - 1), GCC8 still complains about *expected* string truncation:
xsk.c:330:2: error: 'strncpy' output may be truncated copying 15 bytes from a string of length 15 [-Werror=stringop-truncation]
strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1);
This patch gets rid of the issue altogether by using memcpy instead. There is no performance regression, as strncpy will still copy and fill all of the bytes anyway.
v1->v2:
- rebase against bpf tree.
--- tools/lib/bpf/xsk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/xsk.c +2 -2
@@ -336,7 +336,7 @@ static int xsk_get_max_queues(struct xsk_socket *xsk)return -errno; ifr.ifr_data = (void *)&channels; -strncpy (ifr.ifr_name, xsk->ifname,IFNAMSIZ -1 ); +memcpy (ifr.ifr_name, xsk->ifname,IFNAMSIZ -1 ); ifr.ifr_name[IFNAMSIZ -1 ] ='\0' ; err =ioctl (fd,SIOCETHTOOL , &ifr);if (err && errno !=EOPNOTSUPP ) {
@@ -561,7 +561,7 @@ int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname, err = -errno; goto out_socket; } -strncpy (xsk->ifname, ifname,IFNAMSIZ -1 ); +memcpy (xsk->ifname, ifname,IFNAMSIZ -1 ); xsk->ifname[IFNAMSIZ -1 ] ='\0' ; err =xsk_set_xdp_socket_config (&xsk->config, usr_config);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/162 Staging: fbtft: Fix GPIO handling
In reply to Greg Kroah-Hartman[ Upstream commit 92e3e884887c0d278042fbbb6f6c9b41d6addb71 ]
Commit c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor interface") breaks GPIO handling. In several places, checks to only set a GPIO if it was configured ended up backwards.
I have tested this fix. The fixed driver works with a ili9486 display connected to a raspberry pi via SPI.
--- drivers/staging/fbtft/fb_bd663474.c | 2 +- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_s6d1121.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- drivers/staging/fbtft/fb_ssd1331.c | 4 ++-- drivers/staging/fbtft/fb_upd161704.c | 2 +- drivers/staging/fbtft/fbtft-bus.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/fbtft/fb_bd663474.c +1 -1
@@ -24,7 +24,7 @@static int init_display (struct fbtft_par *par) { -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ par->fbtftops.reset (par);
drivers/staging/fbtft/fb_ili9163.c +1 -1
@@ -77,7 +77,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ write_reg (par,MIPI_DCS_SOFT_RESET );/* software reset */
drivers/staging/fbtft/fb_ili9325.c +1 -1
@@ -85,7 +85,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ bt &=0x07 ;
drivers/staging/fbtft/fb_s6d1121.c +1 -1
@@ -29,7 +29,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ /* Initialization sequence from Lib_UTFT */
drivers/staging/fbtft/fb_ssd1289.c +1 -1
@@ -28,7 +28,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ write_reg (par,0x00 ,0x0001 );
drivers/staging/fbtft/fb_ssd1331.c +2 -2
@@ -81,7 +81,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)va_start (args, len); *buf = (u8)va_arg(args, unsigned int); -if (!par->gpio.dc) +if (par->gpio.dc)gpiod_set_value (par->gpio.dc,0 ); ret = par->fbtftops.write (par, par->buf,sizeof (u8));if (ret <0 ) {
@@ -104,7 +104,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)return ; } } -if (!par->gpio.dc) +if (par->gpio.dc)gpiod_set_value (par->gpio.dc,1 );va_end (args); }
drivers/staging/fbtft/fb_upd161704.c +1 -1
@@ -26,7 +26,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ /* Initialization sequence from Lib_UTFT */
drivers/staging/fbtft/fbtft-bus.c +1 -1
@@ -135,7 +135,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) remain = len /2 ; vmem16 = (u16 *)(par->info->screen_buffer + offset); -if (!par->gpio.dc) +if (par->gpio.dc)gpiod_set_value (par->gpio.dc,1 );/* non buffered write */
drivers/staging/fbtft/fbtft-core.c +2 -2
@@ -916,7 +916,7 @@ static int fbtft_init_display_dt(struct fbtft_par *par)return -EINVAL ; par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ while (p) {
@@ -1007,7 +1007,7 @@ int fbtft_init_display(struct fbtft_par *par) } par->fbtftops.reset (par); -if (!par->gpio.cs) +if (par->gpio.cs)gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ i =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/162 st_nci_hci_connectivity_event_received: null check the allocation
In reply to Greg Kroah-Hartman[ Upstream commit 3008e06fdf0973770370f97d5f1fba3701d8281d ]
devm_kzalloc may fail and return NULL. So the null check is needed.
--- drivers/nfc/st-nci/se.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nfc/st-nci/se.c +2 -0
@@ -333,6 +333,8 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev, transaction = (struct nfc_evt_transaction *)devm_kzalloc (dev, skb->len -2 ,GFP_KERNEL ); +if (!transaction) +return -ENOMEM ; transaction->aid_len = skb->data[1 ];memcpy (transaction->aid, &skb->data[2 ], transaction->aid_len);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/162 {nl,mac}80211: fix interface combinations on crypto controlled devices
In reply to Greg Kroah-Hartman[ Upstream commit e6f4051123fd33901e9655a675b22aefcdc5d277 ]
Commit 33d915d9e8ce ("{nl,mac}80211: allow 4addr AP operation on crypto controlled devices") has introduced a change which allows 4addr operation on crypto controlled devices (ex: ath10k). This change has inadvertently impacted the interface combinations logic on such devices.
General rule is that software interfaces like AP/VLAN should not be listed under supported interface combinations and should not be considered during validation of these combinations; because of the aforementioned change, AP/VLAN interfaces(if present) will be checked against interfaces supported by the device and blocks valid interface combinations.
Consider a case where an AP and AP/VLAN are up and running; when a second AP device is brought up on the same physical device, this AP will be checked against the AP/VLAN interface (which will not be part of supported interface combinations of the device) and blocks second AP to come up.
Add a new API cfg80211_iftype_allowed() to fix the problem, this API works for all devices with/without SW crypto control.
--- include/net/cfg80211.h | 15 +++++++++++++++ net/mac80211/util.c | 7 +++---- net/wireless/core.c | 6 ++---- net/wireless/nl80211.c | 4 +--- net/wireless/util.c | 27 +++++++++++++++++++++++++-- 5 files changed, 46 insertions(+), 13 deletions(-)
include/net/cfg80211.h +15 -0
@@ -7254,6 +7254,21 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev,struct cfg80211_pmsr_request *req, gfp_t gfp); +/** +* cfg80211_iftype_allowed - check whether the interface can be allowed +* @wiphy: the wiphy +* @iftype: interface type +* @is_4addr: use_4addr flag, must be '0' when check_swif is '1' +* @check_swif: check iftype against software interfaces +* +* Check whether the interface is allowed to operate; additionally, this API +* can be used to check iftype against the software interfaces when +* check_swif is '1'. +*/ +bool cfg80211_iftype_allowed (struct wiphy *wiphy,enum nl80211_iftype iftype, +bool is_4addr,u8 check_swif); + +/* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */
net/mac80211/util.c +3 -4
@@ -3796,9 +3796,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, }/* Always allow software iftypes */ -if (local->hw.wiphy->software_iftypes &BIT (iftype) || - (iftype ==NL80211_IFTYPE_AP_VLAN && - local->hw.wiphy->flags &WIPHY_FLAG_4ADDR_AP )) { +if (cfg80211_iftype_allowed (local->hw.wiphy, iftype,0 ,1 )) {if (radar_detect)return -EINVAL ;return 0 ;
@@ -3833,7 +3831,8 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,if (sdata_iter == sdata || !ieee80211_sdata_running (sdata_iter) || - local->hw.wiphy->software_iftypes &BIT (wdev_iter->iftype)) +cfg80211_iftype_allowed (local->hw.wiphy, + wdev_iter->iftype,0 ,1 ))continue ; params.iftype_num[wdev_iter->iftype]++;
net/wireless/core.c +2 -4
@@ -1397,10 +1397,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, }break ;case NETDEV_PRE_UP : -if (!(wdev->wiphy->interface_modes &BIT (wdev->iftype)) && - !(wdev->iftype ==NL80211_IFTYPE_AP_VLAN && - rdev->wiphy.flags &WIPHY_FLAG_4ADDR_AP && - wdev->use_4addr)) +if (!cfg80211_iftype_allowed (wdev->wiphy, wdev->iftype, + wdev->use_4addr,0 ))return notifier_from_errno (-EOPNOTSUPP );if (rfkill_blocked (rdev->rfkill))
net/wireless/nl80211.c +1 -3
@@ -3481,9 +3481,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)return err; } -if (!(rdev->wiphy.interface_modes & (1 << type)) && - !(type ==NL80211_IFTYPE_AP_VLAN && params.use_4addr && - rdev->wiphy.flags &WIPHY_FLAG_4ADDR_AP )) +if (!cfg80211_iftype_allowed (&rdev->wiphy, type, params.use_4addr,0 ))return -EOPNOTSUPP ; err =nl80211_parse_mon_options (rdev, type, info, ¶ms);
net/wireless/util.c +25 -2
@@ -1697,7 +1697,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,for (iftype =0 ; iftype <NUM_NL80211_IFTYPES ; iftype++) { num_interfaces += params->iftype_num[iftype];if (params->iftype_num[iftype] >0 && - !(wiphy->software_iftypes &BIT (iftype))) + !cfg80211_iftype_allowed (wiphy, iftype,0 ,1 )) used_iftypes |=BIT (iftype); }
@@ -1719,7 +1719,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,return -ENOMEM ;for (iftype =0 ; iftype <NUM_NL80211_IFTYPES ; iftype++) { -if (wiphy->software_iftypes &BIT (iftype)) +if (cfg80211_iftype_allowed (wiphy, iftype,0 ,1 ))continue ;for (j =0 ; j < c->n_limits; j++) { all_iftypes |= limits[j].types;
@@ -2072,3 +2072,26 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,return max_vht_nss; }EXPORT_SYMBOL (ieee80211_get_vht_max_nss); + +bool cfg80211_iftype_allowed (struct wiphy *wiphy,enum nl80211_iftype iftype, +bool is_4addr,u8 check_swif) + +{ +bool is_vlan = iftype ==NL80211_IFTYPE_AP_VLAN ; + +switch (check_swif) { +case 0 : +if (is_vlan && is_4addr) +return wiphy->flags &WIPHY_FLAG_4ADDR_AP ; +return wiphy->interface_modes &BIT (iftype); +case 1 : +if (!(wiphy->software_iftypes &BIT (iftype)) && is_vlan) +return wiphy->flags &WIPHY_FLAG_4ADDR_AP ; +return wiphy->software_iftypes &BIT (iftype); +default : +break ; + } + +return false; +} +EXPORT_SYMBOL (cfg80211_iftype_allowed);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/162 mips: fix cacheinfo
In reply to Greg Kroah-Hartman[ Upstream commit b8bea8a5e5d942e62203416ab41edecaed4fda02 ]
Because CONFIG_OF defined for MIPS, cacheinfo attempts to fill information from DT, ignoring data filled by architecture routine. This leads to error reported
cacheinfo: Unable to detect cache hierarchy for CPU 0
Way to fix this provided in
commit fac51482577d ("drivers: base: cacheinfo: fix x86 with
CONFIG_OF enabled")
Utilize same mechanism to report that cacheinfo set by architecture specific function
--- arch/mips/kernel/cacheinfo.c | 2 ++ 1 file changed, 2 insertions(+)
arch/mips/kernel/cacheinfo.c +2 -0
@@ -69,6 +69,8 @@ static int __populate_cache_leaves(unsigned int cpu)if (c->tcache.waysize)populate_cache (tcache, this_leaf,3 ,CACHE_TYPE_UNIFIED ); + this_cpu_ci->cpu_map_populated = true; +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/162 ASoC: rockchip: Fix mono capture
In reply to Greg Kroah-Hartman[ Upstream commit 789e162a6255325325bd321ab0cd51dc7e285054 ]
This reverts commit db51707b9c9aeedd310ebce60f15d5bb006567e0. Revert "ASoC: rockchip: i2s: Support mono capture"
Previous discussion in
https://patchwork.kernel.org/patch/10147153/
explains the issue of the patch.
While device is configured as 1-ch, hardware is still generating a 2-ch stream.
When user space reads the data and assumes it is a 1-ch stream, the rate will be slower by 2x.
Revert the change so 1-ch is not supported.
User space can selectively take one channel data out of two channel if 1-ch is preferred.
Currently, both channels record identical data.
--- sound/soc/rockchip/rockchip_i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +2 -3
@@ -326,7 +326,6 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, val |=I2S_CHN_4 ;break ;case 2 : -case 1 : val |=I2S_CHN_2 ;break ;default :
@@ -459,7 +458,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { }, .capture = { .stream_name = "Capture", - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = (SNDRV_PCM_FMTBIT_S8 |
@@ -659,7 +658,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) }if (!of_property_read_u32 (node,"rockchip,capture-channels" , &val)) { -if (val >=1 && val <=8 ) +if (val >=2 && val <=8 ) soc_dai->capture.channels_max = val; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/162 ASoC: ti: davinci-mcasp: Correct slot_width posed constraint
In reply to Greg Kroah-Hartman[ Upstream commit 1e112c35e3c96db7c8ca6ddaa96574f00c06e7db ]
The slot_width is a property for the bus while the constraint for SNDRV_PCM_HW_PARAM_SAMPLE_BITS is for the in memory format.
Applying slot_width constraint to sample_bits works most of the time, but it will blacklist valid formats in some cases.
With slot_width 24 we can support S24_3LE and S24_LE formats as they both look the same on the bus, but a a 24 constraint on sample_bits would not allow S24_LE as it is stored in 32bits in memory.
Implement a simple hw_rule function to allow all formats which require less or equal number of bits on the bus as slot_width (if configured).
--- sound/soc/ti/davinci-mcasp.c | 43 ++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-)
sound/soc/ti/davinci-mcasp.c +34 -9
@@ -1254,6 +1254,28 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,return ret; } +static int davinci_mcasp_hw_rule_slot_width (struct snd_pcm_hw_params *params, +struct snd_pcm_hw_rule *rule) +{ +struct davinci_mcasp_ruledata *rd = rule->private; +struct snd_mask *fmt =hw_param_mask (params,SNDRV_PCM_HW_PARAM_FORMAT ); +struct snd_mask nfmt; +int i, slot_width; + +snd_mask_none (&nfmt); + slot_width = rd->mcasp->slot_width; + +for (i =0 ; i <=SNDRV_PCM_FORMAT_LAST ; i++) { +if (snd_mask_test (fmt, i)) { +if (snd_pcm_format_width (i) <= slot_width) { +snd_mask_set (&nfmt, i); + } + } + } + +return snd_mask_refine (fmt, &nfmt); +} +static const unsigned int davinci_mcasp_dai_rates[] = {8000 ,11025 ,16000 ,22050 ,32000 ,44100 ,48000 ,64000 ,88200 ,96000 ,176400 ,192000 ,
@@ -1361,7 +1383,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,struct davinci_mcasp_ruledata *ruledata = &mcasp->ruledata[substream->stream];u32 max_channels =0 ; -int i, dir; +int i, dir, ret;int tdm_slots = mcasp->tdm_slots;/* Do not allow more then one stream per direction */
@@ -1390,6 +1412,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, max_channels++; } ruledata->serializers = max_channels; + ruledata->mcasp = mcasp; max_channels *= tdm_slots;/* * If the already active stream has less channels than the calculated
@@ -1415,20 +1438,22 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , &mcasp->chconstr[substream->stream]); -if (mcasp->slot_width) -snd_pcm_hw_constraint_minmax (substream->runtime, -SNDRV_PCM_HW_PARAM_SAMPLE_BITS , -8 , mcasp->slot_width); +if (mcasp->slot_width) { +/* Only allow formats require <= slot_width bits on the bus */ + ret =snd_pcm_hw_rule_add (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_FORMAT , + davinci_mcasp_hw_rule_slot_width, + ruledata, +SNDRV_PCM_HW_PARAM_FORMAT ,-1 ); +if (ret) +return ret; + }/* * If we rely on implicit BCLK divider setting we should * set constraints based on what we can provide. */ if (mcasp->bclk_master && mcasp->bclk_div ==0 && mcasp->sysclk_freq) { -int ret; - - ruledata->mcasp = mcasp; - ret = snd_pcm_hw_rule_add(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, davinci_mcasp_hw_rule_rate,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/162 net: usb: qmi_wwan: Add the BroadMobi BM818 card
In reply to Greg Kroah-Hartman[ Upstream commit 9a07406b00cdc6ec689dc142540739575c717f3c ]
The BroadMobi BM818 M.2 card uses the QMI protocol
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1294,6 +1294,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x2001, 0x7e35, 4)}, /* D-Link DWM-222 */ {QMI_FIXED_INTF(0x2020, 0x2031, 4)}, /* Olicard 600 */ {QMI_FIXED_INTF(0x2020, 0x2033, 4)}, /* BroadMobi BM806U */ + {QMI_FIXED_INTF(0x2020, 0x2060, 4)}, /* BroadMobi BM818 */ {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)}, /* Sierra Wireless MC7700 */ {QMI_FIXED_INTF(0x114f, 0x68a2, 8)}, /* Sierra Wireless MC7750 */ {QMI_FIXED_INTF(0x1199, 0x68a2, 8)}, /* Sierra Wireless MC7710 in QMI mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/162 qed: RDMA - Fix the hw_ver returned in device attributes
In reply to Greg Kroah-Hartman[ Upstream commit 81af04b432fdfabcdbd2c06be2ee647e3ca41a22 ]
The hw_ver field was initialized to zero. Return the chip revision. This is relevant for rdma driver.
--- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_rdma.c +1 -1
@@ -442,7 +442,7 @@ static void qed_rdma_init_devinfo(struct qed_hwfn *p_hwfn,/* Vendor specific information */ dev->vendor_id = cdev->vendor_id; dev->vendor_part_id = cdev->device_id; - dev->hw_ver =0 ; + dev->hw_ver = cdev->chip_rev; dev->fw_ver = (FW_MAJOR_VERSION <<24 ) | (FW_MINOR_VERSION <<16 ) | (FW_REVISION_VERSION <<8 ) | (FW_ENGINEERING_VERSION );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/162 isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain()
In reply to Greg Kroah-Hartman[ Upstream commit a0d57a552b836206ad7705a1060e6e1ce5a38203 ]
In start_isoc_chain(), usb_alloc_urb() on line 1392 may fail and return NULL. At this time, fifo->iso[i].urb is assigned to NULL.
Then, fifo->iso[i].urb is used at some places, such as:
LINE 1405: fill_isoc_urb(fifo->iso[i].urb, ...)
urb->number_of_packets = num_packets;
urb->transfer_flags = URB_ISO_ASAP;
urb->actual_length = 0;
urb->interval = interval;
LINE 1416: fifo->iso[i].urb->...
LINE 1419: fifo->iso[i].urb->...Thus, possible null-pointer dereferences may occur.
To fix these bugs, "continue" is added to avoid using fifo->iso[i].urb when it is NULL.
These bugs are found by a static analysis tool STCheck written by us.
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/isdn/hardware/mISDN/hfcsusb.c +1 -0
@@ -1394,6 +1394,7 @@ start_isoc_chain(struct usb_fifo *fifo, int num_packets_per_urb,printk (KERN_DEBUG "%s: %s: alloc urb for fifo %i failed" , hw->name, __func__, fifo->fifonum); +continue ; } fifo->iso[i].owner_fifo = (struct usb_fifo *) fifo; fifo->iso[i].indx = i;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/162 habanalabs: fix F/W download in BE architecture
In reply to Greg Kroah-Hartman[ Upstream commit 75035fe22b808a520e1d712ebe913684ba406e01 ]
writeX macros might perform byte-swapping in BE architectures. As our F/W is in LE format, we need to make sure no byte-swapping will occur.
There is a standard kernel function (called memcpy_toio) for copying data to I/O area which is used in a lot of drivers to download F/W to PCIe adapters. That function also makes sure the data is copied "as-is", without byte-swapping.
This patch use that function to copy the F/W to the GOYA ASIC instead of writeX macros.
--- drivers/misc/habanalabs/firmware_if.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/misc/habanalabs/firmware_if.c +2 -17
@@ -24,7 +24,7 @@ int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name, {const struct firmware *fw;const u64 *fw_data; -size_t fw_size, i; +size_t fw_size;int rc; rc =request_firmware (&fw, fw_name, hdev->dev);
@@ -45,22 +45,7 @@ int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name, fw_data = (const u64 *) fw->data; -if ((fw->size %8 ) !=0 ) - fw_size -=8 ; - -for (i =0 ; i < fw_size ; i +=8 , fw_data++, dst +=8 ) { -if (!(i & (0x80000 -1 ))) { -dev_dbg (hdev->dev, -"copied so far %zu out of %zu for %s firmware" , - i, fw_size, fw_name); -usleep_range (20 ,100 ); - } - -writeq (*fw_data, dst); - } - -if ((fw->size %8 ) !=0 ) -writel (*(const u32 *) fw_data, dst); +memcpy_toio (dst, fw_data, fw_size); out:release_firmware (fw);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/162 netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too
In reply to Greg Kroah-Hartman[ Upstream commit b89d15480d0cacacae1a0fe0b3da01b529f2914f ]
In commit 8cc4ccf58379 ("ipset: Allow matching on destination MAC address for mac and ipmac sets"), ipset.git commit 1543514c46a7, I removed the KADT check that prevents matching on destination MAC addresses for hash:mac sets, but forgot to remove the same check for hash:ip,mac set.
Drop this check: functionality is now commented in man pages and there's no reason to restrict to source MAC address matching anymore.
--- net/netfilter/ipset/ip_set_hash_ipmac.c | 4 ---- 1 file changed, 4 deletions(-)
net/netfilter/ipset/ip_set_hash_ipmac.c +0 -4
@@ -89,10 +89,6 @@ hash_ipmac4_kadt(struct ip_set *set, const struct sk_buff *skb,struct hash_ipmac4_elem e = { .ip =0 , { .foo[0 ] =0 , .foo[1 ] =0 } };struct ip_set_ext ext =IP_SET_INIT_KEXT (skb, opt, set); -/* MAC can be src only */ -if (!(opt->flags &IPSET_DIM_TWO_SRC )) -return 0 ; -if (skb_mac_header (skb) < skb->head || (skb_mac_header (skb) +ETH_HLEN ) > skb->data)return -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/162 net: stmmac: manage errors returned by of_get_mac_address()
In reply to Greg Kroah-Hartman[ Upstream commit 195b2919ccd7ffcaf6b6bbcb39444a53ab8308c7 ]
Commit d01f449c008a ("of_net: add NVMEM support to of_get_mac_address") added support for reading the MAC address from an nvmem-cell. This required changing the logic to return an error pointer upon failure.
If stmmac is loaded before the nvmem provider driver then of_get_mac_address() return an error pointer with -EPROBE_DEFER.
Propagate this error so the stmmac driver will be probed again after the nvmem provider driver is loaded.
Default to a random generated MAC address in case of any other error, instead of using the error pointer as MAC address.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +7 -0
@@ -385,6 +385,13 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)return ERR_PTR (-ENOMEM ); *mac =of_get_mac_address (np); +if (IS_ERR (*mac)) { +if (PTR_ERR (*mac) == -EPROBE_DEFER ) +return ERR_CAST (*mac); + + *mac =NULL ; + } + plat->interface =of_get_phy_mode (np);/* Get max speed of operation from device tree */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/162 libbpf: sanitize VAR to conservative 1-byte INT
In reply to Greg Kroah-Hartman[ Upstream commit 1d4126c4e1190d2f7d3f388552f9bd17ae0c64fc ]
If VAR in non-sanitized BTF was size less than 4, converting such VAR into an INT with size=4 will cause BTF validation failure due to violationg of STRUCT (into which DATASEC was converted) member size. Fix by conservatively using size=1.
--- tools/lib/bpf/libbpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.c +7 -2
@@ -1044,8 +1044,13 @@ static void bpf_object__sanitize_btf(struct bpf_object *obj)if (!has_datasec && kind ==BTF_KIND_VAR ) {/* replace VAR with INT */ t->info =BTF_INFO_ENC (BTF_KIND_INT ,0 ,0 ); - t->size =sizeof (int ); - *(int *)(t+1 ) =BTF_INT_ENC (0 ,0 ,32 ); +/* +* using size = 1 is the safest choice, 4 will be too +* big and cause kernel BTF validation failure if +* original variable took less than 4 bytes +*/ + t->size =1 ; + *(int *)(t+1 ) =BTF_INT_ENC (0 ,0 ,8 ); }else if (!has_datasec && kind ==BTF_KIND_DATASEC ) {/* replace DATASEC with STRUCT */ struct btf_var_secinfo *v = (void *)(t +1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/162 netfilter: ipset: Fix rename concurrency with listing
In reply to Greg Kroah-Hartman[ Upstream commit 6c1f7e2c1b96ab9b09ac97c4df2bd9dc327206f6 ]
Shijie Luo reported that when stress-testing ipset with multiple concurrent create, rename, flush, list, destroy commands, it can result
ipset <version>: Broken LIST kernel message: missing DATA part!
error messages and broken list results. The problem was the rename operation was not properly handled with respect of listing. The patch fixes the issue.
--- net/netfilter/ipset/ip_set_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -1161,7 +1161,7 @@ static int ip_set_rename(struct net *net, struct sock *ctnl,return -ENOENT ;write_lock_bh (&ip_set_ref_lock); -if (set->ref !=0 ) { +if (set->ref !=0 || set->ref_netlink !=0 ) { ret = -IPSET_ERR_REFERENCED ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/162 netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets
In reply to Greg Kroah-Hartman[ Upstream commit 1b4a75108d5bc153daf965d334e77e8e94534f96 ]
In commit 8cc4ccf58379 ("ipset: Allow matching on destination MAC address for mac and ipmac sets"), ipset.git commit 1543514c46a7, I added to the KADT functions for sets matching on MAC addreses the copy of source or destination MAC address depending on the configured match.
This was done correctly for hash:mac, but for hash:ip,mac and bitmap:ip,mac, copying and pasting the same code block presents an obvious problem: in these two set types, the MAC address is the second dimension, not the first one, and we are actually selecting the MAC address depending on whether the first dimension (IP address) specifies source or destination.
Fix this by checking for the IPSET_DIM_TWO_SRC flag in option flags.
This way, mixing source and destination matches for the two dimensions of ip,mac set types works as expected. With this setup:
ip netns add A
ip link add veth1 type veth peer name veth2 netns A ip addr add 192.0.2.1/24 dev veth1
ip -net A addr add 192.0.2.2/24 dev veth2 ip link set veth1 up
ip -net A link set veth2 up
dst=$(ip netns exec A cat /sys/class/net/veth2/address)
ip netns exec A ipset create test_bitmap bitmap:ip,mac range 192.0.0.0/16
ip netns exec A ipset add test_bitmap 192.0.2.1,${dst}
ip netns exec A iptables -A INPUT -m set ! --match-set test_bitmap src,dst -j DROP
ip netns exec A ipset create test_hash hash:ip,mac
ip netns exec A ipset add test_hash 192.0.2.1,${dst}
ip netns exec A iptables -A INPUT -m set ! --match-set test_hash src,dst -j DROPipset correctly matches a test packet:
# ping -c1 192.0.2.2 >/dev/null # echo $? 0
--- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +- net/netfilter/ipset/ip_set_hash_ipmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipset/ip_set_bitmap_ipmac.c +1 -1
@@ -227,7 +227,7 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb, e.id =ip_to_id (map, ip); -if (opt->flags &IPSET_DIM_ONE_SRC ) +if (opt->flags &IPSET_DIM_TWO_SRC )ether_addr_copy (e.ether,eth_hdr (skb)->h_source);else ether_addr_copy (e.ether,eth_hdr (skb)->h_dest);
net/netfilter/ipset/ip_set_hash_ipmac.c +1 -1
@@ -93,7 +93,7 @@ hash_ipmac4_kadt(struct ip_set *set, const struct sk_buff *skb, (skb_mac_header(skb) + ETH_HLEN) > skb->data)return -EINVAL ; -if (opt->flags &IPSET_DIM_ONE_SRC ) +if (opt->flags &IPSET_DIM_TWO_SRC )ether_addr_copy (e.ether,eth_hdr (skb)->h_source);else ether_addr_copy (e.ether,eth_hdr (skb)->h_dest);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/162 rxrpc: Fix potential deadlock
In reply to Greg Kroah-Hartman[ Upstream commit 60034d3d146b11922ab1db613bce062dddc0327a ]
There is a potential deadlock in rxrpc_peer_keepalive_dispatch() whereby rxrpc_put_peer() is called with the peer_hash_lock held, but if it reduces the peer's refcount to 0, rxrpc_put_peer() calls __rxrpc_put_peer() - which the tries to take the already held lock.
Fix this by providing a version of rxrpc_put_peer() that can be called in situations where the lock is already held.
The bug may produce the following lockdep report:
============================================
WARNING: possible recursive locking detected 5.2.0-next-20190718 #41 Not tainted
--------------------------------------------
kworker/0:3/21678 is trying to acquire lock:00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at: spin_lock_bh /./include/linux/spinlock.h:343 [inline]00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:__rxrpc_put_peer /net/rxrpc/peer_object.c:415 [inline] 00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:rxrpc_put_peer+0x2d3/0x6a0 /net/rxrpc/peer_object.c:435
but task is already holding lock:00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at: spin_lock_bh /./include/linux/spinlock.h:343 [inline]00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:rxrpc_peer_keepalive_dispatch /net/rxrpc/peer_event.c:378 [inline] 00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:rxrpc_peer_keepalive_worker+0x6b3/0xd02 /net/rxrpc/peer_event.c:430
--- net/rxrpc/ar-internal.h | 1 + net/rxrpc/peer_event.c | 2 +- net/rxrpc/peer_object.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
net/rxrpc/ar-internal.h +1 -0
@@ -1061,6 +1061,7 @@ void rxrpc_destroy_all_peers(struct rxrpc_net *);struct rxrpc_peer *rxrpc_get_peer (struct rxrpc_peer *);struct rxrpc_peer *rxrpc_get_peer_maybe (struct rxrpc_peer *);void rxrpc_put_peer (struct rxrpc_peer *); +void rxrpc_put_peer_locked (struct rxrpc_peer *);/* * proc.c
net/rxrpc/peer_event.c +1 -1
@@ -378,7 +378,7 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,spin_lock_bh (&rxnet->peer_hash_lock);list_add_tail (&peer->keepalive_link, &rxnet->peer_keepalive[slot & mask]); -rxrpc_put_peer (peer); +rxrpc_put_peer_locked (peer); }spin_unlock_bh (&rxnet->peer_hash_lock);
net/rxrpc/peer_object.c +18 -0
@@ -436,6 +436,24 @@ void rxrpc_put_peer(struct rxrpc_peer *peer) } } +/* +* Drop a ref on a peer record where the caller already holds the +* peer_hash_lock. +*/ +void rxrpc_put_peer_locked (struct rxrpc_peer *peer) +{ +const void *here =__builtin_return_address (0 ); +int n; + + n =atomic_dec_return (&peer->usage); +trace_rxrpc_peer (peer, rxrpc_peer_put, n, here); +if (n ==0 ) { +hash_del_rcu (&peer->hash_link); +list_del_init (&peer->keepalive_link); +kfree_rcu (peer, rcu); + } +} +/* * Make sure all peer records have been discarded. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/162 rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet
In reply to Greg Kroah-Hartman[ Upstream commit c69565ee6681e151e2bb80502930a16e04b553d1 ]
Fix the fact that a notification isn't sent to the recvmsg side to indicate a call failed when sendmsg() fails to transmit a DATA packet with the error ENETUNREACH, EHOSTUNREACH or ECONNREFUSED.
Without this notification, the afs client just sits there waiting for the call to complete in some manner (which it's not now going to do), which also pins the rxrpc call in place.
This can be seen if the client has a scope-level IPv6 address, but not a global-level IPv6 address, and we try and transmit an operation to a server's IPv6 address.
Looking in /proc/net/rxrpc/calls shows completed calls just sat there with an abort code of RX_USER_ABORT and an error code of -ENETUNREACH.
--- net/rxrpc/sendmsg.c | 1 + 1 file changed, 1 insertion(+)
net/rxrpc/sendmsg.c +1 -0
@@ -226,6 +226,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,rxrpc_set_call_completion (call,RXRPC_CALL_LOCAL_ERROR ,0 , ret); +rxrpc_notify_socket (call); goto out; }_debug ("need instant resend %d" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/162 nvmem: Use the same permissions for eeprom as for nvmem
In reply to Greg Kroah-Hartman[ Upstream commit e70d8b287301eb6d7c7761c6171c56af62110ea3 ]
The compatibility "eeprom" attribute is currently root-only no matter what the configuration says. The "nvmem" attribute does respect the setting of the root_only configuration bit, so do the same for "eeprom".
--- drivers/nvmem/nvmem-sysfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/nvmem/nvmem-sysfs.c +11 -4
@@ -224,10 +224,17 @@ int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,if (!config->base_dev)return -EINVAL ; -if (nvmem->read_only) - nvmem->eeprom = bin_attr_ro_root_nvmem; -else - nvmem->eeprom = bin_attr_rw_root_nvmem; +if (nvmem->read_only) { +if (config->root_only) + nvmem->eeprom = bin_attr_ro_root_nvmem; +else + nvmem->eeprom = bin_attr_ro_nvmem; + }else { +if (config->root_only) + nvmem->eeprom = bin_attr_rw_root_nvmem; +else + nvmem->eeprom = bin_attr_rw_nvmem; + } nvmem->eeprom.attr.name ="eeprom" ; nvmem->eeprom.size = nvmem->size;#ifdef CONFIG_DEBUG_LOCK_ALLOC
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/162 iwlwifi: mvm: avoid races in rate init and rate perform
In reply to Greg Kroah-Hartman[ Upstream commit 0f8084cdc1f9d4a6693ef4168167febb0918c6f6 ]
Rate perform uses the lq_sta table to calculate the next rate to scale while rate init resets the same table,
Rate perform is done in soft irq context in parallel to rate init that can be called in case we are doing changes like AP changes BW or moving state for auth to assoc.
--- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 42 ++++++++++++++++++-- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 7 +++- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 6 +++ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 1 + 4 files changed, 51 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +38 -4
@@ -1197,6 +1197,27 @@ static u8 rs_get_tid(struct ieee80211_hdr *hdr)return tid; } +void iwl_mvm_rs_init_wk (struct work_struct *wk) +{ + struct iwl_mvm_sta *mvmsta = container_of(wk, struct iwl_mvm_sta, + rs_init_wk); +struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (mvmsta->vif); +struct ieee80211_sta *sta; + +rcu_read_lock (); + + sta =rcu_dereference (mvmvif->mvm->fw_id_to_mac_id[mvmsta->sta_id]); +if (WARN_ON_ONCE (IS_ERR_OR_NULL (sta))) { +rcu_read_unlock (); +return ; + } + +iwl_mvm_rs_rate_init (mvmvif->mvm, sta, mvmvif->phy_ctxt->channel->band, + true); + +rcu_read_unlock (); +} +void iwl_mvm_rs_tx_status (struct iwl_mvm *mvm,struct ieee80211_sta *sta,int tid,struct ieee80211_tx_info *info,bool ndp) {
@@ -1269,7 +1290,7 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta, (unsigned long)(lq_sta->last_tx + (IWL_MVM_RS_IDLE_TIMEOUT * HZ)))) {IWL_DEBUG_RATE (mvm,"Tx idle for too long. reinit rs\n" ); -iwl_mvm_rs_rate_init (mvm, sta, info->band, true); +schedule_work (&mvmsta->rs_init_wk);return ; } lq_sta->last_tx = jiffies;
@@ -1442,16 +1463,24 @@ static void rs_drv_mac80211_tx_status(void *mvm_r,struct iwl_op_mode *op_mode = mvm_r;struct iwl_mvm *mvm =IWL_OP_MODE_GET_MVM (op_mode);struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct iwl_mvm_sta *mvmsta =iwl_mvm_sta_from_mac80211 (sta); -if (!iwl_mvm_sta_from_mac80211 (sta)->vif) +if (!mvmsta->vif)return ;if (!ieee80211_is_data (hdr->frame_control) || info->flags &IEEE80211_TX_CTL_NO_ACK )return ; +/* If it's locked we are in middle of init flow +* just wait for next tx status to update the lq_sta data +*/ +if (!mutex_trylock (&mvmsta->lq_sta.rs_drv.mutex)) +return ; +iwl_mvm_rs_tx_status (mvm, sta,rs_get_tid (hdr), info,ieee80211_is_qos_nullfunc (hdr->frame_control)); +mutex_unlock (&mvmsta->lq_sta.rs_drv.mutex); }/*
@@ -4136,10 +4165,15 @@ static const struct rate_control_ops rs_mvm_ops_drv = {void iwl_mvm_rs_rate_init (struct iwl_mvm *mvm,struct ieee80211_sta *sta,enum nl80211_band band,bool update) { -if (iwl_mvm_has_tlc_offload (mvm)) +if (iwl_mvm_has_tlc_offload (mvm)) {rs_fw_rate_init (mvm, sta, band, update); -else + }else { +struct iwl_mvm_sta *mvmsta =iwl_mvm_sta_from_mac80211 (sta); + +mutex_lock (&mvmsta->lq_sta.rs_drv.mutex);rs_drv_rate_init (mvm, sta, band, update); +mutex_unlock (&mvmsta->lq_sta.rs_drv.mutex); + } }int iwl_mvm_rate_control_register (void )
drivers/net/wireless/intel/iwlwifi/mvm/rs.h +6 -1
@@ -4,7 +4,7 @@* Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2015 Intel Mobile Communications GmbH * Copyright(c) 2017 Intel Deutschland GmbH -* Copyright(c) 2018 Intel Corporation +* Copyright(c) 2018 - 2019 Intel Corporation * * Contact Information: * Intel Linux Wireless <[email protected]>
@@ -376,6 +376,9 @@ struct iwl_lq_sta {/* tx power reduce for this sta */ int tpc_reduce; +/* avoid races of reinit and update table from rx_tx */ +struct mutex mutex; +/* persistent fields - initialized only once - keep last! */ struct lq_sta_pers {#ifdef CONFIG_MAC80211_DEBUGFS
@@ -440,6 +443,8 @@ struct iwl_mvm_sta;int iwl_mvm_tx_protection (struct iwl_mvm *mvm,struct iwl_mvm_sta *mvmsta,bool enable); +void iwl_mvm_rs_init_wk (struct work_struct *wk); +#ifdef CONFIG_IWLWIFI_DEBUGFS void iwl_mvm_reset_frame_stats (struct iwl_mvm *mvm);#endif
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +6 -0
@@ -1684,6 +1684,10 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,*/ if (iwl_mvm_has_tlc_offload (mvm))iwl_mvm_rs_add_sta (mvm, mvm_sta); +else +mutex_init (&mvm_sta->lq_sta.rs_drv.mutex); + +INIT_WORK (&mvm_sta->rs_init_wk, iwl_mvm_rs_init_wk);iwl_mvm_toggle_tx_ant (mvm, &mvm_sta->tx_ant);
@@ -1846,6 +1850,8 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,if (ret)return ret; +cancel_work_sync (&mvm_sta->rs_init_wk); +/* flush its queues here since we are freeing mvm_sta */ ret =iwl_mvm_flush_sta (mvm, mvm_sta, false,0 );if (ret)
drivers/net/wireless/intel/iwlwifi/mvm/sta.h +1 -0
@@ -421,6 +421,7 @@ struct iwl_mvm_sta {struct iwl_lq_sta_rs_fw rs_fw;struct iwl_lq_sta rs_drv; } lq_sta; +struct work_struct rs_init_wk;struct ieee80211_vif *vif;struct iwl_mvm_key_pn __rcu *ptk_pn[4 ];struct iwl_mvm_rxq_dup_data *dup_data;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/162 iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug override ifdef
In reply to Greg Kroah-Hartman[ Upstream commit 072b30642f90b01d139131ec7bf763778a3a3f41 ]
ini debug mode should work even if debug override is not defined.
--- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +2 -0
@@ -1627,6 +1627,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)init_completion (&drv->request_firmware_complete);INIT_LIST_HEAD (&drv->list); +iwl_load_fw_dbg_tlv (drv->trans->dev, drv->trans); +#ifdef CONFIG_IWLWIFI_DEBUGFS /* Create the device debugfs entries. */ drv->dbgfs_drv = debugfs_create_dir(dev_name(trans->dev),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/162 ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks
In reply to Greg Kroah-Hartman[ Upstream commit 8dd26dff00c0636b1d8621acaeef3f6f3a39dd77 ]
DPCM uses snd_soc_dapm_dai_get_connected_widgets to build a list of the widgets connected to a specific front end DAI so it can search through this list for available back end DAIs. The custom_stop_condition was added to is_connected_ep to facilitate this list not containing more widgets than is necessary. Doing so both speeds up the DPCM handling as less widgets need to be searched and avoids issues with CODEC to CODEC links as these would be confused with back end DAIs if they appeared in the list of available widgets.
custom_stop_condition was implemented by aborting the graph walk when the condition is triggered, however there is an issue with this approach. Whilst walking the graph is_connected_ep should update the endpoints cache on each widget, if the walk is aborted the number of attached end points is unknown for that sub-graph. When the stop condition triggered, the original patch ignored the triggering widget and returned zero connected end points; a later patch updated this to set the triggering widget's cache to 1 and return that. Both of these approaches result in inaccurate values being stored in various end point caches as the values propagate back through the graph, which can result in later issues with widgets powering/not powering unexpectedly.
As the original goal was to reduce the size of the widget list passed to the DPCM code, the simplest solution is to limit the functionality of the custom_stop_condition to the widget list. This means the rest of the graph will still be processed resulting in correct end point caches, but only widgets up to the stop condition will be added to the returned widget list.
--- sound/soc/soc-dapm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/soc-dapm.c +4 -4
@@ -1156,8 +1156,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget,list_add_tail (&widget->work_list, list);if (custom_stop_condition &&custom_stop_condition (widget, dir)) { - widget->endpoints[dir] =1 ; -return widget->endpoints[dir]; + list =NULL ; + custom_stop_condition =NULL ; }if ((widget->is_ep &SND_SOC_DAPM_DIR_TO_EP (dir)) && widget->connected) {
@@ -1194,8 +1194,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget,* * Optionally, can be supplied with a function acting as a stopping condition. * This function takes the dapm widget currently being examined and the walk -* direction as an arguments, it should return true if the walk should be -* stopped and false otherwise. +* direction as an arguments, it should return true if widgets from that point +* in the graph onwards should not be added to the widget list. */ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, struct list_head *list,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/162 spi: pxa2xx: Balance runtime PM enable/disable on error
In reply to Greg Kroah-Hartman[ Upstream commit 1274204542f683e1d8491ebe9cc86284d5a8ebcc ]
Don't undo the PM initialization if we error out before we managed to initialize it. The call to pm_runtime_disable() without being preceded by pm_runtime_enable() would disturb the balance of the Force.
In practice, this happens if we fail to allocate any of the GPIOS ("cs", "ready") due to -EPROBE_DEFER because we're getting probled before the GPIO driver.
--- drivers/spi/spi-pxa2xx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/spi-pxa2xx.c +4 -2
@@ -1817,14 +1817,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) status =devm_spi_register_controller (&pdev->dev, controller);if (status !=0 ) {dev_err (&pdev->dev,"problem registering spi controller\n" ); - goto out_error_clock_enabled; + goto out_error_pm_runtime_enabled; }return status; -out_error_clock_enabled: +out_error_pm_runtime_enabled:pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev); + +out_error_clock_enabled:clk_disable_unprepare (ssp->clk); out_error_dma_irq_alloc:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/162 ASoC: SOF: use __u32 instead of uint32_t in uapi headers
In reply to Greg Kroah-Hartman[ Upstream commit 62ec3d13601bd626ca7a0edef6d45dbb753d94e8 ]
When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to make sure they can be included from user-space.
Currently, header.h and fw.h are excluded from the test coverage. To make them join the compile-test, we need to fix the build errors attached below.
For a case like this, we decided to use __u{8,16,32,64} variable types in this discussion:
https://lkml.org/lkml/2019/6/5/18
Build log:
CC usr/include/sound/sof/header.h.s
CC usr/include/sound/sof/fw.h.s
In file included from <command-line>:32:0:./usr/include/sound/sof/header.h:19:2: error: unknown type name ‘uint32_t’
uint32_t magic; /**< 'S', 'O', 'F', '\0' */
^~~~~~~~./usr/include/sound/sof/header.h:20:2: error: unknown type name ‘uint32_t’
uint32_t type; /**< component specific type */
^~~~~~~~./usr/include/sound/sof/header.h:21:2: error: unknown type name ‘uint32_t’
uint32_t size; /**< size in bytes of data excl. this struct */ ^~~~~~~~./usr/include/sound/sof/header.h:22:2: error: unknown type name ‘uint32_t’
uint32_t abi; /**< SOF ABI version */
^~~~~~~~./usr/include/sound/sof/header.h:23:2: error: unknown type name ‘uint32_t’
uint32_t reserved[4]; /**< reserved for future use */ ^~~~~~~~./usr/include/sound/sof/header.h:24:2: error: unknown type name ‘uint32_t’
uint32_t data[0]; /**< Component data - opaque to core */ ^~~~~~~~
In file included from <command-line>:32:0:./usr/include/sound/sof/fw.h:49:2: error: unknown type name ‘uint32_t’
uint32_t size; /* bytes minus this header */
^~~~~~~~./usr/include/sound/sof/fw.h:50:2: error: unknown type name ‘uint32_t’
uint32_t offset; /* offset from base */
^~~~~~~~./usr/include/sound/sof/fw.h:64:2: error: unknown type name ‘uint32_t’
uint32_t size; /* bytes minus this header */
^~~~~~~~./usr/include/sound/sof/fw.h:65:2: error: unknown type name ‘uint32_t’
uint32_t num_blocks; /* number of blocks */
^~~~~~~~./usr/include/sound/sof/fw.h:73:2: error: unknown type name ‘uint32_t’
uint32_t file_size; /* size of file minus this header */ ^~~~~~~~./usr/include/sound/sof/fw.h:74:2: error: unknown type name ‘uint32_t’
uint32_t num_modules; /* number of modules */
^~~~~~~~./usr/include/sound/sof/fw.h:75:2: error: unknown type name ‘uint32_t’
uint32_t abi; /* version of header format */
^~~~~~~~
--- include/uapi/sound/sof/fw.h | 16 +++++++++------- include/uapi/sound/sof/header.h | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-)
include/uapi/sound/sof/fw.h +9 -7
@@ -13,6 +13,8 @@#ifndef __INCLUDE_UAPI_SOF_FW_H__#define __INCLUDE_UAPI_SOF_FW_H__ +#include <linux/types.h> +#define SND_SOF_FW_SIG_SIZE 4#define SND_SOF_FW_ABI 1#define SND_SOF_FW_SIG "Reef"
@@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type {struct snd_sof_blk_hdr {enum snd_sof_fw_blk_type type; -uint32_t size;/* bytes minus this header */ -uint32_t offset;/* offset from base */ +__u32 size;/* bytes minus this header */ +__u32 offset;/* offset from base */ } __packed;/*
@@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type {struct snd_sof_mod_hdr {enum snd_sof_fw_mod_type type; -uint32_t size;/* bytes minus this header */ -uint32_t num_blocks;/* number of blocks */ +__u32 size;/* bytes minus this header */ +__u32 num_blocks;/* number of blocks */ } __packed;/*
@@ -70,9 +72,9 @@ struct snd_sof_mod_hdr {*/ struct snd_sof_fw_header {unsigned char sig[SND_SOF_FW_SIG_SIZE ];/* "Reef" */ -uint32_t file_size;/* size of file minus this header */ -uint32_t num_modules;/* number of modules */ -uint32_t abi;/* version of header format */ +__u32 file_size;/* size of file minus this header */ +__u32 num_modules;/* number of modules */ +__u32 abi;/* version of header format */ } __packed;#endif
include/uapi/sound/sof/header.h +8 -6
@@ -9,6 +9,8 @@#ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__#define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ +#include <linux/types.h> +/* * Header for all non IPC ABI data. *
@@ -16,12 +18,12 @@* Used by any bespoke component data structures or binary blobs. */ struct sof_abi_hdr { -uint32_t magic;/**< 'S', 'O', 'F', '\0' */ -uint32_t type;/**< component specific type */ -uint32_t size;/**< size in bytes of data excl. this struct */ -uint32_t abi;/**< SOF ABI version */ -uint32_t reserved[4 ];/**< reserved for future use */ -uint32_t data[0 ];/**< Component data - opaque to core */ +__u32 magic;/**< 'S', 'O', 'F', '\0' */ +__u32 type;/**< component specific type */ +__u32 size;/**< size in bytes of data excl. this struct */ +__u32 abi;/**< SOF ABI version */ +__u32 reserved[4 ];/**< reserved for future use */ +__u32 data[0 ];/**< Component data - opaque to core */ } __packed;#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/162 NFSv4.1: Fix open stateid recovery
In reply to Greg Kroah-Hartman[ Upstream commit 27a30cf64a5cbe2105e4ff9613246b32d584766a ]
The logic for checking in nfs41_check_open_stateid() whether the state is supported by a delegation is inverted. In addition, it makes more sense to perform that check before we check for expired locks.
--- fs/nfs/nfs4proc.c | 65 +++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 27 deletions(-)
fs/nfs/nfs4proc.c +38 -27
@@ -1654,6 +1654,14 @@ static void nfs_state_set_open_stateid(struct nfs4_state *state,write_sequnlock (&state->seqlock); } +static void nfs_state_clear_open_state_flags (struct nfs4_state *state) +{ +clear_bit (NFS_O_RDWR_STATE , &state->flags); +clear_bit (NFS_O_WRONLY_STATE , &state->flags); +clear_bit (NFS_O_RDONLY_STATE , &state->flags); +clear_bit (NFS_OPEN_STATE , &state->flags); +} +static void nfs_state_set_delegation (struct nfs4_state *state,const nfs4_stateid *deleg_stateid,fmode_t fmode)
@@ -2049,13 +2057,7 @@ static int nfs4_open_recover(struct nfs4_opendata *opendata, struct nfs4_state * {int ret; -/* Don't trigger recovery in nfs_test_and_clear_all_open_stateid */ -clear_bit (NFS_O_RDWR_STATE , &state->flags); -clear_bit (NFS_O_WRONLY_STATE , &state->flags); -clear_bit (NFS_O_RDONLY_STATE , &state->flags);/* memory barrier prior to reading state->n_* */ -clear_bit (NFS_DELEGATED_STATE , &state->flags); -clear_bit (NFS_OPEN_STATE , &state->flags);smp_rmb (); ret =nfs4_open_recover_helper (opendata,FMODE_READ |FMODE_WRITE );if (ret !=0 )
@@ -2131,6 +2133,8 @@ static int nfs4_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *sta ctx =nfs4_state_find_open_context (state);if (IS_ERR (ctx))return -EAGAIN ; +clear_bit (NFS_DELEGATED_STATE , &state->flags); +nfs_state_clear_open_state_flags (state); ret =nfs4_do_open_reclaim (ctx, state);put_nfs_open_context (ctx);return ret;
@@ -2672,6 +2676,7 @@ static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st {/* NFSv4.0 doesn't allow for delegation recovery on open expire */ nfs40_clear_delegation_stateid (state); +nfs_state_clear_open_state_flags (state);return nfs4_open_expired (sp, state); }
@@ -2714,13 +2719,13 @@ out_free:return -NFS4ERR_EXPIRED ; } -static void nfs41_check_delegation_stateid (struct nfs4_state *state) +static int nfs41_check_delegation_stateid (struct nfs4_state *state) {struct nfs_server *server =NFS_SERVER (state->inode);nfs4_stateid stateid;struct nfs_delegation *delegation;const struct cred *cred =NULL ; -int status; +int status, ret =NFS_OK ;/* Get the delegation credential for use by test/free_stateid */ rcu_read_lock ();
@@ -2728,20 +2733,15 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)if (delegation ==NULL ) {rcu_read_unlock ();nfs_state_clear_delegation (state); -return ; +return NFS_OK ; }nfs4_stateid_copy (&stateid, &delegation->stateid); -if (test_bit (NFS_DELEGATION_REVOKED , &delegation->flags)) { -rcu_read_unlock (); -nfs_state_clear_delegation (state); -return ; - }if (!test_and_clear_bit (NFS_DELEGATION_TEST_EXPIRED , &delegation->flags)) {rcu_read_unlock (); -return ; +return NFS_OK ; }if (delegation->cred)
@@ -2751,8 +2751,24 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)trace_nfs4_test_delegation_stateid (state,NULL , status);if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID )nfs_finish_clear_delegation_stateid (state, &stateid); +else + ret = status;put_cred (cred); +return ret; +} + +static void nfs41_delegation_recover_stateid (struct nfs4_state *state) +{ +nfs4_stateid tmp; + +if (test_bit (NFS_DELEGATED_STATE , &state->flags) && +nfs4_copy_delegation_stateid (state->inode, state->state, + &tmp,NULL ) && +nfs4_stateid_match_other (&state->stateid, &tmp)) +nfs_state_set_delegation (state, &tmp, state->state); +else +nfs_state_clear_delegation (state); }/**
@@ -2822,21 +2838,12 @@ static int nfs41_check_open_stateid(struct nfs4_state *state)const struct cred *cred = state->owner->so_cred;int status; -if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 ) { -if (test_bit (NFS_DELEGATED_STATE , &state->flags) ==0 ) { -if (nfs4_have_delegation (state->inode, state->state)) -return NFS_OK ; -return -NFS4ERR_OPENMODE ; - } +if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 )return -NFS4ERR_BAD_STATEID ; - } status =nfs41_test_and_free_expired_stateid (server, stateid, cred);trace_nfs4_test_open_stateid (state,NULL , status);if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID ) { -clear_bit (NFS_O_RDONLY_STATE , &state->flags); -clear_bit (NFS_O_WRONLY_STATE , &state->flags); -clear_bit (NFS_O_RDWR_STATE , &state->flags); -clear_bit (NFS_OPEN_STATE , &state->flags); +nfs_state_clear_open_state_flags (state); stateid->type =NFS4_INVALID_STATEID_TYPE ;return status; }
@@ -2849,7 +2856,11 @@ static int nfs41_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st {int status; -nfs41_check_delegation_stateid (state); + status =nfs41_check_delegation_stateid (state); +if (status !=NFS_OK ) +return status; +nfs41_delegation_recover_stateid (state); + status =nfs41_check_expired_locks (state);if (status !=NFS_OK )return status;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/162 ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma driver
In reply to Greg Kroah-Hartman[ Upstream commit 88639051017fb61a414b636dd0fc490da2b62b64 ]
AMD platform device acp3x_rv_i2s created by parent PCI device driver. Pass struct device of the parent to snd_pcm_lib_preallocate_pages() so dma_alloc_coherent() can use correct dma_ops. Otherwise, it will use default dma_ops which is nommu_dma_ops on x86_64 even when IOMMU is enabled and set to non passthrough mode.
--- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/amd/raven/acp3x-pcm-dma.c +4 -2
@@ -367,9 +367,11 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream)static int acp3x_dma_new (struct snd_soc_pcm_runtime *rtd) { +struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd, +DRV_NAME ); +struct device *parent = component->dev->parent;snd_pcm_lib_preallocate_pages_for_all (rtd->pcm,SNDRV_DMA_TYPE_DEV , - rtd->pcm->card->dev, -MIN_BUFFER ,MAX_BUFFER ); + parent,MIN_BUFFER ,MAX_BUFFER );return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/162 enetc: Select PHYLIB while CONFIG_FSL_ENETC_VF is set
In reply to Greg Kroah-Hartman[ Upstream commit 2802d2cf24b1ca7ea4c54dde266ded6a16020eb5 ]
Like FSL_ENETC, when CONFIG_FSL_ENETC_VF is set, we should select PHYLIB, otherwise building still fails:
drivers/net/ethernet/freescale/enetc/enetc.o: In function `enetc_open':
enetc.c:(.text+0x2744): undefined reference to `phy_start'
enetc.c:(.text+0x282c): undefined reference to phy_disconnect' drivers/net/ethernet/freescale/enetc/enetc.o: In function enetc_close':
enetc.c:(.text+0x28f8): undefined reference to `phy_stop'
enetc.c:(.text+0x2904): undefined reference to phy_disconnect' drivers/net/ethernet/freescale/enetc/enetc_ethtool.o:(.rodata+0x3f8): undefined reference to phy_ethtool_get_link_ksettings' drivers/net/ethernet/freescale/enetc/enetc_ethtool.o:(.rodata+0x400): undefined reference to `phy_ethtool_set_link_ksettings'
--- drivers/net/ethernet/freescale/enetc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/freescale/enetc/Kconfig +1 -0
@@ -13,6 +13,7 @@ config FSL_ENETC config FSL_ENETC_VF tristate "ENETC VF driver" depends on PCI && PCI_MSI && (ARCH_LAYERSCAPE || COMPILE_TEST) + select PHYLIB help This driver supports NXP ENETC gigabit ethernet controller PCIe virtual function (VF) devices enabled by the ENETC PF driver.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/162 NFS: Fix regression whereby fscache errors are appearing on nofsc mounts
In reply to Greg Kroah-Hartman[ Upstream commit dea1bb35c5f35e0577cfc61f79261d80b8715221 ]
People are reporing seeing fscache errors being reported concerning duplicate cookies even in cases where they are not setting up fscache at all. The rule needs to be that if fscache is not enabled, then it should have no side effects at all.
To ensure this is the case, we disable fscache completely on all superblocks for which the 'fsc' mount option was not set. In order to avoid issues with '-oremount', we also disable the ability to turn fscache on via remount.
--- fs/nfs/fscache.c | 7 ++++++- fs/nfs/fscache.h | 2 +- fs/nfs/super.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)
fs/nfs/fscache.c +6 -1
@@ -114,6 +114,10 @@ void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, intstruct rb_node **p, *parent;int diff; + nfss->fscache_key =NULL ; + nfss->fscache =NULL ; +if (!(nfss->options &NFS_OPTION_FSCACHE )) +return ;if (!uniq) { uniq ="" ; ulen =1 ;
@@ -226,10 +230,11 @@ void nfs_fscache_release_super_cookie(struct super_block *sb)void nfs_fscache_init_inode (struct inode *inode) {struct nfs_fscache_inode_auxdata auxdata; +struct nfs_server *nfss =NFS_SERVER (inode);struct nfs_inode *nfsi =NFS_I (inode); nfsi->fscache =NULL ; -if (!S_ISREG (inode->i_mode)) +if (!(nfss->fscache &&S_ISREG (inode->i_mode)))return ;memset (&auxdata,0 ,sizeof (auxdata));
fs/nfs/fscache.h +1 -1
@@ -182,7 +182,7 @@ static inline void nfs_fscache_wait_on_invalidate(struct inode *inode)*/ static inline const char *nfs_server_fscache_state (struct nfs_server *server) { -if (server->fscache && (server->options &NFS_OPTION_FSCACHE )) +if (server->fscache)return "yes" ;return "no " ; }
fs/nfs/super.c +1 -0
@@ -2239,6 +2239,7 @@ nfs_compare_remount_data(struct nfs_server *nfss, data->acdirmin != nfss->acdirmin /HZ || data->acdirmax != nfss->acdirmax /HZ || data->timeo != (10U * nfss->client->cl_timeout->to_initval /HZ ) || + (data->options &NFS_OPTION_FSCACHE ) != (nfss->options &NFS_OPTION_FSCACHE ) || data->nfs_server.port != nfss->port || data->nfs_server.addrlen != nfss->nfs_client->cl_addrlen || !rpc_cmp_addr((struct sockaddr *)&data->nfs_server.address,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/162 HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52
In reply to Greg Kroah-Hartman[ Upstream commit 7bc74853fd61432ec59f812a40425bf6d8c986a4 ]
The Saitek X52 joystick has a pair of axes that are originally (by the Windows driver) used as mouse pointer controls. The corresponding usage->hid values are 0x50024 and 0x50026. Thus they are handled as unknown axes and both get mapped to ABS_MISC. The quirk makes the second axis to be mapped to ABS_MISC1 and thus made available separately.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -990,6 +990,7 @@#define USB_DEVICE_ID_SAITEK_RAT7 0x0cd7#define USB_DEVICE_ID_SAITEK_RAT9 0x0cfa#define USB_DEVICE_ID_SAITEK_MMO7 0x0cd0 +#define USB_DEVICE_ID_SAITEK_X52 0x075c#define USB_VENDOR_ID_SAMSUNG 0x0419#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
drivers/hid/hid-quirks.c +1 -0
@@ -141,6 +141,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_RETROUSB, USB_DEVICE_ID_RETROUSB_SNES_RETROPAD), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, { HID_USB_DEVICE(USB_VENDOR_ID_RETROUSB, USB_DEVICE_ID_RETROUSB_SNES_RETROPORT), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD), HID_QUIRK_BADPAD }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/162 iwlwifi: mvm: send LQ command always ASYNC
In reply to Greg Kroah-Hartman[ Upstream commit cd4d6b0bcd51580efda9ae54ab7b2d630b4147dc ]
The only place where the command was sent as SYNC is during init and this is not really critical. This change is required for replacing RS mutex with a spinlock (in the subsequent patch), since SYNC comamnd requres sleeping and thus the flow cannot be done when holding a spinlock.
--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 23 ++++++++++--------- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/utils.c | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +1 -1
@@ -1807,7 +1807,7 @@ iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)#endif /* CONFIG_IWLWIFI_DEBUGFS */ /* rate scaling */ -int iwl_mvm_send_lq_cmd (struct iwl_mvm *mvm,struct iwl_lq_cmd *lq,bool sync); +int iwl_mvm_send_lq_cmd (struct iwl_mvm *mvm,struct iwl_lq_cmd *lq);void iwl_mvm_update_frame_stats (struct iwl_mvm *mvm,u32 rate,bool agg);int rs_pretty_print_rate (char *buf,int bufsz,const u32 rate); void rs_update_last_rssi(struct iwl_mvm *mvm,
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +12 -11
@@ -1326,7 +1326,7 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,IWL_DEBUG_RATE (mvm,"Too many rates mismatch. Send sync LQ. rs_state %d\n" , lq_sta->rs_state); -iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq, false); +iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq); }/* Regardless, ignore this status info for outdated rate */ return ;
@@ -1388,7 +1388,8 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,if (info->status.ampdu_ack_len ==0 ) info->status.ampdu_len =1 ; -rs_collect_tlc_data (mvm, mvmsta, tid, curr_tbl, tx_resp_rate.index, +rs_collect_tlc_data (mvm, mvmsta, tid, curr_tbl, + tx_resp_rate.index, info->status.ampdu_len, info->status.ampdu_ack_len);
@@ -1823,7 +1824,7 @@ static void rs_update_rate_tbl(struct iwl_mvm *mvm, struct iwl_scale_tbl_info *tbl) {rs_fill_lq_cmd (mvm, sta, lq_sta, &tbl->rate); -iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq, false); +iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq); } static bool rs_tweak_rate_tbl(struct iwl_mvm *mvm,
@@ -2925,7 +2926,7 @@ void rs_update_last_rssi(struct iwl_mvm *mvm,static void rs_initialize_lq (struct iwl_mvm *mvm,struct ieee80211_sta *sta,struct iwl_lq_sta *lq_sta, -enum nl80211_band band,bool update) +enum nl80211_band band) {struct iwl_scale_tbl_info *tbl;struct rs_rate *rate;
@@ -2955,7 +2956,7 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,rs_set_expected_tpt_table (lq_sta, tbl);rs_fill_lq_cmd (mvm, sta, lq_sta, rate);/* TODO restore station should remember the lq cmd */ -iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq, !update); +iwl_mvm_send_lq_cmd (mvm, &lq_sta->lq); } static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta,
@@ -3208,7 +3209,7 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg)* Called after adding a new station to initialize rate scaling */ static void rs_drv_rate_init (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -enum nl80211_band band,bool update) +enum nl80211_band band) {int i, j;struct ieee80211_hw *hw = mvm->hw;
@@ -3288,7 +3289,7 @@ static void rs_drv_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,#ifdef CONFIG_IWLWIFI_DEBUGFS iwl_mvm_reset_frame_stats (mvm);#endif -rs_initialize_lq (mvm, sta, lq_sta, band, update); +rs_initialize_lq (mvm, sta, lq_sta, band); } static void rs_drv_rate_update(void *mvm_r,
@@ -3602,7 +3603,7 @@ static void rs_set_lq_ss_params(struct iwl_mvm *mvm, bfersta_ss_params &= ~LQ_SS_BFER_ALLOWED ; bfersta_lq_cmd->ss_params =cpu_to_le32 (bfersta_ss_params); -iwl_mvm_send_lq_cmd (mvm, bfersta_lq_cmd, false); +iwl_mvm_send_lq_cmd (mvm, bfersta_lq_cmd); ss_params |=LQ_SS_BFER_ALLOWED ; IWL_DEBUG_RATE(mvm,
@@ -3768,7 +3769,7 @@ static void rs_program_fix_rate(struct iwl_mvm *mvm,if (lq_sta->pers.dbg_fixed_rate) {rs_fill_lq_cmd (mvm,NULL , lq_sta,NULL ); -iwl_mvm_send_lq_cmd (lq_sta->pers.drv, &lq_sta->lq, false); +iwl_mvm_send_lq_cmd (lq_sta->pers.drv, &lq_sta->lq); } }
@@ -4171,7 +4172,7 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,struct iwl_mvm_sta *mvmsta =iwl_mvm_sta_from_mac80211 (sta);mutex_lock (&mvmsta->lq_sta.rs_drv.mutex); -rs_drv_rate_init (mvm, sta, band, update); +rs_drv_rate_init (mvm, sta, band);mutex_unlock (&mvmsta->lq_sta.rs_drv.mutex); } }
@@ -4203,7 +4204,7 @@ static int rs_drv_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta, lq->flags &= ~LQ_FLAG_USE_RTS_MSK ; } -return iwl_mvm_send_lq_cmd (mvm, lq, false); +return iwl_mvm_send_lq_cmd (mvm, lq); }/**
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +1 -1
@@ -2978,7 +2978,7 @@ out:IWL_DEBUG_HT (mvm,"Tx aggregation enabled on ra = %pM tid = %d\n" , sta->addr, tid); -return iwl_mvm_send_lq_cmd (mvm, &mvmsta->lq_sta.rs_drv.lq, false); +return iwl_mvm_send_lq_cmd (mvm, &mvmsta->lq_sta.rs_drv.lq); } static void iwl_mvm_unreserve_agg_queue(struct iwl_mvm *mvm,
drivers/net/wireless/intel/iwlwifi/mvm/utils.c +2 -2
@@ -641,12 +641,12 @@ int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,* this case to clear the state indicating that station creation is in * progress. */ -int iwl_mvm_send_lq_cmd (struct iwl_mvm *mvm,struct iwl_lq_cmd *lq,bool sync) +int iwl_mvm_send_lq_cmd (struct iwl_mvm *mvm,struct iwl_lq_cmd *lq) {struct iwl_host_cmd cmd = { .id =LQ_CMD , .len = {sizeof (struct iwl_lq_cmd ), }, - .flags = sync ?0 :CMD_ASYNC , + .flags =CMD_ASYNC , .data = { lq, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/162 HID: input: fix a4tech horizontal wheel custom usage
In reply to Greg Kroah-Hartman[ Upstream commit 1c703b53e5bfb5c2205c30f0fb157ce271fd42fb ]
Some a4tech mice use the 'GenericDesktop.00b8' usage to inform whether the previous wheel report was horizontal or vertical. Before c01908a14bf73 ("HID: input: add mapping for "Toggle Display" key") this usage was being mapped to 'Relative.Misc'. After the patch it's simply ignored (usage->type == 0 & usage->code == 0). Which ultimately makes hid-a4tech ignore the WHEEL/HWHEEL selection event, as it has no usage->type.
We shouldn't rely on a mapping for that usage as it's nonstandard and doesn't really map to an input event. So we bypass the mapping and make sure the custom event handling properly handles both reports.
--- drivers/hid/hid-a4tech.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
drivers/hid/hid-a4tech.c +27 -3
@@ -23,12 +23,36 @@#define A4_2WHEEL_MOUSE_HACK_7 0x01#define A4_2WHEEL_MOUSE_HACK_B8 0x02 +#define A4_WHEEL_ORIENTATION (HID_UP_GENDESK | 0x000000b8) +struct a4tech_sc {unsigned long quirks;unsigned int hw_wheel;__s32 delayed_value; }; +static int a4_input_mapping (struct hid_device *hdev,struct hid_input *hi, +struct hid_field *field,struct hid_usage *usage, +unsigned long **bit,int *max) +{ +struct a4tech_sc *a4 =hid_get_drvdata (hdev); + +if (a4->quirks &A4_2WHEEL_MOUSE_HACK_B8 && + usage->hid ==A4_WHEEL_ORIENTATION ) { +/* +* We do not want to have this usage mapped to anything as it's +* nonstandard and doesn't really behave like an HID report. +* It's only selecting the orientation (vertical/horizontal) of +* the previous mouse wheel report. The input_events will be +* generated once both reports are recorded in a4_event(). +*/ +return -1 ; + } + +return 0 ; + +} +static int a4_input_mapped (struct hid_device *hdev,struct hid_input *hi,struct hid_field *field,struct hid_usage *usage,unsigned long **bit,int *max)
@@ -52,8 +76,7 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field,struct a4tech_sc *a4 =hid_get_drvdata (hdev);struct input_dev *input; -if (!(hdev->claimed &HID_CLAIMED_INPUT ) || !field->hidinput || - !usage->type) +if (!(hdev->claimed &HID_CLAIMED_INPUT ) || !field->hidinput)return 0 ; input = field->hidinput->input;
@@ -64,7 +87,7 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field,return 1 ; } -if (usage->hid ==0x000100b8 ) { +if (usage->hid ==A4_WHEEL_ORIENTATION ) {input_event (input,EV_REL , value ?REL_HWHEEL :REL_WHEEL , a4->delayed_value); input_event(input, EV_REL, value ? REL_HWHEEL_HI_RES :
@@ -131,6 +154,7 @@ MODULE_DEVICE_TABLE(hid, a4_devices);static struct hid_driver a4_driver = { .name ="a4tech" , .id_table = a4_devices, + .input_mapping = a4_input_mapping, .input_mapped = a4_input_mapped, .event = a4_event, .probe = a4_probe,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/162 drm/rockchip: Suspend DP late
In reply to Greg Kroah-Hartman[ Upstream commit f7ccbed656f78212593ca965d9a8f34bf24e0aab ]
In commit fe64ba5c6323 ("drm/rockchip: Resume DP early") we moved resume to be early but left suspend at its normal time. This seems like it could be OK, but casues problems if a suspend gets interrupted partway through. The OS only balances matching suspend/resume levels. ...so if suspend was called then resume will be called. If suspend late was called then resume early will be called. ...but if suspend was called resume early might not get called. This leads to an unbalance in the clock enables / disables.
Lets take the simple fix and just move suspend to be late to match. This makes the PM core take proper care in keeping things balanced.
--- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +1 -1
@@ -432,7 +432,7 @@ static int rockchip_dp_resume(struct device *dev)static const struct dev_pm_ops rockchip_dp_pm_ops = { #ifdef CONFIG_PM_SLEEP - .suspend = rockchip_dp_suspend, + .suspend_late = rockchip_dp_suspend, .resume_early = rockchip_dp_resume, #endif };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/162 SMB3: Fix potential memory leak when processing compound chain
In reply to Greg Kroah-Hartman[ Upstream commit 3edeb4a4146dc3b54d6fa71b7ee0585cb52ebfdf ]
When a reconnect happens in the middle of processing a compound chain the code leaks a buffer from the memory pool. Fix this by properly checking for a return code and freeing buffers in case of error.
Also maintain a buf variable to be equal to either smallbuf or bigbuf depending on a response buffer size while parsing a chain and when returning to the caller.
--- fs/cifs/smb2ops.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
fs/cifs/smb2ops.c +17 -12
@@ -4015,7 +4015,6 @@ receive_encrypted_standard(struct TCP_Server_Info *server, {int ret, length;char *buf = server->smallbuf; -char *tmpbuf;struct smb2_sync_hdr *shdr;unsigned int pdu_length = server->pdu_size;unsigned int buf_size;
@@ -4045,18 +4044,15 @@ receive_encrypted_standard(struct TCP_Server_Info *server,return length; next_is_large = server->large_buf; - one_more: +one_more: shdr = (struct smb2_sync_hdr *)buf;if (shdr->NextCommand) { -if (next_is_large) { - tmpbuf = server->bigbuf; +if (next_is_large) next_buffer = (char *)cifs_buf_get (); - }else { - tmpbuf = server->smallbuf; +else next_buffer = (char *)cifs_small_buf_get (); - }memcpy (next_buffer, - tmpbuf +le32_to_cpu (shdr->NextCommand), + buf +le32_to_cpu (shdr->NextCommand), pdu_length -le32_to_cpu (shdr->NextCommand)); }
@@ -4085,12 +4081,21 @@ receive_encrypted_standard(struct TCP_Server_Info *server, pdu_length -=le32_to_cpu (shdr->NextCommand); server->large_buf = next_is_large;if (next_is_large) - server->bigbuf = next_buffer; + server->bigbuf = buf = next_buffer;else - server->smallbuf = next_buffer; - - buf +=le32_to_cpu (shdr->NextCommand); + server->smallbuf = buf = next_buffer; goto one_more; + }else if (ret !=0 ) { +/* +* ret != 0 here means that we didn't get to handle_mid() thus +* server->smallbuf and server->bigbuf are still valid. We need +* to free next_buffer because it is not going to be used +* anywhere. +*/ +if (next_is_large) +free_rsp_buf (CIFS_LARGE_BUFFER , next_buffer); +else +free_rsp_buf (CIFS_SMALL_BUFFER , next_buffer); }return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/162 SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL
In reply to Greg Kroah-Hartman[ Upstream commit ee9d66182392695535cc9fccfcb40c16f72de2a9 ]
Fix kernel oops when mounting a encryptData CIFS share with CONFIG_DEBUG_VIRTUAL
--- fs/cifs/smb2ops.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/cifs/smb2ops.c +9 -1
@@ -3439,7 +3439,15 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len,static inline void smb2_sg_set_buf (struct scatterlist *sg,const void *buf,unsigned int buflen) { -sg_set_page (sg,virt_to_page (buf), buflen,offset_in_page (buf)); +void *addr; +/* +* VMAP_STACK (at least) puts stack into the vmalloc address space +*/ +if (is_vmalloc_addr (buf)) + addr =vmalloc_to_page (buf); +else + addr =virt_to_page (buf); +sg_set_page (sg, addr, buflen,offset_in_page (buf)); }/* Assumes the first rqst has a transform header as the first iov.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/162 sched/deadline: Fix double accounting of rq/running bw in push & pull
In reply to Greg Kroah-Hartman[ Upstream commit f4904815f97a934258445a8f763f6b6c48f007e7 ]
{push,pull}_dl_task() always calls {de,}activate_task() with .flags=0 which sets p->on_rq=TASK_ON_RQ_MIGRATING.
{push,pull}_dl_task()->{de,}activate_task()->{de,en}queue_task()-> {de,en}queue_task_dl() calls {sub,add}_{running,rq}_bw() since p->on_rq==TASK_ON_RQ_MIGRATING.
So {sub,add}_{running,rq}_bw() in {push,pull}_dl_task() is double-accounting for that task.
Fix it by removing rq/running bw accounting in [push/pull]_dl_task().
--- kernel/sched/deadline.c | 8 -------- 1 file changed, 8 deletions(-)
kernel/sched/deadline.c +0 -8
@@ -2088,17 +2088,13 @@ retry: }deactivate_task (rq, next_task,0 ); -sub_running_bw (&next_task->dl, &rq->dl); -sub_rq_bw (&next_task->dl, &rq->dl);set_task_cpu (next_task, later_rq->cpu); -add_rq_bw (&next_task->dl, &later_rq->dl);/* * Update the later_rq clock here, because the clock is used * by the cpufreq_update_util() inside __add_running_bw(). */ update_rq_clock (later_rq); -add_running_bw (&next_task->dl, &later_rq->dl);activate_task (later_rq, next_task,ENQUEUE_NOCLOCK ); ret =1 ;
@@ -2186,11 +2182,7 @@ static void pull_dl_task(struct rq *this_rq) resched = true;deactivate_task (src_rq, p,0 ); -sub_running_bw (&p->dl, &src_rq->dl); -sub_rq_bw (&p->dl, &src_rq->dl);set_task_cpu (p, this_cpu); -add_rq_bw (&p->dl, &this_rq->dl); -add_running_bw (&p->dl, &this_rq->dl);activate_task (this_rq, p,0 ); dmin = p->dl.deadline;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/162 sched/psi: Do not require setsched permission from the trigger creator
In reply to Greg Kroah-Hartman[ Upstream commit 04e048cf09d7b5fc995817cdc5ae1acd4482429c ]
When a process creates a new trigger by writing into /proc/pressure/* files, permissions to write such a file should be used to determine whether the process is allowed to do so or not. Current implementation would also require such a process to have setsched capability. Setting of psi trigger thread's scheduling policy is an implementation detail and should not be exposed to the user level. Remove the permission check by using _nocheck version of the function.
--- kernel/sched/psi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/psi.c +1 -1
@@ -1061,7 +1061,7 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group,mutex_unlock (&group->trigger_lock);return ERR_CAST (kworker); } -sched_setscheduler (kworker->task,SCHED_FIFO , ¶m); +sched_setscheduler_nocheck (kworker->task,SCHED_FIFO , ¶m);kthread_init_delayed_work (&group->poll_work, psi_poll_work);rcu_assign_pointer (group->poll_kworker, kworker);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/162 sched/psi: Reduce psimon FIFO priority
In reply to Greg Kroah-Hartman[ Upstream commit 14f5c7b46a41a595fc61db37f55721714729e59e ]
PSI defaults to a FIFO-99 thread, reduce this to FIFO-1.
FIFO-99 is the very highest priority available to SCHED_FIFO and it not a suitable default; it would indicate the psi work is the most important work on the machine.
Since Real-Time tasks will have pre-allocated memory and locked it in place, Real-Time tasks do not care about PSI. All it needs is to be above OTHER.
--- kernel/sched/psi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/psi.c +1 -1
@@ -1051,7 +1051,7 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group,if (!rcu_access_pointer (group->poll_kworker)) {struct sched_param param = { - .sched_priority =MAX_RT_PRIO -1 , + .sched_priority =1 , };struct kthread_worker *kworker;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/162 s390/protvirt: avoid memory sharing for diag 308 set/store
In reply to Greg Kroah-Hartman[ Upstream commit a287a49e672d9762bb85de117b477bdf3ef20bd5 ]
This reverts commit db9492cef45e ("s390/protvirt: add memory sharing for diag 308 set/store") which due to ultravisor implementation change is not needed after all.
--- arch/s390/boot/ipl_parm.c | 2 -- arch/s390/kernel/ipl.c | 9 --------- 2 files changed, 11 deletions(-)
arch/s390/boot/ipl_parm.c +0 -2
@@ -48,9 +48,7 @@ void store_ipl_parmblock(void) {int rc; -uv_set_shared (__pa (&ipl_block)); rc =__diag308 (DIAG308_STORE , &ipl_block); -uv_remove_shared (__pa (&ipl_block));if (rc ==DIAG308_RC_OK && ipl_block.hdr.version <=IPL_MAX_SUPPORTED_VERSION ) ipl_block_valid =1 ;
arch/s390/kernel/ipl.c +0 -9
@@ -31,7 +31,6 @@#include <asm/os_info.h> #include <asm/sections.h> #include <asm/boot_data.h> -#include <asm/uv.h> #include "entry.h" #define IPL_PARM_BLOCK_VERSION 0
@@ -892,21 +891,15 @@ static void __reipl_run(void *unused) {switch (reipl_type) {case IPL_TYPE_CCW : -uv_set_shared (__pa (reipl_block_ccw));diag308 (DIAG308_SET , reipl_block_ccw); -uv_remove_shared (__pa (reipl_block_ccw));diag308 (DIAG308_LOAD_CLEAR ,NULL );break ;case IPL_TYPE_FCP : -uv_set_shared (__pa (reipl_block_fcp));diag308 (DIAG308_SET , reipl_block_fcp); -uv_remove_shared (__pa (reipl_block_fcp));diag308 (DIAG308_LOAD_CLEAR ,NULL );break ;case IPL_TYPE_NSS : -uv_set_shared (__pa (reipl_block_nss));diag308 (DIAG308_SET , reipl_block_nss); -uv_remove_shared (__pa (reipl_block_nss));diag308 (DIAG308_LOAD_CLEAR ,NULL );break ;case IPL_TYPE_UNKNOWN :
@@ -1176,9 +1169,7 @@ static struct kset *dump_kset;static void diag308_dump (void *dump_block) { -uv_set_shared (__pa (dump_block));diag308 (DIAG308_SET , dump_block); -uv_remove_shared (__pa (dump_block));while (1 ) {if (diag308 (DIAG308_LOAD_NORMAL_DUMP ,NULL ) !=0x302 )break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/162 s390/mm: fix dump_pagetables top level page table walking
In reply to Greg Kroah-Hartman[ Upstream commit 8024b5a9fc2bed9a00f0bdba60b443fa3cc4bb5d ]
Since commit d1874a0c2805 ("s390/mm: make the pxd_offset functions more robust") behaviour of p4d_offset, pud_offset and pmd_offset has been changed so that they cannot be used to iterate through top level page table, because the index for the top level page table is now calculated in pgd_offset. To avoid dumping the very first region/segment top level table entry 2048 times simply iterate entry pointer like it is already done in other page walking cases.
--- arch/s390/mm/dump_pagetables.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/s390/mm/dump_pagetables.c +6 -6
@@ -161,9 +161,9 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, }#endif -for (i =0 ; i <PTRS_PER_PMD && addr < max_addr; i++) { + pmd =pmd_offset (pud, addr); +for (i =0 ; i <PTRS_PER_PMD && addr < max_addr; i++, pmd++) { st->current_address = addr; - pmd =pmd_offset (pud, addr);if (!pmd_none (*pmd)) {if (pmd_large (*pmd)) { prot = pmd_val(*pmd) &
@@ -192,9 +192,9 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, }#endif -for (i =0 ; i <PTRS_PER_PUD && addr < max_addr; i++) { + pud =pud_offset (p4d, addr); +for (i =0 ; i <PTRS_PER_PUD && addr < max_addr; i++, pud++) { st->current_address = addr; - pud =pud_offset (p4d, addr);if (!pud_none (*pud))if (pud_large (*pud)) { prot = pud_val(*pud) &
@@ -222,9 +222,9 @@ static void walk_p4d_level(struct seq_file *m, struct pg_state *st, }#endif -for (i =0 ; i <PTRS_PER_P4D && addr < max_addr; i++) { + p4d =p4d_offset (pgd, addr); +for (i =0 ; i <PTRS_PER_P4D && addr < max_addr; i++, p4d++) { st->current_address = addr; - p4d =p4d_offset (pgd, addr);if (!p4d_none (*p4d))walk_pud_level (m, st, p4d, addr);else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/162 s390: put _stext and _etext into .text section
In reply to Greg Kroah-Hartman[ Upstream commit 24350fdadbdec780406a1ef988e6cd3875e374a8 ]
Perf relies on _etext and _stext symbols being one of 't', 'T', 'v' or 'V'. Put them into .text section to guarantee that.
Also moves padding to page boundary inside .text which has an effect that .text section is now padded with nops rather than 0's, which apparently has been the initial intention for specifying 0x0700 fill expression.
--- arch/s390/kernel/vmlinux.lds.S | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
arch/s390/kernel/vmlinux.lds.S +4 -6
@@ -32,10 +32,9 @@ PHDRS { SECTIONS { . = 0x100000; - _stext = .; /* Start of text section */ .text : { - /* Text and read-only data */ - _text = .; + _stext = .; /* Start of text section */ + _text = .; /* Text and read-only data */ HEAD_TEXT TEXT_TEXT SCHED_TEXT
@@ -47,11 +46,10 @@ SECTIONS *(.text.*_indirect_*) *(.fixup) *(.gnu.warning) + . = ALIGN(PAGE_SIZE); + _etext = .; /* End of text section */ } :text = 0x0700 - . = ALIGN(PAGE_SIZE); - _etext = .; /* End of text section */ - NOTES :text :note .dummy : { *(.dummy) } :data
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/162 ata: rb532_cf: Fix unused variable warning in rb532_pata_driver_probe
In reply to Greg Kroah-Hartman[ Upstream commit db341a049ec7e87053c91008cb452d0bfa6dde72 ]
Fix the following warning (Building: rb532_defconfig mips):
drivers/ata/pata_rb532_cf.c: In function ‘rb532_pata_driver_remove’:drivers/ata/pata_rb532_cf.c:161:24: warning: unused variable ‘info’ [-Wunused-variable]
struct rb532_cf_info *info = ah->private_data;
^~~~--- drivers/ata/pata_rb532_cf.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/pata_rb532_cf.c +0 -1
@@ -158,7 +158,6 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)static int rb532_pata_driver_remove (struct platform_device *pdev) {struct ata_host *ah =platform_get_drvdata (pdev); -struct rb532_cf_info *info = ah->private_data;ata_host_detach (ah);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/162 net: cxgb3_main: Fix a resource leak in a error path in init_one()
In reply to Greg Kroah-Hartman[ Upstream commit debea2cd3193ac868289e8893c3a719c265b0612 ]
A call to 'kfree_skb()' is missing in the error handling path of 'init_one()'.
This is already present in 'remove_one()' but is missing here.
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +4 -1
@@ -3269,7 +3269,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (!adapter->regs) {dev_err (&pdev->dev,"cannot map device registers\n" ); err = -ENOMEM ; - goto out_free_adapter; + goto out_free_adapter_nofail; } adapter->pdev = pdev;
@@ -3397,6 +3397,9 @@ out_free_dev:if (adapter->port[i])free_netdev (adapter->port[i]); +out_free_adapter_nofail: +kfree_skb (adapter->nofail_skb); + out_free_adapter:kfree (adapter);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/162 net: stmmac: tc: Do not return a fragment entry
In reply to Greg Kroah-Hartman[ Upstream commit 4a6a1385a4db5f42258a40fcd497cbfd22075968 ]
Do not try to return a fragment entry from TC list. Otherwise we may not clean properly allocated entries.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +1 -1
@@ -37,7 +37,7 @@ static struct stmmac_tc_entry *tc_find_entry(struct stmmac_priv *priv, entry = &priv->tc_entries[i];if (!entry->in_use && !first && free) first = entry; -if (entry->handle == loc && !free) +if ((entry->handle == loc) && !free && !entry->is_frag) dup = entry; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/162 drm/amdgpu: pin the csb buffer on hw init for gfx v8
In reply to Greg Kroah-Hartman[ Upstream commit 72cda9bb5e219aea0f2f62f56ae05198c59022a7 ]
Without this pin, the csb buffer will be filled with inconsistent data after S3 resume. And that will causes gfx hang on gfxoff exit since this csb will be executed then.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +40 -0
@@ -1317,6 +1317,39 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev)return 0 ; } +static int gfx_v8_0_csb_vram_pin (struct amdgpu_device *adev) +{ +int r; + + r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, false); +if (unlikely (r !=0 )) +return r; + + r =amdgpu_bo_pin (adev->gfx.rlc.clear_state_obj, +AMDGPU_GEM_DOMAIN_VRAM ); +if (!r) + adev->gfx.rlc.clear_state_gpu_addr = +amdgpu_bo_gpu_offset (adev->gfx.rlc.clear_state_obj); + +amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); + +return r; +} + +static void gfx_v8_0_csb_vram_unpin (struct amdgpu_device *adev) +{ +int r; + +if (!adev->gfx.rlc.clear_state_obj) +return ; + + r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, true); +if (likely (r ==0 )) { +amdgpu_bo_unpin (adev->gfx.rlc.clear_state_obj); +amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); + } +} +static void gfx_v8_0_mec_fini (struct amdgpu_device *adev) {amdgpu_bo_free_kernel (&adev->gfx.mec.hpd_eop_obj,NULL ,NULL );
@@ -4777,6 +4810,10 @@ static int gfx_v8_0_hw_init(void *handle)gfx_v8_0_init_golden_registers (adev);gfx_v8_0_constants_init (adev); + r =gfx_v8_0_csb_vram_pin (adev); +if (r) +return r; + r = adev->gfx.rlc.funcs->resume (adev);if (r)return r;
@@ -4893,6 +4930,9 @@ static int gfx_v8_0_hw_fini(void *handle)else pr_err ("rlc is busy, skip halt rlc\n" );amdgpu_gfx_rlc_exit_safe_mode (adev); + +gfx_v8_0_csb_vram_unpin (adev); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/162 net: hisilicon: make hip04_tx_reclaim non-reentrant
In reply to Greg Kroah-Hartman[ Upstream commit 1a2c070ae805910a853b4a14818481ed2e17c727 ]
If hip04_tx_reclaim is interrupted while it is running and then __napi_schedule continues to execute hip04_rx_poll->hip04_tx_reclaim, reentrancy occurs and oops is generated. So you need to mask the interrupt during the hip04_tx_reclaim run.
The kernel oops exception stack is as follows:
Unable to handle kernel NULL pointer dereference at virtual address 00000050 pgd = c0003000 [00000050] *pgd=80000000a04003, *pmd=00000000 Internal error: Oops: 206 [#1] SMP ARM Modules linked in: hip04_eth mtdblock mtd_blkdevs mtd ohci_platform ehci_platform ohci_hcd ehci_hcd vfat fat sd_mod usb_storage scsi_mod usbcore usb_common CPU: 0 PID: 0 Comm: swapper/0 Tainted: G O 4.4.185 #1 Hardware name: Hisilicon A15 task: c0a250e0 task.stack: c0a00000 PC is at hip04_tx_reclaim+0xe0/0x17c [hip04_eth] LR is at hip04_tx_reclaim+0x30/0x17c [hip04_eth] pc : [<bf30c3a4>] lr : [<bf30c2f4>] psr: 600e0313
sp : c0a01d88 ip : 00000000 fp : c0601f9c
r10: 00000000 r9 : c3482380 r8 : 00000001
r7 : 00000000 r6 : 000000e1 r5 : c3482000 r4 : 0000000c r3 : f2209800 r2 : 00000000 r1 : 00000000 r0 : 00000000
Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
Control: 32c5387d Table: 03d28c80 DAC: 55555555 Process swapper/0 (pid: 0, stack limit = 0xc0a00190)
Stack: (0xc0a01d88 to 0xc0a02000)
[<bf30c3a4>] (hip04_tx_reclaim [hip04_eth]) from [<bf30d2e0>]
(hip04_rx_poll+0x88/0x368 [hip04_eth])[<bf30d2e0>] (hip04_rx_poll [hip04_eth]) from [<c04c2d9c>] (net_rx_action+0x114/0x34c) [<c04c2d9c>] (net_rx_action) from [<c021eed8>] (__do_softirq+0x218/0x318) [<c021eed8>] (__do_softirq) from [<c021f284>] (irq_exit+0x88/0xac) [<c021f284>] (irq_exit) from [<c0240090>] (msa_irq_exit+0x11c/0x1d4) [<c0240090>] (msa_irq_exit) from [<c02677e0>] (__handle_domain_irq+0x110/0x148) [<c02677e0>] (__handle_domain_irq) from [<c0201588>] (gic_handle_irq+0xd4/0x118) [<c0201588>] (gic_handle_irq) from [<c0551700>] (__irq_svc+0x40/0x58)
Exception stack(0xc0a01f30 to 0xc0a01f78)
1f20: c0ae8b40 00000000 00000000 00000000
1f40: 00000002 ffffe000 c0601f9c 00000000 ffffffff c0a2257c c0a22440 c0831a38 1f60: c0a01ec4 c0a01f80 c0203714 c0203718 600e0213 ffffffff [<c0551700>] (__irq_svc) from [<c0203718>] (arch_cpu_idle+0x20/0x3c) [<c0203718>] (arch_cpu_idle) from [<c025bfd8>] (cpu_startup_entry+0x244/0x29c) [<c025bfd8>] (cpu_startup_entry) from [<c054b0d8>] (rest_init+0xc8/0x10c) [<c054b0d8>] (rest_init) from [<c0800c58>] (start_kernel+0x468/0x514)
Code: a40599e5 016086e2 018088e2 7660efe6 (503090e5) ---[ end trace 1db21d6d09c49d74 ]--- Kernel panic - not syncing: Fatal exception in interrupt CPU3: stopping CPU: 3 PID: 0 Comm: swapper/3 Tainted: G D O 4.4.185 #1
--- drivers/net/ethernet/hisilicon/hip04_eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hip04_eth.c +4 -2
@@ -494,6 +494,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)u16 len;u32 err; +/* clean up tx descriptors */ + tx_remaining =hip04_tx_reclaim (ndev, false); +while (cnt && !last) { buf = priv->rx_buf[priv->rx_head]; skb =build_skb (buf, priv->rx_buf_size);
@@ -554,8 +557,7 @@ refill: }napi_complete_done (napi, rx); done: -/* clean up tx descriptors and start a new timer if necessary */ - tx_remaining =hip04_tx_reclaim (ndev, false); +/* start a new timer if necessary */ if (rx < budget && tx_remaining)hip04_start_tx_timer (priv);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/162 net: hisilicon: fix hip04-xmit never return TX_BUSY
In reply to Greg Kroah-Hartman[ Upstream commit f2243b82785942be519016067ee6c55a063bbfe2 ]
TX_DESC_NUM is 256, in tx_count, the maximum value of mod(TX_DESC_NUM - 1) is 254, the variable "count" in the hip04_mac_start_xmit function is never equal to (TX_DESC_NUM - 1), so hip04_mac_start_xmit never return NETDEV_TX_BUSY.
tx_count is modified to mod(TX_DESC_NUM) so that the maximum value of tx_count can reach (TX_DESC_NUM - 1), then hip04_mac_start_xmit can reurn NETDEV_TX_BUSY.
--- drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hip04_eth.c +1 -1
@@ -181,7 +181,7 @@ struct hip04_priv {static inline unsigned int tx_count (unsigned int head,unsigned int tail) { -return (head - tail) % (TX_DESC_NUM -1 ); +return (head - tail) %TX_DESC_NUM ; }static void hip04_config_port (struct net_device *ndev,u32 speed,u32 duplex)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/162 net: hisilicon: Fix dma_map_single failed on arm64
In reply to Greg Kroah-Hartman[ Upstream commit 96a50c0d907ac8f5c3d6b051031a19eb8a2b53e3 ]
On the arm64 platform, executing "ifconfig eth0 up" will fail, returning "ifconfig: SIOCSIFFLAGS: Input/output error."
ndev->dev is not initialized, dma_map_single->get_dma_ops-> dummy_dma_ops->__dummy_map_page will return DMA_ERROR_CODE directly, so when we use dma_map_single, the first parameter is to use the device of platform_device.
--- drivers/net/ethernet/hisilicon/hip04_eth.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/net/ethernet/hisilicon/hip04_eth.c +11 -9
@@ -153,6 +153,7 @@ struct hip04_priv {unsigned int reg_inten;struct napi_struct napi; +struct device *dev;struct net_device *ndev;struct tx_desc *tx_desc;
@@ -383,7 +384,7 @@ static int hip04_tx_reclaim(struct net_device *ndev, bool force) }if (priv->tx_phys[tx_tail]) { -dma_unmap_single (&ndev->dev, priv->tx_phys[tx_tail], +dma_unmap_single (priv->dev, priv->tx_phys[tx_tail], priv->tx_skb[tx_tail]->len,DMA_TO_DEVICE ); priv->tx_phys[tx_tail] =0 ;
@@ -434,8 +435,8 @@ hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)return NETDEV_TX_BUSY ; } - phys =dma_map_single (&ndev->dev, skb->data, skb->len,DMA_TO_DEVICE ); -if (dma_mapping_error (&ndev->dev, phys)) { + phys =dma_map_single (priv->dev, skb->data, skb->len,DMA_TO_DEVICE ); +if (dma_mapping_error (priv->dev, phys)) {dev_kfree_skb (skb);return NETDEV_TX_OK ; }
@@ -505,7 +506,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) goto refill; } -dma_unmap_single (&ndev->dev, priv->rx_phys[priv->rx_head], +dma_unmap_single (priv->dev, priv->rx_phys[priv->rx_head],RX_BUF_SIZE ,DMA_FROM_DEVICE ); priv->rx_phys[priv->rx_head] =0 ;
@@ -534,9 +535,9 @@ refill: buf =netdev_alloc_frag (priv->rx_buf_size);if (!buf) goto done; - phys =dma_map_single (&ndev->dev, buf, + phys =dma_map_single (priv->dev, buf,RX_BUF_SIZE ,DMA_FROM_DEVICE ); -if (dma_mapping_error (&ndev->dev, phys)) +if (dma_mapping_error (priv->dev, phys)) goto done; priv->rx_buf[priv->rx_head] = buf; priv->rx_phys[priv->rx_head] = phys;
@@ -639,9 +640,9 @@ static int hip04_mac_open(struct net_device *ndev)for (i =0 ; i <RX_DESC_NUM ; i++) {dma_addr_t phys; - phys =dma_map_single (&ndev->dev, priv->rx_buf[i], + phys =dma_map_single (priv->dev, priv->rx_buf[i],RX_BUF_SIZE ,DMA_FROM_DEVICE ); -if (dma_mapping_error (&ndev->dev, phys)) +if (dma_mapping_error (priv->dev, phys))return -EIO ; priv->rx_phys[i] = phys;
@@ -675,7 +676,7 @@ static int hip04_mac_stop(struct net_device *ndev)for (i =0 ; i <RX_DESC_NUM ; i++) {if (priv->rx_phys[i]) { -dma_unmap_single (&ndev->dev, priv->rx_phys[i], +dma_unmap_single (priv->dev, priv->rx_phys[i],RX_BUF_SIZE ,DMA_FROM_DEVICE ); priv->rx_phys[i] =0 ; }
@@ -819,6 +820,7 @@ static int hip04_mac_probe(struct platform_device *pdev)return -ENOMEM ; priv =netdev_priv (ndev); + priv->dev = d; priv->ndev = ndev;platform_set_drvdata (pdev, ndev);SET_NETDEV_DEV (ndev, &pdev->dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/162 libata: have ata_scsi_rw_xlat() fail invalid passthrough requests
In reply to Greg Kroah-Hartman[ Upstream commit 2d7271501720038381d45fb3dcbe4831228fc8cc ]
For passthrough requests, libata-scsi takes what the user passes in as gospel. This can be problematic if the user fills in the CDB incorrectly. One example of that is in request sizes. For read/write commands, the CDB contains fields describing the transfer length of the request. These should match with the SG_IO header fields, but libata-scsi currently does no validation of that.
Check that the number of blocks in the CDB for passthrough requests matches what was mapped into the request. If the CDB asks for more data then the validated SG_IO header fields, error it.
--- drivers/ata/libata-scsi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/ata/libata-scsi.c +21 -0
@@ -1786,6 +1786,21 @@ nothing_to_do:return 1 ; } +static bool ata_check_nblocks (struct scsi_cmnd *scmd,u32 n_blocks) +{ +struct request *rq = scmd->request; +u32 req_blocks; + +if (!blk_rq_is_passthrough (rq)) +return true; + + req_blocks =blk_rq_bytes (rq) / scmd->device->sector_size; +if (n_blocks > req_blocks) +return false; + +return true; +} +/** * ata_scsi_rw_xlat - Translate SCSI r/w command into an ATA one * @qc: Storage for translated ATA taskfile
@@ -1830,6 +1845,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)scsi_10_lba_len (cdb, &block, &n_block);if (cdb[1 ] & (1 <<3 )) tf_flags |=ATA_TFLAG_FUA ; +if (!ata_check_nblocks (scmd, n_block)) + goto invalid_fld;break ;case READ_6 :case WRITE_6 :
@@ -1844,6 +1861,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)*/ if (!n_block) n_block =256 ; +if (!ata_check_nblocks (scmd, n_block)) + goto invalid_fld;break ;case READ_16 :case WRITE_16 :
@@ -1854,6 +1873,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)scsi_16_lba_len (cdb, &block, &n_block);if (cdb[1 ] & (1 <<3 )) tf_flags |=ATA_TFLAG_FUA ; +if (!ata_check_nblocks (scmd, n_block)) + goto invalid_fld;break ;default :DPRINTK ("no-byte command\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/162 NFSv4: Ensure state recovery handles ETIMEDOUT correctly
In reply to Greg Kroah-Hartman[ Upstream commit 67e7b52d44e3d539dfbfcd866c3d3d69da23a909 ]
Ensure that the state recovery code handles ETIMEDOUT correctly, and also that we set RPC_TASK_TIMEOUT when recovering open state.
--- fs/nfs/nfs4proc.c | 2 ++ fs/nfs/nfs4state.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -0
@@ -2150,6 +2150,7 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, structcase -ENOENT :case -EAGAIN :case -ESTALE : +case -ETIMEDOUT :break ;case -NFS4ERR_BADSESSION :case -NFS4ERR_BADSLOT :
@@ -2470,6 +2471,7 @@ static int nfs4_run_open_task(struct nfs4_opendata *data,if (!ctx) {nfs4_init_sequence (&o_arg->seq_args, &o_res->seq_res,1 ,1 ); data->is_recover = true; + task_setup_data.flags |=RPC_TASK_TIMEOUT ; }else {nfs4_init_sequence (&o_arg->seq_args, &o_res->seq_res,1 ,0 );pnfs_lgopen_prepare (data, ctx);
fs/nfs/nfs4state.c +5 -2
@@ -1528,6 +1528,7 @@ restart:switch (status) {case 0 :break ; +case -ETIMEDOUT :case -ESTALE :case -NFS4ERR_ADMIN_REVOKED :case -NFS4ERR_STALE_STATEID :
@@ -1681,11 +1682,13 @@ restart:case -NFS4ERR_EXPIRED :case -NFS4ERR_NO_GRACE :nfs4_state_mark_reclaim_nograce (sp->so_server->nfs_client, state); +/* Fall through */ case -NFS4ERR_STALE_CLIENTID :case -NFS4ERR_BADSESSION :case -NFS4ERR_BADSLOT :case -NFS4ERR_BAD_HIGH_SLOT :case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION : +case -ETIMEDOUT : goto out_err; }nfs4_put_open_state (state);
@@ -1970,7 +1973,6 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)return -EPERM ;case -EACCES :case -NFS4ERR_DELAY : -case -ETIMEDOUT :case -EAGAIN :ssleep (1 );break ;
@@ -2599,7 +2601,7 @@ static void nfs4_state_manager(struct nfs_client *clp) }/* Now recover expired state... */ -if (test_and_clear_bit (NFS4CLNT_RECLAIM_NOGRACE , &clp->cl_state)) { +if (test_bit (NFS4CLNT_RECLAIM_NOGRACE , &clp->cl_state)) { section ="reclaim nograce" ; status =nfs4_do_reclaim (clp, clp->cl_mvops->nograce_recovery_ops);
@@ -2607,6 +2609,7 @@ static void nfs4_state_manager(struct nfs_client *clp)continue ;if (status <0 ) goto out_error; +clear_bit (NFS4CLNT_RECLAIM_NOGRACE , &clp->cl_state); }nfs4_end_drain_session (clp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/162 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack
In reply to Greg Kroah-Hartman[ Upstream commit d8a1de3d5bb881507602bc02e004904828f88711 ]
Since linux 4.9 it is not possible to use buffers on the stack for DMA transfers.
During usb probe the driver crashes with "transfer buffer is on stack" message.
This fix k-allocates a buffer to be used on "read_reg_atomic", which is a macro that calls "usb_control_msg" under the hood.
Kernel 4.19 backtrace:
usb_hcd_submit_urb+0x3e5/0x900 ? sched_clock+0x9/0x10 ? log_store+0x203/0x270 ? get_random_u32+0x6f/0x90 ? cache_alloc_refill+0x784/0x8a0 usb_submit_urb+0x3b4/0x550 usb_start_wait_urb+0x4e/0xd0 usb_control_msg+0xb8/0x120 hfcsusb_probe+0x6bc/0xb40 [hfcsusb] usb_probe_interface+0xc2/0x260 really_probe+0x176/0x280 driver_probe_device+0x49/0x130 __driver_attach+0xa9/0xb0 ? driver_probe_device+0x130/0x130 bus_for_each_dev+0x5a/0x90 driver_attach+0x14/0x20 ? driver_probe_device+0x130/0x130 bus_add_driver+0x157/0x1e0 driver_register+0x51/0xe0 usb_register_driver+0x5d/0x120 ? 0xf81ed000 hfcsusb_drv_init+0x17/0x1000 [hfcsusb] do_one_initcall+0x44/0x190 ? free_unref_page_commit+0x6a/0xd0 do_init_module+0x46/0x1c0 load_module+0x1dc1/0x2400 sys_init_module+0xed/0x120 do_fast_syscall_32+0x7a/0x200 entry_SYSENTER_32+0x6b/0xbe
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/isdn/hardware/mISDN/hfcsusb.c +11 -1
@@ -1693,13 +1693,23 @@ hfcsusb_stop_endpoint(struct hfcsusb *hw, int channel)static int setup_hfcsusb (struct hfcsusb *hw) { +void *dmabuf =kmalloc (sizeof (u_char),GFP_KERNEL );u_char b; +int ret;if (debug &DBG_HFC_CALL_TRACE )printk (KERN_DEBUG "%s: %s\n" , hw->name, __func__); +if (!dmabuf) +return -ENOMEM ; + + ret =read_reg_atomic (hw,HFCUSB_CHIP_ID , dmabuf); + +memcpy (&b, dmabuf,sizeof (u_char)); +kfree (dmabuf); +/* check the chip id */ -if (read_reg_atomic (hw,HFCUSB_CHIP_ID , &b) !=1 ) { +if (ret !=1 ) {printk (KERN_DEBUG "%s: %s: cannot read chip id\n" , hw->name, __func__);return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/162 libata: add SG safety checks in SFF pio transfers
In reply to Greg Kroah-Hartman[ Upstream commit 752ead44491e8c91e14d7079625c5916b30921c5 ]
Abort processing of a command if we run out of mapped data in the SG list. This should never happen, but a previous bug caused it to be possible. Play it safe and attempt to abort nicely if we don't have more SG segments left.
--- drivers/ata/libata-sff.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/ata/libata-sff.c +6 -0
@@ -658,6 +658,10 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)unsigned int offset;unsigned char *buf; +if (!qc->cursg) { + qc->curbytes = qc->nbytes; +return ; + }if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ;
@@ -683,6 +687,8 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->cursg_ofs == qc->cursg->length) { qc->cursg =sg_next (qc->cursg); +if (!qc->cursg) + ap->hsm_task_state =HSM_ST_LAST ; qc->cursg_ofs =0 ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/162 x86/lib/cpu: Address missing prototypes warning
In reply to Greg Kroah-Hartman[ Upstream commit 04f5bda84b0712d6f172556a7e8dca9ded5e73b9 ]
When building with W=1, warnings about missing prototypes are emitted:
CC arch/x86/lib/cpu.oarch/x86/lib/cpu.c:5:14: warning: no previous prototype for 'x86_family' [-Wmissing-prototypes]
5 | unsigned int x86_family(unsigned int sig)
| ^~~~~~~~~~arch/x86/lib/cpu.c:18:14: warning: no previous prototype for 'x86_model' [-Wmissing-prototypes]
18 | unsigned int x86_model(unsigned int sig)
| ^~~~~~~~~
arch/x86/lib/cpu.c:33:14: warning: no previous prototype for 'x86_stepping' [-Wmissing-prototypes]
33 | unsigned int x86_stepping(unsigned int sig)
| ^~~~~~~~~~~~Add the proper include file so the prototypes are there.
--- arch/x86/lib/cpu.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/lib/cpu.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only #include <linux/types.h> #include <linux/export.h> +#include <asm/cpu.h> unsigned int x86_family (unsigned int sig) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/162 block: aoe: Fix kernel crash due to atomic sleep when exiting
In reply to Greg Kroah-Hartman[ Upstream commit 430380b4637aec646996b4aef67ad417593923b2 ]
Since commit 3582dd291788 ("aoe: convert aoeblk to blk-mq"), aoedev_downdev has had the possibility of sleeping and causing the following crash.
BUG: scheduling while atomic: rmmod/2242/0x00000003 Modules linked in: aoe Preemption disabled at: [<ffffffffc01d95e5>] flush+0x95/0x4a0 [aoe] CPU: 7 PID: 2242 Comm: rmmod Tainted: G I 5.2.3 #1 Hardware name: Intel Corporation S5520HC/S5520HC, BIOS S5500.86B.01.10.0025.030220091519 03/02/2009 Call Trace: dump_stack+0x4f/0x6a ? flush+0x95/0x4a0 [aoe] __schedule_bug.cold+0x44/0x54 __schedule+0x44f/0x680 schedule+0x44/0xd0 blk_mq_freeze_queue_wait+0x46/0xb0 ? wait_woken+0x80/0x80 blk_mq_freeze_queue+0x1b/0x20 aoedev_downdev+0x111/0x160 [aoe] flush+0xff/0x4a0 [aoe] aoedev_exit+0x23/0x30 [aoe] aoe_exit+0x35/0x948 [aoe] __se_sys_delete_module+0x183/0x210 __x64_sys_delete_module+0x16/0x20 do_syscall_64+0x4d/0x130 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f24e0043b07 Code: 73 01 c3 48 8b 0d 89 73 0b 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f
1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 59 73 0b 00 f7 d8 64 89 01 48
RSP: 002b:00007ffe18f7f1e8 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f24e0043b07
RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555c3ecf87c8
RBP: 00007ffe18f7f1f0 R08: 0000000000000000 R09: 0000000000000000
R10: 00007f24e00b4ac0 R11: 0000000000000206 R12: 00007ffe18f7f238
R13: 00007ffe18f7f410 R14: 00007ffe18f80e73 R15: 0000555c3ecf8760
This patch, handling in the same way of pass two, unlocks the locks and restart pass one after aoedev_downdev is done.
--- drivers/block/aoe/aoedev.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/block/aoe/aoedev.c +10 -3
@@ -323,10 +323,14 @@ flush(const char __user *str, size_t cnt, int exiting) }flush_scheduled_work (); -/* pass one: without sleeping, do aoedev_downdev */ +/* pass one: do aoedev_downdev, which might sleep */ +restart1:spin_lock_irqsave (&devlist_lock, flags);for (d = devlist; d; d = d->next) {spin_lock (&d->lock); +if (d->flags &DEVFL_TKILL ) + goto cont; +if (exiting) {/* unconditionally take each device down */ }else if (specified) {
@@ -338,8 +342,11 @@ flush(const char __user *str, size_t cnt, int exiting) || d->ref) goto cont; +spin_unlock (&d->lock); +spin_unlock_irqrestore (&devlist_lock, flags);aoedev_downdev (d); d->flags |=DEVFL_TKILL ; + goto restart1; cont:spin_unlock (&d->lock); }
@@ -348,7 +355,7 @@ cont:/* pass two: call freedev, which might sleep, * for aoedevs marked with DEVFL_TKILL */ -restart: +restart2:spin_lock_irqsave (&devlist_lock, flags);for (d = devlist; d; d = d->next) {spin_lock (&d->lock);
@@ -357,7 +364,7 @@ restart:spin_unlock (&d->lock);spin_unlock_irqrestore (&devlist_lock, flags);freedev (d); - goto restart; + goto restart2; }spin_unlock (&d->lock); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/162 block, bfq: handle NULL return value by bfq_init_rq()
In reply to Greg Kroah-Hartman[ Upstream commit fd03177c33b287c6541f4048f1d67b7b45a1abc9 ]
As reported in [1], the call bfq_init_rq(rq) may return NULL in case of OOM (in particular, if rq->elv.icq is NULL because memory allocation failed in failed in ioc_create_icq()).
This commit handles this circumstance.
[1] https://lkml.org/lkml/2019/7/22/824
--- block/bfq-iosched.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
block/bfq-iosched.c +11 -3
@@ -2085,9 +2085,14 @@ static void bfq_request_merged(struct request_queue *q, struct request *req, blk_rq_pos(container_of(rb_prev(&req->rb_node), struct request, rb_node))) {struct bfq_queue *bfqq =bfq_init_rq (req); -struct bfq_data *bfqd = bfqq->bfqd; +struct bfq_data *bfqd;struct request *prev, *next_rq; +if (!bfqq) +return ; + + bfqd = bfqq->bfqd; +/* Reposition request in its sort_list */ elv_rb_del (&bfqq->sort_list, req);elv_rb_add (&bfqq->sort_list, req);
@@ -2134,6 +2139,9 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,struct bfq_queue *bfqq =bfq_init_rq (rq), *next_bfqq =bfq_init_rq (next); +if (!bfqq) +return ; +/* * If next and rq belong to the same bfq_queue and next is older * than rq, then reposition rq in the fifo (by substituting next
@@ -5061,12 +5069,12 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,spin_lock_irq (&bfqd->lock); bfqq =bfq_init_rq (rq); -if (at_head ||blk_rq_is_passthrough (rq)) { +if (!bfqq || at_head ||blk_rq_is_passthrough (rq)) {if (at_head)list_add (&rq->queuelist, &bfqd->dispatch);else list_add_tail (&rq->queuelist, &bfqd->dispatch); - }else {/* bfqq is assumed to be non null here */ + }else { idle_timer_disabled =__bfq_insert_request (bfqd, rq);/* * Update bfqq, because, if a queue merge has occurred
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/162 net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed()
In reply to Greg Kroah-Hartman[ Upstream commit 271da132e29b5341c31eca6ba6a72ea1302ebac8 ]
In phy_led_trigger_change_speed(), there is an if statement on line 48 to check whether phy->last_triggered is NULL:
if (!phy->last_triggered)
When phy->last_triggered is NULL, it is used on line 52:
led_trigger_event(&phy->last_triggered->trigger, LED_OFF);
Thus, a possible null-pointer dereference may occur.
To fix this bug, led_trigger_event(&phy->last_triggered->trigger, LED_OFF) is called when phy->last_triggered is not NULL.
This bug is found by a static analysis tool STCheck written by the OSLAB group in Tsinghua University.
--- drivers/net/phy/phy_led_triggers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/phy_led_triggers.c +2 -1
@@ -48,8 +48,9 @@ void phy_led_trigger_change_speed(struct phy_device *phy)if (!phy->last_triggered)led_trigger_event (&phy->led_link_trigger->trigger,LED_FULL ); +else +led_trigger_event (&phy->last_triggered->trigger,LED_OFF ); -led_trigger_event (&phy->last_triggered->trigger,LED_OFF );led_trigger_event (&plt->trigger,LED_FULL ); phy->last_triggered = plt; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/162 perf bench numa: Fix cpu0 binding
In reply to Greg Kroah-Hartman[ Upstream commit 6bbfe4e602691b90ac866712bd4c43c51e546a60 ]
Michael reported an issue with perf bench numa failing with binding to cpu0 with '-0' option.
# perf bench numa mem -p 3 -t 1 -P 512 -s 100 -zZcm0 --thp 1 -M 1 -ddd # Running 'numa/mem' benchmark:
# Running main, "perf bench numa numa-mem -p 3 -t 1 -P 512 -s 100 -zZcm0 --thp 1 -M 1 -ddd"
binding to node 0, mask: 0000000000000001 => -1
perf: bench/numa.c:356: bind_to_memnode: Assertion `!(ret)' failed.
Aborted (core dumped)
This happens when the cpu0 is not part of node0, which is the benchmark assumption and we can see that's not the case for some powerpc servers.
Using correct node for cpu0 binding.
--- tools/perf/bench/numa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/bench/numa.c +4 -2
@@ -379,8 +379,10 @@ static u8 *alloc_data(ssize_t bytes0, int map_flags,/* Allocate and initialize all memory on CPU#0: */ if (init_cpu0) { - orig_mask =bind_to_node (0 ); -bind_to_memnode (0 ); +int node =numa_node_of_cpu (0 ); + + orig_mask =bind_to_node (node); +bind_to_memnode (node); } bytes = bytes0 +HPSIZE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/162 spi: pxa2xx: Add support for Intel Tiger Lake
In reply to Greg Kroah-Hartman[ Upstream commit a4127952859a869cf3fc5a49547dbe2ffa2eac89 ]
Intel Tiger Lake -LP LPSS SPI controller is otherwise similar than Cannon Lake but has more controllers and up to two chip selects per controller.
--- drivers/spi/spi-pxa2xx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/spi/spi-pxa2xx.c +8 -0
@@ -1453,6 +1453,14 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { { PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP }, { PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP }, { PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP }, +/* TGL-LP */ + { PCI_VDEVICE(INTEL, 0xa0aa), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0ab), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0de), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0df), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0fb), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0fd), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0xa0fe), LPSS_CNL_SSP }, { }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/162 can: sja1000: force the string buffer NULL-terminated
In reply to Greg Kroah-Hartman[ Upstream commit cd28aa2e056cd1ea79fc5f24eed0ce868c6cab5c ]
strncpy() does not ensure NULL-termination when the input string size equals to the destination buffer size IFNAMSIZ. The output string 'name' is passed to dev_info which relies on NULL-termination.
Use strlcpy() instead.
This issue is identified by a Coccinelle script.
--- drivers/net/can/sja1000/peak_pcmcia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/sja1000/peak_pcmcia.c +1 -1
@@ -479,7 +479,7 @@ static void pcan_free_channels(struct pcan_pccard *card)if (!netdev)continue ; -strncpy (name, netdev->name,IFNAMSIZ ); +strlcpy (name, netdev->name,IFNAMSIZ );unregister_sja1000dev (netdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/162 can: peak_usb: force the string buffer NULL-terminated
In reply to Greg Kroah-Hartman[ Upstream commit e787f19373b8a5fa24087800ed78314fd17b984a ]
strncpy() does not ensure NULL-termination when the input string size equals to the destination buffer size IFNAMSIZ. The output string is passed to dev_info() which relies on the NULL-termination.
Use strlcpy() instead.
This issue is identified by a Coccinelle script.
--- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/usb/peak_usb/pcan_usb_core.c +1 -1
@@ -855,7 +855,7 @@ static void peak_usb_disconnect(struct usb_interface *intf) dev_prev_siblings = dev->prev_siblings; dev->state &= ~PCAN_USB_STATE_CONNECTED ; -strncpy (name, netdev->name,IFNAMSIZ ); +strlcpy (name, netdev->name,IFNAMSIZ );unregister_netdev (netdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/162 iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef
In reply to Greg Kroah-Hartman[ Upstream commit abcbef5977df1fb61026ba429964cd6b9a085699 ]
The driver should call iwl_dbg_tlv_free even if debugfs is not defined since ini mode does not depend on debugfs ifdef.
--- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +1 -1
@@ -1649,8 +1649,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) err_fw:#ifdef CONFIG_IWLWIFI_DEBUGFS debugfs_remove_recursive (drv->dbgfs_drv); -iwl_fw_dbg_free (drv->trans);#endif +iwl_fw_dbg_free (drv->trans);kfree (drv); err:return ERR_PTR (ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/162 perf cpumap: Fix writing to illegal memory in handling cpumap mask
In reply to Greg Kroah-Hartman[ Upstream commit 5f5e25f1c7933a6e1673515c0b1d5acd82fea1ed ]
cpu_map__snprint_mask() would write to illegal memory pointed by zalloc(0) when there is only one cpu.
This patch fixes the calculation and adds sanity check against the input parameters.
--- tools/perf/util/cpumap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/cpumap.c +4 -1
@@ -701,7 +701,10 @@ size_t cpu_map__snprint_mask(struct cpu_map *map, char *buf, size_t size)unsigned char *bitmap;int last_cpu =cpu_map__cpu (map, map->nr -1 ); - bitmap =zalloc ((last_cpu +7 ) /8 ); +if (buf ==NULL ) +return 0 ; + + bitmap =zalloc (last_cpu /8 +1 );if (bitmap ==NULL ) { buf[0 ] ='\0' ;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/162 Revert "KVM: x86/mmu: Zap only the relevant pages when removing a memslot"
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit d012a06ab1d23178fc6856d8d2161fbcc4dd8ebd upstream.
This reverts commit 4e103134b862314dc2f2f18f2fb0ab972adc3f5f. Alex Williamson reported regressions with device assignment with this patch. Even though the bug is probably elsewhere and still latent, this is needed to fix the regression.
--- arch/x86/kvm/mmu.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-)
arch/x86/kvm/mmu.c +1 -32
@@ -5649,38 +5649,7 @@ static void kvm_mmu_invalidate_zap_pagesstruct kvm_memory_slot *slot, struct kvm_page_track_notifier_node *node) { - struct kvm_mmu_page *sp; -LIST_HEAD (invalid_list); -unsigned long i; -bool flush; -gfn_t gfn; - -spin_lock (&kvm->mmu_lock); - -if (list_empty (&kvm->arch.active_mmu_pages)) - goto out_unlock; - - flush =slot_handle_all_level (kvm, slot, kvm_zap_rmapp, false); - -for (i =0 ; i < slot->npages; i++) { - gfn = slot->base_gfn + i; - -for_each_valid_sp (kvm, sp, gfn) { -if (sp->gfn != gfn) -continue ; - -kvm_mmu_prepare_zap_page (kvm, sp, &invalid_list); - } -if (need_resched () ||spin_needbreak (&kvm->mmu_lock)) { -kvm_mmu_remote_flush_or_zap (kvm, &invalid_list, flush); - flush = false; -cond_resched_lock (&kvm->mmu_lock); - } - } -kvm_mmu_remote_flush_or_zap (kvm, &invalid_list, flush); - -out_unlock: -spin_unlock (&kvm->mmu_lock); +kvm_mmu_zap_all (kvm ); }void kvm_mmu_init_vm (struct kvm *kvm)
Greg Kroah-Hartman
maintainerPATCH 114/162 Revert "dm bufio: fix deadlock with loop device"
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit cf3591ef832915892f2499b7e54b51d4c578b28c upstream.
Revert the commit bd293d071ffe65e645b4d8104f9d8fe15ea13862. The proper fix has been made available with commit d0a255e795ab ("loop: set PF_MEMALLOC_NOIO for the worker thread").
Note that the fix offered by commit bd293d071ffe doesn't really prevent the deadlock from occuring - if we look at the stacktrace reported by Junxiao Bi, we see that it hangs in bit_wait_io and not on the mutex - i.e. it has already successfully taken the mutex. Changing the mutex from mutex_lock to mutex_trylock won't help with deadlocks that happen afterwards.
PID: 474 TASK: ffff8813e11f4600 CPU: 10 COMMAND: "kswapd0"
#0 [ffff8813dedfb938] __schedule at ffffffff8173f405
#1 [ffff8813dedfb990] schedule at ffffffff8173fa27
#2 [ffff8813dedfb9b0] schedule_timeout at ffffffff81742fec
#3 [ffff8813dedfba60] io_schedule_timeout at ffffffff8173f186 #4 [ffff8813dedfbaa0] bit_wait_io at ffffffff8174034f
#5 [ffff8813dedfbac0] __wait_on_bit at ffffffff8173fec8
#6 [ffff8813dedfbb10] out_of_line_wait_on_bit at ffffffff8173ff81 #7 [ffff8813dedfbb90] __make_buffer_clean at ffffffffa038736f [dm_bufio] #8 [ffff8813dedfbbb0] __try_evict_buffer at ffffffffa0387bb8 [dm_bufio] #9 [ffff8813dedfbbd0] dm_bufio_shrink_scan at ffffffffa0387cc3 [dm_bufio]
#10 [ffff8813dedfbc40] shrink_slab at ffffffff811a87ce
#11 [ffff8813dedfbd30] shrink_zone at ffffffff811ad778
#12 [ffff8813dedfbdc0] kswapd at ffffffff811ae92f
#13 [ffff8813dedfbec0] kthread at ffffffff810a8428
#14 [ffff8813dedfbf50] ret_from_fork at ffffffff81745242
Depends-on: d0a255e795ab ("loop: set PF_MEMALLOC_NOIO for the worker thread")
--- drivers/md/dm-bufio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/dm-bufio.c +3 -1
@@ -1599,7 +1599,9 @@ dm_bufio_shrink_scan(struct shrinker *shunsigned long freed; c = container_of(shrink, struct dm_bufio_client, shrinker); -if (!dm_bufio_trylock (c)) +if (sc->gfp_mask & __GFP_FS) +dm_bufio_lock (c); +else if (!dm_bufio_trylock (c))return SHRINK_STOP ; freed =__scan (c, sc->nr_to_scan, sc->gfp_mask);
Greg Kroah-Hartman
maintainerPATCH 115/162 clk: socfpga: stratix10: fix rate caclulationg for cnt_clks
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
commit c7ec75ea4d5316518adc87224e3cff47192579e7 upstream.
Checking bypass_reg is incorrect for calculating the cnt_clk rates. Instead we should be checking that there is a proper hardware register that holds the clock divider.
--- drivers/clk/socfpga/clk-periph-s10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/socfpga/clk-periph-s10.c +1 -1
@@ -38,7 +38,7 @@ static unsigned long clk_peri_cnt_clk_reif (socfpgaclk->fixed_div) { div = socfpgaclk->fixed_div; }else { -if (!socfpgaclk->bypass_reg) +if (socfpgaclk->hw.reg) div = ((readl (socfpgaclk->hw.reg) &0x7ff ) +1 ); }
Greg Kroah-Hartman
maintainerPATCH 117/162 ceph: dont try fill file_lock on unsuccessful GETFILELOCK reply
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 28a282616f56990547b9dcd5c6fbd2001344664c upstream.
When ceph_mdsc_do_request returns an error, we can't assume that the filelock_reply pointer will be set. Only try to fetch fields out of the r_reply_info when it returns success.
--- fs/ceph/locks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ceph/locks.c +1 -2
@@ -111,8 +111,7 @@ static int ceph_lock_message(u8 lock_typ req->r_wait_for_completion = ceph_lock_wait_for_completion; err =ceph_mdsc_do_request (mdsc, inode, req); - -if (operation ==CEPH_MDS_OP_GETFILELOCK ) { +if (!err && operation ==CEPH_MDS_OP_GETFILELOCK ) { fl->fl_pid = -le64_to_cpu (req->r_reply_info.filelock_reply->pid);if (CEPH_LOCK_SHARED == req->r_reply_info.filelock_reply->type) fl->fl_type =F_RDLCK ;
Greg Kroah-Hartman
maintainerPATCH 118/162 libceph: fix PG split vs OSD (re)connect race
In reply to Greg Kroah-HartmanFrom: Ilya Dryomov <[email protected]>
commit a561372405cf6bc6f14239b3a9e57bb39f2788b0 upstream.
We can't rely on ->peer_features in calc_target() because it may be called both when the OSD session is established and open and when it's not. ->peer_features is not valid unless the OSD session is open. If this happens on a PG split (pg_num increase), that could mean we don't resend a request that should have been resent, hanging the client indefinitely.
In userspace this was fixed by looking at require_osd_release and get_xinfo[osd].features fields of the osdmap. However these fields belong to the OSD section of the osdmap, which the kernel doesn't decode (only the client section is decoded).
Instead, let's drop this feature check. It effectively checks for luminous, so only pre-luminous OSDs would be affected in that on a PG split the kernel might resend a request that should not have been resent. Duplicates can occur in other scenarios, so both sides should already be prepared for them: see dup/replay logic on the OSD side and retry_attempt check on the client side.
--- net/ceph/osd_client.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/ceph/osd_client.c +4 -5
@@ -1504,7 +1504,7 @@ static enum calc_target_result calc_targstruct ceph_osds up, acting;bool force_resend = false;bool unpaused = false; -bool legacy_change; +bool legacy_change = false;bool split = false;bool sort_bitwise =ceph_osdmap_flag (osdc,CEPH_OSDMAP_SORTBITWISE ); bool recovery_deletes = ceph_osdmap_flag(osdc,
@@ -1592,15 +1592,14 @@ static enum calc_target_result calc_targ t->osd = acting.primary; } -if (unpaused || legacy_change || force_resend || - (split && con &&CEPH_HAVE_FEATURE (con->peer_features, -RESEND_ON_SPLIT ))) +if (unpaused || legacy_change || force_resend || split) ct_res =CALC_TARGET_NEED_RESEND ;else ct_res =CALC_TARGET_NO_ACTION ; out: -dout ("%s t %p -> ct_res %d osd %d\n" , __func__, t, ct_res, t->osd); +dout ("%s t %p -> %d%d%d%d ct_res %d osd%d\n" , __func__, t, unpaused, + legacy_change, force_resend, split, ct_res, t->osd);return ct_res; }
Greg Kroah-Hartman
maintainerPATCH 119/162 drm/amdgpu/gfx9: update pg_flags after determining if gfx off is possible
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 98f58ada2d37e68125c056f1fc005748251879c2 upstream.
We need to set certain power gating flags after we determine if the firmware version is sufficient to support gfxoff. Previously we set the pg flags in early init, but we later we might have disabled gfxoff if the firmware versions didn't support it. Move adding the additional pg flags after we determine whether or not to support gfxoff.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -0
@@ -596,6 +596,10 @@ static void gfx_v9_0_check_if_need_gfxof (adev->gfx.rlc_feature_version <1 ) || !adev->gfx.rlc.is_rlc_v2_1) adev->pm.pp_feature &= ~PP_GFXOFF_MASK; +if (adev->pm.pp_feature &PP_GFXOFF_MASK ) + adev->pg_flags |=AMD_PG_SUPPORT_GFX_PG | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_RLC_SMU_HS ;break ;default :break ;
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -5
@@ -949,11 +949,6 @@ static int soc15_common_early_init(void adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; } - -if (adev->pm.pp_feature &PP_GFXOFF_MASK ) - adev->pg_flags |=AMD_PG_SUPPORT_GFX_PG | -AMD_PG_SUPPORT_CP | -AMD_PG_SUPPORT_RLC_SMU_HS ;break ;default :/* FIXME: not supported yet */
Greg Kroah-Hartman
maintainerPATCH 121/162 scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 7c7cfdcf7f1777c7376fc9a239980de04b6b5ea1 upstream.
Fix the following BUG:
[ 187.065689] BUG: kernel NULL pointer dereference, address: 000000000000001c [ 187.065790] RIP: 0010:ufshcd_vreg_set_hpm+0x3c/0x110 [ufshcd_core] [ 187.065938] Call Trace: [ 187.065959] ufshcd_resume+0x72/0x290 [ufshcd_core] [ 187.065980] ufshcd_system_resume+0x54/0x140 [ufshcd_core] [ 187.065993] ? pci_pm_restore+0xb0/0xb0 [ 187.066005] ufshcd_pci_resume+0x15/0x20 [ufshcd_pci] [ 187.066017] pci_pm_thaw+0x4c/0x90 [ 187.066030] dpm_run_callback+0x5b/0x150 [ 187.066043] device_resume+0x11b/0x220
Voltage regulators are optional, so functions must check they exist before dereferencing.
Note this issue is hidden if CONFIG_REGULATORS is not set, because the offending code is optimised away.
Notes for stable:
The issue first appears in commit 57d104c153d3 ("ufs: add UFS power management support") but is inadvertently fixed in commit 60f0187031c0 ("scsi: ufs: disable vccq if it's not needed by UFS device") which in turn was reverted by commit 730679817d83 ("Revert "scsi: ufs: disable vccq if it's not needed by UFS device""). So fix applies v3.18 to v4.5 and v5.1+
--- drivers/scsi/ufs/ufshcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +3 -0
@@ -7032,6 +7032,9 @@ static inline int ufshcd_config_vreg_lpmstatic inline int ufshcd_config_vreg_hpm (struct ufs_hba *hba,struct ufs_vreg *vreg) { +if (!vreg) +return 0 ; +return ufshcd_config_vreg_load (hba->dev, vreg, vreg->max_uA); }
Greg Kroah-Hartman
maintainerPATCH 122/162 gpiolib: never report open-drain/source lines as input to user-space
In reply to Greg Kroah-HartmanFrom: Bartosz Golaszewski <[email protected]>
commit 2c60e6b5c9241b24b8b523fefd3e44fb85622cda upstream.
If the driver doesn't support open-drain/source config options, we emulate this behavior when setting the direction by calling gpiod_direction_input() if the default value is 0 (open-source) or 1 (open-drain), thus not actively driving the line in those cases.
This however clears the FLAG_IS_OUT bit for the GPIO line descriptor and makes the LINEINFO ioctl() incorrectly report this line's mode as 'input' to user-space.
This commit modifies the ioctl() to always set the GPIOLINE_FLAG_IS_OUT bit in the lineinfo structure's flags field. Since it's impossible to use the input mode and open-drain/source options at the same time, we can be sure the reported information will be correct.
--- drivers/gpio/gpiolib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib.c +4 -2
@@ -1091,9 +1091,11 @@ static long gpio_ioctl(struct file *filpif (test_bit (FLAG_ACTIVE_LOW , &desc->flags)) lineinfo.flags |=GPIOLINE_FLAG_ACTIVE_LOW ;if (test_bit (FLAG_OPEN_DRAIN , &desc->flags)) - lineinfo.flags |=GPIOLINE_FLAG_OPEN_DRAIN ; + lineinfo.flags |= (GPIOLINE_FLAG_OPEN_DRAIN | +GPIOLINE_FLAG_IS_OUT );if (test_bit (FLAG_OPEN_SOURCE , &desc->flags)) - lineinfo.flags |=GPIOLINE_FLAG_OPEN_SOURCE ; + lineinfo.flags |= (GPIOLINE_FLAG_OPEN_SOURCE | +GPIOLINE_FLAG_IS_OUT );if (copy_to_user (ip, &lineinfo,sizeof (lineinfo)))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 124/162 userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx
In reply to Greg Kroah-HartmanFrom: Oleg Nesterov <[email protected]>
commit 46d0b24c5ee10a15dfb25e20642f5a5ed59c5003 upstream.
userfaultfd_release() should clear vm_flags/vm_userfaultfd_ctx even if mm->core_state != NULL.
Otherwise a page fault can see userfaultfd_missing() == T and use an already freed userfaultfd_ctx.
--- fs/userfaultfd.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
fs/userfaultfd.c +13 -12
@@ -880,6 +880,7 @@ static int userfaultfd_release(struct in/* len == 0 means wake all */ struct userfaultfd_wake_range range = { .len =0 , };unsigned long new_flags; +bool still_valid;WRITE_ONCE (ctx->released, true);
@@ -895,8 +896,7 @@ static int userfaultfd_release(struct in* taking the mmap_sem for writing. */ down_write (&mm->mmap_sem); -if (!mmget_still_valid (mm)) - goto skip_mm; + still_valid =mmget_still_valid (mm); prev =NULL ;for (vma = mm->mmap; vma; vma = vma->vm_next) {cond_resched ();
@@ -907,19 +907,20 @@ static int userfaultfd_release(struct incontinue ; } new_flags = vma->vm_flags & ~(VM_UFFD_MISSING |VM_UFFD_WP ); - prev =vma_merge (mm, prev, vma->vm_start, vma->vm_end, - new_flags, vma->anon_vma, - vma->vm_file, vma->vm_pgoff, -vma_policy (vma), -NULL_VM_UFFD_CTX ); -if (prev) - vma = prev; -else - prev = vma; +if (still_valid) { + prev =vma_merge (mm, prev, vma->vm_start, vma->vm_end, + new_flags, vma->anon_vma, + vma->vm_file, vma->vm_pgoff, +vma_policy (vma), +NULL_VM_UFFD_CTX ); +if (prev) + vma = prev; +else + prev = vma; + } vma->vm_flags = new_flags; vma->vm_userfaultfd_ctx =NULL_VM_UFFD_CTX ; } -skip_mm:up_write (&mm->mmap_sem);mmput (mm); wakeup:
Greg Kroah-Hartman
maintainerPATCH 123/162 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit a9fc4340aee041dd186d1fb8f1b5d1e9caf28212 upstream.
In the case of X86_PAE, unsigned long is u32, but the physical address type should be u64. Due to the bug here, the netvsc driver can not load successfully, and sometimes the VM can panic due to memory corruption (the hypervisor writes data to the wrong location).
--- drivers/hv/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hv/channel.c +1 -1
@@ -26,7 +26,7 @@static unsigned long virt_to_hvpfn (void *addr) { -unsigned long paddr; +phys_addr_t paddr;if (is_vmalloc_addr (addr)) paddr = page_to_phys(vmalloc_to_page(addr)) +
Greg Kroah-Hartman
maintainerPATCH 125/162 x86/retpoline: Dont clobber RFLAGS during CALL_NOSPEC on i386
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit b63f20a778c88b6a04458ed6ffc69da953d3a109 upstream.
Use 'lea' instead of 'add' when adjusting %rsp in CALL_NOSPEC so as to avoid clobbering flags.
KVM's emulator makes indirect calls into a jump table of sorts, where the destination of the CALL_NOSPEC is a small blob of code that performs fast emulation by executing the target instruction with fixed operands.
adcb_al_dl:
0x000339f8 <+0>: adc %dl,%al
0x000339fa <+2>: retA major motiviation for doing fast emulation is to leverage the CPU to handle consumption and manipulation of arithmetic flags, i.e. RFLAGS is both an input and output to the target of CALL_NOSPEC. Clobbering flags results in all sorts of incorrect emulation, e.g. Jcc instructions often take the wrong path. Sans the nops...
asm("push %[flags]; popf; " CALL_NOSPEC " ; pushf; pop %[flags]\n"
0x0003595a <+58>: mov 0xc0(%ebx),%eax
0x00035960 <+64>: mov 0x60(%ebx),%edx
0x00035963 <+67>: mov 0x90(%ebx),%ecx
0x00035969 <+73>: push %edi
0x0003596a <+74>: popf
0x0003596b <+75>: call *%esi
0x000359a0 <+128>: pushf
0x000359a1 <+129>: pop %edi
0x000359a2 <+130>: mov %eax,0xc0(%ebx)
0x000359b1 <+145>: mov %edx,0x60(%ebx) ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK);
0x000359a8 <+136>: mov -0x10(%ebp),%eax
0x000359ab <+139>: and $0x8d5,%edi
0x000359b4 <+148>: and $0xfffff72a,%eax
0x000359b9 <+153>: or %eax,%edi
0x000359bd <+157>: mov %edi,0x4(%ebx)For the most part this has gone unnoticed as emulation of guest code that can trigger fast emulation is effectively limited to MMIO when running on modern hardware, and MMIO is rarely, if ever, accessed by instructions that affect or consume flags.
Breakage is almost instantaneous when running with unrestricted guest disabled, in which case KVM must emulate all instructions when the guest has invalid state, e.g. when the guest is in Big Real Mode during early BIOS.
--- arch/x86/include/asm/nospec-branch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/nospec-branch.h +1 -1
@@ -192,7 +192,7 @@" lfence;\n" \" jmp 902b;\n" \" .align 16\n" \ -"903: addl $4, %%esp;\n" \ +"903: lea 4(%%esp), %%esp;\n" \" pushl %[thunk_target];\n" \" ret;\n" \" .align 16\n" \
Greg Kroah-Hartman
maintainerPATCH 126/162 x86/apic: Handle missing global clockevent gracefully
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit f897e60a12f0b9146357780d317879bce2a877dc upstream.
Some newer machines do not advertise legacy timers. The kernel can handle that situation if the TSC and the CPU frequency are enumerated by CPUID or MSRs and the CPU supports TSC deadline timer. If the CPU does not support TSC deadline timer the local APIC timer frequency has to be known as well.
Some Ryzens machines do not advertize legacy timers, but there is no reliable way to determine the bus frequency which feeds the local APIC timer when the machine allows overclocking of that frequency.
As there is no legacy timer the local APIC timer calibration crashes due to a NULL pointer dereference when accessing the not installed global clock event device.
Switch the calibration loop to a non interrupt based one, which polls either TSC (if frequency is known) or jiffies. The latter requires a global clockevent. As the machines which do not have a global clockevent installed have a known TSC frequency this is a non issue. For older machines where TSC frequency is not known, there is no known case where the legacy timers do not exist as that would have been reported long ago.
--- arch/x86/kernel/apic/apic.c | 68 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 15 deletions(-)
arch/x86/kernel/apic/apic.c +53 -15
@@ -722,7 +722,7 @@ static __initdata unsigned long lapic_castatic __initdata unsigned long lapic_cal_j1, lapic_cal_j2;/* -* Temporary interrupt handler. +* Temporary interrupt handler and polled calibration function. */ static void __init lapic_cal_handler (struct clock_event_device *dev) {
@@ -824,7 +824,8 @@ static int __init lapic_init_clockevent(static int __init calibrate_APIC_clock (void ) {struct clock_event_device *levt =this_cpu_ptr (&lapic_events); -void (*real_handler)(struct clock_event_device *dev); +u64 tsc_perj =0 , tsc_start =0 ; +unsigned long jif_start;unsigned long deltaj;long delta, deltatsc;int pm_referenced =0 ;
@@ -851,29 +852,65 @@ static int __init calibrate_APIC_clock(vapic_printk (APIC_VERBOSE ,"Using local APIC timer interrupts.\n" "calibrating APIC timer ...\n" ); +/* +* There are platforms w/o global clockevent devices. Instead of +* making the calibration conditional on that, use a polling based +* approach everywhere. +*/ local_irq_disable (); -/* Replace the global interrupt handler */ - real_handler = global_clock_event->event_handler; - global_clock_event->event_handler = lapic_cal_handler; -/* * Setup the APIC counter to maximum. There is no way the lapic * can underflow in the 100ms detection time frame */ __setup_APIC_LVTT (0xffffffff ,0 ,0 ); -/* Let the interrupts run */ +/* +* Methods to terminate the calibration loop: +* 1) Global clockevent if available (jiffies) +* 2) TSC if available and frequency is known +*/ + jif_start =READ_ONCE (jiffies); + +if (tsc_khz) { + tsc_start =rdtsc (); + tsc_perj =div_u64 ((u64 )tsc_khz *1000 ,HZ ); + } + +/* +* Enable interrupts so the tick can fire, if a global +* clockevent device is available +*/ local_irq_enable (); -while (lapic_cal_loops <=LAPIC_CAL_LOOPS ) -cpu_relax (); +while (lapic_cal_loops <=LAPIC_CAL_LOOPS ) { +/* Wait for a tick to elapse */ +while (1 ) { +if (tsc_khz) { +u64 tsc_now =rdtsc (); +if ((tsc_now - tsc_start) >= tsc_perj) { + tsc_start += tsc_perj; +break ; + } + }else { +unsigned long jif_now =READ_ONCE (jiffies); + +if (time_after (jif_now, jif_start)) { + jif_start = jif_now; +break ; + } + } +cpu_relax (); + } + +/* Invoke the calibration routine */ +local_irq_disable (); +lapic_cal_handler (NULL ); +local_irq_enable (); + }local_irq_disable (); -/* Restore the real event handler */ - global_clock_event->event_handler = real_handler; -/* Build delta t1-t2 as apic timer counts down */ delta = lapic_cal_t1 - lapic_cal_t2;apic_printk (APIC_VERBOSE ,"... lapic delta = %ld\n" , delta);
@@ -916,10 +953,11 @@ static int __init calibrate_APIC_clock(v levt->features &= ~CLOCK_EVT_FEAT_DUMMY ;/* -* PM timer calibration failed or not turned on -* so lets try APIC timer based calibration +* PM timer calibration failed or not turned on so lets try APIC +* timer based calibration, if a global clockevent device is +* available. */ -if (!pm_referenced) { +if (!pm_referenced && global_clock_event) {apic_printk (APIC_VERBOSE ,"... verify APIC timer\n" );/*
Greg Kroah-Hartman
maintainerPATCH 127/162 x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
commit c49a0a80137c7ca7d6ced4c812c9e07a949f6f24 upstream.
There have been reports of RDRAND issues after resuming from suspend on some AMD family 15h and family 16h systems. This issue stems from a BIOS not performing the proper steps during resume to ensure RDRAND continues to function properly.
RDRAND support is indicated by CPUID Fn00000001_ECX[30]. This bit can be reset by clearing MSR C001_1004[62]. Any software that checks for RDRAND support using CPUID, including the kernel, will believe that RDRAND is not supported.
Update the CPU initialization to clear the RDRAND CPUID bit for any family 15h and 16h processor that supports RDRAND. If it is known that the family 15h or family 16h system does not have an RDRAND resume issue or that the system will not be placed in suspend, the "rdrand=force" kernel parameter can be used to stop the clearing of the RDRAND CPUID bit.
Additionally, update the suspend and resume path to save and restore the MSR C001_1004 value to ensure that the RDRAND CPUID setting remains in place after resuming from suspend.
Note, that clearing the RDRAND CPUID bit does not prevent a processor that normally supports the RDRAND instruction from executing it. So any code that determined the support based on family and model won't #UD.
--- Documentation/admin-guide/kernel-parameters.txt | 7 + arch/x86/include/asm/msr-index.h | 1 arch/x86/kernel/cpu/amd.c | 66 ++++++++++++++++++ arch/x86/power/cpu.c | 86 ++++++++++++++++++++---- 4 files changed, 147 insertions(+), 13 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +7 -0
@@ -4055,6 +4055,13 @@ Run specified binary instead of /init from the ramdisk, used for early userspace startup. See initrd. + rdrand= [X86] + force - Override the decision by the kernel to hide the + advertisement of RDRAND support (this affects + certain AMD processors because of buggy BIOS + support, specifically around the suspend/resume + path). + rdt= [HW,X86,RDT] Turn on/off individual RDT features. List is: cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,
arch/x86/include/asm/msr-index.h +1 -0
@@ -372,6 +372,7 @@#define MSR_AMD64_PATCH_LEVEL 0x0000008b#define MSR_AMD64_TSC_RATIO 0xc0000104#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_CPUID_FN_1 0xc0011004#define MSR_AMD64_PATCH_LOADER 0xc0010020#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140#define MSR_AMD64_OSVW_STATUS 0xc0010141
arch/x86/kernel/cpu/amd.c +66 -0
84 lines not on this page · raw message
arch/x86/power/cpu.c +73 -13
136 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 128/162 x86/boot: Save fields explicitly, zero out everything else
In reply to Greg Kroah-HartmanFrom: John Hubbard <[email protected]>
commit a90118c445cc7f07781de26a9684d4ec58bfcfd1 upstream.
Recent gcc compilers (gcc 9.1) generate warnings about an out of bounds memset, if the memset goes accross several fields of a struct. This generated a couple of warnings on x86_64 builds in sanitize_boot_params().
Fix this by explicitly saving the fields in struct boot_params that are intended to be preserved, and zeroing all the rest.
[ tglx: Tagged for stable as it breaks the warning free build there as well ]
--- arch/x86/include/asm/bootparam_utils.h | 63 +++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 15 deletions(-)
arch/x86/include/asm/bootparam_utils.h +48 -15
@@ -18,6 +18,20 @@* Note: efi_info is commonly left uninitialized, but that field has a * private magic, so it is better to leave it unchanged. */ + +#define sizeof_mbr (type, member) ({ sizeof(((type *)0)->member); }) + +#define BOOT_PARAM_PRESERVE (struct_member) \ + { \ + .start = offsetof(struct boot_params, struct_member), \ + .len = sizeof_mbr(struct boot_params, struct_member), \ + } + +struct boot_params_to_save { +unsigned int start; +unsigned int len; +}; +static void sanitize_boot_params (struct boot_params *boot_params) {/*
@@ -35,21 +49,40 @@ static void sanitize_boot_params(struct* problems again. */ if (boot_params->sentinel) { -/* fields in boot_params are left uninitialized, clear them */ - boot_params->acpi_rsdp_addr =0 ; -memset (&boot_params->ext_ramdisk_image,0 , - (char *)&boot_params->efi_info - - (char *)&boot_params->ext_ramdisk_image); -memset (&boot_params->kbd_status,0 , - (char *)&boot_params->hdr - - (char *)&boot_params->kbd_status); -memset (&boot_params->_pad7[0 ],0 , - (char *)&boot_params->edd_mbr_sig_buffer[0 ] - - (char *)&boot_params->_pad7[0 ]); -memset (&boot_params->_pad8[0 ],0 , - (char *)&boot_params->eddbuf[0 ] - - (char *)&boot_params->_pad8[0 ]); -memset (&boot_params->_pad9[0 ],0 ,sizeof (boot_params->_pad9)); +static struct boot_params scratch; +char *bp_base = (char *)boot_params; +char *save_base = (char *)&scratch; +int i; + +const struct boot_params_to_save to_save[] = { +BOOT_PARAM_PRESERVE (screen_info), +BOOT_PARAM_PRESERVE (apm_bios_info), +BOOT_PARAM_PRESERVE (tboot_addr), +BOOT_PARAM_PRESERVE (ist_info), +BOOT_PARAM_PRESERVE (acpi_rsdp_addr), +BOOT_PARAM_PRESERVE (hd0_info), +BOOT_PARAM_PRESERVE (hd1_info), +BOOT_PARAM_PRESERVE (sys_desc_table), +BOOT_PARAM_PRESERVE (olpc_ofw_header), +BOOT_PARAM_PRESERVE (efi_info), +BOOT_PARAM_PRESERVE (alt_mem_k), +BOOT_PARAM_PRESERVE (scratch), +BOOT_PARAM_PRESERVE (e820_entries), +BOOT_PARAM_PRESERVE (eddbuf_entries), +BOOT_PARAM_PRESERVE (edd_mbr_sig_buf_entries), +BOOT_PARAM_PRESERVE (edd_mbr_sig_buffer), +BOOT_PARAM_PRESERVE (e820_table), +BOOT_PARAM_PRESERVE (eddbuf), + }; + +memset (&scratch,0 ,sizeof (scratch)); + +for (i =0 ; i <ARRAY_SIZE (to_save); i++) { +memcpy (save_base + to_save[i].start, + bp_base + to_save[i].start, to_save[i].len); + } + +memcpy (boot_params, save_base,sizeof (*boot_params)); } }
Greg Kroah-Hartman
maintainerPATCH 129/162 x86/boot: Fix boot regression caused by bootparam sanitizing
In reply to Greg Kroah-HartmanFrom: John Hubbard <[email protected]>
commit 7846f58fba964af7cb8cf77d4d13c33254725211 upstream.
commit a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else") had two errors:
* It preserved boot_params.acpi_rsdp_addr, and
* It failed to preserve boot_params.hdr
Therefore, zero out acpi_rsdp_addr, and preserve hdr.
--- arch/x86/include/asm/bootparam_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/bootparam_utils.h +1 -1
@@ -59,7 +59,6 @@ static void sanitize_boot_params(structBOOT_PARAM_PRESERVE (apm_bios_info),BOOT_PARAM_PRESERVE (tboot_addr),BOOT_PARAM_PRESERVE (ist_info), -BOOT_PARAM_PRESERVE (acpi_rsdp_addr),BOOT_PARAM_PRESERVE (hd0_info),BOOT_PARAM_PRESERVE (hd1_info), BOOT_PARAM_PRESERVE(sys_desc_table),
@@ -71,6 +70,7 @@ static void sanitize_boot_params(structBOOT_PARAM_PRESERVE (eddbuf_entries),BOOT_PARAM_PRESERVE (edd_mbr_sig_buf_entries),BOOT_PARAM_PRESERVE (edd_mbr_sig_buffer), +BOOT_PARAM_PRESERVE (hdr),BOOT_PARAM_PRESERVE (e820_table), BOOT_PARAM_PRESERVE(eddbuf), };
Greg Kroah-Hartman
maintainerPATCH 130/162 IB/hfi1: Unsafe PSN checking for TID RDMA READ Resp packet
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit 35d5c8b82e2c32e8e29ca195bb4dac60ba7d97fc upstream.
When processing a TID RDMA READ RESP packet that causes KDETH EFLAGS errors, the packet's IB PSN is checked against qp->s_last_psn and qp->s_psn without the protection of qp->s_lock, which is not safe.
This patch fixes the issue by acquiring qp->s_lock first.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/tid_rdma.c +2 -2
@@ -2689,12 +2689,12 @@ static bool handle_read_kdeth_eflags(stru32 fpsn;lockdep_assert_held (&qp->r_lock); +spin_lock (&qp->s_lock);/* If the psn is out of valid range, drop the packet */ if (cmp_psn (ibpsn, qp->s_last_psn) <0 ||cmp_psn (ibpsn, qp->s_psn) >0 ) -return ret; + goto s_unlock; -spin_lock (&qp->s_lock);/* * Note that NAKs implicitly ACK outstanding SEND and RDMA write * requests and implicitly NAK RDMA read and atomic requests issued
Greg Kroah-Hartman
maintainerPATCH 131/162 IB/hfi1: Add additional checks when handling TID RDMA READ RESP packet
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit a8adbf7d0d0a6e3bf7f99da461a06039364e028b upstream.
In a congested fabric with adaptive routing enabled, traces show that packets could be delivered out of order, which could cause incorrect processing of stale packets. For stale TID RDMA READ RESP packets that cause KDETH EFLAGS errors, this patch adds additional checks before processing the packets.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/tid_rdma.c +4 -1
@@ -2742,9 +2742,12 @@ static bool handle_read_kdeth_eflags(str wqe =do_rc_completion (qp, wqe, ibp);if (qp->s_acked == qp->s_tail) -break ; + goto s_unlock; } +if (qp->s_acked == qp->s_tail) + goto s_unlock; +/* Handle the eflags for the request */ if (wqe->wr.opcode !=IB_WR_TID_RDMA_READ ) goto s_unlock;
Greg Kroah-Hartman
maintainerPATCH 106/162 dt-bindings: riscv: fix the schema compatible string for the HiFive Unleashed board
In reply to Greg Kroah-Hartman[ Upstream commit b390e0bfd2996f1215231395f4e25a4c011eeaf9 ]
The YAML binding document for SiFive boards has an incorrect compatible string for the HiFive Unleashed board. Change it to match the name of the board on the SiFive web site:
https://www.sifive.com/boards/hifive-unleashed
which also matches the contents of the board DT data file:
--- Documentation/devicetree/bindings/riscv/sifive.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/riscv/sifive.yaml +1 -1
@@ -19,7 +19,7 @@ properties: compatible: items: - enum: - - sifive,freedom-unleashed-a00 + - sifive,hifive-unleashed-a00 - const: sifive,fu540-c000 - const: sifive,fu540 ...
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/162 IB/hfi1: Drop stale TID RDMA packets that cause TIDErr
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit d9d1f5e7bb82415591e8b62b222cbb88c4797ef3 upstream.
In a congested fabric with adaptive routing enabled, traces show that packets could be delivered out of order. A stale TID RDMA data packet could lead to TidErr if the TID entries have been released by duplicate data packets generated from retries, and subsequently erroneously force the qp into error state in the current implementation.
Since the payload has already been dropped by hardware, the packet can be simply dropped and it is no longer necessary to put the qp into error state.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 47 ++-------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-)
drivers/infiniband/hw/hfi1/tid_rdma.c +3 -44
@@ -2576,18 +2576,9 @@ void hfi1_kern_read_tid_flow_free(structhfi1_kern_clear_hw_flow (priv->rcd, qp); } -static bool tid_rdma_tid_err (struct hfi1_ctxtdata *rcd, -struct hfi1_packet *packet,u8 rcv_type, -u8 opcode) +static bool tid_rdma_tid_err (struct hfi1_packet *packet,u8 rcv_type) {struct rvt_qp *qp = packet->qp; -struct hfi1_qp_priv *qpriv = qp->priv; -u32 ipsn; -struct ib_other_headers *ohdr = packet->ohdr; -struct rvt_ack_entry *e; -struct tid_rdma_request *req; -struct rvt_dev_info *rdi =ib_to_rvt (qp->ibqp.device); -u32 i;if (rcv_type >=RHF_RCV_TYPE_IB ) goto done;
@@ -2604,41 +2595,9 @@ static bool tid_rdma_tid_err(struct hfi1if (rcv_type ==RHF_RCV_TYPE_EAGER ) {hfi1_restart_rc (qp, qp->s_last_psn +1 ,1 );hfi1_schedule_send (qp); - goto done_unlock; - } - -/* -* For TID READ response, error out QP after freeing the tid -* resources. -*/ -if (opcode ==TID_OP (READ_RESP )) { - ipsn =mask_psn (be32_to_cpu (ohdr->u.tid_rdma.r_rsp.verbs_psn)); -if (cmp_psn (ipsn, qp->s_last_psn) >0 && -cmp_psn (ipsn, qp->s_psn) <0 ) { -hfi1_kern_read_tid_flow_free (qp); -spin_unlock (&qp->s_lock); -rvt_rc_error (qp,IB_WC_LOC_QP_OP_ERR ); - goto done; - } - goto done_unlock; } -/* -* Error out the qp for TID RDMA WRITE -*/ -hfi1_kern_clear_hw_flow (qpriv->rcd, qp); -for (i =0 ; i <rvt_max_atomic (rdi); i++) { - e = &qp->s_ack_queue[i]; -if (e->opcode ==TID_OP (WRITE_REQ )) { - req =ack_to_tid_req (e); -hfi1_kern_exp_rcv_clear_all (req); - } - } -spin_unlock (&qp->s_lock); -rvt_rc_error (qp,IB_WC_LOC_LEN_ERR ); - goto done; - -done_unlock: +/* Since no payload is delivered, just drop the packet */ spin_unlock (&qp->s_lock); done:return true;
@@ -2927,7 +2886,7 @@ bool hfi1_handle_kdeth_eflags(struct hfiif (lnh ==HFI1_LRH_GRH ) goto r_unlock; -if (tid_rdma_tid_err (rcd, packet, rcv_type, opcode)) +if (tid_rdma_tid_err (packet, rcv_type)) goto r_unlock; }
Greg Kroah-Hartman
maintainerPATCH 134/162 psi: get poll_work to run when calling poll syscall next time
In reply to Greg Kroah-HartmanFrom: Jason Xing <[email protected]>
commit 7b2b55da1db10a5525460633ae4b6fb0be060c41 upstream.
Only when calling the poll syscall the first time can user receive POLLPRI correctly. After that, user always fails to acquire the event signal.
Reproduce case:
1. Get the monitor code in Documentation/accounting/psi.txt
2. Run it, and wait for the event triggered.
3. Kill and restart the process.
The question is why we can end up with poll_scheduled = 1 but the work not running (which would reset it to 0). And the answer is because the scheduling side sees group->poll_kworker under RCU protection and then schedules it, but here we cancel the work and destroy the worker. The cancel needs to pair with resetting the poll_scheduled flag.
--- kernel/sched/psi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
kernel/sched/psi.c +8 -0
@@ -1131,7 +1131,15 @@ static void psi_trigger_destroy(struct k* deadlock while waiting for psi_poll_work to acquire trigger_lock */ if (kworker_to_destroy) { +/* +* After the RCU grace period has expired, the worker +* can no longer be found through group->poll_kworker. +* But it might have been already scheduled before +* that - deschedule it cleanly before destroying it. +*/ kthread_cancel_delayed_work_sync (&group->poll_work); +atomic_set (&group->poll_scheduled,0 ); +kthread_destroy_worker (kworker_to_destroy); }kfree (t);
Greg Kroah-Hartman
maintainerPATCH 135/162 dm kcopyd: always complete failed jobs
In reply to Greg Kroah-HartmanFrom: Dmitry Fomichev <[email protected]>
commit d1fef41465f0e8cae0693fb184caa6bfafb6cd16 upstream.
This patch fixes a problem in dm-kcopyd that may leave jobs in complete queue indefinitely in the event of backing storage failure.
This behavior has been observed while running 100% write file fio workload against an XFS volume created on top of a dm-zoned target device. If the underlying storage of dm-zoned goes to offline state under I/O, kcopyd sometimes never issues the end copy callback and dm-zoned reclaim work hangs indefinitely waiting for that completion.
This behavior was traced down to the error handling code in process_jobs() function that places the failed job to complete_jobs queue, but doesn't wake up the job handler. In case of backing device failure, all outstanding jobs may end up going to complete_jobs queue via this code path and then stay there forever because there are no more successful I/O jobs to wake up the job handler.
This patch adds a wake() call to always wake up kcopyd job wait queue for all I/O jobs that fail before dm_io() gets called for that job.
The patch also sets the write error status in all sub jobs that are failed because their master job has failed.
--- drivers/md/dm-kcopyd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/md/dm-kcopyd.c +4 -1
@@ -548,8 +548,10 @@ static int run_io_job(struct kcopyd_job* no point in continuing. */ if (test_bit (DM_KCOPYD_WRITE_SEQ , &job->flags) && - job->master_job->write_err) + job->master_job->write_err) { + job->write_err = job->master_job->write_err;return -EIO ; + }io_job_start (job->kc->throttle);
@@ -601,6 +603,7 @@ static int process_jobs(struct list_headelse job->read_err =1 ;push (&kc->complete_jobs, job); +wake (kc);break ; }
Greg Kroah-Hartman
maintainerPATCH 136/162 dm dust: use dust block size for badblocklist index
In reply to Greg Kroah-HartmanFrom: Bryan Gurney <[email protected]>
commit 08c04c84a5cde3af9baac0645a7496d6dcd76822 upstream.
Change the "frontend" dust_remove_block, dust_add_block, and dust_query_block functions to store the "dust block number", instead of the sector number corresponding to the "dust block number".
For the "backend" functions dust_map_read and dust_map_write, right-shift by sect_per_block_shift. This fixes the inability to emulate failure beyond the first sector of each "dust block" (for devices with a "dust block size" larger than 512 bytes).
--- drivers/md/dm-dust.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/md/dm-dust.c +8 -3
@@ -25,6 +25,7 @@ struct dust_device {unsigned long long badblock_count;spinlock_t dust_lock;unsigned int blksz; +int sect_per_block_shift;unsigned int sect_per_block;sector_t start; bool fail_read_on_bb:1;
@@ -79,7 +80,7 @@ static int dust_remove_block(struct dustunsigned long flags;spin_lock_irqsave (&dd->dust_lock, flags); - bblock =dust_rb_search (&dd->badblocklist, block * dd->sect_per_block); + bblock =dust_rb_search (&dd->badblocklist, block);if (bblock ==NULL ) {if (!dd->quiet_mode) {
@@ -113,7 +114,7 @@ static int dust_add_block(struct dust_de }spin_lock_irqsave (&dd->dust_lock, flags); - bblock->bb = block * dd->sect_per_block; + bblock->bb = block;if (!dust_rb_insert (&dd->badblocklist, bblock)) {if (!dd->quiet_mode) { DMERR("%s: block %llu already in badblocklist",
@@ -138,7 +139,7 @@ static int dust_query_block(struct dust_unsigned long flags;spin_lock_irqsave (&dd->dust_lock, flags); - bblock =dust_rb_search (&dd->badblocklist, block * dd->sect_per_block); + bblock =dust_rb_search (&dd->badblocklist, block);if (bblock !=NULL )DMINFO ("%s: block %llu found in badblocklist" , __func__, block);else
@@ -165,6 +166,7 @@ static int dust_map_read(struct dust_devint ret =DM_MAPIO_REMAPPED ;if (fail_read_on_bb) { + thisblock >>= dd->sect_per_block_shift;spin_lock_irqsave (&dd->dust_lock, flags); ret =__dust_map_read (dd, thisblock);spin_unlock_irqrestore (&dd->dust_lock, flags);
@@ -195,6 +197,7 @@ static int dust_map_write(struct dust_deunsigned long flags;if (fail_read_on_bb) { + thisblock >>= dd->sect_per_block_shift;spin_lock_irqsave (&dd->dust_lock, flags);__dust_map_write (dd, thisblock);spin_unlock_irqrestore (&dd->dust_lock, flags);
@@ -331,6 +334,8 @@ static int dust_ctr(struct dm_target *ti dd->blksz = blksz; dd->start = tmp; + dd->sect_per_block_shift =__ffs (sect_per_block); +/* * Whether to fail a read on a "bad" block. * Defaults to false; enabled later by message.
Greg Kroah-Hartman
maintainerPATCH 137/162 dm btree: fix order of block initialization in btree_split_beneath
In reply to Greg Kroah-HartmanFrom: ZhangXiaoxu <[email protected]>
commit e4f9d6013820d1eba1432d51dd1c5795759aa77f upstream.
When btree_split_beneath() splits a node to two new children, it will allocate two blocks: left and right. If right block's allocation failed, the left block will be unlocked and marked dirty. If this happened, the left block'ss content is zero, because it wasn't initialized with the btree struct before the attempot to allocate the right block. Upon return, when flushing the left block to disk, the validator will fail when check this block. Then a BUG_ON is raised.
Fix this by completely initializing the left block before allocating and initializing the right block.
--- drivers/md/persistent-data/dm-btree.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/md/persistent-data/dm-btree.c +16 -15
@@ -628,39 +628,40 @@ static int btree_split_beneath(struct sh new_parent =shadow_current (s); + pn =dm_block_data (new_parent); + size =le32_to_cpu (pn->header.flags) &INTERNAL_NODE ? +sizeof (__le64) : s->info->value_type.size; + +/* create & init the left block */ r =new_block (s->info, &left);if (r <0 )return r; + ln =dm_block_data (left); + nr_left =le32_to_cpu (pn->header.nr_entries) /2 ; + + ln->header.flags = pn->header.flags; + ln->header.nr_entries =cpu_to_le32 (nr_left); + ln->header.max_entries = pn->header.max_entries; + ln->header.value_size = pn->header.value_size; +memcpy (ln->keys, pn->keys, nr_left *sizeof (pn->keys[0 ])); +memcpy (value_ptr (ln,0 ),value_ptr (pn,0 ), nr_left * size); + +/* create & init the right block */ r =new_block (s->info, &right);if (r <0 ) {unlock_block (s->info, left);return r; } - pn =dm_block_data (new_parent); - ln =dm_block_data (left); rn =dm_block_data (right); - - nr_left =le32_to_cpu (pn->header.nr_entries) /2 ; nr_right =le32_to_cpu (pn->header.nr_entries) - nr_left; - ln->header.flags = pn->header.flags; - ln->header.nr_entries =cpu_to_le32 (nr_left); - ln->header.max_entries = pn->header.max_entries; - ln->header.value_size = pn->header.value_size; - rn->header.flags = pn->header.flags; rn->header.nr_entries =cpu_to_le32 (nr_right); rn->header.max_entries = pn->header.max_entries; rn->header.value_size = pn->header.value_size; - -memcpy (ln->keys, pn->keys, nr_left *sizeof (pn->keys[0 ]));memcpy (rn->keys, pn->keys + nr_left, nr_right *sizeof (pn->keys[0 ])); - - size =le32_to_cpu (pn->header.flags) &INTERNAL_NODE ? -sizeof (__le64) : s->info->value_type.size; -memcpy (value_ptr (ln,0 ),value_ptr (pn,0 ), nr_left * size);memcpy (value_ptr (rn,0 ),value_ptr (pn, nr_left), nr_right * size);
Greg Kroah-Hartman
maintainerPATCH 139/162 dm raid: add missing cleanup in raid_ctr()
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
commit dc1a3e8e0cc6b2293b48c044710e63395aeb4fb4 upstream.
If rs_prepare_reshape() fails, no cleanup is executed, leading to leak of the raid_set structure allocated at the beginning of raid_ctr(). To fix this issue, go to the label 'bad' if the error occurs.
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -3194,7 +3194,7 @@ static int raid_ctr(struct dm_target *ti*/ r =rs_prepare_reshape (rs);if (r) -return r; + goto bad;/* Reshaping ain't recovery, so disable recovery */ rs_setup_recovery (rs, MaxSector);
Greg Kroah-Hartman
maintainerPATCH 140/162 dm space map metadata: fix missing store of apply_bops() return value
In reply to Greg Kroah-HartmanFrom: ZhangXiaoxu <[email protected]>
commit ae148243d3f0816b37477106c05a2ec7d5f32614 upstream.
In commit 6096d91af0b6 ("dm space map metadata: fix occasional leak of a metadata block on resize"), we refactor the commit logic to a new function 'apply_bops'. But when that logic was replaced in out() the return value was not stored. This may lead out() returning a wrong value to the caller.
--- drivers/md/persistent-data/dm-space-map-metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/persistent-data/dm-space-map-metadata.c +1 -1
@@ -249,7 +249,7 @@ static int out(struct sm_metadata *smm) }if (smm->recursion_count ==1 ) -apply_bops (smm); + r =apply_bops (smm); smm->recursion_count--;
Greg Kroah-Hartman
maintainerPATCH 141/162 dm table: fix invalid memory accesses with too high sector number
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 1cfd5d3399e87167b7f9157ef99daa0e959f395d upstream.
If the sector number is too high, dm_table_find_target() should return a pointer to a zeroed dm_target structure (the caller should test it with dm_target_is_valid).
However, for some table sizes, the code in dm_table_find_target() that performs btree lookup will access out of bound memory structures.
Fix this bug by testing the sector number at the beginning of dm_table_find_target(). Also, add an "inline" keyword to the function dm_table_get_size() because this is a hot path.
--- drivers/md/dm-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/md/dm-table.c +4 -1
@@ -1334,7 +1334,7 @@ void dm_table_event(struct dm_table *t) }EXPORT_SYMBOL (dm_table_event); -sector_t dm_table_get_size (struct dm_table *t) +inline sector_t dm_table_get_size (struct dm_table *t) {return t->num_targets ? (t->highs[t->num_targets -1 ] +1 ) :0 ; }
@@ -1359,6 +1359,9 @@ struct dm_target *dm_table_find_target(sunsigned int l, n =0 , k =0 ;sector_t *node; +if (unlikely (sector >=dm_table_get_size (t))) +return &t->targets[t->num_targets]; +for (l =0 ; l < t->depth; l++) { n =get_child (n, k); node =get_node (t, l, n);
Greg Kroah-Hartman
maintainerPATCH 142/162 dm zoned: improve error handling in reclaim
In reply to Greg Kroah-HartmanFrom: Dmitry Fomichev <[email protected]>
commit b234c6d7a703661b5045c5bf569b7c99d2edbf88 upstream.
There are several places in reclaim code where errors are not propagated to the main function, dmz_reclaim(). This function is responsible for unlocking zones that might be still locked at the end of any failed reclaim iterations. As the result, some device zones may be left permanently locked for reclaim, degrading target's capability to reclaim zones.
This patch fixes these issues as follows -
Make sure that dmz_reclaim_buf(), dmz_reclaim_seq_data() and dmz_reclaim_rnd_data() return error codes to the caller.
dmz_reclaim() function is renamed to dmz_do_reclaim() to avoid clashing with "struct dmz_reclaim" and is modified to return the error to the caller.
dmz_get_zone_for_reclaim() now returns an error instead of NULL pointer and reclaim code checks for that error.
Error logging/debug messages are added where necessary.
--- drivers/md/dm-zoned-metadata.c | 4 ++-- drivers/md/dm-zoned-reclaim.c | 28 +++++++++++++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-)
drivers/md/dm-zoned-metadata.c +2 -2
@@ -1534,7 +1534,7 @@ static struct dm_zone *dmz_get_rnd_zone_struct dm_zone *zone;if (list_empty (&zmd->map_rnd_list)) -return NULL ; +return ERR_PTR (-EBUSY );list_for_each_entry (zone, &zmd->map_rnd_list, link) {if (dmz_is_buf (zone))
@@ -1545,7 +1545,7 @@ static struct dm_zone *dmz_get_rnd_zone_return dzone; } -return NULL ; +return ERR_PTR (-EBUSY ); }/*
drivers/md/dm-zoned-reclaim.c +19 -9
@@ -215,7 +215,7 @@ static int dmz_reclaim_buf(struct dmz_redmz_unlock_flush (zmd); -return 0 ; +return ret; }/*
@@ -259,7 +259,7 @@ static int dmz_reclaim_seq_data(struct ddmz_unlock_flush (zmd); -return 0 ; +return ret; }/*
@@ -312,7 +312,7 @@ static int dmz_reclaim_rnd_data(struct ddmz_unlock_flush (zmd); -return 0 ; +return ret; }/*
@@ -334,7 +334,7 @@ static void dmz_reclaim_empty(struct dmz/* * Find a candidate zone for reclaim and process it. */ -static void dmz_reclaim (struct dmz_reclaim *zrc) +static int dmz_do_reclaim (struct dmz_reclaim *zrc) {struct dmz_metadata *zmd = zrc->metadata;struct dm_zone *dzone;
@@ -344,8 +344,8 @@ static void dmz_reclaim(struct dmz_recla/* Get a data zone */ dzone =dmz_get_zone_for_reclaim (zmd); -if (!dzone) -return ; +if (IS_ERR (dzone)) +return PTR_ERR (dzone); start = jiffies;
@@ -391,13 +391,20 @@ static void dmz_reclaim(struct dmz_recla out:if (ret) {dmz_unlock_zone_reclaim (dzone); -return ; +return ret; } - (void )dmz_flush_metadata (zrc->metadata); + ret =dmz_flush_metadata (zrc->metadata); +if (ret) { +dmz_dev_debug (zrc->dev, +"Metadata flush for zone %u failed, err %d\n" , +dmz_id (zmd, rzone), ret); +return ret; + }dmz_dev_debug (zrc->dev,"Reclaimed zone %u in %u ms" ,dmz_id (zmd, rzone),jiffies_to_msecs (jiffies - start)); +return 0 ; }/*
@@ -442,6 +449,7 @@ static void dmz_reclaim_work(struct workstruct dmz_metadata *zmd = zrc->metadata;unsigned int nr_rnd, nr_unmap_rnd;unsigned int p_unmap_rnd; +int ret;if (!dmz_should_reclaim (zrc)) {mod_delayed_work (zrc->wq, &zrc->work,DMZ_IDLE_PERIOD );
@@ -471,7 +479,9 @@ static void dmz_reclaim_work(struct work (dmz_target_idle (zrc) ?"Idle" :"Busy" ), p_unmap_rnd, nr_unmap_rnd, nr_rnd); -dmz_reclaim (zrc); + ret =dmz_do_reclaim (zrc); +if (ret) +dmz_dev_debug (zrc->dev,"Reclaim error %d\n" , ret);dmz_schedule_reclaim (zrc); }
Greg Kroah-Hartman
maintainerPATCH 107/162 KVM: arm64: Dont write junk to sysregs on reset
In reply to Greg Kroah-Hartman[ Upstream commit 03fdfb2690099c19160a3f2c5b77db60b3afeded ]
At the moment, the way we reset system registers is mildly insane:
We write junk to them, call the reset functions, and then check that we have something else in them.
The "fun" thing is that this can happen while the guest is running (PSCI, for example). If anything in KVM has to evaluate the state of a system register while junk is in there, bad thing may happen.
Let's stop doing that. Instead, we track that we have called a reset function for that register, and assume that the reset function has done something. This requires fixing a couple of sysreg refinition in the trap table.
In the end, the very need of this reset check is pretty dubious, as it doesn't check everything (a lot of the sysregs leave outside of the sys_regs[] array). It may well be axed in the near future.
--- arch/arm64/kvm/sys_regs.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
arch/arm64/kvm/sys_regs.c +18 -14
@@ -632,7 +632,7 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)*/ val = ((pmcr & ~ARMV8_PMU_PMCR_MASK ) | (ARMV8_PMU_PMCR_MASK &0xdecafbad )) & (~ARMV8_PMU_PMCR_E ); -__vcpu_sys_reg (vcpu,PMCR_EL0 ) = val; +__vcpu_sys_reg (vcpu, r->reg) = val; }static bool check_pmu_access_disabled (struct kvm_vcpu *vcpu,u64 flags)
@@ -981,13 +981,13 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \ - trap_bvr, reset_bvr, n, 0, get_bvr, set_bvr }, \ + trap_bvr, reset_bvr, 0, 0, get_bvr, set_bvr }, \ { SYS_DESC(SYS_DBGBCRn_EL1(n)), \ - trap_bcr, reset_bcr, n, 0, get_bcr, set_bcr }, \ + trap_bcr, reset_bcr, 0, 0, get_bcr, set_bcr }, \ { SYS_DESC(SYS_DBGWVRn_EL1(n)), \ - trap_wvr, reset_wvr, n, 0, get_wvr, set_wvr }, \ + trap_wvr, reset_wvr, 0, 0, get_wvr, set_wvr }, \ { SYS_DESC(SYS_DBGWCRn_EL1(n)), \ - trap_wcr, reset_wcr, n, 0, get_wcr, set_wcr } + trap_wcr, reset_wcr, 0, 0, get_wcr, set_wcr }/* Macro to expand the PMEVCNTRn_EL0 register */ #define PMU_PMEVCNTR_EL0 (n) \
@@ -1540,7 +1540,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, { SYS_DESC(SYS_CTR_EL0), access_ctr }, - { SYS_DESC(SYS_PMCR_EL0), access_pmcr, reset_pmcr, }, + { SYS_DESC(SYS_PMCR_EL0), access_pmcr, reset_pmcr, PMCR_EL0 }, { SYS_DESC(SYS_PMCNTENSET_EL0), access_pmcnten, reset_unknown, PMCNTENSET_EL0 }, { SYS_DESC(SYS_PMCNTENCLR_EL0), access_pmcnten, NULL, PMCNTENSET_EL0 }, { SYS_DESC(SYS_PMOVSCLR_EL0), access_pmovs, NULL, PMOVSSET_EL0 },
@@ -2254,13 +2254,19 @@ static int emulate_sys_reg(struct kvm_vcpu *vcpu, }static void reset_sys_reg_descs (struct kvm_vcpu *vcpu, -const struct sys_reg_desc *table,size_t num) +const struct sys_reg_desc *table,size_t num, +unsigned long *bmap) {unsigned long i;for (i =0 ; i < num; i++) -if (table[i].reset) +if (table[i].reset) { +int reg = table[i].reg; + table[i].reset (vcpu, &table[i]); +if (reg >0 && reg <NR_SYS_REGS ) +set_bit (reg, bmap); + } }/**
@@ -2774,18 +2780,16 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu) {size_t num;const struct sys_reg_desc *table; - -/* Catch someone adding a register without putting in reset entry. */ -memset (&vcpu->arch.ctxt.sys_regs,0x42 ,sizeof (vcpu->arch.ctxt.sys_regs)); + DECLARE_BITMAP(bmap, NR_SYS_REGS) = { 0, };/* Generic chip reset first (so target could override). */ -reset_sys_reg_descs (vcpu, sys_reg_descs,ARRAY_SIZE (sys_reg_descs)); +reset_sys_reg_descs (vcpu, sys_reg_descs,ARRAY_SIZE (sys_reg_descs), bmap); table =get_target_table (vcpu->arch.target, true, &num); -reset_sys_reg_descs (vcpu, table, num); +reset_sys_reg_descs (vcpu, table, num, bmap);for (num =1 ; num <NR_SYS_REGS ; num++) { -if (WARN (__vcpu_sys_reg (vcpu, num) ==0x4242424242424242 , +if (WARN (!test_bit (num, bmap),"Didn't reset __vcpu_sys_reg(%zi)\n" , num))break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/162 dm zoned: properly handle backing device failure
In reply to Greg Kroah-HartmanFrom: Dmitry Fomichev <[email protected]>
commit 75d66ffb48efb30f2dd42f041ba8b39c5b2bd115 upstream.
dm-zoned is observed to lock up or livelock in case of hardware failure or some misconfiguration of the backing zoned device.
This patch adds a new dm-zoned target function that checks the status of the backing device. If the request queue of the backing device is found to be in dying state or the SCSI backing device enters offline state, the health check code sets a dm-zoned target flag prompting all further incoming I/O to be rejected. In order to detect backing device failures timely, this new function is called in the request mapping path, at the beginning of every reclaim run and before performing any metadata I/O.
The proper way out of this situation is to do
dmsetup remove <dm-zoned target>
and recreate the target when the problem with the backing device is resolved.
--- drivers/md/dm-zoned-metadata.c | 51 ++++++++++++++++++++++++++++++++--------- drivers/md/dm-zoned-reclaim.c | 18 ++++++++++++-- drivers/md/dm-zoned-target.c | 45 ++++++++++++++++++++++++++++++++++-- drivers/md/dm-zoned.h | 10 ++++++++ 4 files changed, 110 insertions(+), 14 deletions(-)
drivers/md/dm-zoned-metadata.c +41 -10
@@ -401,15 +401,18 @@ static struct dmz_mblock *dmz_get_mblocksector_t block = zmd->sb[zmd->mblk_primary].block + mblk_no;struct bio *bio; +if (dmz_bdev_is_dying (zmd->dev)) +return ERR_PTR (-EIO ); +/* Get a new block and a BIO to read it */ mblk =dmz_alloc_mblock (zmd, mblk_no);if (!mblk) -return NULL ; +return ERR_PTR (-ENOMEM ); bio =bio_alloc (GFP_NOIO ,1 );if (!bio) {dmz_free_mblock (zmd, mblk); -return NULL ; +return ERR_PTR (-ENOMEM ); }spin_lock (&zmd->mblk_lock);
@@ -540,8 +543,8 @@ static struct dmz_mblock *dmz_get_mblockif (!mblk) {/* Cache miss: read the block from disk */ mblk =dmz_get_mblock_slow (zmd, mblk_no); -if (!mblk) -return ERR_PTR (-ENOMEM ); +if (IS_ERR (mblk)) +return mblk; }/* Wait for on-going read I/O and check for error */
@@ -569,16 +572,19 @@ static void dmz_dirty_mblock(struct dmz_/* * Issue a metadata block write BIO. */ -static void dmz_write_mblock (struct dmz_metadata *zmd,struct dmz_mblock *mblk, -unsigned int set) +static int dmz_write_mblock (struct dmz_metadata *zmd,struct dmz_mblock *mblk, +unsigned int set) {sector_t block = zmd->sb[set].block + mblk->no;struct bio *bio; +if (dmz_bdev_is_dying (zmd->dev)) +return -EIO ; + bio =bio_alloc (GFP_NOIO ,1 );if (!bio) {set_bit (DMZ_META_ERROR , &mblk->state); -return ; +return -ENOMEM ; }set_bit (DMZ_META_WRITING , &mblk->state);
@@ -590,6 +596,8 @@ static void dmz_write_mblock(struct dmz_bio_set_op_attrs (bio,REQ_OP_WRITE ,REQ_META |REQ_PRIO );bio_add_page (bio, mblk->page,DMZ_BLOCK_SIZE ,0 );submit_bio (bio); + +return 0 ; }/*
@@ -601,6 +609,9 @@ static int dmz_rdwr_block(struct dmz_metstruct bio *bio;int ret; +if (dmz_bdev_is_dying (zmd->dev)) +return -EIO ; + bio =bio_alloc (GFP_NOIO ,1 );if (!bio)return -ENOMEM ;
@@ -658,22 +669,29 @@ static int dmz_write_dirty_mblocks(struc {struct dmz_mblock *mblk;struct blk_plug plug; -int ret =0 ; +int ret =0 , nr_mblks_submitted =0 ;/* Issue writes */ blk_start_plug (&plug); -list_for_each_entry (mblk, write_list, link) -dmz_write_mblock (zmd, mblk, set); +list_for_each_entry (mblk, write_list, link) { + ret =dmz_write_mblock (zmd, mblk, set); +if (ret) +break ; + nr_mblks_submitted++; + }blk_finish_plug (&plug);/* Wait for completion */ list_for_each_entry (mblk, write_list, link) { +if (!nr_mblks_submitted) +break ;wait_on_bit_io (&mblk->state,DMZ_META_WRITING ,TASK_UNINTERRUPTIBLE );if (test_bit (DMZ_META_ERROR , &mblk->state)) {clear_bit (DMZ_META_ERROR , &mblk->state); ret = -EIO ; } + nr_mblks_submitted--; }/* Flush drive cache (this will also sync data) */
@@ -735,6 +753,11 @@ int dmz_flush_metadata(struct dmz_metada*/ dmz_lock_flush (zmd); +if (dmz_bdev_is_dying (zmd->dev)) { + ret = -EIO ; + goto out; + } +/* Get dirty blocks */ spin_lock (&zmd->mblk_lock);list_splice_init (&zmd->mblk_dirty_list, &write_list);
@@ -1623,6 +1646,10 @@ again:/* Alloate a random zone */ dzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!dzone) { +if (dmz_bdev_is_dying (zmd->dev)) { + dzone =ERR_PTR (-EIO ); + goto out; + }dmz_wait_for_free_zones (zmd); goto again; }
@@ -1720,6 +1747,10 @@ again:/* Alloate a random zone */ bzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!bzone) { +if (dmz_bdev_is_dying (zmd->dev)) { + bzone =ERR_PTR (-EIO ); + goto out; + }dmz_wait_for_free_zones (zmd); goto again; }
drivers/md/dm-zoned-reclaim.c +16 -2
@@ -37,7 +37,7 @@ enum {/* * Number of seconds of target BIO inactivity to consider the target idle. */ -#define DMZ_IDLE_PERIOD (10UL * HZ) +#define DMZ_IDLE_PERIOD (10UL * HZ)/* * Percentage of unmapped (free) random zones below which reclaim starts
@@ -134,6 +134,9 @@ static int dmz_reclaim_copy(struct dmz_rset_bit (DM_KCOPYD_WRITE_SEQ , &flags);while (block < end_block) { +if (dev->flags &DMZ_BDEV_DYING ) +return -EIO ; +/* Get a valid region from the source zone */ ret =dmz_first_valid_block (zmd, src_zone, &block);if (ret <=0 )
@@ -451,6 +454,9 @@ static void dmz_reclaim_work(struct workunsigned int p_unmap_rnd;int ret; +if (dmz_bdev_is_dying (zrc->dev)) +return ; +if (!dmz_should_reclaim (zrc)) {mod_delayed_work (zrc->wq, &zrc->work,DMZ_IDLE_PERIOD );return ;
@@ -480,8 +486,16 @@ static void dmz_reclaim_work(struct work p_unmap_rnd, nr_unmap_rnd, nr_rnd); ret =dmz_do_reclaim (zrc); -if (ret) +if (ret) {dmz_dev_debug (zrc->dev,"Reclaim error %d\n" , ret); +if (ret == -EIO ) +/* +* LLD might be performing some error handling sequence +* at the underlying device. To not interfere, do not +* attempt to schedule the next reclaim run immediately. +*/ +return ; + }dmz_schedule_reclaim (zrc); }
drivers/md/dm-zoned-target.c +43 -2
87 lines not on this page · raw message
drivers/md/dm-zoned.h +10 -0
@@ -56,6 +56,8 @@ struct dmz_dev {unsigned int nr_zones; +unsigned int flags; +sector_t zone_nr_sectors;unsigned int zone_nr_sectors_shift;
@@ -67,6 +69,9 @@ struct dmz_dev { (dev)->zone_nr_sectors_shift)#define dmz_chunk_block (dev, b) ((b) & ((dev)->zone_nr_blocks - 1)) +/* Device flags. */ +#define DMZ_BDEV_DYING (1 << 0) +/* * Zone descriptor. */
@@ -245,4 +250,9 @@ void dmz_resume_reclaim(struct dmz_reclavoid dmz_reclaim_bio_acc (struct dmz_reclaim *zrc);void dmz_schedule_reclaim (struct dmz_reclaim *zrc); +/* +* Functions defined in dm-zoned-target.c +*/ +bool dmz_bdev_is_dying (struct dmz_dev *dmz_dev); +#endif /* DM_ZONED_H */
Greg Kroah-Hartman
maintainerPATCH 145/162 genirq: Properly pair kobject_del() with kobject_add()
In reply to Greg Kroah-HartmanFrom: Michael Kelley <[email protected]>
commit d0ff14fdc987303aeeb7de6f1bd72c3749ae2a9b upstream.
If alloc_descs() fails before irq_sysfs_init() has run, free_desc() in the cleanup path will call kobject_del() even though the kobject has not been added with kobject_add().
Fix this by making the call to kobject_del() conditional on whether irq_sysfs_init() has run.
This problem surfaced because commit aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") makes kobject_del() stricter about pairing with kobject_add(). If the pairing is incorrrect, a WARNING and backtrace occur in sysfs_remove_group() because there is no parent.
[ tglx: Add a comment to the code and make it work with CONFIG_SYSFS=n ]
--- kernel/irq/irqdesc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
kernel/irq/irqdesc.c +14 -1
@@ -295,6 +295,18 @@ static void irq_sysfs_add(int irq, struc } } +static void irq_sysfs_del (struct irq_desc *desc) +{ +/* +* If irq_sysfs_init() has not yet been invoked (early boot), then +* irq_kobj_base is NULL and the descriptor was never added. +* kobject_del() complains about a object with no parent, so make +* it conditional. +*/ +if (irq_kobj_base) +kobject_del (&desc->kobj); +} +static int __init irq_sysfs_init (void ) {struct irq_desc *desc;
@@ -325,6 +337,7 @@ static struct kobj_type irq_kobj_type = };static void irq_sysfs_add (int irq,struct irq_desc *desc) {} +static void irq_sysfs_del (struct irq_desc *desc) {}#endif /* CONFIG_SYSFS */
@@ -438,7 +451,7 @@ static void free_desc(unsigned int irq)* The sysfs entry must be serialized against a concurrent * irq_sysfs_init() as well. */ -kobject_del (&desc->kobj); +irq_sysfs_del (desc);delete_irq_desc (irq);/*
Greg Kroah-Hartman
maintainerPATCH 143/162 dm zoned: improve error handling in i/o map code
In reply to Greg Kroah-HartmanFrom: Dmitry Fomichev <[email protected]>
commit d7428c50118e739e672656c28d2b26b09375d4e0 upstream.
Some errors are ignored in the I/O path during queueing chunks for processing by chunk works. Since at least these errors are transient in nature, it should be possible to retry the failed incoming commands.
The fix -
Errors that can happen while queueing chunks are carried upwards to the main mapping function and it now returns DM_MAPIO_REQUEUE for any incoming requests that can not be properly queued.
Error logging/debug messages are added where needed.
--- drivers/md/dm-zoned-target.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/md/dm-zoned-target.c +16 -6
@@ -513,22 +513,24 @@ static void dmz_flush_work(struct work_s* Get a chunk work and start it to process a new BIO. * If the BIO chunk has no work yet, create one. */ -static void dmz_queue_chunk_work (struct dmz_target *dmz,struct bio *bio) +static int dmz_queue_chunk_work (struct dmz_target *dmz,struct bio *bio) {unsigned int chunk =dmz_bio_chunk (dmz->dev, bio);struct dm_chunk_work *cw; +int ret =0 ;mutex_lock (&dmz->chunk_lock);/* Get the BIO chunk work. If one is not active yet, create one */ cw =radix_tree_lookup (&dmz->chunk_rxtree, chunk);if (!cw) { -int ret;/* Create a new chunk work */ cw =kmalloc (sizeof (struct dm_chunk_work ),GFP_NOIO ); -if (!cw) +if (unlikely (!cw)) { + ret = -ENOMEM ; goto out; + }INIT_WORK (&cw->work, dmz_chunk_work);refcount_set (&cw->refcount,0 );
@@ -539,7 +541,6 @@ static void dmz_queue_chunk_work(struct ret =radix_tree_insert (&dmz->chunk_rxtree, chunk, cw);if (unlikely (ret)) {kfree (cw); - cw =NULL ; goto out; } }
@@ -547,10 +548,12 @@ static void dmz_queue_chunk_work(structbio_list_add (&cw->bio_list, bio);dmz_get_chunk_work (cw); +dmz_reclaim_bio_acc (dmz->reclaim);if (queue_work (dmz->chunk_wq, &cw->work))dmz_get_chunk_work (cw); out:mutex_unlock (&dmz->chunk_lock); +return ret; }/*
@@ -564,6 +567,7 @@ static int dmz_map(struct dm_target *ti,sector_t sector = bio->bi_iter.bi_sector;unsigned int nr_sectors =bio_sectors (bio);sector_t chunk_sector; +int ret; dmz_dev_debug(dev, "BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks", bio_op(bio), (unsigned long long)sector, nr_sectors,
@@ -601,8 +605,14 @@ static int dmz_map(struct dm_target *ti,dm_accept_partial_bio (bio, dev->zone_nr_sectors - chunk_sector);/* Now ready to handle this BIO */ -dmz_reclaim_bio_acc (dmz->reclaim); -dmz_queue_chunk_work (dmz, bio); + ret =dmz_queue_chunk_work (dmz, bio); +if (ret) { +dmz_dev_debug (dmz->dev, +"BIO op %d, can't process chunk %llu, err %i\n" , +bio_op (bio), (u64 )dmz_bio_chunk (dmz->dev, bio), + ret); +return DM_MAPIO_REQUEUE ; + }return DM_MAPIO_SUBMITTED ; }
Greg Kroah-Hartman
maintainerPATCH 108/162 KVM: arm: Dont write junk to CP15 registers on reset
In reply to Greg Kroah-Hartman[ Upstream commit c69509c70aa45a8c4954c88c629a64acf4ee4a36 ]
At the moment, the way we reset CP15 registers is mildly insane:
We write junk to them, call the reset functions, and then check that we have something else in them.
The "fun" thing is that this can happen while the guest is running (PSCI, for example). If anything in KVM has to evaluate the state of a CP15 register while junk is in there, bad thing may happen.
Let's stop doing that. Instead, we track that we have called a reset function for that register, and assume that the reset function has done something.
In the end, the very need of this reset check is pretty dubious, as it doesn't check everything (a lot of the CP15 reg leave outside of the cp15_regs[] array). It may well be axed in the near future.
--- arch/arm/kvm/coproc.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
arch/arm/kvm/coproc.c +15 -8
@@ -651,13 +651,22 @@ int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run) }static void reset_coproc_regs (struct kvm_vcpu *vcpu, -const struct coproc_reg *table,size_t num) +const struct coproc_reg *table,size_t num, +unsigned long *bmap) {unsigned long i;for (i =0 ; i < num; i++) -if (table[i].reset) +if (table[i].reset) { +int reg = table[i].reg; + table[i].reset (vcpu, &table[i]); +if (reg >0 && reg <NR_CP15_REGS ) { +set_bit (reg, bmap); +if (table[i].is_64bit) +set_bit (reg +1 , bmap); + } + } }static struct coproc_params decode_32bit_hsr (struct kvm_vcpu *vcpu)
@@ -1432,17 +1441,15 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu) {size_t num;const struct coproc_reg *table; - -/* Catch someone adding a register without putting in reset entry. */ -memset (vcpu->arch.ctxt.cp15,0x42 ,sizeof (vcpu->arch.ctxt.cp15)); + DECLARE_BITMAP(bmap, NR_CP15_REGS) = { 0, };/* Generic chip reset first (so target could override). */ -reset_coproc_regs (vcpu, cp15_regs,ARRAY_SIZE (cp15_regs)); +reset_coproc_regs (vcpu, cp15_regs,ARRAY_SIZE (cp15_regs), bmap); table =get_target_table (vcpu->arch.target, &num); -reset_coproc_regs (vcpu, table, num); +reset_coproc_regs (vcpu, table, num, bmap);for (num =1 ; num <NR_CP15_REGS ; num++) -WARN (vcpu_cp15 (vcpu, num) ==0x42424242 , +WARN (!test_bit (num, bmap),"Didn't reset vcpu_cp15(vcpu, %zi)" , num); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/162 iwlwifi: mvm: disable TX-AMSDU on older NICs
In reply to Greg Kroah-Hartman[ Upstream commit cfb21b11b891b08b79be07be57c40a85bb926668 ]
On older NICs, we occasionally see issues with A-MSDU support, where the commands in the FIFO get confused and then we see an assert EDC because the next command in the FIFO isn't TX.
We've tried to isolate this issue and understand where it comes from, but haven't found any errors in building the A-MSDU in software.
At least for now, disable A-MSDU support on older hardware so that users can use it again without fearing the assert.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=203315.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +13 -1
@@ -474,7 +474,19 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)ieee80211_hw_set (hw,SUPPORTS_VHT_EXT_NSS_BW );ieee80211_hw_set (hw,BUFF_MMPDU_TXQ );ieee80211_hw_set (hw,STA_MMPDU_TXQ ); -ieee80211_hw_set (hw,TX_AMSDU ); +/* +* On older devices, enabling TX A-MSDU occasionally leads to +* something getting messed up, the command read from the FIFO +* gets out of sync and isn't a TX command, so that we have an +* assert EDC. +* +* It's not clear where the bug is, but since we didn't used to +* support A-MSDU until moving the mac80211 iTXQs, just leave it +* for older devices. We also don't see this issue on any newer +* devices. +*/ +if (mvm->cfg->device_family >=IWL_DEVICE_FAMILY_9000 ) +ieee80211_hw_set (hw,TX_AMSDU );ieee80211_hw_set (hw,TX_FRAG_LIST );if (iwl_mvm_has_tlc_offload (mvm)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/162 mm/z3fold.c: fix race between migration and destruction
In reply to Greg Kroah-HartmanFrom: Henry Burns <[email protected]>
commit d776aaa9895eb6eb770908e899cb7f5bd5025b3c upstream.
In z3fold_destroy_pool() we call destroy_workqueue(&pool->compact_wq). However, we have no guarantee that migration isn't happening in the background at that time.
Migration directly calls queue_work_on(pool->compact_wq), if destruction wins that race we are using a destroyed workqueue.
--- mm/z3fold.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)
mm/z3fold.c +89 -0
@@ -41,6 +41,7 @@#include <linux/workqueue.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/wait.h> #include <linux/zpool.h> /*
@@ -144,6 +145,8 @@ struct z3fold_header {* @release_wq: workqueue for safe page release * @work: work_struct for safe page release * @inode: inode for z3fold pseudo filesystem +* @destroying: bool to stop migration once we start destruction +* @isolated: int to count the number of pages currently in isolation * * This structure is allocated at pool creation time and maintains metadata * pertaining to a particular z3fold pool.
@@ -162,8 +165,11 @@ struct z3fold_pool {const struct zpool_ops *zpool_ops;struct workqueue_struct *compact_wq;struct workqueue_struct *release_wq; +struct wait_queue_head isolate_wait;struct work_struct work;struct inode *inode; +bool destroying; +int isolated; };/*
@@ -771,6 +777,7 @@ static struct z3fold_pool *z3fold_create goto out_c;spin_lock_init (&pool->lock);spin_lock_init (&pool->stale_lock); +init_waitqueue_head (&pool->isolate_wait); pool->unbuddied =__alloc_percpu (sizeof (struct list_head )*NCHUNKS ,2 );if (!pool->unbuddied) goto out_pool;
@@ -810,6 +817,15 @@ out:return NULL ; } +static bool pool_isolated_are_drained (struct z3fold_pool *pool) +{ +bool ret; + +spin_lock (&pool->lock); + ret = pool->isolated ==0 ; +spin_unlock (&pool->lock); +return ret; +}/** * z3fold_destroy_pool() - destroys an existing z3fold pool * @pool: the z3fold pool to be destroyed
@@ -819,6 +835,22 @@ out:static void z3fold_destroy_pool (struct z3fold_pool *pool) {kmem_cache_destroy (pool->c_handle); +/* +* We set pool-> destroying under lock to ensure that +* z3fold_page_isolate() sees any changes to destroying. This way we +* avoid the need for any memory barriers. +*/ + +spin_lock (&pool->lock); + pool->destroying = true; +spin_unlock (&pool->lock); + +/* +* We need to ensure that no pages are being migrated while we destroy +* these workqueues, as migration can queue work on either of the +* workqueues. +*/ +wait_event (pool->isolate_wait, !pool_isolated_are_drained (pool));/* * We need to destroy pool->compact_wq before pool->release_wq,
@@ -1309,6 +1341,28 @@ static u64 z3fold_get_pool_size(struct zreturn atomic64_read (&pool->pages_nr); } +/* +* z3fold_dec_isolated() expects to be called while pool->lock is held. +*/ +static void z3fold_dec_isolated (struct z3fold_pool *pool) +{ +assert_spin_locked (&pool->lock); +VM_BUG_ON (pool->isolated <=0 ); + pool->isolated--; + +/* +* If we have no more isolated pages, we have to see if +* z3fold_destroy_pool() is waiting for a signal. +*/ +if (pool->isolated ==0 &&waitqueue_active (&pool->isolate_wait)) +wake_up_all (&pool->isolate_wait); +} + +static void z3fold_inc_isolated (struct z3fold_pool *pool) +{ + pool->isolated++; +} +static bool z3fold_page_isolate (struct page *page,isolate_mode_t mode) {struct z3fold_header *zhdr;
@@ -1335,6 +1389,33 @@ static bool z3fold_page_isolate(struct pspin_lock (&pool->lock);if (!list_empty (&page->lru))list_del (&page->lru); +/* +* We need to check for destruction while holding pool->lock, as +* otherwise destruction could see 0 isolated pages, and +* proceed. +*/ +if (unlikely (pool->destroying)) { +spin_unlock (&pool->lock); +/* +* If this page isn't stale, somebody else holds a +* reference to it. Let't drop our refcount so that they +* can call the release logic. +*/ +if (unlikely (kref_put (&zhdr->refcount, + release_z3fold_page_locked))) { +/* +* If we get here we have kref problems, so we +* should freak out. +*/ +WARN (1 ,"Z3fold is experiencing kref problems\n" ); +return false; + } +z3fold_page_unlock (zhdr); +return false; + } + + +z3fold_inc_isolated (pool);spin_unlock (&pool->lock);z3fold_page_unlock (zhdr);return true;
@@ -1408,6 +1489,10 @@ static int z3fold_page_migrate(struct adqueue_work_on (new_zhdr->cpu, pool->compact_wq, &new_zhdr->work); +spin_lock (&pool->lock); +z3fold_dec_isolated (pool); +spin_unlock (&pool->lock); +page_mapcount_reset (page);unlock_page (page);put_page (page);
@@ -1428,10 +1513,14 @@ static void z3fold_page_putback(struct pINIT_LIST_HEAD (&page->lru);if (kref_put (&zhdr->refcount, release_z3fold_page_locked)) {atomic64_dec (&pool->pages_nr); +spin_lock (&pool->lock); +z3fold_dec_isolated (pool); +spin_unlock (&pool->lock);return ; }spin_lock (&pool->lock);list_add (&page->lru, &pool->lru); +z3fold_dec_isolated (pool);spin_unlock (&pool->lock);z3fold_page_unlock (zhdr); }
Greg Kroah-Hartman
maintainerPATCH 112/162 HID: wacom: Correct distance scale for 2nd-gen Intuos devices
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit b72fb1dcd2ea9d29417711cb302cef3006fa8d5a upstream.
Distance values reported by 2nd-gen Intuos tablets are on an inverted scale (0 == far, 63 == near). We need to change them over to a normal scale before reporting to userspace or else userspace drivers and applications can get confused.
Ref: https://github.com/linuxwacom/input-wacom/issues/98
--- drivers/hid/wacom_wac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/wacom_wac.c +2 -0
@@ -846,6 +846,8 @@ static int wacom_intuos_general(struct w y >>=1 ; distance >>=1 ; } +if (features->type ==INTUOSHT2 ) + distance = features->distance_max - distance;input_report_abs (input,ABS_X , x);input_report_abs (input,ABS_Y , y);input_report_abs (input,ABS_DISTANCE , distance);
Greg Kroah-Hartman
maintainerPATCH 158/162 io_uring: dont enter poll loop if we have CQEs pending
In reply to Greg Kroah-Hartman[ Upstream commit a3a0e43fd77013819e4b6f55e37e0efe8e35d805 ]
We need to check if we have CQEs pending before starting a poll loop, as those could be the events we will be spinning for (and hence we'll find none). This can happen if a CQE triggers an error, or if it is found by eg an IRQ before we get a chance to find it through polling.
--- fs/io_uring.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
fs/io_uring.c +15 -7
@@ -618,6 +618,13 @@ static void io_put_req(struct io_kiocb *req)io_free_req (req); } +static unsigned io_cqring_events (struct io_cq_ring *ring) +{ +/* See comment at the top of this file */ +smp_rmb (); +return READ_ONCE (ring->r.tail) -READ_ONCE (ring->r.head); +} +/* * Find and free completed poll iocbs */
@@ -756,6 +763,14 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events, do { int tmin = 0; + /* + * Don't enter poll loop if we already have events pending. + * If we do, we can potentially be spinning for commands that + * already triggered a CQE (eg in error). + */ + if (io_cqring_events(ctx->cq_ring)) + break; + /* * If a submit got punted to a workqueue, we can have the * application entering polling for a command before it gets
@@ -2232,13 +2247,6 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit)return submit; } -static unsigned io_cqring_events (struct io_cq_ring *ring) -{ -/* See comment at the top of this file */ -smp_rmb (); -return READ_ONCE (ring->r.tail) -READ_ONCE (ring->r.head); -} -/* * Wait until events become available, if we don't already have some. The * application must reap them itself, as they reside on the shared cq ring.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/162 io_uring: add need_resched() check in inner poll loop
In reply to Greg Kroah-Hartman[ Upstream commit 08f5439f1df25a6cf6cf4c72cf6c13025599ce67 ]
The outer poll loop checks for whether we need to reschedule, and returns to userspace if we do. However, it's possible to get stuck in the inner loop as well, if the CPU we are running on needs to reschedule to finish the IO work.
Add the need_resched() check in the inner loop as well. This fixes a potential hang if the kernel is configured with CONFIG_PREEMPT_VOLUNTARY=y.
--- fs/io_uring.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/io_uring.c +7 -1
@@ -716,7 +716,7 @@ static int io_do_iopoll(struct io_ring_ctx *ctx, unsigned int *nr_events,static int io_iopoll_getevents (struct io_ring_ctx *ctx,unsigned int *nr_events,long min) { -while (!list_empty (&ctx->poll_list)) { +while (!list_empty (&ctx->poll_list) && !need_resched ()) {int ret; ret =io_do_iopoll (ctx, nr_events, min);
@@ -743,6 +743,12 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx)unsigned int nr_events =0 ;io_iopoll_getevents (ctx, &nr_events,1 ); + +/* +* Ensure we allow local-to-the-cpu processing to take place, +* in this case we need to ensure that we reap all events. +*/ +cond_resched (); }mutex_unlock (&ctx->uring_lock); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/162 rxrpc: Fix read-after-free in rxrpc_queue_local()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit 06d9532fa6b34f12a6d75711162d47c17c1add72 upstream.
rxrpc_queue_local() attempts to queue the local endpoint it is given and then, if successful, prints a trace line. The trace line includes the current usage count - but we're not allowed to look at the local endpoint at this point as we passed our ref on it to the workqueue.
Fix this by reading the usage count before queuing the work item.
Also fix the reading of local->debug_id for trace lines, which must be done with the same consideration as reading the usage count.
--- include/trace/events/rxrpc.h | 6 +++--- net/rxrpc/local_object.c | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-)
include/trace/events/rxrpc.h +3 -3
@@ -498,10 +498,10 @@ rxrpc_tx_points;#define E_ (a, b) { a, b } TRACE_EVENT(rxrpc_local, - TP_PROTO(struct rxrpc_local *local, enum rxrpc_local_trace op, + TP_PROTO(unsigned int local_debug_id, enum rxrpc_local_trace op, int usage, const void *where), - TP_ARGS(local, op, usage, where), + TP_ARGS(local_debug_id, op, usage, where), TP_STRUCT__entry( __field(unsigned int, local )
@@ -511,7 +511,7 @@ TRACE_EVENT(rxrpc_local, ), TP_fast_assign( - __entry->local = local->debug_id; + __entry->local = local_debug_id; __entry->op = op; __entry->usage = usage; __entry->where = where;
net/rxrpc/local_object.c +10 -9
@@ -93,7 +93,7 @@ static struct rxrpc_local *rxrpc_alloc_l local->debug_id =atomic_inc_return (&rxrpc_debug_id);memcpy (&local->srx, srx,sizeof (*srx)); local->srx.srx_service =0 ; -trace_rxrpc_local (local, rxrpc_local_new,1 ,NULL ); +trace_rxrpc_local (local->debug_id, rxrpc_local_new,1 ,NULL ); }_leave (" = %p" , local);
@@ -321,7 +321,7 @@ struct rxrpc_local *rxrpc_get_local(struint n; n =atomic_inc_return (&local->usage); -trace_rxrpc_local (local, rxrpc_local_got, n, here); +trace_rxrpc_local (local->debug_id, rxrpc_local_got, n, here);return local; }
@@ -335,7 +335,8 @@ struct rxrpc_local *rxrpc_get_local_maybif (local) {int n =atomic_fetch_add_unless (&local->usage,1 ,0 );if (n >0 ) -trace_rxrpc_local (local, rxrpc_local_got, n +1 , here); +trace_rxrpc_local (local->debug_id, rxrpc_local_got, + n +1 , here);else local =NULL ; }
@@ -343,16 +344,16 @@ struct rxrpc_local *rxrpc_get_local_mayb }/* -* Queue a local endpoint unless it has become unreferenced and pass the -* caller's reference to the work item. +* Queue a local endpoint and pass the caller's reference to the work item. */ void rxrpc_queue_local (struct rxrpc_local *local) {const void *here =__builtin_return_address (0 ); +unsigned int debug_id = local->debug_id; +int n =atomic_read (&local->usage);if (rxrpc_queue_work (&local->processor)) -trace_rxrpc_local (local, rxrpc_local_queued, -atomic_read (&local->usage), here); +trace_rxrpc_local (debug_id, rxrpc_local_queued, n, here);else rxrpc_put_local (local); }
@@ -367,7 +368,7 @@ void rxrpc_put_local(struct rxrpc_localif (local) { n =atomic_dec_return (&local->usage); -trace_rxrpc_local (local, rxrpc_local_put, n, here); +trace_rxrpc_local (local->debug_id, rxrpc_local_put, n, here);if (n ==0 )call_rcu (&local->rcu, rxrpc_local_rcu);
@@ -454,7 +455,7 @@ static void rxrpc_local_processor(struct container_of(work, struct rxrpc_local, processor);bool again; -trace_rxrpc_local (local, rxrpc_local_processing, +trace_rxrpc_local (local->debug_id, rxrpc_local_processing,atomic_read (&local->usage),NULL ); do {
Greg Kroah-Hartman
maintainerPATCH 150/162 mm, page_owner: handle THP splits correctly
In reply to Greg Kroah-HartmanFrom: Vlastimil Babka <[email protected]>
commit f7da677bc6e72033f0981b9d58b5c5d409fa641e upstream.
THP splitting path is missing the split_page_owner() call that split_page() has.
As a result, split THP pages are wrongly reported in the page_owner file as order-9 pages. Furthermore when the former head page is freed, the remaining former tail pages are not listed in the page_owner file at all. This patch fixes that by adding the split_page_owner() call into __split_huge_page().
--- mm/huge_memory.c | 4 ++++ 1 file changed, 4 insertions(+)
mm/huge_memory.c +4 -0
@@ -32,6 +32,7 @@#include <linux/shmem_fs.h> #include <linux/oom.h> #include <linux/numa.h> +#include <linux/page_owner.h> #include <asm/tlb.h> #include <asm/pgalloc.h>
@@ -2500,6 +2501,9 @@ static void __split_huge_page(struct pag }ClearPageCompound (head); + +split_page_owner (head,HPAGE_PMD_ORDER ); +/* See comment in __split_huge_page_tail() */ if (PageAnon (head)) {/* Additional pin to swap cache */
Greg Kroah-Hartman
maintainerPATCH 151/162 mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely
In reply to Greg Kroah-HartmanFrom: Henry Burns <[email protected]>
commit 1a87aa03597efa9641e92875b883c94c7f872ccb upstream.
In zs_page_migrate() we call putback_zspage() after we have finished migrating all pages in this zspage. However, the return value is ignored. If a zs_free() races in between zs_page_isolate() and zs_page_migrate(), freeing the last object in the zspage, putback_zspage() will leave the page in ZS_EMPTY for potentially an unbounded amount of time.
To fix this, we need to do the same thing as zs_page_putback() does:
schedule free_work to occur.
To avoid duplicated code, move the sequence to a new putback_zspage_deferred() function which both zs_page_migrate() and zs_page_putback() call.
--- mm/zsmalloc.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
mm/zsmalloc.c +15 -4
@@ -1882,6 +1882,18 @@ static void dec_zspage_isolation(struct zspage->isolated--; } +static void putback_zspage_deferred (struct zs_pool *pool, +struct size_class *class, +struct zspage *zspage) +{ +enum fullness_group fg; + + fg =putback_zspage (class, zspage); +if (fg ==ZS_EMPTY ) +schedule_work (&pool->free_work); + +} +static void replace_sub_page (struct size_class *class,struct zspage *zspage,struct page *newpage,struct page *oldpage) {
@@ -2051,7 +2063,7 @@ static int zs_page_migrate(struct addres* the list if @page is final isolated subpage in the zspage. */ if (!is_zspage_isolated (zspage)) -putback_zspage (class, zspage); +putback_zspage_deferred (pool, class, zspage);reset_page (page);put_page (page);
@@ -2097,14 +2109,13 @@ static void zs_page_putback(struct pagespin_lock (&class->lock);dec_zspage_isolation (zspage);if (!is_zspage_isolated (zspage)) { - fg =putback_zspage (class, zspage);/* * Due to page_lock, we cannot free zspage immediately * so let's defer. */ -if (fg ==ZS_EMPTY ) -schedule_work (&pool->free_work); +putback_zspage_deferred (pool, class, zspage); } +spin_unlock (&class->lock); }
Greg Kroah-Hartman
maintainerPATCH 153/162 mm/kasan: fix false positive invalid-free reports with CONFIG_KASAN_SW_TAGS=y
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit 00fb24a42a68b1ee0f6495993fe1be7124433dfb upstream.
The code like this:
ptr = kmalloc(size, GFP_KERNEL); page = virt_to_page(ptr); offset = offset_in_page(ptr); kfree(page_address(page) + offset);
may produce false-positive invalid-free reports on the kernel with CONFIG_KASAN_SW_TAGS=y.
In the example above we lose the original tag assigned to 'ptr', so kfree() gets the pointer with 0xFF tag. In kfree() we check that 0xFF tag is different from the tag in shadow hence print false report.
Instead of just comparing tags, do the following:
1) Check that shadow doesn't contain KASAN_TAG_INVALID. Otherwise it's double-free and it doesn't matter what tag the pointer have.
2) If pointer tag is different from 0xFF, make sure that tag in the shadow is the same as in the pointer.
--- mm/kasan/common.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/kasan/common.c +8 -2
@@ -409,8 +409,14 @@ static inline bool shadow_invalid(u8 tagif (IS_ENABLED (CONFIG_KASAN_GENERIC ))return shadow_byte <0 || shadow_byte >=KASAN_SHADOW_SCALE_SIZE ; -else -return tag != (u8 )shadow_byte; + +/* else CONFIG_KASAN_SW_TAGS: */ +if ((u8 )shadow_byte ==KASAN_TAG_INVALID ) +return true; +if ((tag !=KASAN_TAG_KERNEL ) && (tag != (u8 )shadow_byte)) +return true; + +return false; } static bool __kasan_slab_free(struct kmem_cache *cache, void *object,
Greg Kroah-Hartman
maintainerPATCH 154/162 xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
commit 1fb254aa983bf190cfd685d40c64a480a9bafaee upstream.
Benjamin Moody reported to Debian that XFS partially wedges when a chgrp fails on account of being out of disk quota. I ran his reproducer script:
# adduser dummy # adduser dummy plugdev
# dd if=/dev/zero bs=1M count=100 of=test.img # mkfs.xfs test.img # mount -t xfs -o gquota test.img /mnt # mkdir -p /mnt/dummy # chown -c dummy /mnt/dummy # xfs_quota -xc 'limit -g bsoft=100k bhard=100k plugdev' /mnt
(and then as user dummy)
$ dd if=/dev/urandom bs=1M count=50 of=/mnt/dummy/foo $ chgrp plugdev /mnt/dummy/foo
and saw:
================================================
WARNING: lock held when returning to user space!
5.3.0-rc5 #rc5 Tainted: G W
------------------------------------------------
chgrp/47006 is leaving the kernel with locks still held!
1 lock held by chgrp/47006:
#0: 000000006664ea2d (&xfs_nondir_ilock_class){++++}, at: xfs_ilock+0xd2/0x290 [xfs]
...which is clearly caused by xfs_setattr_nonsize failing to unlock the ILOCK after the xfs_qm_vop_chown_reserve call fails. Add the missing unlock.
--- fs/xfs/xfs_iops.c | 1 + 1 file changed, 1 insertion(+)
fs/xfs/xfs_iops.c +1 -0
@@ -803,6 +803,7 @@ xfs_setattr_nonsize( out_cancel:xfs_trans_cancel (tp); +xfs_iunlock (ip,XFS_ILOCK_EXCL ); out_dqrele:xfs_qm_dqrele (udqp);xfs_qm_dqrele (gdqp);
Greg Kroah-Hartman
maintainerPATCH 156/162 dm zoned: fix potential NULL dereference in dmz_do_reclaim()
In reply to Greg Kroah-Hartman[ Upstream commit e0702d90b79d430b0ccc276ead4f88440bb51352 ]
This function is supposed to return error pointers so it matches the dmz_get_rnd_zone_for_reclaim() function. The current code could lead to a NULL dereference in dmz_do_reclaim()
--- drivers/md/dm-zoned-metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-zoned-metadata.c +2 -2
@@ -1579,7 +1579,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)struct dm_zone *zone;if (list_empty (&zmd->map_seq_list)) -return NULL ; +return ERR_PTR (-EBUSY );list_for_each_entry (zone, &zmd->map_seq_list, link) {if (!zone->bzone)
@@ -1588,7 +1588,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)return zone; } -return NULL ; +return ERR_PTR (-EBUSY ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/162 mm: memcontrol: flush percpu vmstats before releasing memcg
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit c350a99ea2b1b666c28948d74ab46c16913c28a7 upstream.
Percpu caching of local vmstats with the conditional propagation by the cgroup tree leads to an accumulation of errors on non-leaf levels.
Let's imagine two nested memory cgroups A and A/B. Say, a process belonging to A/B allocates 100 pagecache pages on the CPU 0. The percpu cache will spill 3 times, so that 32*3=96 pages will be accounted to A/B and A atomic vmstat counters, 4 pages will remain in the percpu cache.
Imagine A/B is nearby memory.max, so that every following allocation triggers a direct reclaim on the local CPU. Say, each such attempt will free 16 pages on a new cpu. That means every percpu cache will have -16 pages, except the first one, which will have 4 - 16 = -12. A/B and A atomic counters will not be touched at all.
Now a user removes A/B. All percpu caches are freed and corresponding vmstat numbers are forgotten. A has 96 pages more than expected.
As memory cgroups are created and destroyed, errors do accumulate. Even 1-2 pages differences can accumulate into large numbers.
To fix this issue let's accumulate and propagate percpu vmstat values before releasing the memory cgroup. At this point these numbers are stable and cannot be changed.
Since on cpu hotplug we do flush percpu vmstats anyway, we can iterate only over online cpus.
--- mm/memcontrol.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
mm/memcontrol.c +40 -0
@@ -3150,6 +3150,41 @@ static u64 mem_cgroup_read_u64(struct cg } } +static void memcg_flush_percpu_vmstats (struct mem_cgroup *memcg) +{ +unsigned long stat[MEMCG_NR_STAT ]; +struct mem_cgroup *mi; +int node, cpu, i; + +for (i =0 ; i <MEMCG_NR_STAT ; i++) + stat[i] =0 ; + +for_each_online_cpu (cpu) +for (i =0 ; i <MEMCG_NR_STAT ; i++) + stat[i] +=raw_cpu_read (memcg->vmstats_percpu->stat[i]); + +for (mi = memcg; mi; mi =parent_mem_cgroup (mi)) +for (i =0 ; i <MEMCG_NR_STAT ; i++) +atomic_long_add (stat[i], &mi->vmstats[i]); + +for_each_node (node) { +struct mem_cgroup_per_node *pn = memcg->nodeinfo[node]; +struct mem_cgroup_per_node *pi; + +for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) + stat[i] =0 ; + +for_each_online_cpu (cpu) +for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) + stat[i] +=raw_cpu_read ( + pn->lruvec_stat_cpu->count[i]); + +for (pi = pn; pi; pi =parent_nodeinfo (pi, node)) +for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) +atomic_long_add (stat[i], &pi->lruvec_stat[i]); + } +} +#ifdef CONFIG_MEMCG_KMEM static int memcg_online_kmem (struct mem_cgroup *memcg) {
@@ -4551,6 +4586,11 @@ static void __mem_cgroup_free(struct mem {int node; +/* +* Flush percpu vmstats to guarantee the value correctness +* on parent's and all ancestor levels. +*/ +memcg_flush_percpu_vmstats (memcg);for_each_node (node)free_mem_cgroup_per_node_info (memcg, node);free_percpu (memcg->vmstats_percpu);
Greg Kroah-Hartman
maintainerPATCH 157/162 io_uring: fix potential hang with polled IO
In reply to Greg Kroah-Hartman[ Upstream commit 500f9fbadef86466a435726192f4ca4df7d94236 ]
If a request issue ends up being punted to async context to avoid blocking, we can get into a situation where the original application enters the poll loop for that very request before it has been issued. This should not be an issue, except that the polling will hold the io_uring uring_ctx mutex for the duration of the poll. When the async worker has actually issued the request, it needs to acquire this mutex to add the request to the poll issued list. Since the application polling is already holding this mutex, the workqueue sleeps on the mutex forever, and the application thus never gets a chance to poll for the very request it was interested in.
Fix this by ensuring that the polling drops the uring_ctx occasionally if it's not making any progress.
--- fs/io_uring.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
fs/io_uring.c +25 -11
@@ -743,11 +743,34 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx)static int io_iopoll_check (struct io_ring_ctx *ctx,unsigned *nr_events,long min) { -int ret =0 ; +int iters, ret =0 ; + +/* +* We disallow the app entering submit/complete with polling, but we +* still need to lock the ring to prevent racing with polled issue +* that got punted to a workqueue. +*/ +mutex_lock (&ctx->uring_lock); + iters =0 ; do { int tmin = 0; + /* + * If a submit got punted to a workqueue, we can have the + * application entering polling for a command before it gets + * issued. That app will hold the uring_lock for the duration + * of the poll right here, so we need to take a breather every + * now and then to ensure that the issue has a chance to add + * the poll to the issued list. Otherwise we can spin here + * forever, while the workqueue is stuck trying to acquire the + * very same mutex. + */ + if (!(++iters & 7)) { + mutex_unlock(&ctx->uring_lock); + mutex_lock(&ctx->uring_lock); + } + if (*nr_events < min) tmin = min - *nr_events;
@@ -757,6 +780,7 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events, ret =0 ; }while (min && !*nr_events && !need_resched ()); +mutex_unlock (&ctx->uring_lock);return ret; }
@@ -2073,15 +2097,7 @@ static int io_sq_thread(void *data)unsigned nr_events =0 ;if (ctx->flags &IORING_SETUP_IOPOLL ) { -/* -* We disallow the app entering submit/complete -* with polling, but we still need to lock the -* ring to prevent racing with polled issue -* that got punted to a workqueue. -*/ -mutex_lock (&ctx->uring_lock);io_iopoll_check (ctx, &nr_events,0 ); -mutex_unlock (&ctx->uring_lock); }else {/* * Normal IO, just pretend everything completed.
@@ -2978,9 +2994,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, min_complete =min (min_complete, ctx->cq_entries);if (ctx->flags &IORING_SETUP_IOPOLL ) { -mutex_lock (&ctx->uring_lock); ret =io_iopoll_check (ctx, &nr_events, min_complete); -mutex_unlock (&ctx->uring_lock); }else { ret =io_cqring_wait (ctx, min_complete, sig, sigsz); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/162 IB/hfi1: Drop stale TID RDMA packets
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit d58c1834bf0d218a0bc00f8fb44874551b21da84 upstream.
In a congested fabric with adaptive routing enabled, traces show that the sender could receive stale TID RDMA NAK packets that contain newer KDETH PSNs and older Verbs PSNs. If not dropped, these packets could cause the incorrect rewinding of the software flows and the incorrect completion of TID RDMA WRITE requests, and eventually leading to memory corruption and kernel crash.
The current code drops stale TID RDMA ACK/NAK packets solely based on KDETH PSNs, which may lead to erroneous processing. This patch fixes the issue by also checking the Verbs PSN. Addition checks are added before rewinding the TID RDMA WRITE DATA packets.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hfi1/tid_rdma.c +11 -3
@@ -4480,7 +4480,7 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfistruct rvt_swqe *wqe;struct tid_rdma_request *req;struct tid_rdma_flow *flow; -u32 aeth, psn, req_psn, ack_psn, fspsn, resync_psn, ack_kpsn; +u32 aeth, psn, req_psn, ack_psn, flpsn, resync_psn, ack_kpsn;unsigned long flags;u16 fidx;
@@ -4509,6 +4509,9 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfi ack_kpsn--; } +if (unlikely (qp->s_acked == qp->s_tail)) + goto ack_op_err; + wqe =rvt_get_swqe_ptr (qp, qp->s_acked);if (wqe->wr.opcode !=IB_WR_TID_RDMA_WRITE )
@@ -4521,7 +4524,8 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfitrace_hfi1_tid_flow_rcv_tid_ack (qp, req->acked_tail, flow);/* Drop stale ACK/NAK */ -if (cmp_psn (psn,full_flow_psn (flow, flow->flow_state.spsn)) <0 ) +if (cmp_psn (psn,full_flow_psn (flow, flow->flow_state.spsn)) <0 || +cmp_psn (req_psn, flow->flow_state.resp_ib_psn) <0 ) goto ack_op_err; while (cmp_psn(ack_kpsn,
@@ -4683,8 +4687,12 @@ done:switch ((aeth >>IB_AETH_CREDIT_SHIFT ) &IB_AETH_CREDIT_MASK ) {case 0 :/* PSN sequence error */ +if (!req->flows) +break ; flow = &req->flows[req->acked_tail]; - fspsn =full_flow_psn (flow, flow->flow_state.spsn); + flpsn =full_flow_psn (flow, flow->flow_state.lpsn); +if (cmp_psn (psn, flpsn) >0 ) +break ;trace_hfi1_tid_flow_rcv_tid_ack (qp, req->acked_tail, flow); req->r_ack_psn =mask_psn (be32_to_cpu (ohdr->bth[2 ]));
Greg Kroah-Hartman
maintainerPATCH 152/162 mm/zsmalloc.c: fix race condition in zs_destroy_pool
In reply to Greg Kroah-HartmanFrom: Henry Burns <[email protected]>
commit 701d678599d0c1623aaf4139c03eea260a75b027 upstream.
In zs_destroy_pool() we call flush_work(&pool->free_work). However, we have no guarantee that migration isn't happening in the background at that time.
Since migration can't directly free pages, it relies on free_work being scheduled to free the pages. But there's nothing preventing an in-progress migrate from queuing the work *after* zs_unregister_migration() has called flush_work(). Which would mean pages still pointing at the inode when we free it.
Since we know at destroy time all objects should be free, no new migrations can come in (since zs_page_isolate() fails for fully-free zspages). This means it is sufficient to track a "# isolated zspages" count by class, and have the destroy logic ensure all such pages have drained before proceeding. Keeping that state under the class spinlock keeps the logic straightforward.
In this case a memory leak could lead to an eventual crash if compaction hits the leaked page. This crash would only occur if people are changing their zswap backend at runtime (which eventually starts destruction).
--- mm/zsmalloc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-)
mm/zsmalloc.c +59 -2
@@ -53,6 +53,7 @@#include <linux/zpool.h> #include <linux/mount.h> #include <linux/migrate.h> +#include <linux/wait.h> #include <linux/pagemap.h> #include <linux/fs.h>
@@ -267,6 +268,10 @@ struct zs_pool {#ifdef CONFIG_COMPACTION struct inode *inode;struct work_struct free_work; +/* A wait queue for when migration races with async_free_zspage() */ +struct wait_queue_head migration_wait; +atomic_long_t isolated_pages; +bool destroying;#endif };
@@ -1894,6 +1899,19 @@ static void putback_zspage_deferred(stru } +static inline void zs_pool_dec_isolated (struct zs_pool *pool) +{ +VM_BUG_ON (atomic_long_read (&pool->isolated_pages) <=0 ); +atomic_long_dec (&pool->isolated_pages); +/* +* There's no possibility of racing, since wait_for_isolated_drain() +* checks the isolated count under &class->lock after enqueuing +* on migration_wait. +*/ +if (atomic_long_read (&pool->isolated_pages) ==0 && pool->destroying) +wake_up_all (&pool->migration_wait); +} +static void replace_sub_page (struct size_class *class,struct zspage *zspage,struct page *newpage,struct page *oldpage) {
@@ -1963,6 +1981,7 @@ static bool zs_page_isolate(struct page*/ if (!list_empty (&zspage->list) && !is_zspage_isolated (zspage)) {get_zspage_mapping (zspage, &class_idx, &fullness); +atomic_long_inc (&pool->isolated_pages);remove_zspage (class, zspage, fullness); }
@@ -2062,8 +2081,16 @@ static int zs_page_migrate(struct addres* Page migration is done so let's putback isolated zspage to * the list if @page is final isolated subpage in the zspage. */ -if (!is_zspage_isolated (zspage)) +if (!is_zspage_isolated (zspage)) { +/* +* We cannot race with zs_destroy_pool() here because we wait +* for isolation to hit zero before we start destroying. +* Also, we ensure that everyone can see pool->destroying before +* we start waiting. +*/ putback_zspage_deferred (pool, class, zspage); +zs_pool_dec_isolated (pool); + }reset_page (page);put_page (page);
@@ -2114,8 +2141,8 @@ static void zs_page_putback(struct page* so let's defer. */ putback_zspage_deferred (pool, class, zspage); +zs_pool_dec_isolated (pool); } -spin_unlock (&class->lock); }
@@ -2138,8 +2165,36 @@ static int zs_register_migration(structreturn 0 ; } +static bool pool_isolated_are_drained (struct zs_pool *pool) +{ +return atomic_long_read (&pool->isolated_pages) ==0 ; +} + +/* Function for resolving migration */ +static void wait_for_isolated_drain (struct zs_pool *pool) +{ + +/* +* We're in the process of destroying the pool, so there are no +* active allocations. zs_page_isolate() fails for completely free +* zspages, so we need only wait for the zs_pool's isolated +* count to hit zero. +*/ +wait_event (pool->migration_wait, +pool_isolated_are_drained (pool)); +} +static void zs_unregister_migration (struct zs_pool *pool) { + pool->destroying = true; +/* +* We need a memory barrier here to ensure global visibility of +* pool->destroying. Thus pool->isolated pages will either be 0 in which +* case we don't care, or it will be > 0 and pool->destroying will +* ensure that we wake up once isolation hits 0. +*/ +smp_mb (); +wait_for_isolated_drain (pool);/* This can block */ flush_work (&pool->free_work);iput (pool->inode); }
@@ -2377,6 +2432,8 @@ struct zs_pool *zs_create_pool(const chaif (!pool->name) goto err; +init_waitqueue_head (&pool->migration_wait); +if (create_cache (pool)) goto err;
Greg Kroah-Hartman
maintainerPATCH 161/162 rxrpc: Fix local endpoint refcounting
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit 730c5fd42c1e3652a065448fd235cb9fafb2bd10 upstream.
The object lifetime management on the rxrpc_local struct is broken in that the rxrpc_local_processor() function is expected to clean up and remove an object - but it may get requeued by packets coming in on the backing UDP socket once it starts running.
This may result in the assertion in rxrpc_local_rcu() firing because the memory has been scheduled for RCU destruction whilst still queued:
rxrpc: Assertion failed ------------[ cut here ]------------ kernel BUG at net/rxrpc/local_object.c:468!
Note that if the processor comes around before the RCU free function, it will just do nothing because ->dead is true.
Fix this by adding a separate refcount to count active users of the endpoint that causes the endpoint to be destroyed when it reaches 0.
The original refcount can then be used to refcount objects through the work processor and cause the memory to be rcu freed when that reaches 0.
--- net/rxrpc/af_rxrpc.c | 4 +- net/rxrpc/ar-internal.h | 5 ++ net/rxrpc/input.c | 16 ++++++-- net/rxrpc/local_object.c | 86 +++++++++++++++++++++++++++++------------------ 4 files changed, 72 insertions(+), 39 deletions(-)
net/rxrpc/af_rxrpc.c +2 -2
@@ -193,7 +193,7 @@ static int rxrpc_bind(struct socket *soc service_in_use:write_unlock (&local->services_lock); -rxrpc_put_local (local); +rxrpc_unuse_local (local); ret = -EADDRINUSE ; error_unlock:release_sock (&rx->sk);
@@ -901,7 +901,7 @@ static int rxrpc_release_sock(struct socrxrpc_queue_work (&rxnet->service_conn_reaper);rxrpc_queue_work (&rxnet->client_conn_reaper); -rxrpc_put_local (rx->local); +rxrpc_unuse_local (rx->local); rx->local =NULL ;key_put (rx->key); rx->key =NULL ;
net/rxrpc/ar-internal.h +4 -1
@@ -254,7 +254,8 @@ struct rxrpc_security {*/ struct rxrpc_local {struct rcu_head rcu; -atomic_t usage; +atomic_t active_users;/* Number of users of the local endpoint */ +atomic_t usage;/* Number of references to the structure */ struct rxrpc_net *rxnet;/* The network ns in which this resides */ struct list_head link;struct socket *socket;/* my UDP socket */
@@ -1002,6 +1003,8 @@ struct rxrpc_local *rxrpc_lookup_local(sstruct rxrpc_local *rxrpc_get_local (struct rxrpc_local *);struct rxrpc_local *rxrpc_get_local_maybe (struct rxrpc_local *);void rxrpc_put_local (struct rxrpc_local *); +struct rxrpc_local *rxrpc_use_local (struct rxrpc_local *); +void rxrpc_unuse_local (struct rxrpc_local *);void rxrpc_queue_local (struct rxrpc_local *);void rxrpc_destroy_all_locals (struct rxrpc_net *);
net/rxrpc/input.c +12 -4
@@ -1108,8 +1108,12 @@ static void rxrpc_post_packet_to_local(s {_enter ("%p,%p" , local, skb); -skb_queue_tail (&local->event_queue, skb); -rxrpc_queue_local (local); +if (rxrpc_get_local_maybe (local)) { +skb_queue_tail (&local->event_queue, skb); +rxrpc_queue_local (local); + }else { +rxrpc_free_skb (skb, rxrpc_skb_rx_freed); + } }/*
@@ -1119,8 +1123,12 @@ static void rxrpc_reject_packet(struct r {CHECK_SLAB_OKAY (&local->usage); -skb_queue_tail (&local->reject_queue, skb); -rxrpc_queue_local (local); +if (rxrpc_get_local_maybe (local)) { +skb_queue_tail (&local->reject_queue, skb); +rxrpc_queue_local (local); + }else { +rxrpc_free_skb (skb, rxrpc_skb_rx_freed); + } }/*
net/rxrpc/local_object.c +54 -32
154 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 160/162 powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB
In reply to Greg Kroah-HartmanFrom: Alastair D'Silva <[email protected]>
The upstream commit:22e9c88d486a ("powerpc/64: reuse PPC32 static inline flush_dcache_range()") has a similar effect, but since it is a rewrite of the assembler to C, is too invasive for stable. This patch is a minimal fix to address the issue in assembler.
This patch applies cleanly to v5.2, v4.19 & v4.14.
When calling flush_(inval_)dcache_range with a size >4GB, we were masking off the upper 32 bits, so we would incorrectly flush a range smaller than intended.
This patch replaces the 32 bit shifts with 64 bit ones, so that the full size is accounted for.
--- arch/powerpc/kernel/misc_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/misc_64.S +2 -2
@@ -130,7 +130,7 @@ _GLOBAL_TOC(flush_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8 0: dcbst 0,r6
@@ -148,7 +148,7 @@ _GLOBAL(flush_inval_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10)/* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ sync isync
Greg Kroah-Hartman
maintainerPATCH 149/162 mm: memcontrol: flush percpu vmevents before releasing memcg
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit bb65f89b7d3d305c14951f49860711fbcae70692 upstream.
Similar to vmstats, percpu caching of local vmevents leads to an accumulation of errors on non-leaf levels. This happens because some leftovers may remain in percpu caches, so that they are never propagated up by the cgroup tree and just disappear into nonexistence with on releasing of the memory cgroup.
To fix this issue let's accumulate and propagate percpu vmevents values before releasing the memory cgroup similar to what we're doing with vmstats.
Since on cpu hotplug we do flush percpu vmstats anyway, we can iterate only over online cpus.
--- mm/memcontrol.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
mm/memcontrol.c +21 -1
@@ -3185,6 +3185,25 @@ static void memcg_flush_percpu_vmstats(s } } +static void memcg_flush_percpu_vmevents (struct mem_cgroup *memcg) +{ +unsigned long events[NR_VM_EVENT_ITEMS ]; +struct mem_cgroup *mi; +int cpu, i; + +for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++) + events[i] =0 ; + +for_each_online_cpu (cpu) +for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++) + events[i] +=raw_cpu_read ( + memcg->vmstats_percpu->events[i]); + +for (mi = memcg; mi; mi =parent_mem_cgroup (mi)) +for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++) +atomic_long_add (events[i], &mi->vmevents[i]); +} +#ifdef CONFIG_MEMCG_KMEM static int memcg_online_kmem (struct mem_cgroup *memcg) {
@@ -4587,10 +4606,11 @@ static void __mem_cgroup_free(struct memint node;/* -* Flush percpu vmstats to guarantee the value correctness +* Flush percpu vmstats and vmevents to guarantee the value correctness * on parent's and all ancestor levels. */ memcg_flush_percpu_vmstats (memcg); +memcg_flush_percpu_vmevents (memcg);for_each_node (node)free_mem_cgroup_per_node_info (memcg, node);free_percpu (memcg->vmstats_percpu);
Greg Kroah-Hartman
maintainerPATCH 147/162 mm, page_alloc: move_freepages should not examine struct page of reserved memory
In reply to Greg Kroah-HartmanFrom: David Rientjes <[email protected]>
commit cd961038381f392b364a7c4a040f4576ca415b1a upstream.
After commit 907ec5fca3dc ("mm: zero remaining unavailable struct pages"), struct page of reserved memory is zeroed. This causes page->flags to be 0 and fixes issues related to reading /proc/kpageflags, for example, of reserved memory.
The VM_BUG_ON() in move_freepages_block(), however, assumes that page_zone() is meaningful even for reserved memory. That assumption is no longer true after the aforementioned commit.
There's no reason why move_freepages_block() should be testing the legitimacy of page_zone() for reserved memory; its scope is limited only to pages on the zone's freelist.
Note that pfn_valid() can be true for reserved memory: there is a backing struct page. The check for page_to_nid(page) is also buggy but reserved memory normally only appears on node 0 so the zeroing doesn't affect this.
Move the debug checks to after verifying PageBuddy is true. This isolates the scope of the checks to only be for buddy pages which are on the zone's freelist which move_freepages_block() is operating on. In this case, an incorrect node or zone is a bug worthy of being warned about (and the examination of struct page is acceptable bcause this memory is not reserved).
Why does move_freepages_block() gets called on reserved memory? It's simply math after finding a valid free page from the per-zone free area to use as fallback. We find the beginning and end of the pageblock of the valid page and that can bring us into memory that was reserved per the e820. pfn_valid() is still true (it's backed by a struct page), but since it's zero'd we shouldn't make any inferences here about comparing its node or zone. The current node check just happens to succeed most of the time by luck because reserved memory typically appears on node 0.
The fix here is to validate that we actually have buddy pages before testing if there's any type of zone or node strangeness going on.
We noticed it almost immediately after bringing 907ec5fca3dc in on CONFIG_DEBUG_VM builds. It depends on finding specific free pages in the per-zone free area where the math in move_freepages() will bring the start or end pfn into reserved memory and wanting to claim that entire pageblock as a new migratetype. So the path will be rare, require CONFIG_DEBUG_VM, and require fallback to a different migratetype.
Some struct pages were already zeroed from reserve pages before 907ec5fca3c so it theoretically could trigger before this commit. I think it's rare enough under a config option that most people don't run that others may not have noticed. I wouldn't argue against a stable tag and the backport should be easy enough, but probably wouldn't single out a commit that this is fixing.
Mel said:
: The overhead of the debugging check is higher with this patch although : it'll only affect debug builds and the path is not particularly hot. : If this was a concern, I think it would be reasonable to simply remove : the debugging check as the zone boundaries are checked in
: move_freepages_block and we never expect a zone/node to be smaller than : a pageblock and stuck in the middle of another zone.
--- mm/page_alloc.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
mm/page_alloc.c +4 -15
@@ -2167,27 +2167,12 @@ static int move_freepages(struct zone *zunsigned int order;int pages_moved =0 ; -#ifndef CONFIG_HOLES_IN_ZONE -/* -* page_zone is not safe to call in this context when -* CONFIG_HOLES_IN_ZONE is set. This bug check is probably redundant -* anyway as we check zone boundaries in move_freepages_block(). -* Remove at a later date when no bug reports exist related to -* grouping pages by mobility -*/ -VM_BUG_ON (pfn_valid (page_to_pfn (start_page)) && -pfn_valid (page_to_pfn (end_page)) && -page_zone (start_page) !=page_zone (end_page)); -#endif for (page = start_page; page <= end_page;) {if (!pfn_valid_within (page_to_pfn (page))) { page++;continue ; } -/* Make sure we are not inadvertently changing nodes */ -VM_BUG_ON_PAGE (page_to_nid (page) !=zone_to_nid (zone), page); -if (!PageBuddy (page)) {/* * We assume that pages that could be isolated for
@@ -2202,6 +2187,10 @@ static int move_freepages(struct zone *zcontinue ; } +/* Make sure we are not inadvertently changing nodes */ +VM_BUG_ON_PAGE (page_to_nid (page) !=zone_to_nid (zone), page); +VM_BUG_ON_PAGE (page_zone (page) != zone, page); + order =page_order (page);move_to_free_area (page, &zone->free_area[order], migratetype); page +=1 << order;
Greg Kroah-Hartman
maintainerPATCH 111/162 HID: wacom: correct misreported EKR ring values
In reply to Greg Kroah-HartmanFrom: Aaron Armstrong Skomra <[email protected]>
commit fcf887e7caaa813eea821d11bf2b7619a37df37a upstream.
The EKR ring claims a range of 0 to 71 but actually reports values 1 to 72. The ring is used in relative mode so this change should not affect users.
--- drivers/hid/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/wacom_wac.c +1 -1
@@ -1059,7 +1059,7 @@ static int wacom_remote_irq(struct wacominput_report_key (input,BTN_BASE2 , (data[11 ] &0x02 ));if (data[12 ] &0x80 ) -input_report_abs (input,ABS_WHEEL , (data[12 ] &0x7f )); +input_report_abs (input,ABS_WHEEL , (data[12 ] &0x7f ) -1 );else input_report_abs (input,ABS_WHEEL ,0 );
Greg Kroah-Hartman
maintainerPATCH 103/162 perf ftrace: Fix failure to set cpumask when only one cpu is present
In reply to Greg Kroah-Hartman[ Upstream commit cf30ae726c011e0372fd4c2d588466c8b50a8907 ]
The buffer containing the string used to set cpumask is overwritten at the end of the string later in cpu_map__snprint_mask due to not enough memory space, when there is only one cpu.
And thus causes the following failure:
$ perf ftrace ls failed to reset ftrace $
This patch fixes the calculation of the cpumask string size.
--- tools/perf/builtin-ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-ftrace.c +1 -1
@@ -173,7 +173,7 @@ static int set_tracing_cpumask(struct cpu_map *cpumap)int last_cpu; last_cpu =cpu_map__cpu (cpumap, cpumap->nr -1 ); - mask_size = (last_cpu +3 ) /4 +1 ; + mask_size = last_cpu /4 +2 ;/* one more byte for EOS */ mask_size += last_cpu /32 ;/* ',' is needed for every 32th cpus */ cpumask =malloc (mask_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/162 selftests: kvm: Adding config fragments
In reply to Greg Kroah-Hartman[ Upstream commit c096397c78f766db972f923433031f2dec01cae0 ]
selftests kvm test cases need pre-required kernel configs for the test to get pass.
--- tools/testing/selftests/kvm/config | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tools/testing/selftests/kvm/config
tools/testing/selftests/kvm/config new file +3 -0
@@ -0,0 +1,3 @@ +CONFIG_KVM=y +CONFIG_KVM_INTEL=y +CONFIG_KVM_AMD=y
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/162 dm integrity: fix a crash due to BUG_ON in __journal_read_write()
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 5729b6e5a1bcb0bbc28abe82d749c7392f66d2c7 upstream.
Fix a crash that was introduced by the commit 724376a04d1a. The crash is reported here: https://gitlab.com/cryptsetup/cryptsetup/issues/468
When reading from the integrity device, the function dm_integrity_map_continue calls find_journal_node to find out if the location to read is present in the journal. Then, it calculates how many sectors are consecutively stored in the journal. Then, it locks the range with add_new_range and wait_and_add_new_range.
The problem is that during wait_and_add_new_range, we hold no locks (we don't hold ic->endio_wait.lock and we don't hold a range lock), so the journal may change arbitrarily while wait_and_add_new_range sleeps.
The code then goes to __journal_read_write and hits BUG_ON(journal_entry_get_sector(je) != logical_sector); because the journal has changed.
In order to fix this bug, we need to re-check the journal location after wait_and_add_new_range. We restrict the length to one block in order to not complicate the code too much.
--- drivers/md/dm-integrity.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/md/dm-integrity.c +15 -0
@@ -1940,7 +1940,22 @@ offload_to_thread:queue_work (ic->wait_wq, &dio->work);return ; } +if (journal_read_pos !=NOT_FOUND ) + dio->range.n_sectors = ic->sectors_per_block;wait_and_add_new_range (ic, &dio->range); +/* +* wait_and_add_new_range drops the spinlock, so the journal +* may have been changed arbitrarily. We need to recheck. +* To simplify the code, we restrict I/O size to just one block. +*/ +if (journal_read_pos !=NOT_FOUND ) { +sector_t next_sector; +unsigned new_pos =find_journal_node (ic, dio->range.logical_sector, &next_sector); +if (unlikely (new_pos != journal_read_pos)) { +remove_range_unlocked (ic, &dio->range); + goto retry; + } + } }spin_unlock_irq (&ic->endio_wait.lock);
Greg Kroah-Hartman
maintainerPATCH 132/162 IB/hfi1: Add additional checks when handling TID RDMA WRITE DATA packet
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit 90fdae66e72bf0381d168f12dca0259617927895 upstream.
In a congested fabric with adaptive routing enabled, traces show that packets could be delivered out of order, which could cause incorrect processing of stale packets. For stale TID RDMA WRITE DATA packets that cause KDETH EFLAGS errors, this patch adds additional checks before processing the packets.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/infiniband/hw/hfi1/tid_rdma.c +7 -0
@@ -2947,8 +2947,15 @@ bool hfi1_handle_kdeth_eflags(struct hfi*/ spin_lock (&qp->s_lock); qpriv = qp->priv; +if (qpriv->r_tid_tail ==HFI1_QP_WQE_INVALID || + qpriv->r_tid_tail == qpriv->r_tid_head) + goto unlock; e = &qp->s_ack_queue[qpriv->r_tid_tail]; +if (e->opcode !=TID_OP (WRITE_REQ )) + goto unlock; req =ack_to_tid_req (e); +if (req->comp_seg == req->cur_seg) + goto unlock; flow = &req->flows[req->clear_tail];trace_hfi1_eflags_err_write (qp, rcv_type, rte, psn);trace_hfi1_rsp_handle_kdeth_eflags (qp, psn);
Greg Kroah-Hartman
maintainerPATCH 120/162 drm/nouveau: Dont retry infinitely when receiving no data on i2c over AUX
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
commit c358ebf59634f06d8ed176da651ec150df3c8686 upstream.
While I had thought I had fixed this issue in:
commit 342406e4fbba ("drm/nouveau/i2c: Disable i2c bus access after ->fini()")
It turns out that while I did fix the error messages I was seeing on my P50 when trying to access i2c busses with the GPU in runtime suspend, I accidentally had missed one important detail that was mentioned on the bug report this commit was supposed to fix: that the CPU would only lock up when trying to access i2c busses _on connected devices_ _while the GPU is not in runtime suspend_. Whoops. That definitely explains why I was not able to get my machine to hang with i2c bus interactions until now, as plugging my P50 into it's dock with an HDMI monitor connected allowed me to finally reproduce this locally.
Now that I have managed to reproduce this issue properly, it looks like the problem is much simpler then it looks. It turns out that some connected devices, such as MST laptop docks, will actually ACK i2c reads even if no data was actually read:
[ 275.063043] nouveau 0000:01:00.0: i2c: aux 000a: 1: 0000004c 1 [ 275.063447] nouveau 0000:01:00.0: i2c: aux 000a: 00 01101000 10040000 [ 275.063759] nouveau 0000:01:00.0: i2c: aux 000a: rd 00000001 [ 275.064024] nouveau 0000:01:00.0: i2c: aux 000a: rd 00000000 [ 275.064285] nouveau 0000:01:00.0: i2c: aux 000a: rd 00000000 [ 275.064594] nouveau 0000:01:00.0: i2c: aux 000a: rd 00000000
Because we don't handle the situation of i2c ack without any data, we end up entering an infinite loop in nvkm_i2c_aux_i2c_xfer() since the value of cnt always remains at 0. This finally properly explains how this could result in a CPU hang like the ones observed in the aforementioned commit.
So, fix this by retrying transactions if no data is written or received, and give up and fail the transaction if we continue to not write or receive any data after 32 retries.
--- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c +17 -7
@@ -40,8 +40,7 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapteru8 *ptr = msg->buf;while (remaining) { -u8 cnt = (remaining >16 ) ?16 : remaining; -u8 cmd; +u8 cnt, retries, cmd;if (msg->flags &I2C_M_RD ) cmd =1 ;
@@ -51,10 +50,19 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapterif (mcnt || remaining >16 ) cmd |=4 ;/* MOT */ - ret = aux->func->xfer (aux, true, cmd, msg->addr, ptr, &cnt); -if (ret <0 ) { -nvkm_i2c_aux_release (aux); -return ret; +for (retries =0 , cnt =0 ; + retries <32 && !cnt; + retries++) { + cnt =min_t (u8, remaining,16 ); + ret = aux->func->xfer (aux, true, cmd, + msg->addr, ptr, &cnt); +if (ret <0 ) + goto out; + } +if (!cnt) { +AUX_TRACE (aux,"no data after 32 retries" ); + ret = -EIO ; + goto out; } ptr += cnt;
@@ -64,8 +72,10 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter msg++; } + ret = num; +out:nvkm_i2c_aux_release (aux); -return num; +return ret; } static u32
Greg Kroah-Hartman
maintainerPATCH 105/162 perf pmu-events: Fix missing "cpu_clk_unhalted.core" event
In reply to Greg Kroah-Hartman[ Upstream commit 8e6e5bea2e34c61291d00cb3f47560341aa84bc3 ]
The events defined in pmu-events JSON are parsed and added into perf tool. For fixed counters, we handle the encodings between JSON and perf by using a static array fixed[].
But the fixed[] has missed an important event "cpu_clk_unhalted.core".
For example, on the Tremont platform,
[root@localhost ~]# perf stat -e cpu_clk_unhalted.core -a event syntax error: 'cpu_clk_unhalted.core'
\___ parser error
With this patch, the event cpu_clk_unhalted.core can be parsed.
[root@localhost perf]# ./perf stat -e cpu_clk_unhalted.core -a -vvv
------------------------------------------------------------
perf_event_attr:
type 4
size 112
config 0x3c
sample_type IDENTIFIER
read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING
disabled 1
inherit 1
exclude_guest 1 ------------------------------------------------------------
...
--- tools/perf/pmu-events/jevents.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/pmu-events/jevents.c +1 -0
@@ -450,6 +450,7 @@ static struct fixed { { "inst_retired.any_p", "event=0xc0" }, { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" }, { "cpu_clk_unhalted.thread", "event=0x3c" }, + { "cpu_clk_unhalted.core", "event=0x3c" }, { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, { NULL, NULL}, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/162 ceph: clear page dirty before invalidate page
In reply to Greg Kroah-HartmanFrom: Erqi Chen <[email protected]>
commit c95f1c5f436badb9bb87e9b30fd573f6b3d59423 upstream.
clear_page_dirty_for_io(page) before mapping->a_ops->invalidatepage(). invalidatepage() clears page's private flag, if dirty flag is not cleared, the page may cause BUG_ON failure in ceph_set_page_dirty().
--- fs/ceph/addr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ceph/addr.c +3 -2
@@ -912,8 +912,9 @@ get_more_pages:if (page_offset (page) >= ceph_wbc.i_size) {dout ("%p page eof %llu\n" , page, ceph_wbc.i_size); -if (ceph_wbc.size_stable || -page_offset (page) >=i_size_read (inode)) +if ((ceph_wbc.size_stable || +page_offset (page) >=i_size_read (inode)) && +clear_page_dirty_for_io (page)) mapping->a_ops->invalidatepage (page,0 ,PAGE_SIZE );unlock_page (page);
Greg Kroah-Hartman
maintainerPATCH 100/162 drm/vmwgfx: fix memory leak when too many retries have occurred
In reply to Greg Kroah-Hartman[ Upstream commit 6b7c3b86f0b63134b2ab56508921a0853ffa687a ]
Currently when too many retries have occurred there is a memory leak on the allocation for reply on the error return path. Fix this by kfree'ing reply before returning.
Addresses-Coverity: ("Resource leak")
--- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +3 -1
@@ -389,8 +389,10 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,break ; } -if (retries ==RETRIES ) +if (retries ==RETRIES ) { +kfree (reply);return -EINVAL ; + } *msg_len = reply_len; *msg = reply;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/162 net: stmmac: Fix issues when number of Queues >= 4
In reply to Greg Kroah-Hartman[ Upstream commit e8df7e8c233a18d2704e37ecff47583b494789d3 ]
When queues >= 4 we use different registers but we were not subtracting the offset of 4. Fix this.
Found out by Coverity.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 ++++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 4 ++++ 2 files changed, 8 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +4 -0
@@ -85,6 +85,8 @@ static void dwmac4_rx_queue_priority(struct mac_device_info *hw,u32 value; base_register = (queue <4 ) ?GMAC_RXQ_CTRL2 :GMAC_RXQ_CTRL3 ; +if (queue >=4 ) + queue -=4 ; value =readl (ioaddr + base_register);
@@ -102,6 +104,8 @@ static void dwmac4_tx_queue_priority(struct mac_device_info *hw,u32 value; base_register = (queue <4 ) ?GMAC_TXQ_PRTY_MAP0 :GMAC_TXQ_PRTY_MAP1 ; +if (queue >=4 ) + queue -=4 ; value =readl (ioaddr + base_register);
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +4 -0
@@ -106,6 +106,8 @@ static void dwxgmac2_rx_queue_prio(struct mac_device_info *hw, u32 prio,u32 value, reg; reg = (queue <4 ) ?XGMAC_RXQ_CTRL2 :XGMAC_RXQ_CTRL3 ; +if (queue >=4 ) + queue -=4 ; value =readl (ioaddr + reg); value &= ~XGMAC_PSRQ (queue);
@@ -169,6 +171,8 @@ static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue,u32 value, reg; reg = (queue <4 ) ?XGMAC_MTL_RXQ_DMA_MAP0 :XGMAC_MTL_RXQ_DMA_MAP1 ; +if (queue >=4 ) + queue -=4 ; value =readl (ioaddr + reg); value &= ~XGMAC_QxMDMACH (queue);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/162 enetc: Fix build error without PHYLIB
In reply to Greg Kroah-Hartman[ Upstream commit 5f4e4203add2b860d2345312509a160f8292063b ]
If PHYLIB is not set, build enetc will fails:
drivers/net/ethernet/freescale/enetc/enetc.o: In function `enetc_open':enetc.c: undefined reference to `phy_disconnect'enetc.c: undefined reference to `phy_start'drivers/net/ethernet/freescale/enetc/enetc.o: In function `enetc_close':enetc.c: undefined reference to `phy_stop'enetc.c: undefined reference to phy_disconnect' drivers/net/ethernet/freescale/enetc/enetc_ethtool.o: undefined reference to phy_ethtool_get_link_ksettings' drivers/net/ethernet/freescale/enetc/enetc_ethtool.o: undefined reference to phy_ethtool_set_link_ksettings' drivers/net/ethernet/freescale/enetc/enetc_mdio.o: In function enetc_mdio_probe':enetc_mdio.c: undefined reference to `mdiobus_alloc_size'enetc_mdio.c: undefined reference to `mdiobus_free'
--- drivers/net/ethernet/freescale/enetc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/freescale/enetc/Kconfig +1 -0
@@ -2,6 +2,7 @@ config FSL_ENETC tristate "ENETC PF driver" depends on PCI && PCI_MSI && (ARCH_LAYERSCAPE || COMPILE_TEST) + select PHYLIB help This driver supports NXP ENETC gigabit ethernet controller PCIe physical function (PF) devices, managing ENETC Ports at a privileged
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/162 NFSv4.1: Only reap expired delegations
In reply to Greg Kroah-Hartman[ Upstream commit ad11408970df79d5f481aa9964e91f183133424c ]
Fix nfs_reap_expired_delegations() to ensure that we only reap delegations that are actually expired, rather than triggering on random errors.
--- fs/nfs/delegation.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
fs/nfs/delegation.c +17 -6
@@ -1046,6 +1046,22 @@ void nfs_test_expired_all_delegations(struct nfs_client *clp)nfs4_schedule_state_manager (clp); } +static void +nfs_delegation_test_free_expired (struct inode *inode, +nfs4_stateid *stateid, +const struct cred *cred) +{ +struct nfs_server *server =NFS_SERVER (inode); +const struct nfs4_minor_version_ops *ops = server->nfs_client->cl_mvops; +int status; + +if (!cred) +return ; + status = ops->test_and_free_expired (server, stateid, cred); +if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID ) +nfs_remove_bad_delegation (inode, stateid); +} +/** * nfs_reap_expired_delegations - reap expired delegations * @clp: nfs_client to process
@@ -1057,7 +1073,6 @@ void nfs_test_expired_all_delegations(struct nfs_client *clp)*/ void nfs_reap_expired_delegations (struct nfs_client *clp) { -const struct nfs4_minor_version_ops *ops = clp->cl_mvops;struct nfs_delegation *delegation;struct nfs_server *server;struct inode *inode;
@@ -1088,11 +1103,7 @@ restart:nfs4_stateid_copy (&stateid, &delegation->stateid);clear_bit (NFS_DELEGATION_TEST_EXPIRED , &delegation->flags);rcu_read_unlock (); -if (cred !=NULL && - ops->test_and_free_expired (server, &stateid, cred) <0 ) { -nfs_revoke_delegation (inode, &stateid); -nfs_inode_find_state_and_recover (inode, &stateid); - } +nfs_delegation_test_free_expired (inode, &stateid, cred);put_cred (cred);if (nfs4_server_rebooted (clp)) {nfs_inode_mark_test_expired_delegation (server,inode);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/162 NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()
In reply to Greg Kroah-Hartman[ Upstream commit c77e22834ae9a11891cb613bd9a551be1b94f2bc ]
John Hubbard reports seeing the following stack trace:
nfs4_do_reclaim
rcu_read_lock /* we are now in_atomic() and must not sleep */
nfs4_purge_state_owners
nfs4_free_state_owner
nfs4_destroy_seqid_counter
rpc_destroy_wait_queue
cancel_delayed_work_sync
__cancel_work_timer
__flush_work
start_flush_work
might_sleep:
(kernel/workqueue.c:2975: BUG)The solution is to separate out the freeing of the state owners from nfs4_purge_state_owners(), and perform that outside the atomic context.
--- fs/nfs/nfs4_fs.h | 3 ++- fs/nfs/nfs4client.c | 5 ++++- fs/nfs/nfs4state.c | 27 ++++++++++++++++++++++----- 3 files changed, 28 insertions(+), 7 deletions(-)
fs/nfs/nfs4_fs.h +2 -1
@@ -465,7 +465,8 @@ static inline void nfs4_schedule_session_recovery(struct nfs4_session *session,extern struct nfs4_state_owner *nfs4_get_state_owner (struct nfs_server *,const struct cred *,gfp_t );extern void nfs4_put_state_owner (struct nfs4_state_owner *); -extern void nfs4_purge_state_owners (struct nfs_server *); +extern void nfs4_purge_state_owners (struct nfs_server *,struct list_head *); +extern void nfs4_free_state_owners (struct list_head *head);extern struct nfs4_state *nfs4_get_open_state (struct inode *,struct nfs4_state_owner *);extern void nfs4_put_open_state (struct nfs4_state *);extern void nfs4_close_state (struct nfs4_state *,fmode_t );
fs/nfs/nfs4client.c +4 -1
@@ -758,9 +758,12 @@ out:static void nfs4_destroy_server (struct nfs_server *server) { +LIST_HEAD (freeme); +nfs_server_return_all_delegations (server);unset_pnfs_layoutdriver (server); -nfs4_purge_state_owners (server); +nfs4_purge_state_owners (server, &freeme); +nfs4_free_state_owners (&freeme); }/*
fs/nfs/nfs4state.c +22 -5
@@ -624,24 +624,39 @@ void nfs4_put_state_owner(struct nfs4_state_owner *sp)/** * nfs4_purge_state_owners - Release all cached state owners * @server: nfs_server with cached state owners to release +* @head: resulting list of state owners * * Called at umount time. Remaining state owners will be on * the LRU with ref count of zero. +* Note that the state owners are not freed, but are added +* to the list @head, which can later be used as an argument +* to nfs4_free_state_owners. */ -void nfs4_purge_state_owners (struct nfs_server *server) +void nfs4_purge_state_owners (struct nfs_server *server,struct list_head *head) {struct nfs_client *clp = server->nfs_client;struct nfs4_state_owner *sp, *tmp; -LIST_HEAD (doomed);spin_lock (&clp->cl_lock);list_for_each_entry_safe (sp, tmp, &server->state_owners_lru, so_lru) { -list_move (&sp->so_lru, &doomed); +list_move (&sp->so_lru, head);nfs4_remove_state_owner_locked (sp); }spin_unlock (&clp->cl_lock); +} -list_for_each_entry_safe (sp, tmp, &doomed, so_lru) { +/** +* nfs4_purge_state_owners - Release all cached state owners +* @head: resulting list of state owners +* +* Frees a list of state owners that was generated by +* nfs4_purge_state_owners +*/ +void nfs4_free_state_owners (struct list_head *head) +{ +struct nfs4_state_owner *sp, *tmp; + +list_for_each_entry_safe (sp, tmp, head, so_lru) {list_del (&sp->so_lru);nfs4_free_state_owner (sp); }
@@ -1864,12 +1879,13 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recovstruct nfs4_state_owner *sp;struct nfs_server *server;struct rb_node *pos; +LIST_HEAD (freeme);int status =0 ; restart:rcu_read_lock ();list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) { -nfs4_purge_state_owners (server); +nfs4_purge_state_owners (server, &freeme);spin_lock (&clp->cl_lock); for (pos = rb_first(&server->state_owners); pos != NULL;
@@ -1898,6 +1914,7 @@ restart:spin_unlock (&clp->cl_lock); }rcu_read_unlock (); +nfs4_free_state_owners (&freeme);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/162 iwlwifi: fix locking in delayed GTK setting
In reply to Greg Kroah-Hartman[ Upstream commit 6569e7d36773956298ec1d5f4e6a2487913d2752 ]
This code clearly never could have worked, since it locks while already locked. Add an unlocked __iwl_mvm_mac_set_key() variant that doesn't do locking to fix that.
--- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +26 -13
@@ -207,11 +207,11 @@ static const struct cfg80211_pmsr_capabilities iwl_mvm_pmsr_capa = { }, }; -static int iwl_mvm_mac_set_key (struct ieee80211_hw *hw, -enum set_key_cmd cmd, -struct ieee80211_vif *vif, -struct ieee80211_sta *sta, -struct ieee80211_key_conf *key); +static int __iwl_mvm_mac_set_key (struct ieee80211_hw *hw, +enum set_key_cmd cmd, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_key_conf *key);void iwl_mvm_ref (struct iwl_mvm *mvm,enum iwl_mvm_ref_type ref_type) {
@@ -2725,7 +2725,7 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, mvmvif->ap_early_keys[i] =NULL ; - ret =iwl_mvm_mac_set_key (hw,SET_KEY , vif,NULL , key); + ret =__iwl_mvm_mac_set_key (hw,SET_KEY , vif,NULL , key);if (ret) goto out_quota_failed; }
@@ -3493,11 +3493,11 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,return ret; } -static int iwl_mvm_mac_set_key (struct ieee80211_hw *hw, -enum set_key_cmd cmd, -struct ieee80211_vif *vif, -struct ieee80211_sta *sta, -struct ieee80211_key_conf *key) +static int __iwl_mvm_mac_set_key (struct ieee80211_hw *hw, +enum set_key_cmd cmd, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_key_conf *key) {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif);struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw);
@@ -3552,8 +3552,6 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,return -EOPNOTSUPP ; } -mutex_lock (&mvm->mutex); -switch (cmd) {case SET_KEY : if ((vif->type == NL80211_IFTYPE_ADHOC ||
@@ -3699,7 +3697,22 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, ret = -EINVAL ; } +return ret; +} + +static int iwl_mvm_mac_set_key (struct ieee80211_hw *hw, +enum set_key_cmd cmd, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_key_conf *key) +{ +struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw); +int ret; + +mutex_lock (&mvm->mutex); + ret =__iwl_mvm_mac_set_key (hw, cmd, vif, sta, key);mutex_unlock (&mvm->mutex); +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/162 HID: logitech-hidpp: add USB PID for a few more supported mice
In reply to Greg Kroah-Hartman[ Upstream commit 27fc32fd9417968a459d43d9a7c50fd423d53eb9 ]
Add more device IDs to logitech-hidpp driver.
--- drivers/hid/hid-logitech-hidpp.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
drivers/hid/hid-logitech-hidpp.c +31 -1
@@ -3749,15 +3749,45 @@ static const struct hid_device_id hidpp_devices[] = { { L27MHZ_DEVICE(HID_ANY_ID) }, - {/* Logitech G403 Gaming Mouse over USB */ + {/* Logitech G203/Prodigy Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC084) }, + { /* Logitech G302 Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07F) }, + { /* Logitech G303 Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC080) }, + { /* Logitech G400 Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07E) }, + { /* Logitech G403 Wireless Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC082) }, + { /* Logitech G403 Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC083) }, + { /* Logitech G403 Hero Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08F) }, + { /* Logitech G502 Proteus Core Gaming Mouse */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07D) }, + { /* Logitech G502 Proteus Spectrum Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) }, + { /* Logitech G502 Hero Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) }, { /* Logitech G700 Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) }, + { /* Logitech G700s Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) }, + { /* Logitech G703 Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC087) }, + { /* Logitech G703 Hero Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC090) }, { /* Logitech G900 Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC081) }, + { /* Logitech G903 Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC086) }, + { /* Logitech G903 Hero Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC091) }, { /* Logitech G920 Wheel over USB */HID_USB_DEVICE (USB_VENDOR_ID_LOGITECH ,USB_DEVICE_ID_LOGITECH_G920_WHEEL ), .driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS}, + { /* Logitech G Pro Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC088) }, { /* MX5000 keyboard over Bluetooth */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/162 NFSv4: When recovering state fails with EAGAIN, retry the same recovery
In reply to Greg Kroah-Hartman[ Upstream commit c34fae003c79570b6c930b425fea3f0b7b1e7056 ]
If the server returns with EAGAIN when we're trying to recover from a server reboot, we currently delay for 1 second, but then mark the stateid as needing recovery after the grace period has expired.
Instead, we should just retry the same recovery process immediately after the 1 second delay. Break out of the loop after 10 retries.
--- fs/nfs/nfs4state.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/nfs/nfs4state.c +8 -1
@@ -1606,6 +1606,7 @@ static int __nfs4_reclaim_open_state(struct nfs4_state_owner *sp, struct nfs4_ststatic int nfs4_reclaim_open_state (struct nfs4_state_owner *sp,const struct nfs4_state_recovery_ops *ops) {struct nfs4_state *state; +unsigned int loop =0 ;int status =0 ;/* Note: we rely on the sp->so_states list being ordered
@@ -1632,8 +1633,10 @@ restart:switch (status) {default : -if (status >=0 ) +if (status >=0 ) { + loop =0 ;break ; + }printk (KERN_ERR "NFS: %s: unhandled error %d\n" , __func__, status);/* Fall through */ case -ENOENT :
@@ -1647,6 +1650,10 @@ restart:break ;case -EAGAIN :ssleep (1 ); +if (loop++ <10 ) { +set_bit (ops->state_flag_bit, &state->flags); +break ; + }/* Fall through */ case -NFS4ERR_ADMIN_REVOKED :case -NFS4ERR_STALE_STATEID :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/162 bpf: sockmap, sock_map_delete needs to use xchg
In reply to Greg Kroah-Hartman[ Upstream commit 45a4521dcbd92e71c9e53031b40e34211d3b4feb ]
__sock_map_delete() may be called from a tcp event such as unhash or close from the following trace,
tcp_bpf_close()
tcp_bpf_remove()
sk_psock_unlink()
sock_map_delete_from_link()
__sock_map_delete()In this case the sock lock is held but this only protects against duplicate removals on the TCP side. If the map is free'd then we have this trace,
sock_map_free
xchg() <- replaces map entry
sock_map_unref()
sk_psock_put()
sock_map_del_link()The __sock_map_delete() call however uses a read, test, null over the map entry which can result in both paths trying to free the map entry.
To fix use xchg in TCP paths as well so we avoid having two references to the same map entry.
--- net/core/sock_map.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
net/core/sock_map.c +9 -5
@@ -281,16 +281,20 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test, struct sock **psk) {struct sock *sk; +int err =0 ;raw_spin_lock_bh (&stab->lock); sk = *psk;if (!sk_test || sk_test == sk) - *psk =NULL ; + sk =xchg (psk,NULL ); + +if (likely (sk)) +sock_map_unref (sk, psk); +else + err = -EINVAL ; +raw_spin_unlock_bh (&stab->lock); -if (unlikely (!sk)) -return -EINVAL ; -sock_map_unref (sk, psk); -return 0 ; +return err; } static void sock_map_delete_from_link(struct bpf_map *map, struct sock *sk,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/162 NFSv4: Fix a credential refcount leak in nfs41_check_delegation_stateid
In reply to Greg Kroah-Hartman[ Upstream commit 8c39a39e28b86a4021d9be314ce01019bafa5fdc ]
It is unsafe to dereference delegation outside the rcu lock, and in any case, the refcount is guaranteed held if cred is non-zero.
--- fs/nfs/nfs4proc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/nfs4proc.c +1 -2
@@ -2752,8 +2752,7 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID )nfs_finish_clear_delegation_stateid (state, &stateid); -if (delegation->cred) -put_cred (cred); +put_cred (cred); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/162 net/ethernet/qlogic/qed: force the string buffer NULL-terminated
In reply to Greg Kroah-Hartman[ Upstream commit 3690c8c9a8edff0db077a38783112d8fe12a7dd2 ]
strncpy() does not ensure NULL-termination when the input string size equals to the destination buffer size 30.
The output string is passed to qed_int_deassertion_aeu_bit() which calls DP_INFO() and relies NULL-termination.
Use strlcpy instead. The other conditional branch above strncpy() needs no fix as snprintf() ensures NULL-termination.
This issue is identified by a Coccinelle script.
--- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_int.c +1 -1
@@ -1093,7 +1093,7 @@ static int qed_int_deassertion(struct qed_hwfn *p_hwfn,snprintf (bit_name,30 , p_aeu->bit_name, num); else - strncpy(bit_name, + strlcpy(bit_name, p_aeu->bit_name, 30);/* We now need to pass bitmask in its
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/162 netfilter: ebtables: fix a memory leak bug in compat
In reply to Greg Kroah-Hartman[ Upstream commit 15a78ba1844a8e052c1226f930133de4cef4e7ad ]
In compat_do_replace(), a temporary buffer is allocated through vmalloc() to hold entries copied from the user space. The buffer address is firstly saved to 'newinfo->entries', and later on assigned to 'entries_tmp'. Then the entries in this temporary buffer is copied to the internal kernel structure through compat_copy_entries(). If this copy process fails, compat_do_replace() should be terminated. However, the allocated temporary buffer is not freed on this path, leading to a memory leak.
To fix the bug, free the buffer before returning from compat_do_replace().
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -2267,8 +2267,10 @@ static int compat_do_replace(struct net *net, void __user *user, state.buf_kern_len = size64; ret =compat_copy_entries (entries_tmp, tmp.entries_size, &state); -if (WARN_ON (ret <0 )) +if (WARN_ON (ret <0 )) { +vfree (entries_tmp); goto out_unlock; + }vfree (entries_tmp); tmp.entries_size = size64;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/162 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl()
In reply to Greg Kroah-Hartman[ Upstream commit b55f3b841099e641bdb2701d361a4c304e2dbd6f ]
In hwsim_dump_radio_nl(), when genlmsg_put() on line 3617 fails, hdr is assigned to NULL. Then hdr is used on lines 3622 and 3623:
genl_dump_check_consistent(cb, hdr);
genlmsg_end(skb, hdr);Thus, possible null-pointer dereferences may occur.
To fix these bugs, hdr is used here when it is not NULL.
This bug is found by a static analysis tool STCheck written by us.
--- drivers/net/wireless/mac80211_hwsim.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/mac80211_hwsim.c +5 -3
@@ -3615,10 +3615,12 @@ static int hwsim_dump_radio_nl(struct sk_buff *skb, hdr =genlmsg_put (skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, &hwsim_genl_family,NLM_F_MULTI ,HWSIM_CMD_GET_RADIO ); -if (!hdr) +if (hdr) { +genl_dump_check_consistent (cb, hdr); +genlmsg_end (skb, hdr); + }else { res = -EMSGSIZE ; -genl_dump_check_consistent (cb, hdr); -genlmsg_end (skb, hdr); + } } done:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/162 ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master mode
In reply to Greg Kroah-Hartman[ Upstream commit 34a2a80ff30b5d2330abfa8980c7f0cc15a8158a ]
When running McASP as master capture alone will not record any audio unless a parallel playback stream is running. As soon as the playback stops the captured data is going to be silent again.
In McASP master mode we need to set the PDIR for the clock pins and fix the mcasp_set_axr_pdir() to skip the bits in the PDIR registers above AMUTE.
This went unnoticed as most of the boards uses McASP as slave and neither of these issues are visible (audible) in those setups.
--- sound/soc/ti/davinci-mcasp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-mcasp.c +2 -1
@@ -194,7 +194,7 @@ static inline void mcasp_set_axr_pdir(struct davinci_mcasp *mcasp, bool enable) {u32 bit; -for_each_set_bit (bit, &mcasp->pdir,PIN_BIT_AFSR ) { +for_each_set_bit (bit, &mcasp->pdir,PIN_BIT_AMUTE ) {if (enable)mcasp_set_bits (mcasp,DAVINCI_MCASP_PDIR_REG ,BIT (bit));else
@@ -222,6 +222,7 @@ static void mcasp_start_rx(struct davinci_mcasp *mcasp)if (mcasp_is_synchronous (mcasp)) {mcasp_set_ctl_reg (mcasp,DAVINCI_MCASP_GBLCTLX_REG ,TXHCLKRST );mcasp_set_ctl_reg (mcasp,DAVINCI_MCASP_GBLCTLX_REG ,TXCLKRST ); +mcasp_set_clk_pdir (mcasp, true); }/* Activate serializer(s) */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/162 st21nfca_connectivity_event_received: null check the allocation
In reply to Greg Kroah-Hartman[ Upstream commit 9891d06836e67324c9e9c4675ed90fc8b8110034 ]
devm_kzalloc may fail and return null. So the null check is needed.
--- drivers/nfc/st21nfca/se.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nfc/st21nfca/se.c +2 -0
@@ -317,6 +317,8 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host, transaction = (struct nfc_evt_transaction *)devm_kzalloc (dev, skb->len -2 ,GFP_KERNEL ); +if (!transaction) +return -ENOMEM ; transaction->aid_len = skb->data[1 ]; memcpy(transaction->aid, &skb->data[2],
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/162 selftests/bpf: fix sendmsg6_prog on s390
In reply to Greg Kroah-Hartman[ Upstream commit c8eee4135a456bc031d67cadc454e76880d1afd8 ]
"sendmsg6: rewrite IP & port (C)" fails on s390, because the code in sendmsg_v6_prog() assumes that (ctx->user_ip6[0] & 0xFFFF) refers to leading IPv6 address digits, which is not the case on big-endian machines.
Since checking bitwise operations doesn't seem to be the point of the test, replace two short comparisons with a single int comparison.
--- tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/bpf/progs/sendmsg6_prog.c +1 -2
@@ -41,8 +41,7 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx) }/* Rewrite destination. */ -if ((ctx->user_ip6[0 ] &0xFFFF ) ==bpf_htons (0xFACE ) && - ctx->user_ip6[0 ] >>16 ==bpf_htons (0xB00C )) { +if (ctx->user_ip6[0 ] ==bpf_htonl (0xFACEB00C )) { ctx->user_ip6[0 ] =bpf_htonl (DST_REWRITE_IP6_0 ); ctx->user_ip6[1 ] =bpf_htonl (DST_REWRITE_IP6_1 ); ctx->user_ip6[2 ] =bpf_htonl (DST_REWRITE_IP6_2 );
Signature · 1 line
2.20.1
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.11 release. There are 162 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 Thu 29 Aug 2019 07:25:02 AM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 390 pass: 390 fail: 0
Guenter