net: ovs: fix return type of ndo_start_xmit function
Subsystems (41)
Sasha Levin
maintainerPATCH 182/209 spi: spidev: Fix OF tree warning logic
In reply to Sasha LevinFrom: Trent Piepho <[email protected]>
[ Upstream commit 605b3bec73cbd74b4ac937b580cd0b47d1300484 ]
spidev will make a big fuss if a device tree node binds a device by using "spidev" as the node's compatible property.
However, the logic for this isn't looking for "spidev" in the compatible, but rather checking that the device is NOT compatible with spidev's list of devices.
This causes a false positive if a device not named "rohm,dh2228fv", etc. binds to spidev, even if a means other than putting "spidev" in the device tree was used. E.g., the sysfs driver_override attribute.
--- drivers/spi/spidev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/spi/spidev.c +3 -5
@@ -724,11 +724,9 @@ static int spidev_probe(struct spi_device *spi)* compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ -if (spi->dev.of_node && !of_match_device (spidev_dt_ids, &spi->dev)) { -dev_err (&spi->dev,"buggy DT: spidev listed directly in DT\n" ); -WARN_ON (spi->dev.of_node && - !of_match_device (spidev_dt_ids, &spi->dev)); - } +WARN (spi->dev.of_node && +of_device_is_compatible (spi->dev.of_node,"spidev" ), +"%pOF: buggy DT: spidev listed directly in DT\n" , spi->dev.of_node);spidev_probe_acpi (spi);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/209 ARM: 8802/1: Call syscall_trace_exit even when system call skipped
In reply to Sasha LevinFrom: Timothy E Baldwin <[email protected]>
[ Upstream commit f18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 ]
On at least x86 and ARM64, and as documented in the ptrace man page a skipped system call will still cause a syscall exit ptrace stop.
Previous to this commit 32-bit ARM did not, resulting in strace being confused when seccomp skips system calls.
This change also impacts programs that use ptrace to skip system calls.
--- arch/arm/kernel/entry-common.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/kernel/entry-common.S +4 -5
@@ -296,16 +296,15 @@ __sys_trace: cmp scno, #-1 @ skip the syscall? bne 2b add sp, sp, #S_OFF @ restore stack - b ret_slow_syscall -__sys_trace_return: - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 +__sys_trace_return_nosave: + enable_irq_notrace mov r0, sp bl syscall_trace_exit b ret_slow_syscall -__sys_trace_return_nosave: - enable_irq_notrace +__sys_trace_return: + str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit b ret_slow_syscall
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/209 x86/mm: Do not warn about PCI BIOS W+X mappings
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit c200dac78fec66d87ef262cac38cfe4feabdf737 ]
PCI BIOS requires the BIOS area 0x0A0000-0x0FFFFFF to be mapped W+X for various legacy reasons. When CONFIG_DEBUG_WX is enabled, this triggers the WX warning, but this is misleading because the mapping is required and is not a result of an accidental oversight.
Prevent the full warning when PCI BIOS is enabled and the detected WX mapping is in the BIOS area. Just emit a pr_warn() which denotes the fact. This is partially duplicating the info which the PCI BIOS code emits when it maps the area as executable, but that info is not in the context of the WX checking output.
Remove the extra %p printout in the WARN_ONCE() while at it. %pS is enough.
--- arch/x86/mm/dump_pagetables.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
arch/x86/mm/dump_pagetables.c +27 -8
@@ -19,7 +19,9 @@#include <linux/sched.h> #include <linux/seq_file.h> #include <linux/highmem.h> +#include <linux/pci.h> +#include <asm/e820/types.h> #include <asm/pgtable.h> /*
@@ -238,6 +240,29 @@ static unsigned long normalize_addr(unsigned long u)return (signed long )(u << shift) >> shift; } +static void note_wx (struct pg_state *st) +{ +unsigned long npages; + + npages = (st->current_address - st->start_address) /PAGE_SIZE ; + +#ifdef CONFIG_PCI_BIOS +/* +* If PCI BIOS is enabled, the PCI BIOS area is forced to WX. +* Inform about it, but avoid the warning. +*/ +if (pcibios_enabled && st->start_address >=PAGE_OFFSET +BIOS_BEGIN && + st->current_address <=PAGE_OFFSET +BIOS_END ) { +pr_warn_once ("x86/mm: PCI BIOS W+X mapping %lu pages\n" , npages); +return ; + } +#endif +/* Account the WX pages */ + st->wx_pages += npages; +WARN_ONCE (1 ,"x86/mm: Found insecure W+X mapping at address %pS\n" , + (void *)st->start_address); +} +/* * This function gets called on a break in a continuous series * of PTE entries; the next one is different so we need to
@@ -273,14 +298,8 @@ static void note_page(struct seq_file *m, struct pg_state *st,unsigned long delta;int width =sizeof (unsigned long ) *2 ; -if (st->check_wx && (eff & _PAGE_RW) && !(eff & _PAGE_NX)) { -WARN_ONCE (1 , -"x86/mm: Found insecure W+X mapping at address %p/%pS\n" , - (void *)st->start_address, - (void *)st->start_address); - st->wx_pages += (st->current_address - - st->start_address) /PAGE_SIZE ; - } +if (st->check_wx && (eff & _PAGE_RW) && !(eff & _PAGE_NX)) +note_wx (st);/* * Now print the actual finished series
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/209 orangefs: rate limit the client not running info message
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 2978d873471005577e7b68a528b4f256a529b030 ]
Currently accessing various /sys/fs/orangefs files will spam the kernel log with the following info message when the client is not running:
[ 491.489284] sysfs_service_op_show: Client not running :-5:
Rate limit this info message to make it less spammy.
--- fs/orangefs/orangefs-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/orangefs/orangefs-sysfs.c +1 -1
@@ -323,7 +323,7 @@ static ssize_t sysfs_service_op_show(struct kobject *kobj,/* Can't do a service_operation if the client is not running... */ rc =is_daemon_in_service ();if (rc) { -pr_info ("%s: Client not running :%d:\n" , +pr_info_ratelimited ("%s: Client not running :%d:\n" , __func__,is_daemon_in_service ()); goto out;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/209 pinctrl: gemini: Fix up TVC clock group
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit a85c928f6a7856a09e47d9b37faa3407c7ac6a8e ]
The previous fix made the TVC clock get muxed in on the D-Link DIR-685 instead of giving nagging warnings of this not working. Not good. We didn't want that, as it breaks video.
Create a specific group for the TVC CLK, and break out a specific GPIO group for it on the SL3516 so we can use that line as GPIO if we don't need the TVC CLK.
--- drivers/pinctrl/pinctrl-gemini.c | 44 ++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 8 deletions(-)
drivers/pinctrl/pinctrl-gemini.c +36 -8
@@ -591,13 +591,16 @@ static const unsigned int tvc_3512_pins[] = {319 ,/* TVC_DATA[1] */ 301 ,/* TVC_DATA[2] */ 283 ,/* TVC_DATA[3] */ -265 ,/* TVC_CLK */ 320 ,/* TVC_DATA[4] */ 302 ,/* TVC_DATA[5] */ 284 ,/* TVC_DATA[6] */ 266, /* TVC_DATA[7] */ }; +static const unsigned int tvc_clk_3512_pins[] = { +265 ,/* TVC_CLK */ +}; +/* NAND flash pins */ static const unsigned int nflash_3512_pins[] = { 199, 200, 201, 202, 216, 217, 218, 219, 220, 234, 235, 236, 237, 252,
@@ -629,7 +632,7 @@ static const unsigned int pflash_3512_pins_extended[] = {/* Serial flash pins CE0, CE1, DI, DO, CK */ static const unsigned int sflash_3512_pins[] = {230 ,231 ,232 ,233 ,211 }; -/* The GPIO0A (0) pin overlap with TVC and extended parallel flash */ +/* The GPIO0A (0) pin overlap with TVC CLK and extended parallel flash */ static const unsigned int gpio0a_3512_pins[] = {265 };/* The GPIO0B (1-4) pins overlap with TVC and ICE */
@@ -823,7 +826,13 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = { .num_pins = ARRAY_SIZE(tvc_3512_pins), /* Conflict with character LCD and ICE */ .mask = LCD_PADS_ENABLE, - .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE, + .value = TVC_PADS_ENABLE, + }, + { + .name = "tvcclkgrp", + .pins = tvc_clk_3512_pins, + .num_pins = ARRAY_SIZE(tvc_clk_3512_pins), + .value = TVC_CLK_PAD_ENABLE, },/* * The construction is done such that it is possible to use a serial
@@ -860,8 +869,8 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = { .name = "gpio0agrp", .pins = gpio0a_3512_pins, .num_pins = ARRAY_SIZE(gpio0a_3512_pins), - /* Conflict with TVC */ - .mask = TVC_PADS_ENABLE, + /* Conflict with TVC CLK */ + .mask = TVC_CLK_PAD_ENABLE, }, { .name = "gpio0bgrp",
@@ -1531,13 +1540,16 @@ static const unsigned int tvc_3516_pins[] = {311 ,/* TVC_DATA[1] */ 394 ,/* TVC_DATA[2] */ 374 ,/* TVC_DATA[3] */ -333 ,/* TVC_CLK */ 354 ,/* TVC_DATA[4] */ 395 ,/* TVC_DATA[5] */ 312 ,/* TVC_DATA[6] */ 334, /* TVC_DATA[7] */ }; +static const unsigned int tvc_clk_3516_pins[] = { +333 ,/* TVC_CLK */ +}; +/* NAND flash pins */ static const unsigned int nflash_3516_pins[] = { 243, 260, 261, 224, 280, 262, 281, 264, 300, 263, 282, 301, 320, 283,
@@ -1570,7 +1582,7 @@ static const unsigned int pflash_3516_pins_extended[] = {static const unsigned int sflash_3516_pins[] = {296 ,338 ,295 ,359 ,339 };/* The GPIO0A (0-4) pins overlap with TVC and extended parallel flash */ -static const unsigned int gpio0a_3516_pins[] = {333 ,354 ,395 ,312 ,334 }; +static const unsigned int gpio0a_3516_pins[] = {354 ,395 ,312 ,334 };/* The GPIO0B (5-7) pins overlap with ICE */ static const unsigned int gpio0b_3516_pins[] = {375 ,396 ,376 };
@@ -1602,6 +1614,9 @@ static const unsigned int gpio0j_3516_pins[] = { 359, 339 };/* The GPIO0K (30,31) pins overlap with NAND flash */ static const unsigned int gpio0k_3516_pins[] = {275 ,298 }; +/* The GPIO0L (0) pins overlap with TVC_CLK */ +static const unsigned int gpio0l_3516_pins[] = {333 }; +/* The GPIO1A (0-4) pins that overlap with IDE and parallel flash */ static const unsigned int gpio1a_3516_pins[] = {221 ,200 ,222 ,201 ,220 };
@@ -1761,7 +1776,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = { .num_pins = ARRAY_SIZE(tvc_3516_pins), /* Conflict with character LCD */ .mask = LCD_PADS_ENABLE, - .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE, + .value = TVC_PADS_ENABLE, + }, + { + .name = "tvcclkgrp", + .pins = tvc_clk_3516_pins, + .num_pins = ARRAY_SIZE(tvc_clk_3516_pins), + .value = TVC_CLK_PAD_ENABLE, },/* * The construction is done such that it is possible to use a serial
@@ -1872,6 +1893,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = {/* Conflict with parallel and NAND flash */ .value = PFLASH_PADS_DISABLE | NAND_PADS_DISABLE, }, + { + .name = "gpio0lgrp", + .pins = gpio0l_3516_pins, + .num_pins = ARRAY_SIZE(gpio0l_3516_pins), + /* Conflict with TVE CLK */ + .mask = TVC_CLK_PAD_ENABLE, + }, { .name = "gpio1agrp", .pins = gpio1a_3516_pins,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/209 scsi: arcmsr: clean up clang warning on extraneous parentheses
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit ca2ade24157693b4e533ccec69df00ef719d4aad ]
There are extraneous parantheses that are causing clang to produce a warning so remove these.
Clean up 3 clang warnings:
equality comparison with extraneous parentheses [-Wparentheses-equality]
--- drivers/scsi/arcmsr/arcmsr_hba.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/arcmsr/arcmsr_hba.c +3 -3
@@ -4135,9 +4135,9 @@ static void arcmsr_hardware_reset(struct AdapterControlBlock *acb)pci_read_config_byte (acb->pdev, i, &value[i]); }/* hardware reset signal */ -if ((acb->dev_id ==0x1680 )) { +if (acb->dev_id ==0x1680 ) {writel (ARCMSR_ARC1680_BUS_RESET , &pmuA->reserved1[0 ]); - }else if ((acb->dev_id ==0x1880 )) { + }else if (acb->dev_id ==0x1880 ) { do { count++; writel(0xF, &pmuC->write_sequence);
@@ -4161,7 +4161,7 @@ static void arcmsr_hardware_reset(struct AdapterControlBlock *acb) }while (((readl (&pmuE->host_diagnostic_3xxx) & ARCMSR_ARC1884_DiagWrite_ENABLE) ==0 ) && (count <5 ));writel (ARCMSR_ARC188X_RESET_ADAPTER , &pmuE->host_diagnostic_3xxx); - }else if ((acb->dev_id ==0x1214 )) { + }else if (acb->dev_id ==0x1214 ) {writel (0x20 , pmuD->reset_request); }else {pci_write_config_byte (acb->pdev,0x84 ,0x20 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/209 hwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 53dfa0088edd2e2793afa21488532b12eb2dae48 ]
BIOS developer guides refer to Family 15h Models 60h-6fh and Family 15h Models 70h-7fh. So far the driver only checked for Models 60h and 70h. However, there are now processors with other model numbers in the same families. Example is A10-9620P family 15h model 65h. Follow the developer guides and mask the lower 4 bit of the model number to determine the registers to use for reading temperatures and temperature limits.
--- drivers/hwmon/k10temp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/hwmon/k10temp.c +3 -2
@@ -325,8 +325,9 @@ static int k10temp_probe(struct pci_dev *pdev, data->pdev = pdev; -if (boot_cpu_data.x86 ==0x15 && (boot_cpu_data.x86_model ==0x60 || - boot_cpu_data.x86_model ==0x70 )) { +if (boot_cpu_data.x86 ==0x15 && + ((boot_cpu_data.x86_model &0xf0 ) ==0x60 || + (boot_cpu_data.x86_model &0xf0 ) ==0x70 )) { data->read_htcreg = read_htcreg_nb_f15; data->read_tempreg = read_tempreg_nb_f15; }else if (boot_cpu_data.x86 ==0x17 ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/209 hwmon: (nct6775) Fix names of DIMM temperature sources
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 3be8c9d103534fadc72b3e174613f37aa19fa423 ]
For NCT6795D and NCT6796D, the DIMM temperature sources are named "Agent[01] Dimm [01]" per datasheet. Match names in datasheets to avoid confusion.
--- drivers/hwmon/nct6775.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/hwmon/nct6775.c +8 -8
@@ -704,10 +704,10 @@ static const char *const nct6795_temp_label[] = {"PCH_CHIP_TEMP" ,"PCH_CPU_TEMP" ,"PCH_MCH_TEMP" , -"PCH_DIM0_TEMP" , -"PCH_DIM1_TEMP" , -"PCH_DIM2_TEMP" , -"PCH_DIM3_TEMP" , +"Agent0 Dimm0" , +"Agent0 Dimm1" , +"Agent1 Dimm0" , +"Agent1 Dimm1" ,"BYTE_TEMP0" ,"BYTE_TEMP1" , "PECI Agent 0 Calibration",
@@ -742,10 +742,10 @@ static const char *const nct6796_temp_label[] = {"PCH_CHIP_TEMP" ,"PCH_CPU_TEMP" ,"PCH_MCH_TEMP" , -"PCH_DIM0_TEMP" , -"PCH_DIM1_TEMP" , -"PCH_DIM2_TEMP" , -"PCH_DIM3_TEMP" , +"Agent0 Dimm0" , +"Agent0 Dimm1" , +"Agent1 Dimm0" , +"Agent1 Dimm1" ,"BYTE_TEMP0" ,"BYTE_TEMP1" , "PECI Agent 0 Calibration",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/209 hwmon: (pwm-fan) Silence error on probe deferral
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit 9f67f7583e77fe5dc57aab3a6159c2642544eaad ]
Probe deferrals aren't actual errors, so silence the error message in case the PWM cannot yet be acquired.
--- drivers/hwmon/pwm-fan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwmon/pwm-fan.c +6 -2
@@ -221,8 +221,12 @@ static int pwm_fan_probe(struct platform_device *pdev) ctx->pwm =devm_of_pwm_get (&pdev->dev, pdev->dev.of_node,NULL );if (IS_ERR (ctx->pwm)) { -dev_err (&pdev->dev,"Could not get PWM\n" ); -return PTR_ERR (ctx->pwm); + ret =PTR_ERR (ctx->pwm); + +if (ret != -EPROBE_DEFER ) +dev_err (&pdev->dev,"Could not get PWM: %d\n" , ret); + +return ret; }platform_set_drvdata (pdev, ctx);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/209 hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros
In reply to Sasha LevinFrom: Nicolin Chen <[email protected]>
[ Upstream commit 791ebc9d34e9d212fc03742c31654b017d385926 ]
The three INA3221_CONFIG_MODE macros are not correctly defined here. The MODE3-1 bits are located at BIT 2-0 according to the datasheet.
So this patch just fixes them by shifting all of them with a correct offset. However, this isn't a crital bug fix as the driver does not use any of them at this point.
--- drivers/hwmon/ina3221.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/ina3221.c +3 -3
@@ -38,9 +38,9 @@#define INA3221_WARN3 0x0c#define INA3221_MASK_ENABLE 0x0f -#define INA3221_CONFIG_MODE_SHUNT BIT(1) -#define INA3221_CONFIG_MODE_BUS BIT(2) -#define INA3221_CONFIG_MODE_CONTINUOUS BIT(3) +#define INA3221_CONFIG_MODE_SHUNT BIT(0) +#define INA3221_CONFIG_MODE_BUS BIT(1) +#define INA3221_CONFIG_MODE_CONTINUOUS BIT(2)#define INA3221_RSHUNT_DEFAULT 10000
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 192/209 hwmon: (npcm-750-pwm-fan) Change initial pwm target to 255
In reply to Sasha LevinFrom: Kun Yi <[email protected]>
[ Upstream commit f21c8e753b1dcb8f9e5b096db1f7f4e6fdfa7258 ]
Change initial PWM target to 255 to prevent overheating, for example when BMC hangs in userspace or when userspace fan control application is not implemented yet.
--- drivers/hwmon/npcm750-pwm-fan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/npcm750-pwm-fan.c +1 -1
@@ -52,7 +52,7 @@/* Define the Counter Register, value = 100 for match 100% */ #define NPCM7XX_PWM_COUNTER_DEFAULT_NUM 255 -#define NPCM7XX_PWM_CMR_DEFAULT_NUM 127 +#define NPCM7XX_PWM_CMR_DEFAULT_NUM 255#define NPCM7XX_PWM_CMR_MAX 255/* default all PWM channels PRESCALE2 = 1 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 193/209 selftests: forwarding: Have lldpad_app_wait_set() wait for unknown, too
In reply to Sasha LevinFrom: Petr Machata <[email protected]>
[ Upstream commit 372809055f6c830ff978564e09f58bcb9e9b937c ]
Immediately after mlxsw module is probed and lldpad started, added APP entries are briefly in "unknown" state before becoming "pending". That's the state that lldpad_app_wait_set() typically sees, and since there are no pending entries at that time, it bails out. However the entries have not been pushed to the kernel yet at that point, and thus the test case fails.
Fix by waiting for both unknown and pending entries to disappear before proceeding.
--- tools/testing/selftests/net/forwarding/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/forwarding/lib.sh +1 -1
@@ -251,7 +251,7 @@ lldpad_app_wait_set() { local dev=$1; shift - while lldptool -t -i $dev -V APP -c app | grep -q pending; do + while lldptool -t -i $dev -V APP -c app | grep -Eq "pending|unknown"; do echo "$dev: waiting for lldpad to push pending APP updates" sleep 5 done
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 194/209 net: sched: avoid writing on noop_qdisc
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit f98ebd47fd0da1717267ce1583a105d8cc29a16a ]
While noop_qdisc.gso_skb and noop_qdisc.skb_bad_txq are not used in other places, it seems not correct to overwrite their fields in dev_init_scheduler_queue().
noop_qdisc is essentially a shared and read-only object, even if it is not marked as const because of some implementation detail.
--- net/sched/sch_generic.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/sched/sch_generic.c +12 -2
@@ -577,6 +577,18 @@ struct Qdisc noop_qdisc = { .dev_queue = &noop_netdev_queue, .running = SEQCNT_ZERO(noop_qdisc.running), .busylock = __SPIN_LOCK_UNLOCKED(noop_qdisc.busylock), + .gso_skb = { + .next = (struct sk_buff *)&noop_qdisc.gso_skb, + .prev = (struct sk_buff *)&noop_qdisc.gso_skb, + .qlen = 0, + .lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.gso_skb.lock), + }, + .skb_bad_txq = { + .next = (struct sk_buff *)&noop_qdisc.skb_bad_txq, + .prev = (struct sk_buff *)&noop_qdisc.skb_bad_txq, + .qlen = 0, + .lock =__SPIN_LOCK_UNLOCKED (noop_qdisc.skb_bad_txq.lock), + }, };EXPORT_SYMBOL (noop_qdisc);
@@ -1253,8 +1265,6 @@ static void dev_init_scheduler_queue(struct net_device *dev,rcu_assign_pointer (dev_queue->qdisc, qdisc); dev_queue->qdisc_sleeping = qdisc; -__skb_queue_head_init (&qdisc->gso_skb); -__skb_queue_head_init (&qdisc->skb_bad_txq); }void dev_init_scheduler (struct net_device *dev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 195/209 netfilter: nft_compat: do not dump private area
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit d701d8117200399d85e63a737d2e4e897932f3b6 ]
Zero pad private area, otherwise we expose private kernel pointer to userspace. This patch also zeroes the tail area after the ->matchsize and ->targetsize that results from XT_ALIGN().
--- net/netfilter/nft_compat.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
net/netfilter/nft_compat.c +22 -2
@@ -269,6 +269,24 @@ nft_target_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)kfree (expr->ops); } +static int nft_extension_dump_info (struct sk_buff *skb,int attr, +const void *info, +unsigned int size,unsigned int user_size) +{ +unsigned int info_size, aligned_size =XT_ALIGN (size); +struct nlattr *nla; + + nla =nla_reserve (skb, attr, aligned_size); +if (!nla) +return -1 ; + + info_size = user_size ? : size; +memcpy (nla_data (nla), info, info_size); +memset (nla_data (nla) + info_size,0 , aligned_size - info_size); + +return 0 ; +} +static int nft_target_dump (struct sk_buff *skb,const struct nft_expr *expr) {const struct xt_target *target = expr->ops->data;
@@ -276,7 +294,8 @@ static int nft_target_dump(struct sk_buff *skb, const struct nft_expr *expr)if (nla_put_string (skb,NFTA_TARGET_NAME , target->name) ||nla_put_be32 (skb,NFTA_TARGET_REV ,htonl (target->revision)) || -nla_put (skb,NFTA_TARGET_INFO ,XT_ALIGN (target->targetsize), info)) +nft_extension_dump_info (skb,NFTA_TARGET_INFO , info, + target->targetsize, target->usersize)) goto nla_put_failure;return 0 ;
@@ -504,7 +523,8 @@ static int __nft_match_dump(struct sk_buff *skb, const struct nft_expr *expr,if (nla_put_string (skb,NFTA_MATCH_NAME , match->name) ||nla_put_be32 (skb,NFTA_MATCH_REV ,htonl (match->revision)) || -nla_put (skb,NFTA_MATCH_INFO ,XT_ALIGN (match->matchsize), info)) +nft_extension_dump_info (skb,NFTA_MATCH_INFO , info, + match->matchsize, match->usersize)) goto nla_put_failure;return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 196/209 misc: cxl: Fix possible null pointer dereference
In reply to Sasha LevinFrom: zhong jiang <[email protected]>
[ Upstream commit 3dac3583bf1a61db6aaf31dfd752c677a4400afd ]
It is not safe to dereference an object before a null test. It is not needed and just remove them. Ftrace can be used instead.
--- drivers/misc/cxl/guest.c | 2 -- 1 file changed, 2 deletions(-)
drivers/misc/cxl/guest.c +0 -2
@@ -1020,8 +1020,6 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_nvoid cxl_guest_remove_afu (struct cxl_afu *afu) { -pr_devel ("in %s - AFU(%d)\n" , __func__, afu->slice); -if (!afu)return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 197/209 mac80211: minstrel: fix using short preamble CCK rates on HT clients
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 37439f2d6e43ae79e22be9be159f0af157468f82 ]
mi->supported[MINSTREL_CCK_GROUP] needs to be updated
short preamble rates need to be marked as supported regardless of whether it's currently enabled. Its state can change at any time without a rate_update call.
--- net/mac80211/rc80211_minstrel_ht.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +1 -3
@@ -1132,7 +1132,6 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;u16 sta_cap = sta->ht_cap.cap;struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; - struct sta_info *sinfo = container_of(sta, struct sta_info, sta);int use_vht;int n_supported =0 ;int ack_dur;
@@ -1258,8 +1257,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,if (!n_supported) goto use_legacy; -if (test_sta_flag (sinfo,WLAN_STA_SHORT_PREAMBLE )) - mi->cck_supported_short |= mi->cck_supported_short <<4 ; + mi->supported[MINSTREL_CCK_GROUP ] |= mi->cck_supported_short <<4 ;/* create an initial rate table with the lowest supported rates */ minstrel_ht_update_stats (mp, mi);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 198/209 mac80211: minstrel: fix CCK rate group streams value
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 80df9be67c44cb636bbc92caeddad8caf334c53c ]
Fixes a harmless underflow issue when CCK rates are actively being used
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -129,7 +129,7 @@#define CCK_GROUP \ [MINSTREL_CCK_GROUP] = { \ - .streams = 0, \ + .streams = 1, \ .flags = 0, \ .duration = { \ CCK_DURATION_LIST(false), \
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 199/209 mac80211: minstrel: fix sampling/reporting of CCK rates in HT mode
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 972b66b86f85f4e8201db454f4c3e9d990cf9836 ]
Long/short preamble selection cannot be sampled separately, since it depends on the BSS state. Because of that, sampling attempts to currently not used preamble modes are not counted in the statistics, which leads to CCK rates being sampled too often.
Fix statistics accounting for long/short preamble by increasing the index where necessary.
Fix excessive CCK rate sampling by dropping unsupported sample attempts.
This improves throughput on 2.4 GHz channels
--- net/mac80211/rc80211_minstrel_ht.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +10 -4
@@ -282,7 +282,8 @@ minstrel_ht_get_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,break ;/* short preamble */ -if (!(mi->supported[group] &BIT (idx))) +if ((mi->supported[group] &BIT (idx +4 )) && + (rate->flags &IEEE80211_TX_RC_USE_SHORT_PREAMBLE )) idx +=4 ; }return &mi->groups[group].rates[idx];
@@ -1077,18 +1078,23 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,return ; sample_group = &minstrel_mcs_groups[sample_idx /MCS_GROUP_RATES ]; + sample_idx %=MCS_GROUP_RATES ; + +if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP ] && + (sample_idx >=4 ) != txrc->short_preamble) +return ; + info->flags |=IEEE80211_TX_CTL_RATE_CTRL_PROBE ; rate->count =1 ; -if (sample_idx /MCS_GROUP_RATES ==MINSTREL_CCK_GROUP ) { +if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP ]) {int idx = sample_idx %ARRAY_SIZE (mp->cck_rates); rate->idx = mp->cck_rates[idx]; }else if (sample_group->flags &IEEE80211_TX_RC_VHT_MCS ) {ieee80211_rate_set_vht (rate, sample_idx %MCS_GROUP_RATES , sample_group->streams); }else { - rate->idx = sample_idx %MCS_GROUP_RATES + - (sample_group->streams -1 ) *8 ; + rate->idx = sample_idx + (sample_group->streams -1 ) *8 ; } rate->flags = sample_group->flags;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 200/209 spi: rockchip: initialize dma_slave_config properly
In reply to Sasha LevinFrom: Huibin Hong <[email protected]>
[ Upstream commit dd8fd2cbc73f8650f651da71fc61a6e4f30c1566 ]
The rxconf and txconf structs are allocated on the stack, so make sure we zero them before filling out the relevant fields.
--- drivers/spi/spi-rockchip.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-rockchip.c +3 -0
@@ -445,6 +445,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)struct dma_slave_config rxconf, txconf;struct dma_async_tx_descriptor *rxdesc, *txdesc; +memset (&rxconf,0 ,sizeof (rxconf)); +memset (&txconf,0 ,sizeof (txconf)); +spin_lock_irqsave (&rs->lock, flags); rs->state &= ~RXBUSY ; rs->state &= ~TXBUSY ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 201/209 mlxsw: spectrum_switchdev: Check notification relevance based on upper device
In reply to Sasha LevinFrom: Ido Schimmel <[email protected]>
[ Upstream commit 5050f6ae253ad1307af3486c26fc4f94287078b7 ]
VxLAN FDB updates are sent with the VxLAN device which is not our upper and will therefore be ignored by current code.
Solve this by checking whether the upper device (bridge) is our upper.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +8 -1
@@ -2324,8 +2324,15 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused,struct net_device *dev =switchdev_notifier_info_to_dev (ptr);struct mlxsw_sp_switchdev_event_work *switchdev_work;struct switchdev_notifier_fdb_info *fdb_info = ptr; +struct net_device *br_dev; -if (!mlxsw_sp_port_dev_lower_find_rcu (dev)) +/* Tunnel devices are not our uppers, so check their master instead */ + br_dev =netdev_master_upper_dev_get_rcu (dev); +if (!br_dev) +return NOTIFY_DONE ; +if (!netif_is_bridge_master (br_dev)) +return NOTIFY_DONE ; +if (!mlxsw_sp_port_dev_lower_find_rcu (br_dev))return NOTIFY_DONE ; switchdev_work =kzalloc (sizeof (*switchdev_work),GFP_ATOMIC );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 202/209 ARM: dts: omap5: Fix dual-role mode on Super-Speed port
In reply to Sasha LevinFrom: Roger Quadros <[email protected]>
[ Upstream commit a763ecc15d0e37c3a15ff6825183061209832685 ]
OMAP5's Super-Speed USB port has a software mailbox register that needs to be fed with VBUS and ID events from an external VBUS/ID comparator.
Without this, Host role will not work correctly.
--- arch/arm/boot/dts/omap5-board-common.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap5-board-common.dtsi +1 -0
@@ -704,6 +704,7 @@ }; &dwc3 { + extcon = <&extcon_usb3>; dr_mode = "otg"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 203/209 tcp: start receiver buffer autotuning sooner
In reply to Sasha LevinFrom: Yuchung Cheng <[email protected]>
[ Upstream commit 041a14d2671573611ffd6412bc16e2f64469f7fb ]
Previously receiver buffer auto-tuning starts after receiving one advertised window amount of data. After the initial receiver buffer was raised by patch a337531b942b ("tcp: up initial rmem to 128KB and SYN rwin to around 64KB"), the reciver buffer may take too long to start raising. To address this issue, this patch lowers the initial bytes expected to receive roughly the expected sender's initial window.
--- net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_input.c +1 -1
@@ -438,7 +438,7 @@ void tcp_init_buffer_space(struct sock *sk)if (!(sk->sk_userlocks &SOCK_SNDBUF_LOCK ))tcp_sndbuf_expand (sk); - tp->rcvq_space.space = tp->rcv_wnd; + tp->rcvq_space.space =min_t (u32, tp->rcv_wnd,TCP_INIT_CWND * tp->advmss);tcp_mstamp_refresh (tp); tp->rcvq_space.time = tp->tcp_mstamp; tp->rcvq_space.seq = tp->copied_seq;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 204/209 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit c8afd03486c26accdda4846e5561aa3f8e862a9d ]
Commit 48402cee6889 ("ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq") makes acpi_lpss_{suspend_late,resume_early}() bail early on BYT/CHT as resume_from_noirq is set.
This means that on resume from hibernate dw_i2c_plat_resume() doesn't get called by the restore_early callback, acpi_lpss_resume_early(). Instead it should be called by the restore_noirq callback matching how things are done when resume_from_noirq is set and we are doing a regular resume.
Change the restore_noirq callback to acpi_lpss_resume_noirq so that dw_i2c_plat_resume() gets properly called when resume_from_noirq is set and we are resuming from hibernate.
Likewise also change the poweroff_noirq callback so that dw_i2c_plat_suspend gets called properly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202139
--- drivers/acpi/acpi_lpss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpi_lpss.c +2 -2
@@ -1121,8 +1121,8 @@ static struct dev_pm_domain acpi_lpss_pm_domain = { .thaw_noirq = acpi_subsys_thaw_noirq, .poweroff = acpi_subsys_suspend, .poweroff_late = acpi_lpss_suspend_late, - .poweroff_noirq = acpi_subsys_suspend_noirq, - .restore_noirq = acpi_subsys_resume_noirq, + .poweroff_noirq = acpi_lpss_suspend_noirq, + .restore_noirq = acpi_lpss_resume_noirq, .restore_early = acpi_lpss_resume_early, #endif .runtime_suspend = acpi_lpss_runtime_suspend,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 205/209 PM / devfreq: Fix static checker warning in try_then_request_governor
In reply to Sasha LevinFrom: Enric Balletbo i Serra <[email protected]>
[ Upstream commit b53b0128052ffd687797d5f4deeb76327e7b5711 ]
The patch 23c7b54ca1cd: "PM / devfreq: Fix devfreq_add_device() when drivers are built as modules." leads to the following static checker warning:
drivers/devfreq/devfreq.c:1043 governor_store()
warn: 'governor' can also be NULL
The reason is that the try_then_request_governor() function returns both error pointers and NULL. It should just return error pointers, so fix this by returning a ERR_PTR to the error intead of returning NULL.
--- drivers/devfreq/devfreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/devfreq/devfreq.c +2 -2
@@ -231,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name)* if is not found. This can happen when both drivers (the governor driver * and the driver that call devfreq_add_device) are built as modules. * devfreq_list_lock should be held by the caller. Returns the matched -* governor's pointer. +* governor's pointer or an error pointer. */ static struct devfreq_governor *try_then_request_governor (const char *name) {
@@ -257,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name)/* Restore previous state before return */ mutex_lock (&devfreq_list_lock);if (err) -return NULL ; +return ERR_PTR (err); governor =find_devfreq_governor (name); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 206/209 tools: PCI: Fix broken pcitest compilation
In reply to Sasha LevinFrom: Alan Mikhak <[email protected]>
[ Upstream commit 8a5e0af240e07dd3d4897eb8ff52aab757da7fab ]
pcitest is currently broken due to the following compiler error and related warning. Fix by changing the run_test() function signature to return an integer result.
pcitest.c: In function run_test:
pcitest.c:143:9: warning: return with a value, in function returning void
return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */
pcitest.c: In function main:
pcitest.c:232:9: error: void value not ignored as it ought to be
return run_test(test);
--- tools/pci/pcitest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/pci/pcitest.c +3 -3
@@ -47,15 +47,15 @@ struct pci_test {unsigned long size; }; -static void run_test (struct pci_test *test) +static int run_test (struct pci_test *test) { -long ret; +int ret = -EINVAL ;int fd; fd =open (test->device,O_RDWR );if (fd <0 ) {perror ("can't open PCI Endpoint Test device" ); -return ; +return -ENODEV ; }if (test->barnum >=0 && test->barnum <=5 ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 207/209 powerpc/time: Fix clockevent_decrementer initalisation for PR KVM
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit b4d16ab58c41ff0125822464bdff074cebd0fe47 ]
In the recent commit 8b78fdb045de ("powerpc/time: Use clockevents_register_device(), fixing an issue with large decrementer") we changed the way we initialise the decrementer clockevent(s).
We no longer initialise the mult & shift values of decrementer_clockevent itself.
This has the effect of breaking PR KVM, because it uses those values in kvmppc_emulate_dec(). The symptom is guest kernels spin forever mid-way through boot.
For now fix it by assigning back to decrementer_clockevent the mult and shift values.
--- arch/powerpc/kernel/time.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/time.c +4 -0
@@ -988,6 +988,10 @@ static void register_decrementer_clockevent(int cpu)printk_once (KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n" , dec->name, dec->mult, dec->shift, cpu); + +/* Set values for KVM, see kvm_emulate_dec() */ + decrementer_clockevent.mult = dec->mult; + decrementer_clockevent.shift = dec->shift; }static void enable_large_decrementer (void )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 208/209 mmc: tmio: fix SCC error handling to avoid false positive CRC error
In reply to Sasha LevinFrom: Takeshi Saito <[email protected]>
[ Upstream commit 51b72656bb39fdcb8f3174f4007bcc83ad1d275f ]
If an SCC error occurs during a read/write command execution, a false positive CRC error message is output.
mmcblk0: response CRC error sending r/w cmd command, card status 0x900
check_scc_error() checks SCC_RVSREQ.RVSERR bit. RVSERR detects a correction error in the next (up or down) delay tap position. However, since the command is successful, only retuning needs to be executed. This has been confirmed by HW engineers.
Thus, on SCC error, set retuning flag instead of setting an error code.
--- drivers/mmc/host/tmio_mmc_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc_core.c +2 -1
@@ -926,8 +926,9 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)if (mrq->cmd->error || (mrq->data && mrq->data->error))tmio_mmc_abort_dma (host); +/* SCC error means retune, but executed command was still successful */ if (host->check_scc_error && host->check_scc_error (host)) - mrq->cmd->error = -EILSEQ ; +mmc_retune_needed (host->mmc);/* If SET_BLOCK_COUNT, continue with main command */ if (host->mrq && !mrq->cmd->error) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 209/209 x86/resctrl: Fix rdt_find_domain() return value and checks
In reply to Sasha LevinFrom: Reinette Chatre <[email protected]>
[ Upstream commit 52eb74339a6233c69f4e3794b69ea7c98eeeae1b ]
rdt_find_domain() returns an ERR_PTR() that is generated from a provided domain id when the value is negative.
Care needs to be taken when creating an ERR_PTR() from this value because a subsequent check using IS_ERR() expects the error to be within the MAX_ERRNO range. Using an invalid domain id as an ERR_PTR() does work at this time since this is currently always -1. Using this undocumented assumption is fragile since future users of rdt_find_domain() may not be aware of thus assumption.
Two related issues are addressed:
- Ensure that rdt_find_domain() always returns a valid error value by forcing the error to be -ENODEV when a negative domain id is provided.
- In a few instances the return value of rdt_find_domain() is just checked for NULL - fix these to include a check of ERR_PTR.
--- arch/x86/kernel/cpu/intel_rdt.c | 2 +- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 2 +- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/intel_rdt.c +1 -1
@@ -421,7 +421,7 @@ struct rdt_domain *rdt_find_domain(struct rdt_resource *r, int id,struct list_head *l;if (id <0 ) -return ERR_PTR (id); +return ERR_PTR (-ENODEV );list_for_each (l, &r->domains) { d = list_entry(l, struct rdt_domain, list);
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +1 -1
@@ -459,7 +459,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) r = &rdt_resources_all[resid]; d =rdt_find_domain (r, domid,NULL ); -if (!d) { +if (IS_ERR_OR_NULL (d)) { ret = -ENOENT ; goto out; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +1 -1
@@ -1023,7 +1023,7 @@ static int rdt_cdp_peer_get(struct rdt_resource *r, struct rdt_domain *d,* peer RDT CDP resource. Hence the WARN. */ _d_cdp =rdt_find_domain (_r_cdp, d->id,NULL ); -if (WARN_ON (!_d_cdp)) { +if (WARN_ON (IS_ERR_OR_NULL (_d_cdp))) { _r_cdp =NULL ; ret = -EINVAL ; }
Signature · 1 line
2.20.1