5.4.99-rc1 review
Greg Kroah-Hartman
maintainercover 5.4.99-rc1 review
This is the start of the stable review cycle for the 5.4.99 release. There are 60 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 Wed, 17 Feb 2021 15:27:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.99-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.99-rc1
Miklos Szeredi <[email protected]>
ovl: expand warning in ovl_d_real()
Sabyrzhan Tasbolatov <[email protected]>
net/qrtr: restrict user-controlled length in qrtr_tun_write_iter()
Sabyrzhan Tasbolatov <[email protected]>
net/rds: restrict iovecs length for RDS_CMSG_RDMA_ARGS
Stefano Garzarella <[email protected]>
vsock: fix locking in vsock_shutdown()
Stefano Garzarella <[email protected]>
vsock/virtio: update credit only if socket is not closed
Edwin Peer <[email protected]>
net: watchdog: hold device global xmit lock during tx disable
Norbert Slusarek <[email protected]>
net/vmw_vsock: improve locking in vsock_connect_timeout()
NeilBrown <[email protected]>
net: fix iteration for sctp transport seq_files
Eric Dumazet <[email protected]>
net: gro: do not keep too many GRO packets in napi->rx_list
Vladimir Oltean <[email protected]>
net: dsa: call teardown method on probe failure
Willem de Bruijn <[email protected]>
udp: fix skb_copy_and_csum_datagram with odd segment sizes
David Howells <[email protected]>
rxrpc: Fix clearance of Tx/Rx ring when releasing a call
Serge Semin <[email protected]>
usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one
Felipe Balbi <[email protected]>
usb: dwc3: ulpi: fix checkpatch warning
Randy Dunlap <[email protected]>
h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
Alain Volmat <[email protected]>
i2c: stm32f7: fix configuration of the digital filter
Jernej Skrabec <[email protected]>
clk: sunxi-ng: mp: fix parent rate change flag check
Jernej Skrabec <[email protected]>
drm/sun4i: dw-hdmi: Fix max. frequency for H6
Jernej Skrabec <[email protected]>
drm/sun4i: Fix H6 HDMI PHY configuration
Jernej Skrabec <[email protected]>
drm/sun4i: tcon: set sync polarity for tcon1 channel
Fangrui Song <[email protected]>
firmware_loader: align .builtin_fw to 8
Yufeng Mo <[email protected]>
net: hns3: add a check for queue_id in hclge_reset_vf_queue()
Borislav Petkov <[email protected]>
x86/build: Disable CET instrumentation in the kernel for 32-bit too
Florian Westphal <[email protected]>
netfilter: conntrack: skip identical origin tuple in same zone only
Sukadev Bhattiprolu <[email protected]>
ibmvnic: Clear failover_pending if unable to schedule
Mohammad Athari Bin Ismail <[email protected]>
net: stmmac: set TxQ mode back to DCB after disabling CBS
Vadim Fedorenko <[email protected]>
selftests: txtimestamp: fix compilation issue
Vladimir Oltean <[email protected]>
net: enetc: initialize the RFS and RSS memories
Juergen Gross <[email protected]>
xen/netback: avoid race in xenvif_rx_ring_slots_available()
Sven Auhagen <[email protected]>
netfilter: flowtable: fix tcp and udp header checksum update
Pablo Neira Ayuso <[email protected]>
netfilter: nftables: fix possible UAF over chains from packet path in netns
Jozsef Kadlecsik <[email protected]>
netfilter: xt_recent: Fix attempt to update deleted entry
Bui Quang Minh <[email protected]>
bpf: Check for integer overflow when using roundup_pow_of_two()
Maxime Ripard <[email protected]>
drm/vc4: hvs: Fix buffer overflow with the dlist handling
Lorenzo Bianconi <[email protected]>
mt76: dma: fix a possible memory leak in mt76_add_fragment()
Mark Rutland <[email protected]>
lkdtm: don't move ctors to .rodata
Thomas Gleixner <[email protected]>
vmlinux.lds.h: Create section for protection against instrumentation
Russell King <[email protected]>
ARM: kexec: fix oops after TLB are invalidated
Russell King <[email protected]>
ARM: ensure the signal page contains defined contents
Alexandre Belloni <[email protected]>
ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL
Lin Feng <[email protected]>
bfq-iosched: Revert "bfq: Fix computation of shallow depth"
Alexandre Ghiti <[email protected]>
riscv: virt_addr_valid must check the address belongs to linear mapping
Victor Lu <[email protected]>
drm/amd/display: Decrement refcount of dc_sink before reassignment
Victor Lu <[email protected]>
drm/amd/display: Free atomic state after drm_atomic_commit
Victor Lu <[email protected]>
drm/amd/display: Fix dc_sink kref count in emulated_link_detect
Sung Lee <[email protected]>
drm/amd/display: Add more Clock Sources to DCN2.1
Claus Stovgaard <[email protected]>
nvme-pci: ignore the subsysem NQN on Phison E16
Amir Goldstein <[email protected]>
ovl: skip getxattr of security labels
Miklos Szeredi <[email protected]>
cap: fix conversions on getxattr
Miklos Szeredi <[email protected]>
ovl: perform vfs_getxattr() with mounter creds
Hans de Goede <[email protected]>
platform/x86: hp-wmi: Disable tablet-mode reporting by default
Tony Lindgren <[email protected]>
ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled
Bjorn Andersson <[email protected]>
arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc
Marc Zyngier <[email protected]>
arm64: dts: rockchip: Fix PCIe DT properties on rk3399
Odin Ugedal <[email protected]>
cgroup: fix psi monitor for root cgroup
Julien Grall <[email protected]>
arm/xen: Don't probe xenbus as part of an early initcall
Steven Rostedt (VMware) <[email protected]>
tracing: Check length before giving out the filter buffer
Steven Rostedt (VMware) <[email protected]>
tracing: Do not count ftrace events in top level enable output
Nikita Shubin <[email protected]>
gpio: ep93xx: Fix single irqchip with multi gpiochips
Nikita Shubin <[email protected]>
gpio: ep93xx: fix BUG_ON port F usage
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/lpc32xx.dtsi | 3 - arch/arm/include/asm/kexec-internal.h | 12 ++ arch/arm/kernel/asm-offsets.c | 5 + arch/arm/kernel/machine_kexec.c | 20 +- arch/arm/kernel/relocate_kernel.S | 38 ++-- arch/arm/kernel/signal.c | 14 +- arch/arm/mach-omap2/cpuidle44xx.c | 16 +- arch/arm/xen/enlighten.c | 2 - arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- arch/h8300/kernel/asm-offsets.c | 3 + arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/riscv/include/asm/page.h | 5 +- arch/x86/Makefile | 6 +- block/bfq-iosched.c | 8 +- drivers/clk/sunxi-ng/ccu_mp.c | 2 +- drivers/gpio/gpio-ep93xx.c | 216 +++++++++++---------- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 +-- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 10 + drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 +++ drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 6 +- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 26 +-- drivers/gpu/drm/vc4/vc4_plane.c | 18 +- drivers/i2c/busses/i2c-stm32f7.c | 11 +- drivers/misc/lkdtm/Makefile | 2 +- drivers/misc/lkdtm/rodata.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 59 ++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 + drivers/net/ethernet/ibm/ibmvnic.c | 17 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 7 +- drivers/net/wireless/mediatek/mt76/dma.c | 8 +- drivers/net/xen-netback/rx.c | 9 +- drivers/nvme/host/pci.c | 2 + drivers/platform/x86/hp-wmi.c | 14 +- drivers/usb/dwc3/ulpi.c | 20 +- drivers/xen/xenbus/xenbus.h | 1 - drivers/xen/xenbus/xenbus_probe.c | 2 +- fs/overlayfs/copy_up.c | 15 +- fs/overlayfs/inode.c | 2 + fs/overlayfs/super.c | 13 +- include/asm-generic/sections.h | 3 + include/asm-generic/vmlinux.lds.h | 12 +- include/linux/compiler.h | 53 +++++ include/linux/compiler_types.h | 4 + include/linux/netdevice.h | 2 + include/linux/uio.h | 8 +- include/xen/xenbus.h | 2 - kernel/bpf/stackmap.c | 2 + kernel/cgroup/cgroup.c | 4 +- kernel/trace/trace.c | 2 +- kernel/trace/trace_events.c | 3 +- lib/iov_iter.c | 24 ++- net/core/datagram.c | 12 +- net/core/dev.c | 11 +- net/dsa/dsa2.c | 7 +- net/netfilter/nf_conntrack_core.c | 3 +- net/netfilter/nf_flow_table_core.c | 4 +- net/netfilter/nf_tables_api.c | 25 ++- net/netfilter/xt_recent.c | 12 +- net/qrtr/tun.c | 6 + net/rds/rdma.c | 3 + net/rxrpc/call_object.c | 2 - net/sctp/proc.c | 16 +- net/vmw_vsock/af_vsock.c | 13 +- net/vmw_vsock/hyperv_transport.c | 4 - net/vmw_vsock/virtio_transport_common.c | 4 +- scripts/mod/modpost.c | 2 +- security/commoncap.c | 67 ++++--- .../networking/timestamping/txtimestamp.c | 6 +- 73 files changed, 666 insertions(+), 321 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/60 gpio: ep93xx: fix BUG_ON port F usage
From: Nikita Shubin <[email protected]>
commit 8b81a7ab8055d01d827ef66374b126eeac3bd108 upstream.
Two index spaces and ep93xx_gpio_port are confusing.
Instead add a separate struct to store necessary data and remove ep93xx_gpio_port.
- add struct to store IRQ related data for each IRQ capable chip
- replace offset array with defined offsets
- add IRQ registers offset for each IRQ capable chip into ep93xx_gpio_banks
------------[ cut here ]------------ kernel BUG at drivers/gpio/gpio-ep93xx.c:64! ---[ end trace 3f6544e133e9f5ae ]---
--- drivers/gpio/gpio-ep93xx.c | 186 +++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 87 deletions(-)
drivers/gpio/gpio-ep93xx.c +99 -87
@@ -25,6 +25,9 @@/* Maximum value for gpio line identifiers */ #define EP93XX_GPIO_LINE_MAX 63 +/* Number of GPIO chips in EP93XX */ +#define EP93XX_GPIO_CHIP_NUM 8 +/* Maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ 23
@@ -34,74 +37,74 @@*/ #define EP93XX_GPIO_F_IRQ_BASE 80 +struct ep93xx_gpio_irq_chip { +u8 irq_offset; +u8 int_unmasked; +u8 int_enabled; +u8 int_type1; +u8 int_type2; +u8 int_debounce; +}; + +struct ep93xx_gpio_chip { +struct gpio_chip gc; +struct ep93xx_gpio_irq_chip *eic; +}; +struct ep93xx_gpio {void __iomem *base; -struct gpio_chip gc[8 ]; +struct ep93xx_gpio_chip gc[EP93XX_GPIO_CHIP_NUM ]; }; -/************************************************************************* -* Interrupt handling for EP93xx on-chip GPIOs -*************************************************************************/ -static unsigned char gpio_int_unmasked[3 ]; -static unsigned char gpio_int_enabled[3 ]; -static unsigned char gpio_int_type1[3 ]; -static unsigned char gpio_int_type2[3 ]; -static unsigned char gpio_int_debounce[3 ]; +#define to_ep93xx_gpio_chip (x) container_of(x, struct ep93xx_gpio_chip, gc) -/* Port ordering is: A B F */ -static const u8 int_type1_register_offset[3 ] = {0x90 ,0xac ,0x4c }; -static const u8 int_type2_register_offset[3 ] = {0x94 ,0xb0 ,0x50 }; -static const u8 eoi_register_offset[3 ] = {0x98 ,0xb4 ,0x54 }; -static const u8 int_en_register_offset[3 ] = {0x9c ,0xb8 ,0x58 }; -static const u8 int_debounce_register_offset[3 ] = {0xa8 ,0xc4 ,0x64 }; - -static void ep93xx_gpio_update_int_params (struct ep93xx_gpio *epg,unsigned port) +static struct ep93xx_gpio_irq_chip *to_ep93xx_gpio_irq_chip (struct gpio_chip *gc) { -BUG_ON (port >2 ); - -writeb_relaxed (0 , epg->base + int_en_register_offset[port]); +struct ep93xx_gpio_chip *egc =to_ep93xx_gpio_chip (gc); -writeb_relaxed (gpio_int_type2[port], - epg->base + int_type2_register_offset[port]); - -writeb_relaxed (gpio_int_type1[port], - epg->base + int_type1_register_offset[port]); - -writeb (gpio_int_unmasked[port] & gpio_int_enabled[port], - epg->base + int_en_register_offset[port]); +return egc->eic; } -static int ep93xx_gpio_port (struct gpio_chip *gc) -{ -struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =0 ; +/************************************************************************* +* Interrupt handling for EP93xx on-chip GPIOs +*************************************************************************/ +#define EP93XX_INT_TYPE1_OFFSET 0x00 +#define EP93XX_INT_TYPE2_OFFSET 0x04 +#define EP93XX_INT_EOI_OFFSET 0x08 +#define EP93XX_INT_EN_OFFSET 0x0c +#define EP93XX_INT_STATUS_OFFSET 0x10 +#define EP93XX_INT_RAW_STATUS_OFFSET 0x14 +#define EP93XX_INT_DEBOUNCE_OFFSET 0x18 + +static void ep93xx_gpio_update_int_params (struct ep93xx_gpio *epg, +struct ep93xx_gpio_irq_chip *eic) +{ +writeb_relaxed (0 , epg->base + eic->irq_offset +EP93XX_INT_EN_OFFSET ); -while (port <ARRAY_SIZE (epg->gc) && gc != &epg->gc[port]) - port++; +writeb_relaxed (eic->int_type2, + epg->base + eic->irq_offset +EP93XX_INT_TYPE2_OFFSET ); -/* This should not happen but is there as a last safeguard */ -if (port ==ARRAY_SIZE (epg->gc)) { -pr_crit ("can't find the GPIO port\n" ); -return 0 ; - } +writeb_relaxed (eic->int_type1, + epg->base + eic->irq_offset +EP93XX_INT_TYPE1_OFFSET ); -return port; +writeb_relaxed (eic->int_unmasked & eic->int_enabled, + epg->base + eic->irq_offset +EP93XX_INT_EN_OFFSET ); }static void ep93xx_gpio_int_debounce (struct gpio_chip *gc,unsigned int offset,bool enable) {struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);int port_mask =BIT (offset);if (enable) - gpio_int_debounce[port] |= port_mask; + eic->int_debounce |= port_mask;else - gpio_int_debounce[port] &= ~port_mask; + eic->int_debounce &= ~port_mask; -writeb (gpio_int_debounce[port], - epg->base + int_debounce_register_offset[port]); +writeb (eic->int_debounce, + epg->base + eic->irq_offset +EP93XX_INT_DEBOUNCE_OFFSET ); }static void ep93xx_gpio_ab_irq_handler (struct irq_desc *desc)
@@ -122,12 +125,12 @@ static void ep93xx_gpio_ab_irq_handler(s*/ stat =readb (epg->base +EP93XX_GPIO_A_INT_STATUS );for_each_set_bit (offset, &stat,8 ) -generic_handle_irq (irq_find_mapping (epg->gc[0 ].irq.domain, +generic_handle_irq (irq_find_mapping (epg->gc[0 ].gc.irq.domain, offset)); stat =readb (epg->base +EP93XX_GPIO_B_INT_STATUS );for_each_set_bit (offset, &stat,8 ) -generic_handle_irq (irq_find_mapping (epg->gc[1 ].irq.domain, +generic_handle_irq (irq_find_mapping (epg->gc[1 ].gc.irq.domain, offset));chained_irq_exit (irqchip, desc);
@@ -153,52 +156,52 @@ static void ep93xx_gpio_f_irq_handler(ststatic void ep93xx_gpio_irq_ack (struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc);int port_mask =BIT (d->irq &7 );if (irqd_get_trigger_type (d) ==IRQ_TYPE_EDGE_BOTH ) { - gpio_int_type2[port] ^= port_mask;/* switch edge direction */ -ep93xx_gpio_update_int_params (epg, port); + eic->int_type2 ^= port_mask;/* switch edge direction */ +ep93xx_gpio_update_int_params (epg, eic); } -writeb (port_mask, epg->base + eoi_register_offset[port]); +writeb (port_mask, epg->base + eic->irq_offset +EP93XX_INT_EOI_OFFSET ); }static void ep93xx_gpio_irq_mask_ack (struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc);int port_mask =BIT (d->irq &7 );if (irqd_get_trigger_type (d) ==IRQ_TYPE_EDGE_BOTH ) - gpio_int_type2[port] ^= port_mask;/* switch edge direction */ + eic->int_type2 ^= port_mask;/* switch edge direction */ - gpio_int_unmasked[port] &= ~port_mask; -ep93xx_gpio_update_int_params (epg, port); + eic->int_unmasked &= ~port_mask; +ep93xx_gpio_update_int_params (epg, eic); -writeb (port_mask, epg->base + eoi_register_offset[port]); +writeb (port_mask, epg->base + eic->irq_offset +EP93XX_INT_EOI_OFFSET ); }static void ep93xx_gpio_irq_mask (struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc); - gpio_int_unmasked[port] &= ~BIT (d->irq &7 ); -ep93xx_gpio_update_int_params (epg, port); + eic->int_unmasked &= ~BIT (d->irq &7 ); +ep93xx_gpio_update_int_params (epg, eic); }static void ep93xx_gpio_irq_unmask (struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc); - gpio_int_unmasked[port] |=BIT (d->irq &7 ); -ep93xx_gpio_update_int_params (epg, port); + eic->int_unmasked |=BIT (d->irq &7 ); +ep93xx_gpio_update_int_params (epg, eic); }/*
@@ -209,8 +212,8 @@ static void ep93xx_gpio_irq_unmask(strucstatic int ep93xx_gpio_irq_type (struct irq_data *d,unsigned int type) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d); +struct ep93xx_gpio_irq_chip *eic =to_ep93xx_gpio_irq_chip (gc);struct ep93xx_gpio *epg =gpiochip_get_data (gc); -int port =ep93xx_gpio_port (gc);int offset = d->irq &7 ;int port_mask =BIT (offset);irq_flow_handler_t handler;
@@ -219,32 +222,32 @@ static int ep93xx_gpio_irq_type(struct iswitch (type) {case IRQ_TYPE_EDGE_RISING : - gpio_int_type1[port] |= port_mask; - gpio_int_type2[port] |= port_mask; + eic->int_type1 |= port_mask; + eic->int_type2 |= port_mask; handler = handle_edge_irq;break ;case IRQ_TYPE_EDGE_FALLING : - gpio_int_type1[port] |= port_mask; - gpio_int_type2[port] &= ~port_mask; + eic->int_type1 |= port_mask; + eic->int_type2 &= ~port_mask; handler = handle_edge_irq;break ;case IRQ_TYPE_LEVEL_HIGH : - gpio_int_type1[port] &= ~port_mask; - gpio_int_type2[port] |= port_mask; + eic->int_type1 &= ~port_mask; + eic->int_type2 |= port_mask; handler = handle_level_irq;break ;case IRQ_TYPE_LEVEL_LOW : - gpio_int_type1[port] &= ~port_mask; - gpio_int_type2[port] &= ~port_mask; + eic->int_type1 &= ~port_mask; + eic->int_type2 &= ~port_mask; handler = handle_level_irq;break ;case IRQ_TYPE_EDGE_BOTH : - gpio_int_type1[port] |= port_mask; + eic->int_type1 |= port_mask;/* set initial polarity based on current input level */ if (gc->get (gc, offset)) - gpio_int_type2[port] &= ~port_mask;/* falling */ + eic->int_type2 &= ~port_mask;/* falling */ else - gpio_int_type2[port] |= port_mask;/* rising */ + eic->int_type2 |= port_mask;/* rising */ handler = handle_edge_irq;break ;default :
@@ -253,9 +256,9 @@ static int ep93xx_gpio_irq_type(struct iirq_set_handler_locked (d, handler); - gpio_int_enabled[port] |= port_mask; + eic->int_enabled |= port_mask; -ep93xx_gpio_update_int_params (epg, port); +ep93xx_gpio_update_int_params (epg, eic);return 0 ; }
@@ -276,17 +279,19 @@ struct ep93xx_gpio_bank {const char *label;int data;int dir; +int irq;int base;bool has_irq;bool has_hierarchical_irq;unsigned int irq_base; }; -#define EP93XX_GPIO_BANK (_label, _data, _dir, _base, _has_irq, _has_hier, _irq_base) \ +#define EP93XX_GPIO_BANK (_label, _data, _dir, _irq, _base, _has_irq, _has_hier, _irq_base) \ { \ .label = _label, \ .data = _data, \ .dir = _dir, \ + .irq = _irq, \ .base = _base, \ .has_irq = _has_irq, \ .has_hierarchical_irq = _has_hier, \
@@ -295,16 +300,16 @@ struct ep93xx_gpio_bank {static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = {/* Bank A has 8 IRQs */ -EP93XX_GPIO_BANK ("A" ,0x00 ,0x10 ,0 , true, false,64 ), +EP93XX_GPIO_BANK ("A" ,0x00 ,0x10 ,0x90 ,0 , true, false,64 ),/* Bank B has 8 IRQs */ -EP93XX_GPIO_BANK ("B" ,0x04 ,0x14 ,8 , true, false,72 ), -EP93XX_GPIO_BANK ("C" ,0x08 ,0x18 ,40 , false, false,0 ), -EP93XX_GPIO_BANK ("D" ,0x0c ,0x1c ,24 , false, false,0 ), -EP93XX_GPIO_BANK ("E" ,0x20 ,0x24 ,32 , false, false,0 ), +EP93XX_GPIO_BANK ("B" ,0x04 ,0x14 ,0xac ,8 , true, false,72 ), +EP93XX_GPIO_BANK ("C" ,0x08 ,0x18 ,0x00 ,40 , false, false,0 ), +EP93XX_GPIO_BANK ("D" ,0x0c ,0x1c ,0x00 ,24 , false, false,0 ), +EP93XX_GPIO_BANK ("E" ,0x20 ,0x24 ,0x00 ,32 , false, false,0 ),/* Bank F has 8 IRQs */ -EP93XX_GPIO_BANK ("F" ,0x30 ,0x34 ,16 , false, true,0 ), -EP93XX_GPIO_BANK ("G" ,0x38 ,0x3c ,48 , false, false,0 ), -EP93XX_GPIO_BANK ("H" ,0x40 ,0x44 ,56 , false, false,0 ), +EP93XX_GPIO_BANK ("F" ,0x30 ,0x34 ,0x4c ,16 , false, true,0 ), +EP93XX_GPIO_BANK ("G" ,0x38 ,0x3c ,0x00 ,48 , false, false,0 ), +EP93XX_GPIO_BANK ("H" ,0x40 ,0x44 ,0x00 ,56 , false, false,0 ), }; static int ep93xx_gpio_set_config(struct gpio_chip *gc, unsigned offset,
@@ -326,13 +331,14 @@ static int ep93xx_gpio_f_to_irq(struct greturn EP93XX_GPIO_F_IRQ_BASE + offset; } -static int ep93xx_gpio_add_bank (struct gpio_chip *gc, +static int ep93xx_gpio_add_bank (struct ep93xx_gpio_chip *egc,struct platform_device *pdev,struct ep93xx_gpio *epg,struct ep93xx_gpio_bank *bank) {void __iomem *data = epg->base + bank->data;void __iomem *dir = epg->base + bank->dir; +struct gpio_chip *gc = &egc->gc;struct device *dev = &pdev->dev;struct gpio_irq_chip *girq;int err;
@@ -347,6 +353,12 @@ static int ep93xx_gpio_add_bank(struct g girq = &gc->irq;if (bank->has_irq || bank->has_hierarchical_irq) { gc->set_config = ep93xx_gpio_set_config; + egc->eic =devm_kcalloc (dev,1 , +sizeof (*egc->eic), +GFP_KERNEL ); +if (!egc->eic) +return -ENOMEM ; + egc->eic->irq_offset = bank->irq; girq->chip = &ep93xx_gpio_irq_chip; }
@@ -415,7 +427,7 @@ static int ep93xx_gpio_probe(struct platreturn PTR_ERR (epg->base);for (i =0 ; i <ARRAY_SIZE (ep93xx_gpio_banks); i++) { -struct gpio_chip *gc = &epg->gc[i]; +struct ep93xx_gpio_chip *gc = &epg->gc[i];struct ep93xx_gpio_bank *bank = &ep93xx_gpio_banks[i];if (ep93xx_gpio_add_bank (gc, pdev, epg, bank))
Greg Kroah-Hartman
maintainerPATCH 2/60 gpio: ep93xx: Fix single irqchip with multi gpiochips
In reply to Greg Kroah-HartmanFrom: Nikita Shubin <[email protected]>
commit 28dc10eb77a2db7681b08e3b109764bbe469e347 upstream.
Fixes the following warnings which results in interrupts disabled on port B/F:
gpio gpiochip1: (B): detected irqchip that is shared with multiple gpiochips: please fix the driver. gpio gpiochip5: (F): detected irqchip that is shared with multiple gpiochips: please fix the driver.
- added separate irqchip for each interrupt capable gpiochip
- provided unique names for each irqchip
--- drivers/gpio/gpio-ep93xx.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/gpio/gpio-ep93xx.c +19 -11
@@ -38,6 +38,7 @@#define EP93XX_GPIO_F_IRQ_BASE 80struct ep93xx_gpio_irq_chip { +struct irq_chip ic;u8 irq_offset;u8 int_unmasked;u8 int_enabled;
@@ -263,15 +264,6 @@ static int ep93xx_gpio_irq_type(struct ireturn 0 ; } -static struct irq_chip ep93xx_gpio_irq_chip = { - .name ="GPIO" , - .irq_ack = ep93xx_gpio_irq_ack, - .irq_mask_ack = ep93xx_gpio_irq_mask_ack, - .irq_mask = ep93xx_gpio_irq_mask, - .irq_unmask = ep93xx_gpio_irq_unmask, - .irq_set_type = ep93xx_gpio_irq_type, -}; -/************************************************************************* * gpiolib interface for EP93xx on-chip GPIOs *************************************************************************/
@@ -331,6 +323,15 @@ static int ep93xx_gpio_f_to_irq(struct greturn EP93XX_GPIO_F_IRQ_BASE + offset; } +static void ep93xx_init_irq_chip (struct device *dev,struct irq_chip *ic) +{ + ic->irq_ack = ep93xx_gpio_irq_ack; + ic->irq_mask_ack = ep93xx_gpio_irq_mask_ack; + ic->irq_mask = ep93xx_gpio_irq_mask; + ic->irq_unmask = ep93xx_gpio_irq_unmask; + ic->irq_set_type = ep93xx_gpio_irq_type; +} + static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc, struct platform_device *pdev, struct ep93xx_gpio *epg,
@@ -352,6 +353,8 @@ static int ep93xx_gpio_add_bank(struct e girq = &gc->irq;if (bank->has_irq || bank->has_hierarchical_irq) { +struct irq_chip *ic; + gc->set_config = ep93xx_gpio_set_config; egc->eic = devm_kcalloc(dev, 1, sizeof(*egc->eic),
@@ -359,7 +362,12 @@ static int ep93xx_gpio_add_bank(struct eif (!egc->eic)return -ENOMEM ; egc->eic->irq_offset = bank->irq; - girq->chip = &ep93xx_gpio_irq_chip; + ic = &egc->eic->ic; + ic->name =devm_kasprintf (dev,GFP_KERNEL ,"gpio-irq-%s" , bank->label); +if (!ic->name) +return -ENOMEM ; +ep93xx_init_irq_chip (dev, ic); + girq->chip = ic; }if (bank->has_irq) {
@@ -401,7 +409,7 @@ static int ep93xx_gpio_add_bank(struct e gpio_irq =EP93XX_GPIO_F_IRQ_BASE + i;irq_set_chip_data (gpio_irq, &epg->gc[5 ]);irq_set_chip_and_handler (gpio_irq, - &ep93xx_gpio_irq_chip, + girq->chip, handle_level_irq);irq_clear_status_flags (gpio_irq,IRQ_NOREQUEST ); }
Greg Kroah-Hartman
maintainerPATCH 3/60 tracing: Do not count ftrace events in top level enable output
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 256cfdd6fdf70c6fcf0f7c8ddb0ebd73ce8f3bc9 upstream.
The file /sys/kernel/tracing/events/enable is used to enable all events by echoing in "1", or disabling all events when echoing in "0". To know if all events are enabled, disabled, or some are enabled but not all of them, cating the file should show either "1" (all enabled), "0" (all disabled), or "X" (some enabled but not all of them). This works the same as the "enable" files in the individule system directories (like tracing/events/sched/enable).
But when all events are enabled, the top level "enable" file shows "X". The reason is that its checking the "ftrace" events, which are special events that only exist for their format files. These include the format for the function tracer events, that are enabled when the function tracer is enabled, but not by the "enable" file. The check includes these events, which will always be disabled, and even though all true events are enabled, the top level "enable" file will show "X" instead of "1".
To fix this, have the check test the event's flags to see if it has the "IGNORE_ENABLE" flag set, and if so, not test it.
--- kernel/trace/trace_events.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events.c +2 -1
@@ -1107,7 +1107,8 @@ system_enable_read(struct file *filp, chmutex_lock (&event_mutex);list_for_each_entry (file, &tr->events, list) { call = file->event_call; -if (!trace_event_name (call) || !call->class || !call->class->reg) +if ((call->flags &TRACE_EVENT_FL_IGNORE_ENABLE ) || + !trace_event_name (call) || !call->class || !call->class->reg)continue ;if (system &&strcmp (call->class->system, system->name) !=0 )
Greg Kroah-Hartman
maintainerPATCH 4/60 tracing: Check length before giving out the filter buffer
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit b220c049d5196dd94d992dd2dc8cba1a5e6123bf upstream.
When filters are used by trace events, a page is allocated on each CPU and used to copy the trace event fields to this page before writing to the ring buffer. The reason to use the filter and not write directly into the ring buffer is because a filter may discard the event and there's more overhead on discarding from the ring buffer than the extra copy.
The problem here is that there is no check against the size being allocated when using this page. If an event asks for more than a page size while being filtered, it will get only a page, leading to the caller writing more that what was allocated.
Check the length of the request, and if it is more than PAGE_SIZE minus the header default back to allocating from the ring buffer directly. The ring buffer may reject the event if its too big anyway, but it wont overflow.
--- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace.c +1 -1
@@ -2498,7 +2498,7 @@ trace_event_buffer_lock_reserve(struct r (entry = this_cpu_read(trace_buffered_event))) {/* Try to use the per cpu buffer first */ val =this_cpu_inc_return (trace_buffered_event_cnt); -if (val ==1 ) { +if ((len < (PAGE_SIZE -sizeof (*entry))) && val ==1 ) {trace_event_setup (entry, type, flags, pc); entry->array[0 ] = len;return entry;
Greg Kroah-Hartman
maintainerPATCH 5/60 arm/xen: Dont probe xenbus as part of an early initcall
In reply to Greg Kroah-HartmanFrom: Julien Grall <[email protected]>
commit c4295ab0b485b8bc50d2264bcae2acd06f25caaf upstream.
After Commit 3499ba8198cad ("xen: Fix event channel callback via INTX/GSI"), xenbus_probe() will be called too early on Arm. This will recent to a guest hang during boot.
If the hang wasn't there, we would have ended up to call xenbus_probe() twice (the second time is in xenbus_probe_initcall()).
We don't need to initialize xenbus_probe() early for Arm guest. Therefore, the call in xen_guest_init() is now removed.
After this change, there is no more external caller for xenbus_probe(). So the function is turned to a static one. Interestingly there were two prototypes for it.
--- arch/arm/xen/enlighten.c | 2 -- drivers/xen/xenbus/xenbus.h | 1 - drivers/xen/xenbus/xenbus_probe.c | 2 +- include/xen/xenbus.h | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-)
arch/arm/xen/enlighten.c +0 -2
@@ -370,8 +370,6 @@ static int __init xen_guest_init(void)return -ENOMEM ; }gnttab_init (); -if (!xen_initial_domain ()) -xenbus_probe ();/* * Making sure board specific code will not set up ops for
drivers/xen/xenbus/xenbus.h +0 -1
@@ -115,7 +115,6 @@ int xenbus_probe_node(struct xen_bus_typconst char *type, const char *nodename);int xenbus_probe_devices (struct xen_bus_type *bus); -void xenbus_probe (void );void xenbus_dev_changed (const char *node,struct xen_bus_type *bus);
drivers/xen/xenbus/xenbus_probe.c +1 -1
@@ -683,7 +683,7 @@ void unregister_xenstore_notifier(struct }EXPORT_SYMBOL_GPL (unregister_xenstore_notifier); -void xenbus_probe (void ) +static void xenbus_probe (void ) { xenstored_ready =1 ;
include/xen/xenbus.h +0 -2
@@ -187,8 +187,6 @@ void xs_suspend_cancel(void);struct work_struct ; -void xenbus_probe (void ); -#define XENBUS_IS_ERR_READ (str) ({ \ if (!IS_ERR(str) && strlen(str) == 0) { \ kfree(str); \
Greg Kroah-Hartman
maintainerPATCH 6/60 cgroup: fix psi monitor for root cgroup
In reply to Greg Kroah-HartmanFrom: Odin Ugedal <[email protected]>
commit 385aac1519417b89cb91b77c22e4ca21db563cd0 upstream.
Fix NULL pointer dereference when adding new psi monitor to the root cgroup. PSI files for root cgroup was introduced in df5ba5be742 by using system wide psi struct when reading, but file write/monitor was not properly fixed. Since the PSI config for the root cgroup isn't initialized, the current implementation tries to lock a NULL ptr, resulting in a crash.
Can be triggered by running this as root:
$ tee /sys/fs/cgroup/cpu.pressure <<< "some 10000 1000000"
--- kernel/cgroup/cgroup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/cgroup/cgroup.c +3 -1
@@ -3627,6 +3627,7 @@ static ssize_t cgroup_pressure_write(str {struct psi_trigger *new;struct cgroup *cgrp; +struct psi_group *psi; cgrp =cgroup_kn_lock_live (of->kn, false);if (!cgrp)
@@ -3635,7 +3636,8 @@ static ssize_t cgroup_pressure_write(strcgroup_get (cgrp);cgroup_kn_unlock (of->kn); - new =psi_trigger_create (&cgrp->psi, buf, nbytes, res); + psi =cgroup_ino (cgrp) ==1 ? &psi_system : &cgrp->psi; + new =psi_trigger_create (psi, buf, nbytes, res);if (IS_ERR (new)) {cgroup_put (cgrp);return PTR_ERR (new);
Greg Kroah-Hartman
maintainerPATCH 7/60 arm64: dts: rockchip: Fix PCIe DT properties on rk3399
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 43f20b1c6140896916f4e91aacc166830a7ba849 ]
It recently became apparent that the lack of a 'device_type = "pci"' in the PCIe root complex node for rk3399 is a violation of the PCI binding, as documented in IEEE Std 1275-1994. Changes to the kernel's parsing of the DT made such violation fatal, as drivers cannot probe the controller anymore.
Add the missing property makes the PCIe node compliant. While we are at it, drop the pointless linux,pci-domain property, which only makes sense when there are multiple host bridges.
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -232,6 +232,7 @@ reg = <0x0 0xf8000000 0x0 0x2000000>, <0x0 0xfd000000 0x0 0x1000000>; reg-names = "axi-base", "apb-base"; + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>;
@@ -250,7 +251,6 @@ <0 0 0 2 &pcie0_intc 1>, <0 0 0 3 &pcie0_intc 2>, <0 0 0 4 &pcie0_intc 3>; - linux,pci-domain = <0>; max-link-speed = <1>; msi-map = <0x0 &its 0x0 0x1000>; phys = <&pcie_phy 0>, <&pcie_phy 1>,
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 8/60 arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 93f2a11580a9732c1d90f9e01a7e9facc825658f ]
The GCC_LPASS_Q6_AXI_CLK and GCC_LPASS_SWAY_CLK clocks may not be touched on a typical UEFI based SDM845 device, but when the kernel is built with CONFIG_SDM_LPASSCC_845 this happens, unless they are marked as protected-clocks in the DT.
This was done for the MTP and the Pocophone, but not for DB845c and the Lenovo Yoga C630 - causing these to fail to boot if the LPASS clock controller is enabled (which it typically isn't).
--- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 +++- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm845-db845c.dts +3 -1
@@ -337,7 +337,9 @@ &gcc { protected-clocks = <GCC_QSPI_CORE_CLK>, <GCC_QSPI_CORE_CLK_SRC>, - <GCC_QSPI_CNOC_PERIPH_AHB_CLK>; + <GCC_QSPI_CNOC_PERIPH_AHB_CLK>, + <GCC_LPASS_Q6_AXI_CLK>, + <GCC_LPASS_SWAY_CLK>; }; &pm8998_gpio {
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +3 -1
@@ -232,7 +232,9 @@ &gcc { protected-clocks = <GCC_QSPI_CORE_CLK>, <GCC_QSPI_CORE_CLK_SRC>, - <GCC_QSPI_CNOC_PERIPH_AHB_CLK>; + <GCC_QSPI_CNOC_PERIPH_AHB_CLK>, + <GCC_LPASS_Q6_AXI_CLK>, + <GCC_LPASS_SWAY_CLK>; }; &i2c1 {
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 9/60 ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 06862d789ddde8a99c1e579e934ca17c15a84755 ]
We get suspcious RCU usage splats with cpuidle in several places in omap_enter_idle_coupled() with the kernel debug options enabled:
RCU used illegally from extended quiescent state!
...
(_raw_spin_lock_irqsave)
(omap_enter_idle_coupled+0x17c/0x2d8)
(omap_enter_idle_coupled)
(cpuidle_enter_state)
(cpuidle_enter_state_coupled)
(cpuidle_enter)
Let's use RCU_NONIDLE to suppress these splats. Things got changed around with commit 1098582a0f6c ("sched,idle,rcu: Push rcu_idle deeper into the idle path") that started triggering these warnings.
For the tick_broadcast related calls, ideally we'd just switch over to using CPUIDLE_FLAG_TIMER_STOP for omap_enter_idle_coupled() to have the generic cpuidle code handle the tick_broadcast related calls for us and then just drop the tick_broadcast calls here.
But we're currently missing the call in the common cpuidle code for tick_broadcast_enable() that CPU1 hotplug needs as described in earlier commit 50d6b3cf9403 ("ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug").
--- arch/arm/mach-omap2/cpuidle44xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/cpuidle44xx.c +8 -8
@@ -151,10 +151,10 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, (cx->mpu_logic_state ==PWRDM_POWER_OFF );/* Enter broadcast mode for periodic timers */ -tick_broadcast_enable (); +RCU_NONIDLE (tick_broadcast_enable ());/* Enter broadcast mode for one-shot timers */ -tick_broadcast_enter (); +RCU_NONIDLE (tick_broadcast_enter ());/* * Call idle CPU PM enter notifier chain so that
@@ -166,7 +166,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,if (dev->cpu ==0 ) {pwrdm_set_logic_retst (mpu_pd, cx->mpu_logic_state); -omap_set_pwrdm_state (mpu_pd, cx->mpu_state); +RCU_NONIDLE (omap_set_pwrdm_state (mpu_pd, cx->mpu_state));/* * Call idle CPU cluster PM enter notifier chain
@@ -178,7 +178,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, index =0 ; cx = state_ptr + index;pwrdm_set_logic_retst (mpu_pd, cx->mpu_logic_state); -omap_set_pwrdm_state (mpu_pd, cx->mpu_state); +RCU_NONIDLE (omap_set_pwrdm_state (mpu_pd, cx->mpu_state)); mpuss_can_lose_context =0 ; } }
@@ -194,9 +194,9 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, mpuss_can_lose_context)gic_dist_disable (); -clkdm_deny_idle (cpu_clkdm[1 ]); -omap_set_pwrdm_state (cpu_pd[1 ],PWRDM_POWER_ON ); -clkdm_allow_idle (cpu_clkdm[1 ]); +RCU_NONIDLE (clkdm_deny_idle (cpu_clkdm[1 ])); +RCU_NONIDLE (omap_set_pwrdm_state (cpu_pd[1 ],PWRDM_POWER_ON )); +RCU_NONIDLE (clkdm_allow_idle (cpu_clkdm[1 ]));if (IS_PM44XX_ERRATUM (PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD ) && mpuss_can_lose_context) {
@@ -222,7 +222,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,cpu_pm_exit (); cpu_pm_out: -tick_broadcast_exit (); +RCU_NONIDLE (tick_broadcast_exit ()); fail:cpuidle_coupled_parallel_barrier (dev, &abort_barrier);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 10/60 platform/x86: hp-wmi: Disable tablet-mode reporting by default
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 67fbe02a5cebc3c653610f12e3c0424e58450153 ]
Recently userspace has started making more use of SW_TABLET_MODE (when an input-dev reports this).
Specifically recent GNOME3 versions will:
1. When SW_TABLET_MODE is reported and is reporting 0:
1.1 Disable accelerometer-based screen auto-rotation 1.2 Disable automatically showing the on-screen keyboard when a
text-input field is focussed
2. When SW_TABLET_MODE is reported and is reporting 1:
2.1 Ignore input-events from the builtin keyboard and touchpad
(this is for 360° hinges style 2-in-1s where the keyboard and
touchpads are accessible on the back of the tablet when folded into tablet-mode)
This means that claiming to support SW_TABLET_MODE when it does not actually work / reports correct values has bad side-effects.
The check in the hp-wmi code which is used to decide if the input-dev should claim SW_TABLET_MODE support, only checks if the HPWMI_HARDWARE_QUERY is supported. It does *not* check if the hardware actually is capable of reporting SW_TABLET_MODE.
This leads to the hp-wmi input-dev claiming SW_TABLET_MODE support, while in reality it will always report 0 as SW_TABLET_MODE value. This has been seen on a "HP ENVY x360 Convertible 15-cp0xxx" and this likely is the case on a whole lot of other HP models.
This problem causes both auto-rotation and on-screen keyboard support to not work on affected x360 models.
There is no easy fix for this, but since userspace expects SW_TABLET_MODE reporting to be reliable when advertised it is better to not claim/report SW_TABLET_MODE support at all, then to claim to support it while it does not work.
To avoid the mentioned problems, add a new enable_tablet_mode_sw module-parameter which defaults to false.
Note I've made this an int using the standard -1=auto, 0=off, 1=on triplett, with the hope that in the future we can come up with a better way to detect SW_TABLET_MODE support. ATM the default auto option just does the same as off.
--- drivers/platform/x86/hp-wmi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/platform/x86/hp-wmi.c +10 -4
@@ -32,6 +32,10 @@ MODULE_LICENSE("GPL");MODULE_ALIAS ("wmi:95F24279-4D7B-4334-9387-ACCDC67EF61C" );MODULE_ALIAS ("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4" ); +static int enable_tablet_mode_sw =-1 ; +module_param (enable_tablet_mode_sw, int,0444 ); +MODULE_PARM_DESC (enable_tablet_mode_sw,"Enable SW_TABLET_MODE reporting (-1=auto, 0=no, 1=yes)" ); +#define HPWMI_EVENT_GUID "95F24279-4D7B-4334-9387-ACCDC67EF61C"#define HPWMI_BIOS_GUID "5FB7F034-2C63-45e9-BE91-3D44E2C707E4"
@@ -654,10 +658,12 @@ static int __init hp_wmi_input_setup(void) }/* Tablet mode */ - val =hp_wmi_hw_state (HPWMI_TABLET_MASK ); -if (!(val <0 )) { -__set_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit); -input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , val); +if (enable_tablet_mode_sw >0 ) { + val =hp_wmi_hw_state (HPWMI_TABLET_MASK ); +if (val >=0 ) { +__set_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit); +input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , val); + } } err =sparse_keymap_setup (hp_wmi_input_dev, hp_wmi_keymap,NULL );
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 11/60 ovl: perform vfs_getxattr() with mounter creds
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
[ Upstream commit 554677b97257b0b69378bd74e521edb7e94769ff ]
The vfs_getxattr() in ovl_xattr_set() is used to check whether an xattr exist on a lower layer file that is to be removed. If the xattr does not exist, then no need to copy up the file.
This call of vfs_getxattr() wasn't wrapped in credential override, and this is probably okay. But for consitency wrap this instance as well.
--- fs/overlayfs/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/overlayfs/inode.c +2 -0
@@ -337,7 +337,9 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name, goto out;if (!value && !upperdentry) { + old_cred =ovl_override_creds (dentry->d_sb); err =vfs_getxattr (realdentry, name,NULL ,0 ); +revert_creds (old_cred);if (err <0 ) goto out_drop_write; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 12/60 cap: fix conversions on getxattr
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
[ Upstream commit f2b00be488730522d0fb7a8a5de663febdcefe0a ]
If a capability is stored on disk in v2 format cap_inode_getsecurity() will currently return in v2 format unconditionally.
This is wrong: v2 cap should be equivalent to a v3 cap with zero rootid, and so the same conversions performed on it.
If the rootid cannot be mapped, v3 is returned unconverted. Fix this so that both v2 and v3 return -EOVERFLOW if the rootid (or the owner of the fs user namespace in case of v2) cannot be mapped into the current user namespace.
--- security/commoncap.c | 67 ++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 24 deletions(-)
security/commoncap.c +43 -24
@@ -371,10 +371,11 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, {int size, ret;kuid_t kroot; +u32 nsmagic, magic;uid_t root, mappedroot;char *tmpbuf =NULL ;struct vfs_cap_data *cap; -struct vfs_ns_cap_data *nscap; +struct vfs_ns_cap_data *nscap =NULL ;struct dentry *dentry;struct user_namespace *fs_ns;
@@ -396,46 +397,61 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, fs_ns = inode->i_sb->s_user_ns; cap = (struct vfs_cap_data *) tmpbuf;if (is_v2header ((size_t ) ret, cap)) { -/* If this is sizeof(vfs_cap_data) then we're ok with the -* on-disk value, so return that. */ -if (alloc) - *buffer = tmpbuf; -else -kfree (tmpbuf); -return ret; - }else if (!is_v3header ((size_t ) ret, cap)) { -kfree (tmpbuf); -return -EINVAL ; + root =0 ; + }else if (is_v3header ((size_t ) ret, cap)) { + nscap = (struct vfs_ns_cap_data *) tmpbuf; + root =le32_to_cpu (nscap->rootid); + }else { + size = -EINVAL ; + goto out_free; } - nscap = (struct vfs_ns_cap_data *) tmpbuf; - root =le32_to_cpu (nscap->rootid); kroot =make_kuid (fs_ns, root);/* If the root kuid maps to a valid uid in current ns, then return * this as a nscap. */ mappedroot =from_kuid (current_user_ns (), kroot);if (mappedroot != (uid_t)-1 && mappedroot != (uid_t )0 ) { + size =sizeof (struct vfs_ns_cap_data );if (alloc) { - *buffer = tmpbuf; +if (!nscap) { +/* v2 -> v3 conversion */ + nscap =kzalloc (size,GFP_ATOMIC ); +if (!nscap) { + size = -ENOMEM ; + goto out_free; + } + nsmagic =VFS_CAP_REVISION_3 ; + magic =le32_to_cpu (cap->magic_etc); +if (magic &VFS_CAP_FLAGS_EFFECTIVE ) + nsmagic |=VFS_CAP_FLAGS_EFFECTIVE ; +memcpy (&nscap->data, &cap->data,sizeof (__le32) *2 *VFS_CAP_U32 ); + nscap->magic_etc =cpu_to_le32 (nsmagic); + }else { +/* use allocated v3 buffer */ + tmpbuf =NULL ; + } nscap->rootid =cpu_to_le32 (mappedroot); - }else -kfree (tmpbuf); -return size; + *buffer = nscap; + } + goto out_free; }if (!rootid_owns_currentns (kroot)) { -kfree (tmpbuf); -return -EOPNOTSUPP ; + size = -EOVERFLOW ; + goto out_free; }/* This comes from a parent namespace. Return as a v2 capability */ size =sizeof (struct vfs_cap_data );if (alloc) { - *buffer =kmalloc (size,GFP_ATOMIC ); -if (*buffer) { -struct vfs_cap_data *cap = *buffer; -__le32 nsmagic, magic; +if (nscap) { +/* v3 -> v2 conversion */ + cap =kzalloc (size,GFP_ATOMIC ); +if (!cap) { + size = -ENOMEM ; + goto out_free; + } magic =VFS_CAP_REVISION_2 ; nsmagic =le32_to_cpu (nscap->magic_etc);if (nsmagic &VFS_CAP_FLAGS_EFFECTIVE )
@@ -443,9 +459,12 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer,memcpy (&cap->data, &nscap->data,sizeof (__le32) *2 *VFS_CAP_U32 ); cap->magic_etc =cpu_to_le32 (magic); }else { - size = -ENOMEM ; +/* use unconverted v2 */ + tmpbuf =NULL ; } + *buffer = cap; } +out_free:kfree (tmpbuf);return size; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 13/60 ovl: skip getxattr of security labels
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
[ Upstream commit 03fedf93593c82538b18476d8c4f0e8f8435ea70 ]
When inode has no listxattr op of its own (e.g. squashfs) vfs_listxattr calls the LSM inode_listsecurity hooks to list the xattrs that LSMs will intercept in inode_getxattr hooks.
When selinux LSM is installed but not initialized, it will list the security.selinux xattr in inode_listsecurity, but will not intercept it in inode_getxattr. This results in -ENODATA for a getxattr call for an xattr returned by listxattr.
This situation was manifested as overlayfs failure to copy up lower files from squashfs when selinux is built-in but not initialized, because ovl_copy_xattr() iterates the lower inode xattrs by vfs_listxattr() and vfs_getxattr().
ovl_copy_xattr() skips copy up of security labels that are indentified by inode_copy_up_xattr LSM hooks, but it does that after vfs_getxattr(). Since we are not going to copy them, skip vfs_getxattr() of the security labels.
--- fs/overlayfs/copy_up.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +8 -7
@@ -76,6 +76,14 @@ int ovl_copy_xattr(struct dentry *old, struct dentry *new)if (ovl_is_private_xattr (name))continue ; + + error =security_inode_copy_up_xattr (name); +if (error <0 && error != -EOPNOTSUPP ) +break ; +if (error ==1 ) { + error =0 ; +continue ;/* Discard */ + } retry: size =vfs_getxattr (old, name, value, value_size);if (size == -ERANGE )
@@ -99,13 +107,6 @@ retry: goto retry; } - error =security_inode_copy_up_xattr (name); -if (error <0 && error != -EOPNOTSUPP ) -break ; -if (error ==1 ) { - error =0 ; -continue ;/* Discard */ - } error =vfs_setxattr (new, name, value, size,0 );if (error)break ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 14/60 nvme-pci: ignore the subsysem NQN on Phison E16
In reply to Greg Kroah-HartmanFrom: Claus Stovgaard <[email protected]>
[ Upstream commit c9e95c39280530200cdd0bbd2670e6334a81970b ]
Tested both with Corsairs firmware 11.3 and 13.0 for the Corsairs MP600 and both have the issue as reported by the kernel.
nvme nvme0: missing or invalid SUBNQN field.
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3147,6 +3147,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_DEVICE(0x144d, 0xa822), /* Samsung PM1725a */ .driver_data =NVME_QUIRK_DELAY_BEFORE_CHK_RDY | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + { PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */ + .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x1d1d, 0x1f1f), /* LighNVM qemu device */ .driver_data = NVME_QUIRK_LIGHTNVM, }, { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 15/60 drm/amd/display: Add more Clock Sources to DCN2.1
In reply to Greg Kroah-HartmanFrom: Sung Lee <[email protected]>
[ Upstream commit 1622711beebe887e4f0f8237fea1f09bb48e9a51 ]
[WHY]
When enabling HDMI on ComboPHY, there are not enough clock sources to complete display detection.
[HOW]
Initialize more clock sources.
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +10 -0
@@ -826,6 +826,8 @@ enum dcn20_clk_src_array_id {DCN20_CLK_SRC_PLL0 ,DCN20_CLK_SRC_PLL1 ,DCN20_CLK_SRC_PLL2 , +DCN20_CLK_SRC_PLL3 , +DCN20_CLK_SRC_PLL4 , DCN20_CLK_SRC_TOTAL_DCN21 };
@@ -1498,6 +1500,14 @@ static bool construct(dcn21_clock_source_create (ctx, ctx->dc_bios,CLOCK_SOURCE_COMBO_PHY_PLL2 , &clk_src_regs[2 ], false); + pool->base.clock_sources[DCN20_CLK_SRC_PLL3 ] = +dcn21_clock_source_create (ctx, ctx->dc_bios, +CLOCK_SOURCE_COMBO_PHY_PLL3 , + &clk_src_regs[3 ], false); + pool->base.clock_sources[DCN20_CLK_SRC_PLL4 ] = +dcn21_clock_source_create (ctx, ctx->dc_bios, +CLOCK_SOURCE_COMBO_PHY_PLL4 , + &clk_src_regs[4 ], false); pool->base.clk_src_count =DCN20_CLK_SRC_TOTAL_DCN21 ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 16/60 drm/amd/display: Fix dc_sink kref count in emulated_link_detect
In reply to Greg Kroah-HartmanFrom: Victor Lu <[email protected]>
[ Upstream commit 3ddc818d9bb877c64f5c649beab97af86c403702 ]
[why]prev_sink is not used anywhere else in the function and the reference to it from dc_link is replaced with a new dc_sink.
[how]
Change dc_sink_retain(prev_sink) to dc_sink_release(prev_sink).
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -1093,8 +1093,8 @@ static void emulated_link_detect(struct dc_link *link) link->type = dc_connection_none; prev_sink = link->local_sink; -if (prev_sink !=NULL ) -dc_sink_retain (prev_sink); +if (prev_sink) +dc_sink_release (prev_sink);switch (link->connector_signal) {case SIGNAL_TYPE_HDMI_TYPE_A : {
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 17/60 drm/amd/display: Free atomic state after drm_atomic_commit
In reply to Greg Kroah-HartmanFrom: Victor Lu <[email protected]>
[ Upstream commit 2abaa323d744011982b20b8f3886184d56d23946 ]
[why]drm_atomic_commit was changed so that the caller must free their drm_atomic_state reference on successes.
[how]
Add drm_atomic_commit_put after drm_atomic_commit call in dm_force_atomic_commit.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -8
@@ -6463,14 +6463,14 @@ static int dm_force_atomic_commit(struct drm_connector *connector) ret =PTR_ERR_OR_ZERO (conn_state);if (ret) - goto err; + goto out;/* Attach crtc to drm_atomic_state*/ crtc_state =drm_atomic_get_crtc_state (state, &disconnected_acrtc->base); ret =PTR_ERR_OR_ZERO (crtc_state);if (ret) - goto err; + goto out;/* force a restore */ crtc_state->mode_changed = true;
@@ -6480,17 +6480,15 @@ static int dm_force_atomic_commit(struct drm_connector *connector) ret =PTR_ERR_OR_ZERO (plane_state);if (ret) - goto err; - + goto out;/* Call commit internally with the state we just constructed */ ret =drm_atomic_commit (state); -if (!ret) -return 0 ; -err: -DRM_ERROR ("Restoring old state failed with %i\n" , ret); +out:drm_atomic_state_put (state); +if (ret) +DRM_ERROR ("Restoring old state failed with %i\n" , ret);return ret; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 18/60 drm/amd/display: Decrement refcount of dc_sink before reassignment
In reply to Greg Kroah-HartmanFrom: Victor Lu <[email protected]>
[ Upstream commit 8e92bb0fa75bca9a57e4aba2e36f67d8016a3053 ]
[why]
An old dc_sink state is causing a memory leak because it is missing a dc_sink_release before a new dc_sink is assigned back to aconnector->dc_sink.
[how]
Decrement the dc_sink refcount before reassigning it to a new dc_sink.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -1
@@ -1417,8 +1417,10 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)* TODO: check if we still need the S3 mode update workaround. * If yes, put it here. */ -if (aconnector->dc_sink) +if (aconnector->dc_sink) {amdgpu_dm_update_freesync_caps (connector,NULL ); +dc_sink_release (aconnector->dc_sink); + } aconnector->dc_sink = sink;dc_sink_retain (aconnector->dc_sink);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 19/60 riscv: virt_addr_valid must check the address belongs to linear mapping
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit 2ab543823322b564f205cb15d0f0302803c87d11 ]
virt_addr_valid macro checks that a virtual address is valid, ie that the address belongs to the linear mapping and that the corresponding
physical page exists.
Add the missing check that ensures the virtual address belongs to the linear mapping, otherwise __virt_to_phys, when compiled with CONFIG_DEBUG_VIRTUAL enabled, raises a WARN that is interpreted as a kernel bug by syzbot.
--- arch/riscv/include/asm/page.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/riscv/include/asm/page.h +4 -1
@@ -119,7 +119,10 @@ extern unsigned long min_low_pfn;#endif /* __ASSEMBLY__ */ -#define virt_addr_valid (vaddr) (pfn_valid(virt_to_pfn(vaddr))) +#define virt_addr_valid (vaddr) ({ \ + unsigned long _addr = (unsigned long)vaddr; \ + (unsigned long)(_addr) >= PAGE_OFFSET && pfn_valid(virt_to_pfn(_addr)); \ +})#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 20/60 bfq-iosched: Revert "bfq: Fix computation of shallow depth"
In reply to Greg Kroah-HartmanFrom: Lin Feng <[email protected]>
[ Upstream commit 388c705b95f23f317fa43e6abf9ff07b583b721a ]
This reverts commit 6d4d273588378c65915acaf7b2ee74e9dd9c130a.
bfq.limit_depth passes word_depths[] as shallow_depth down to sbitmap core sbitmap_get_shallow, which uses just the number to limit the scan depth of each bitmap word, formula:scan_percentage_for_each_word = shallow_depth / (1 << sbimap->shift) * 100%
That means the comments's percentiles 50%, 75%, 18%, 37% of bfq are correct. But after commit patch 'bfq: Fix computation of shallow depth', we use sbitmap.depth instead, as a example in following case:
sbitmap.depth = 256, map_nr = 4, shift = 6; sbitmap_word.depth = 64. The resulsts of computed bfqd->word_depths[] are {128, 192, 48, 96}, and three of the numbers exceed core dirver's 'sbitmap_word.depth=64' limit nothing.
--- block/bfq-iosched.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
block/bfq-iosched.c +4 -4
@@ -6320,13 +6320,13 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd,* limit 'something'. */ /* no more than 50% of tags for async I/O */ - bfqd->word_depths[0 ][0 ] =max (bt->sb.depth >>1 ,1U ); + bfqd->word_depths[0 ][0 ] =max ((1U << bt->sb.shift) >>1 ,1U );/* * no more than 75% of tags for sync writes (25% extra tags * w.r.t. async I/O, to prevent async I/O from starving sync * writes) */ - bfqd->word_depths[0 ][1 ] =max ((bt->sb.depth *3 ) >>2 ,1U ); + bfqd->word_depths[0 ][1 ] =max (((1U << bt->sb.shift) *3 ) >>2 ,1U );/* * In-word depths in case some bfq_queue is being weight-
@@ -6336,9 +6336,9 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd,* shortage. */ /* no more than ~18% of tags for async I/O */ - bfqd->word_depths[1 ][0 ] =max ((bt->sb.depth *3 ) >>4 ,1U ); + bfqd->word_depths[1 ][0 ] =max (((1U << bt->sb.shift) *3 ) >>4 ,1U );/* no more than ~37% of tags for sync writes (~20% extra tags) */ - bfqd->word_depths[1 ][1 ] =max ((bt->sb.depth *6 ) >>4 ,1U ); + bfqd->word_depths[1 ][1 ] =max (((1U << bt->sb.shift) *6 ) >>4 ,1U );for (i =0 ; i <2 ; i++)for (j =0 ; j <2 ; j++)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 21/60 ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit 5638159f6d93b99ec9743ac7f65563fca3cf413d ]
This reverts commit c17e9377aa81664d94b4f2102559fcf2a01ec8e7.
The lpc32xx clock driver is not able to actually change the PLL rate as this would require reparenting ARM_CLK, DDRAM_CLK, PERIPH_CLK to SYSCLK, then stop the PLL, update the register, restart the PLL and wait for the PLL to lock and finally reparent ARM_CLK, DDRAM_CLK, PERIPH_CLK to HCLK PLL.
Currently, the HCLK driver simply updates the registers but this has no real effect and all the clock rate calculation end up being wrong. This is especially annoying for the peripheral (e.g. UARTs, I2C, SPI).
--- arch/arm/boot/dts/lpc32xx.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm/boot/dts/lpc32xx.dtsi +0 -3
@@ -329,9 +329,6 @@ clocks = <&xtal_32k>, <&xtal>; clock-names = "xtal_32k", "xtal"; - - assigned-clocks = <&clk LPC32XX_CLK_HCLK_PLL>; - assigned-clock-rates = <208000000>; }; };
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 22/60 ARM: ensure the signal page contains defined contents
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 9c698bff66ab4914bb3d71da7dc6112519bde23e ]
Ensure that the signal page contains our poison instruction to increase the protection against ROP attacks and also contains well defined contents.
--- arch/arm/kernel/signal.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
arch/arm/kernel/signal.c +8 -6
@@ -694,18 +694,20 @@ struct page *get_signal_page(void) addr =page_address (page); +/* Poison the entire page */ +memset32 (addr,__opcode_to_mem_arm (0xe7fddef1 ), +PAGE_SIZE /sizeof (u32)); +/* Give the signal return code some randomness */ offset =0x200 + (get_random_int () &0x7fc ); signal_return_offset = offset; -/* -* Copy signal return handlers into the vector page, and -* set sigreturn to be a pointer to these. -*/ +/* Copy signal return handlers into the page */ memcpy (addr + offset, sigreturn_codes,sizeof (sigreturn_codes)); - ptr = (unsigned long )addr + offset; -flush_icache_range (ptr, ptr +sizeof (sigreturn_codes)); +/* Flush out all instructions in this page */ + ptr = (unsigned long )addr; +flush_icache_range (ptr, ptr +PAGE_SIZE );return page; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 23/60 ARM: kexec: fix oops after TLB are invalidated
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 4d62e81b60d4025e2dfcd5ea531cc1394ce9226f ]
Giancarlo Ferrari reports the following oops while trying to use kexec:
Unable to handle kernel paging request at virtual address 80112f38 pgd = fd7ef03e [80112f38] *pgd=0001141e(bad) Internal error: Oops: 80d [#1] PREEMPT SMP ARM ...
This is caused by machine_kexec() trying to set the kernel text to be read/write, so it can poke values into the relocation code before copying it - and an interrupt occuring which changes the page tables. The subsequent writes then hit read-only sections that trigger a data abort resulting in the above oops.
Fix this by copying the relocation code, and then writing the variables into the destination, thereby avoiding the need to make the kernel text read/write.
--- arch/arm/include/asm/kexec-internal.h | 12 ++++++++++ arch/arm/kernel/asm-offsets.c | 5 ++++ arch/arm/kernel/machine_kexec.c | 20 +++++++---------- arch/arm/kernel/relocate_kernel.S | 38 +++++++++------------------------- 4 files changed, 36 insertions(+), 39 deletions(-) create mode 100644 arch/arm/include/asm/kexec-internal.h
arch/arm/include/asm/kexec-internal.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ARM_KEXEC_INTERNAL_H +#define _ARM_KEXEC_INTERNAL_H + +struct kexec_relocate_data { +unsigned long kexec_start_address; +unsigned long kexec_indirection_page; +unsigned long kexec_mach_type; +unsigned long kexec_r2; +}; + +#endif
arch/arm/kernel/asm-offsets.c +5 -0
@@ -15,6 +15,7 @@#include <linux/kvm_host.h> #endif #include <asm/cacheflush.h> +#include <asm/kexec-internal.h> #include <asm/glue-df.h> #include <asm/glue-pf.h> #include <asm/mach/arch.h>
@@ -190,5 +191,9 @@ int main(void)DEFINE (MPU_RGN_PRBAR , offsetof(struct mpu_rgn , prbar));DEFINE (MPU_RGN_PRLAR , offsetof(struct mpu_rgn , prlar));#endif +DEFINE (KEXEC_START_ADDR , offsetof(struct kexec_relocate_data , kexec_start_address)); +DEFINE (KEXEC_INDIR_PAGE , offsetof(struct kexec_relocate_data , kexec_indirection_page)); +DEFINE (KEXEC_MACH_TYPE , offsetof(struct kexec_relocate_data , kexec_mach_type)); +DEFINE (KEXEC_R2 , offsetof(struct kexec_relocate_data , kexec_r2));return 0 ; }
arch/arm/kernel/machine_kexec.c +8 -12
@@ -15,6 +15,7 @@#include <asm/pgalloc.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> +#include <asm/kexec-internal.h> #include <asm/fncpy.h> #include <asm/mach-types.h> #include <asm/smp_plat.h>
@@ -24,11 +25,6 @@extern void relocate_new_kernel (void );extern const unsigned int relocate_new_kernel_size; -extern unsigned long kexec_start_address; -extern unsigned long kexec_indirection_page; -extern unsigned long kexec_mach_type; -extern unsigned long kexec_boot_atags; -static atomic_t waiting_for_crash_ipi;/*
@@ -161,6 +157,7 @@ void (*kexec_reinit)(void);void machine_kexec (struct kimage *image) {unsigned long page_list, reboot_entry_phys; +struct kexec_relocate_data *data;void (*reboot_entry)(void );void *reboot_code_buffer;
@@ -176,18 +173,17 @@ void machine_kexec(struct kimage *image) reboot_code_buffer =page_address (image->control_code_page); -/* Prepare parameters for reboot_code_buffer*/ -set_kernel_text_rw (); - kexec_start_address = image->start; - kexec_indirection_page = page_list; - kexec_mach_type = machine_arch_type; - kexec_boot_atags = image->arch.kernel_r2; -/* copy our kernel relocation code to the control code page */ reboot_entry =fncpy (reboot_code_buffer, &relocate_new_kernel, relocate_new_kernel_size); + data = reboot_code_buffer + relocate_new_kernel_size; + data->kexec_start_address = image->start; + data->kexec_indirection_page = page_list; + data->kexec_mach_type = machine_arch_type; + data->kexec_r2 = image->arch.kernel_r2; +/* get the identity mapping physical address for the reboot code */ reboot_entry_phys =virt_to_idmap (reboot_entry);
arch/arm/kernel/relocate_kernel.S +11 -27
@@ -5,14 +5,16 @@ #include <linux/linkage.h> #include <asm/assembler.h> +#include <asm/asm-offsets.h> #include <asm/kexec.h> .align 3 /* not needed for this code, but keeps fncpy() happy */ ENTRY(relocate_new_kernel) - ldr r0,kexec_indirection_page - ldr r1,kexec_start_address + adr r7, relocate_new_kernel_end + ldr r0, [r7, #KEXEC_INDIR_PAGE] + ldr r1, [r7, #KEXEC_START_ADDR] /* * If there is no indirection page (we are doing crashdumps)
@@ -57,34 +59,16 @@ ENTRY(relocate_new_kernel) 2: /* Jump to relocated kernel */ - mov lr,r1 - mov r0,#0 - ldr r1,kexec_mach_type - ldr r2,kexec_boot_atags - ARM( ret lr ) - THUMB( bx lr ) - - .align - - .globl kexec_start_address -kexec_start_address: - .long 0x0 - - .globl kexec_indirection_page -kexec_indirection_page: - .long 0x0 - - .globl kexec_mach_type -kexec_mach_type: - .long 0x0 - - /* phy addr of the atags for the new kernel */ - .globl kexec_boot_atags -kexec_boot_atags: - .long 0x0 + mov lr, r1 + mov r0, #0 + ldr r1, [r7, #KEXEC_MACH_TYPE] + ldr r2, [r7, #KEXEC_R2] + ARM( ret lr ) + THUMB( bx lr ) ENDPROC(relocate_new_kernel) + .align 3 relocate_new_kernel_end: .globl relocate_new_kernel_size
Greg Kroah-Hartman
maintainerPATCH 24/60 vmlinux.lds.h: Create section for protection against instrumentation
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 6553896666433e7efec589838b400a2a652b3ffa ]
Some code pathes, especially the low level entry code, must be protected against instrumentation for various reasons:
- Low level entry code can be a fragile beast, especially on x86.
- With NO_HZ_FULL RCU state needs to be established before using it.
Having a dedicated section for such code allows to validate with tooling that no unsafe functions are invoked.
Add the .noinstr.text section and the noinstr attribute to mark functions. noinstr implies notrace. Kprobes will gain a section check later.
Provide also a set of markers: instrumentation_begin()/end()
These are used to mark code inside a noinstr function which calls into regular instrumentable text section as safe.
The instrumentation markers are only active when CONFIG_DEBUG_ENTRY is enabled as the end marker emits a NOP to prevent the compiler from merging the annotation points. This means the objtool verification requires a kernel compiled with this option.
--- arch/powerpc/kernel/vmlinux.lds.S | 1 + include/asm-generic/sections.h | 3 ++ include/asm-generic/vmlinux.lds.h | 10 ++++++ include/linux/compiler.h | 53 +++++++++++++++++++++++++++++++ include/linux/compiler_types.h | 4 +++ scripts/mod/modpost.c | 2 +- 6 files changed, 72 insertions(+), 1 deletion(-)
arch/powerpc/kernel/vmlinux.lds.S +1 -0
@@ -102,6 +102,7 @@ SECTIONS #ifdef CONFIG_PPC64 *(.tramp.ftrace.text); #endif + NOINSTR_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT
include/asm-generic/sections.h +3 -0
@@ -53,6 +53,9 @@ extern char __ctors_start[], __ctors_end[];/* Start and end of .opd section - used for function descriptors. */ extern char __start_opd[], __end_opd[]; +/* Start and end of instrumentation protected text section */ +extern char __noinstr_text_start[], __noinstr_text_end[]; + extern __visible const void __nosave_begin, __nosave_end;/* Function descriptor handling (if any). Override in asm/sections.h */
include/asm-generic/vmlinux.lds.h +10 -0
@@ -510,6 +510,15 @@#define RODATA RO_DATA_SECTION(4096)#define RO_DATA (align) RO_DATA_SECTION(align) +/* +* Non-instrumentable text section +*/ +#define NOINSTR_TEXT \ + ALIGN_FUNCTION(); \ + __noinstr_text_start = .; \ + *(.noinstr.text) \ + __noinstr_text_end = .; +/* * .text section. Map to function alignment to avoid address changes * during second ld run in second ld pass when generating System.map
@@ -524,6 +533,7 @@ *(TEXT_MAIN .text.fixup) \ *(.text.unlikely .text.unlikely.*) \ *(.text.unknown .text.unknown.*) \ + NOINSTR_TEXT \ *(.text..refcount) \ *(.ref.text) \ MEM_KEEP(init.text*) \
include/linux/compiler.h +53 -0
65 lines not on this page · raw message
include/linux/compiler_types.h +4 -0
@@ -118,6 +118,10 @@ struct ftrace_likely_data {#define notrace __attribute__((__no_instrument_function__))#endif +/* Section for code which can't be instrumented at all */ +#define noinstr \ + noinline notrace __attribute((__section__(".noinstr.text"))) +/* * it doesn't make sense on ARM (currently the only user of __naked) * to trace naked functions because then mcount is called without
scripts/mod/modpost.c +1 -1
@@ -960,7 +960,7 @@ static void check_section(const char *modname, struct elf_info *elf,#define DATA_SECTIONS ".data", ".data.rel"#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ - ".kprobes.text", ".cpuidle.text" + ".kprobes.text", ".cpuidle.text", ".noinstr.text"#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ ".fixup", ".entry.text", ".exception.text", ".text.*", \ ".coldtext"
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 25/60 lkdtm: dont move ctors to .rodata
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit 3f618ab3323407ee4c6a6734a37eb6e9663ebfb9 ]
When building with KASAN and LKDTM, clang may implictly generate an asan.module_ctor function in the LKDTM rodata object. The Makefile moves the lkdtm_rodata_do_nothing() function into .rodata by renaming the file's .text section to .rodata, and consequently also moves the ctor function into .rodata, leading to a boot time crash (splat below) when the ctor is invoked by do_ctors().
Let's prevent this by marking the function as noinstr rather than notrace, and renaming the file's .noinstr.text to .rodata. Marking the function as noinstr will prevent tracing and kprobes, and will inhibit any undesireable compiler instrumentation.
The ctor function (if any) will be placed in .text and will work correctly.
Example splat before this patch is applied:
[ 0.916359] Unable to handle kernel execute from non-executable memory at virtual address ffffa0006b60f5ac [ 0.922088] Mem abort info: [ 0.922828] ESR = 0x8600000e [ 0.923635] EC = 0x21: IABT (current EL), IL = 32 bits [ 0.925036] SET = 0, FnV = 0 [ 0.925838] EA = 0, S1PTW = 0 [ 0.926714] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000000427b3000 [ 0.928489] [ffffa0006b60f5ac] pgd=000000023ffff003, p4d=000000023ffff003, pud=000000023fffe003, pmd=0068000042000f01 [ 0.931330] Internal error: Oops: 8600000e [#1] PREEMPT SMP [ 0.932806] Modules linked in: [ 0.933617] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.10.0-rc7 #2 [ 0.935620] Hardware name: linux,dummy-virt (DT) [ 0.936924] pstate: 40400005 (nZcv daif +PAN -UAO -TCO BTYPE=--) [ 0.938609] pc : asan.module_ctor+0x0/0x14 [ 0.939759] lr : do_basic_setup+0x4c/0x70 [ 0.940889] sp : ffff27b600177e30 [ 0.941815] x29: ffff27b600177e30 x28: 0000000000000000 [ 0.943306] x27: 0000000000000000 x26: 0000000000000000 [ 0.944803] x25: 0000000000000000 x24: 0000000000000000 [ 0.946289] x23: 0000000000000001 x22: 0000000000000000 [ 0.947777] x21: ffffa0006bf4a890 x20: ffffa0006befb6c0 [ 0.949271] x19: ffffa0006bef9358 x18: 0000000000000068 [ 0.950756] x17: fffffffffffffff8 x16: 0000000000000000 [ 0.952246] x15: 0000000000000000 x14: 0000000000000000 [ 0.953734] x13: 00000000838a16d5 x12: 0000000000000001 [ 0.955223] x11: ffff94000da74041 x10: dfffa00000000000 [ 0.956715] x9 : 0000000000000000 x8 : ffffa0006b60f5ac [ 0.958199] x7 : f9f9f9f9f9f9f9f9 x6 : 000000000000003f [ 0.959683] x5 : 0000000000000040 x4 : 0000000000000000 [ 0.961178] x3 : ffffa0006bdc15a0 x2 : 0000000000000005 [ 0.962662] x1 : 00000000000000f9 x0 : ffffa0006bef9350 [ 0.964155] Call trace: [ 0.964844] asan.module_ctor+0x0/0x14 [ 0.965895] kernel_init_freeable+0x158/0x198 [ 0.967115] kernel_init+0x14/0x19c [ 0.968104] ret_from_fork+0x10/0x30 [ 0.969110] Code: 00000003 00000000 00000000 00000000 (00000000) [ 0.970815] ---[ end trace b5339784e20d015c ]---
--- drivers/misc/lkdtm/Makefile | 2 +- drivers/misc/lkdtm/rodata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/misc/lkdtm/Makefile +1 -1
@@ -16,7 +16,7 @@ KCOV_INSTRUMENT_rodata.o := n OBJCOPYFLAGS := OBJCOPYFLAGS_rodata_objcopy.o := \ - --rename-section .text=.rodata,alloc,readonly,load + --rename-section .noinstr.text=.rodata,alloc,readonly,load targets += rodata.o rodata_objcopy.o $(obj)/rodata_objcopy.o: $(obj)/rodata.o FORCE $(call if_changed,objcopy)
drivers/misc/lkdtm/rodata.c +1 -1
@@ -5,7 +5,7 @@*/ #include "lkdtm.h" -void notrace lkdtm_rodata_do_nothing(void) +void noinstr lkdtm_rodata_do_nothing(void) {/* Does nothing. We just want an architecture agnostic "return". */ }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 26/60 mt76: dma: fix a possible memory leak in mt76_add_fragment()
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 93a1d4791c10d443bc67044def7efee2991d48b7 ]
Fix a memory leak in mt76_add_fragment routine returning the buffer to the page_frag_cache when we receive a new fragment and the skb_shared_info frag array is full.
--- drivers/net/wireless/mediatek/mt76/dma.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +5 -3
@@ -452,15 +452,17 @@ static void mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, int len, bool more) { - struct page *page = virt_to_head_page(data); -int offset = data -page_address (page); struct sk_buff *skb = q->rx_head;struct skb_shared_info *shinfo =skb_shinfo (skb);if (shinfo->nr_frags <ARRAY_SIZE (shinfo->frags)) { - offset += q->buf_offset; +struct page *page =virt_to_head_page (data); +int offset = data -page_address (page) + q->buf_offset; +skb_add_rx_frag (skb, shinfo->nr_frags, page, offset, len, q->buf_size); + }else { +skb_free_frag (data); }if (more)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 27/60 drm/vc4: hvs: Fix buffer overflow with the dlist handling
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit facd93f4285c405f9a91b05166147cb39e860666 ]
Commit 0a038c1c29a7 ("drm/vc4: Move LBM creation out of vc4_plane_mode_set()") changed the LBM allocation logic from first allocating the LBM memory for the plane to running mode_set, adding a gap in the LBM, and then running the dlist allocation filling that gap.
The gap was introduced by incrementing the dlist array index, but was never checking whether or not we were over the array length, leading eventually to memory corruptions if we ever crossed this limit.
vc4_dlist_write had that logic though, and was reallocating a larger dlist array when reaching the end of the buffer. Let's share the logic between both functions.
--- drivers/gpu/drm/vc4/vc4_plane.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +14 -4
@@ -205,7 +205,7 @@ static void vc4_plane_reset(struct drm_plane *plane)__drm_atomic_helper_plane_reset (plane, &vc4_state->base); } -static void vc4_dlist_write (struct vc4_plane_state *vc4_state,u32 val) +static void vc4_dlist_counter_increment (struct vc4_plane_state *vc4_state) {if (vc4_state->dlist_count == vc4_state->dlist_size) {u32 new_size =max (4u , vc4_state->dlist_count *2 );
@@ -220,7 +220,15 @@ static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) vc4_state->dlist_size = new_size; } - vc4_state->dlist[vc4_state->dlist_count++] = val; + vc4_state->dlist_count++; +} + +static void vc4_dlist_write (struct vc4_plane_state *vc4_state,u32 val) +{ +unsigned int idx = vc4_state->dlist_count; + +vc4_dlist_counter_increment (vc4_state); + vc4_state->dlist[idx] = val; }/* Returns the scl0/scl1 field based on whether the dimensions need to
@@ -871,8 +879,10 @@ static int vc4_plane_mode_set(struct drm_plane *plane,* be set when calling vc4_plane_allocate_lbm(). */ if (vc4_state->y_scaling[0 ] !=VC4_SCALING_NONE || - vc4_state->y_scaling[1 ] !=VC4_SCALING_NONE ) - vc4_state->lbm_offset = vc4_state->dlist_count++; + vc4_state->y_scaling[1 ] !=VC4_SCALING_NONE ) { + vc4_state->lbm_offset = vc4_state->dlist_count; +vc4_dlist_counter_increment (vc4_state); + }if (num_planes >1 ) {/* Emit Cb/Cr as channel 0 and Y as channel
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 28/60 bpf: Check for integer overflow when using roundup_pow_of_two()
In reply to Greg Kroah-HartmanFrom: Bui Quang Minh <[email protected]>
[ Upstream commit 6183f4d3a0a2ad230511987c6c362ca43ec0055f ]
On 32-bit architecture, roundup_pow_of_two() can return 0 when the argument has upper most bit set due to resulting 1UL << 32. Add a check for this case.
--- kernel/bpf/stackmap.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/stackmap.c +2 -0
@@ -112,6 +112,8 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)/* hash table size must be power of 2 */ n_buckets =roundup_pow_of_two (attr->max_entries); +if (!n_buckets) +return ERR_PTR (-E2BIG ); cost = n_buckets *sizeof (struct stack_map_bucket *) +sizeof (*smap); cost += n_buckets * (value_size +sizeof (struct stack_map_bucket ));
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 29/60 netfilter: xt_recent: Fix attempt to update deleted entry
In reply to Greg Kroah-HartmanFrom: Jozsef Kadlecsik <[email protected]>
[ Upstream commit b1bdde33b72366da20d10770ab7a49fe87b5e190 ]
When both --reap and --update flag are specified, there's a code path at which the entry to be updated is reaped beforehand, which then leads to kernel crash. Reap only entries which won't be updated.
Fixes kernel bugzilla #207773.
--- net/netfilter/xt_recent.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/netfilter/xt_recent.c +10 -2
@@ -152,7 +152,8 @@ static void recent_entry_remove(struct recent_table *t, struct recent_entry *e)/* * Drop entries with timestamps older then 'time'. */ -static void recent_entry_reap (struct recent_table *t,unsigned long time) +static void recent_entry_reap (struct recent_table *t,unsigned long time, +struct recent_entry *working,bool update) {struct recent_entry *e;
@@ -161,6 +162,12 @@ static void recent_entry_reap(struct recent_table *t, unsigned long time)*/ e = list_entry(t->lru_list.next, struct recent_entry, lru_list); +/* +* Do not reap the entry which are going to be updated. +*/ +if (e == working && update) +return ; +/* * The last time stamp is the most recent. */
@@ -303,7 +310,8 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)/* info->seconds must be non-zero */ if (info->check_set &XT_RECENT_REAP ) -recent_entry_reap (t, time); +recent_entry_reap (t, time, e, + info->check_set &XT_RECENT_UPDATE && ret); } if (info->check_set & XT_RECENT_SET ||
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 30/60 netfilter: nftables: fix possible UAF over chains from packet path in netns
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 767d1216bff82507c945e92fe719dff2083bb2f4 ]
Although hooks are released via call_rcu(), chain and rule objects are immediately released while packets are still walking over these bits.
This patch adds the .pre_exit callback which is invoked before synchronize_rcu() in the netns framework to stay safe.
Remove a comment which is not valid anymore since the core does not use synchronize_net() anymore since 8c873e219970 ("netfilter: core: free hooks with call_rcu").
--- net/netfilter/nf_tables_api.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
net/netfilter/nf_tables_api.c +19 -6
@@ -7696,6 +7696,17 @@ int __nft_release_basechain(struct nft_ctx *ctx) }EXPORT_SYMBOL_GPL (__nft_release_basechain); +static void __nft_release_hooks (struct net *net) +{ +struct nft_table *table; +struct nft_chain *chain; + +list_for_each_entry (table, &net->nft.tables, list) { +list_for_each_entry (chain, &table->chains, list) +nf_tables_unregister_hook (net, table, chain); + } +} +static void __nft_release_tables (struct net *net) {struct nft_flowtable *flowtable, *nf;
@@ -7711,10 +7722,6 @@ static void __nft_release_tables(struct net *net)list_for_each_entry_safe (table, nt, &net->nft.tables, list) { ctx.family = table->family; - -list_for_each_entry (chain, &table->chains, list) -nf_tables_unregister_hook (net, table, chain); -/* No packets are walking on these chains anymore. */ ctx.table = table;list_for_each_entry (chain, &table->chains, list) { ctx.chain = chain;
@@ -7762,6 +7769,11 @@ static int __net_init nf_tables_init_net(struct net *net)return 0 ; } +static void __net_exit nf_tables_pre_exit_net(struct net *net) +{ +__nft_release_hooks (net); +} + static void __net_exit nf_tables_exit_net(struct net *net) {mutex_lock (&net->nft.commit_mutex);
@@ -7774,8 +7786,9 @@ static void __net_exit nf_tables_exit_net(struct net *net) }static struct pernet_operations nf_tables_net_ops = { - .init = nf_tables_init_net, - .exit = nf_tables_exit_net, + .init = nf_tables_init_net, + .pre_exit = nf_tables_pre_exit_net, + .exit = nf_tables_exit_net, };static int __init nf_tables_module_init (void )
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 31/60 netfilter: flowtable: fix tcp and udp header checksum update
In reply to Greg Kroah-HartmanFrom: Sven Auhagen <[email protected]>
[ Upstream commit 8d6bca156e47d68551750a384b3ff49384c67be3 ]
When updating the tcp or udp header checksum on port nat the function inet_proto_csum_replace2 with the last parameter pseudohdr as true. This leads to an error in the case that GRO is used and packets are split up in GSO. The tcp or udp checksum of all packets is incorrect.
The error is probably masked due to the fact the most network driver implement tcp/udp checksum offloading. It also only happens when GRO is applied and not on single packets.
The error is most visible when using a pppoe connection which is not triggering the tcp/udp checksum offload.
--- net/netfilter/nf_flow_table_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_flow_table_core.c +2 -2
@@ -354,7 +354,7 @@ static int nf_flow_nat_port_tcp(struct sk_buff *skb, unsigned int thoff,return -1 ; tcph = (void *)(skb_network_header (skb) + thoff); -inet_proto_csum_replace2 (&tcph->check, skb, port, new_port, true); +inet_proto_csum_replace2 (&tcph->check, skb, port, new_port, false);return 0 ; }
@@ -371,7 +371,7 @@ static int nf_flow_nat_port_udp(struct sk_buff *skb, unsigned int thoff, udph = (void *)(skb_network_header (skb) + thoff);if (udph->check || skb->ip_summed ==CHECKSUM_PARTIAL ) {inet_proto_csum_replace2 (&udph->check, skb, port, - new_port, true); + new_port, false);if (!udph->check) udph->check =CSUM_MANGLED_0 ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 32/60 xen/netback: avoid race in xenvif_rx_ring_slots_available()
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit ec7d8e7dd3a59528e305a18e93f1cb98f7faf83b ]
Since commit 23025393dbeb3b8b3 ("xen/netback: use lateeoi irq binding") xenvif_rx_ring_slots_available() is no longer called only from the rx queue kernel thread, so it needs to access the rx queue with the associated queue held.
--- drivers/net/xen-netback/rx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/xen-netback/rx.c +8 -1
@@ -38,10 +38,15 @@ static bool xenvif_rx_ring_slots_available(struct xenvif_queue *queue)RING_IDX prod, cons;struct sk_buff *skb;int needed; +unsigned long flags; + +spin_lock_irqsave (&queue->rx_queue.lock, flags); skb =skb_peek (&queue->rx_queue); -if (!skb) +if (!skb) { +spin_unlock_irqrestore (&queue->rx_queue.lock, flags);return false; + } needed =DIV_ROUND_UP (skb->len,XEN_PAGE_SIZE );if (skb_is_gso (skb))
@@ -49,6 +54,8 @@ static bool xenvif_rx_ring_slots_available(struct xenvif_queue *queue)if (skb->sw_hash) needed++; +spin_unlock_irqrestore (&queue->rx_queue.lock, flags); + do { prod = queue->rx.sring->req_prod; cons = queue->rx.req_cons;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 33/60 net: enetc: initialize the RFS and RSS memories
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 07bf34a50e327975b21a9dee64d220c3dcb72ee9 ]
Michael tried to enable Advanced Error Reporting through the ENETC's Root Complex Event Collector, and the system started spitting out single bit correctable ECC errors coming from the ENETC interfaces:
pcieport 0000:00:1f.0: AER: Multiple Corrected error received: 0000:00:00.0 fsl_enetc 0000:00:00.0: PCIe Bus Error: severity=Corrected, type=Transaction Layer, (Receiver ID)fsl_enetc 0000:00:00.0: device [1957:e100] error status/mask=00004000/00000000fsl_enetc 0000:00:00.0: [14] CorrIntErrfsl_enetc 0000:00:00.1: PCIe Bus Error: severity=Corrected, type=Transaction Layer, (Receiver ID)fsl_enetc 0000:00:00.1: device [1957:e100] error status/mask=00004000/00000000fsl_enetc 0000:00:00.1: [14] CorrIntErr
Further investigating the port correctable memory error detect register (PCMEDR) shows that these AER errors have an associated SOURCE_ID of 6 (RFS/RSS):
$ devmem 0x1f8010e10 32 0xC0000006 $ devmem 0x1f8050e10 32 0xC0000006
Discussion with the hardware design engineers reveals that on LS1028A, the hardware does not do initialization of that RFS/RSS memory, and that software should clear/initialize the entire table before starting to operate. That comes as a bit of a surprise, since the driver does not do initialization of the RFS memory. Also, the initialization of the Receive Side Scaling is done only partially.
Even though the entire ENETC IP has a single shared flow steering memory, the flow steering service should returns matches only for TCAM entries that are within the range of the Station Interface that is doing the search. Therefore, it should be sufficient for a Station Interface to initialize all of its own entries in order to avoid any ECC errors, and only the Station Interfaces in use should need initialization.
There are Physical Station Interfaces associated with PCIe PFs and Virtual Station Interfaces associated with PCIe VFs. We let the PF driver initialize the entire port's memory, which includes the RFS entries which are going to be used by the VF.
--- .../net/ethernet/freescale/enetc/enetc_hw.h | 2 + .../net/ethernet/freescale/enetc/enetc_pf.c | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+)
drivers/net/ethernet/freescale/enetc/enetc_hw.h +2 -0
@@ -181,6 +181,8 @@ enum enetc_bdr_type {TX, RX};#define ENETC_PTCCBSR0 (n) (0x1110 + (n) * 8)/* n = 0 to 7*/ #define ENETC_PTCCBSR1 (n) (0x1114 + (n) * 8)/* n = 0 to 7*/ #define ENETC_RSSHASH_KEY_SIZE 40 +#define ENETC_PRSSCAPR 0x1404 +#define ENETC_PRSSCAPR_GET_NUM_RSS (val) (BIT((val) & 0xf) * 32)#define ENETC_PRSSK (n) (0x1410 + (n) * 4)/* n = [0..9] */ #define ENETC_PSIVLANFMR 0x1700#define ENETC_PSIVLANFMR_VS BIT(0)
drivers/net/ethernet/freescale/enetc/enetc_pf.c +59 -0
77 lines not on this page · raw message
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 34/60 selftests: txtimestamp: fix compilation issue
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
[ Upstream commit 647b8dd5184665432cc8a2b5bca46a201f690c37 ]
PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in test. Include it instead of <netpacket/packet.h> otherwise the error of redefinition arrives.
Also fix the compiler warning about ambiguous control flow by adding explicit braces.
--- .../testing/selftests/networking/timestamping/txtimestamp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/networking/timestamping/txtimestamp.c +3 -3
@@ -26,6 +26,7 @@#include <inttypes.h> #include <linux/errqueue.h> #include <linux/if_ether.h> +#include <linux/if_packet.h> #include <linux/ipv6.h> #include <linux/net_tstamp.h> #include <netdb.h>
@@ -34,7 +35,6 @@#include <netinet/ip.h> #include <netinet/udp.h> #include <netinet/tcp.h> -#include <netpacket/packet.h> #include <poll.h> #include <stdarg.h> #include <stdbool.h>
@@ -396,12 +396,12 @@ static void do_test(int family, unsigned int report_opt) total_len = cfg_payload_len;if (cfg_use_pf_packet || cfg_proto ==SOCK_RAW ) { total_len +=sizeof (struct udphdr ); -if (cfg_use_pf_packet || cfg_ipproto ==IPPROTO_RAW ) +if (cfg_use_pf_packet || cfg_ipproto ==IPPROTO_RAW ) {if (family ==PF_INET ) total_len +=sizeof (struct iphdr );else total_len +=sizeof (struct ipv6hdr ); - + }/* special case, only rawv6_sendmsg: * pass proto in sin6_port if not connected * also see ANK comment in net/ipv4/raw.c
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 35/60 net: stmmac: set TxQ mode back to DCB after disabling CBS
In reply to Greg Kroah-HartmanFrom: Mohammad Athari Bin Ismail <[email protected]>
[ Upstream commit f317e2ea8c88737aa36228167b2292baef3f0430 ]
When disable CBS, mode_to_use parameter is not updated even the operation mode of Tx Queue is changed to Data Centre Bridging (DCB). Therefore, when tc_setup_cbs() function is called to re-enable CBS, the operation mode of Tx Queue remains at DCB, which causing CBS fails to work.
This patch updates the value of mode_to_use parameter to MTL_QUEUE_DCB after operation mode of Tx Queue is changed to DCB in stmmac_dma_qmode() callback function.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +6 -1
@@ -332,7 +332,12 @@ static int tc_setup_cbs(struct stmmac_priv *priv, priv->plat->tx_queues_cfg[queue].mode_to_use =MTL_QUEUE_AVB ; }else if (!qopt->enable) { -return stmmac_dma_qmode (priv, priv->ioaddr, queue,MTL_QUEUE_DCB ); + ret =stmmac_dma_qmode (priv, priv->ioaddr, queue, +MTL_QUEUE_DCB ); +if (ret) +return ret; + + priv->plat->tx_queues_cfg[queue].mode_to_use =MTL_QUEUE_DCB ; }/* Port Transmit Rate and Speed Divider */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 36/60 ibmvnic: Clear failover_pending if unable to schedule
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit ef66a1eace968ff22a35f45e6e8ec36b668b6116 ]
Normally we clear the failover_pending flag when processing the reset. But if we are unable to schedule a failover reset we must clear the flag ourselves. We could fail to schedule the reset if we are in PROBING state (eg: when booting via kexec) or because we could not allocate memory.
Thanks to Cris Forno for helping isolate the problem and for testing.
--- drivers/net/ethernet/ibm/ibmvnic.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +16 -1
@@ -4595,7 +4595,22 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,complete (&adapter->init_done); adapter->init_done_rc = -EIO ; } -ibmvnic_reset (adapter,VNIC_RESET_FAILOVER ); + rc =ibmvnic_reset (adapter,VNIC_RESET_FAILOVER ); +if (rc && rc != -EBUSY ) { +/* We were unable to schedule the failover +* reset either because the adapter was still +* probing (eg: during kexec) or we could not +* allocate memory. Clear the failover_pending +* flag since no one else will. We ignore +* EBUSY because it means either FAILOVER reset +* is already scheduled or the adapter is +* being removed. +*/ +netdev_err (netdev, +"Error %ld scheduling failover reset\n" , + rc); + adapter->failover_pending = false; + }break ;case IBMVNIC_CRQ_INIT_COMPLETE :dev_info (dev,"Partner initialization complete\n" );
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 37/60 netfilter: conntrack: skip identical origin tuple in same zone only
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 07998281c268592963e1cd623fe6ab0270b65ae4 ]
The origin skip check needs to re-test the zone. Else, we might skip a colliding tuple in the reply direction.
This only occurs when using 'directional zones' where origin tuples reside in different zones but the reply tuples share the same zone.
This causes the new conntrack entry to be dropped at confirmation time because NAT clash resolution was elided.
--- net/netfilter/nf_conntrack_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_core.c +2 -1
@@ -1091,7 +1091,8 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,* Let nf_ct_resolve_clash() deal with this later. */ if (nf_ct_tuple_equal (&ignored_conntrack->tuplehash[IP_CT_DIR_ORIGINAL ].tuple, - &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple)) + &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple) && +nf_ct_zone_equal (ct, zone,IP_CT_DIR_ORIGINAL ))continue ;NF_CT_STAT_INC_ATOMIC (net, found);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 38/60 x86/build: Disable CET instrumentation in the kernel for 32-bit too
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit 256b92af784d5043eeb7d559b6d5963dcc2ecb10 ]
Commit
20bf2b378729 ("x86/build: Disable CET instrumentation in the kernel")
disabled CET instrumentation which gets added by default by the Ubuntu gcc9 and 10 by default, but did that only for 64-bit builds. It would still fail when building a 32-bit target. So disable CET for all x86 builds.
--- arch/x86/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/Makefile +3 -3
@@ -61,6 +61,9 @@ endif KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow KBUILD_CFLAGS += $(call cc-option,-mno-avx,) +# Intel CET isn't enabled in the kernel +KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) + ifeq ($(CONFIG_X86_32),y) BITS := 32 UTS_MACHINE := i386
@@ -131,9 +134,6 @@ else KBUILD_CFLAGS += -mno-red-zone KBUILD_CFLAGS += -mcmodel=kernel - - # Intel CET isn't enabled in the kernel - KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) endif ifdef CONFIG_X86_X32
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 39/60 net: hns3: add a check for queue_id in hclge_reset_vf_queue()
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
[ Upstream commit 67a69f84cab60484f02eb8cbc7a76edffbb28a25 ]
The queue_id is received from vf, if use it directly, an out-of-bound issue may be caused, so add a check for this queue_id before using it in hclge_reset_vf_queue().
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +7 -0
@@ -8563,12 +8563,19 @@ int hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id)void hclge_reset_vf_queue (struct hclge_vport *vport,u16 queue_id) { +struct hnae3_handle *handle = &vport->nic;struct hclge_dev *hdev = vport->back;int reset_try_times =0 ;int reset_status;u16 queue_gid;int ret; +if (queue_id >= handle->kinfo.num_tqps) { +dev_warn (&hdev->pdev->dev,"Invalid vf queue id(%u)\n" , + queue_id); +return ; + } + queue_gid =hclge_covert_handle_qid_global (&vport->nic, queue_id); ret =hclge_send_reset_tqp_cmd (hdev, queue_gid, true);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 40/60 firmware_loader: align .builtin_fw to 8
In reply to Greg Kroah-HartmanFrom: Fangrui Song <[email protected]>
[ Upstream commit 793f49a87aae24e5bcf92ad98d764153fc936570 ]
arm64 references the start address of .builtin_fw (__start_builtin_fw) with a pair of R_AARCH64_ADR_PREL_PG_HI21/R_AARCH64_LDST64_ABS_LO12_NC relocations. The compiler is allowed to emit the R_AARCH64_LDST64_ABS_LO12_NC relocation because struct builtin_fw in include/linux/firmware.h is 8-byte aligned.
The R_AARCH64_LDST64_ABS_LO12_NC relocation requires the address to be a multiple of 8, which may not be the case if .builtin_fw is empty. Unconditionally align .builtin_fw to fix the linker error. 32-bit architectures could use ALIGN(4) but that would add unnecessary complexity, so just use ALIGN(8).
--- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -396,7 +396,7 @@ } \ \/* Built-in firmware blobs */ \ - .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ + .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) ALIGN(8) { \ __start_builtin_fw = .; \ KEEP(*(.builtin_fw)) \ __end_builtin_fw = .; \
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 41/60 drm/sun4i: tcon: set sync polarity for tcon1 channel
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 50791f5d7b6a14b388f46c8885f71d1b98216d1d ]
Channel 1 has polarity bits for vsync and hsync signals but driver never sets them. It turns out that with pre-HDMI2 controllers seemingly there is no issue if polarity is not set. However, with HDMI2 controllers (H6) there often comes to de-synchronization due to phase shift. This causes flickering screen. It's safe to assume that similar issues might happen also with pre-HDMI2 controllers.
Solve issue with setting vsync and hsync polarity. Note that display stacks with tcon top have polarity bits actually in tcon0 polarity register.
--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 +++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 ++++++ 2 files changed, 31 insertions(+)
drivers/gpu/drm/sun4i/sun4i_tcon.c +25 -0
@@ -665,6 +665,30 @@ static void sun4i_tcon1_mode_set(struct sun4i_tcon *tcon,SUN4I_TCON1_BASIC5_V_SYNC (vsync) | SUN4I_TCON1_BASIC5_H_SYNC(hsync)); +/* Setup the polarity of multiple signals */ +if (tcon->quirks->polarity_in_ch0) { + val =0 ; + +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) + val |=SUN4I_TCON0_IO_POL_HSYNC_POSITIVE ; + +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) + val |=SUN4I_TCON0_IO_POL_VSYNC_POSITIVE ; + +regmap_write (tcon->regs,SUN4I_TCON0_IO_POL_REG , val); + }else { +/* according to vendor driver, this bit must be always set */ + val =SUN4I_TCON1_IO_POL_UNKNOWN ; + +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) + val |=SUN4I_TCON1_IO_POL_HSYNC_POSITIVE ; + +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) + val |=SUN4I_TCON1_IO_POL_VSYNC_POSITIVE ; + +regmap_write (tcon->regs,SUN4I_TCON1_IO_POL_REG , val); + } +/* Map output pins to channel 1 */ regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG, SUN4I_TCON_GCTL_IOMAP_MASK,
@@ -1482,6 +1506,7 @@ static const struct sun4i_tcon_quirks sun8i_a83t_tv_quirks = {static const struct sun4i_tcon_quirks sun8i_r40_tv_quirks = { .has_channel_1 = true, + .polarity_in_ch0 = true, .set_mux = sun8i_r40_tcon_tv_set_mux, };
drivers/gpu/drm/sun4i/sun4i_tcon.h +6 -0
@@ -153,6 +153,11 @@#define SUN4I_TCON1_BASIC5_V_SYNC (height) (((height) - 1) & 0x3ff)#define SUN4I_TCON1_IO_POL_REG 0xf0 +/* there is no documentation about this bit */ +#define SUN4I_TCON1_IO_POL_UNKNOWN BIT(26) +#define SUN4I_TCON1_IO_POL_HSYNC_POSITIVE BIT(25) +#define SUN4I_TCON1_IO_POL_VSYNC_POSITIVE BIT(24) +#define SUN4I_TCON1_IO_TRI_REG 0xf4#define SUN4I_TCON_ECC_FIFO_REG 0xf8
@@ -224,6 +229,7 @@ struct sun4i_tcon_quirks {bool needs_de_be_mux;/* sun6i needs mux to select backend */ bool needs_edp_reset;/* a80 edp reset needed for tcon0 access */ bool supports_lvds;/* Does the TCON support an LVDS output? */ +bool polarity_in_ch0;/* some tcon1 channels have polarity bits in tcon0 pol register */ u8 dclk_min_div;/* minimum divider for TCON0 DCLK */ /* callback to handle tcon muxing options */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 42/60 drm/sun4i: Fix H6 HDMI PHY configuration
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 6a155216c48f2f65c8dcb02c4c27549c170d24a9 ]
As it turns out, vendor HDMI PHY driver for H6 has a pretty big table of predefined values for various pixel clocks. However, most of them are not useful/tested because they come from reference driver code. Vendor PHY driver is concerned with only few of those, namely 27 MHz, 74.25 MHz, 148.5 MHz, 297 MHz and 594 MHz. These are all frequencies for standard CEA modes.
Fix sun50i_h6_cur_ctr and sun50i_h6_phy_config with the values only for aforementioned frequencies.
Table sun50i_h6_mpll_cfg doesn't need to be changed because values are actually frequency dependent and not so much SoC dependent. See i.MX6 documentation for explanation of those values for similar PHY.
--- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +9 -17
@@ -104,29 +104,21 @@ static const struct dw_hdmi_mpll_config sun50i_h6_mpll_cfg[] = {static const struct dw_hdmi_curr_ctrl sun50i_h6_cur_ctr[] = {/* pixelclk bpp8 bpp10 bpp12 */ - {25175000 , {0x0000 ,0x0000 ,0x0000 }, }, {27000000 , {0x0012 ,0x0000 ,0x0000 }, }, - {59400000 , {0x0008 ,0x0008 ,0x0008 }, }, - {72000000 , {0x0008 ,0x0008 ,0x001b }, }, - {74250000 , {0x0013 ,0x0013 ,0x0013 }, }, - {90000000 , {0x0008 ,0x001a ,0x001b }, }, - {118800000 , {0x001b ,0x001a ,0x001b }, }, - {144000000 , {0x001b ,0x001a ,0x0034 }, }, - {180000000 , {0x001b ,0x0033 ,0x0034 }, }, - {216000000 , {0x0036 ,0x0033 ,0x0034 }, }, - {237600000 , {0x0036 ,0x0033 ,0x001b }, }, - {288000000 , {0x0036 ,0x001b ,0x001b }, }, - {297000000 , {0x0019 ,0x001b ,0x0019 }, }, - {330000000 , {0x0036 ,0x001b ,0x001b }, }, - {594000000 , {0x003f ,0x001b ,0x001b }, }, + {74250000 , {0x0013 ,0x001a ,0x001b }, }, + {148500000 , {0x0019 ,0x0033 ,0x0034 }, }, + {297000000 , {0x0019 ,0x001b ,0x001b }, }, + {594000000 , {0x0010 ,0x001b ,0x001b }, }, { ~0UL , {0x0000 ,0x0000 ,0x0000 }, } };static const struct dw_hdmi_phy_config sun50i_h6_phy_config[] = {/*pixelclk symbol term vlev*/ - {74250000 ,0x8009 ,0x0004 ,0x0232 }, - {148500000 ,0x8029 ,0x0004 ,0x0273 }, - {594000000 ,0x8039 ,0x0004 ,0x014a }, + {27000000 ,0x8009 ,0x0007 ,0x02b0 }, + {74250000 ,0x8009 ,0x0006 ,0x022d }, + {148500000 ,0x8029 ,0x0006 ,0x0270 }, + {297000000 ,0x8039 ,0x0005 ,0x01ab }, + {594000000 ,0x8029 ,0x0000 ,0x008a }, { ~0UL ,0x0000 ,0x0000 ,0x0000 } };
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 43/60 drm/sun4i: dw-hdmi: Fix max. frequency for H6
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 1926a0508d8947cf081280d85ff035300dc71da7 ]
It turns out that reasoning for lowering max. supported frequency is wrong. Scrambling works just fine. Several now fixed bugs prevented proper functioning, even with rates lower than 340 MHz. Issues were just more pronounced with higher frequencies.
Fix that by allowing max. supported frequency in HW and fix the comment.
--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +2 -4
@@ -49,11 +49,9 @@ sun8i_dw_hdmi_mode_valid_h6(struct drm_connector *connector, {/* * Controller support maximum of 594 MHz, which correlates to -* 4K@60Hz 4:4:4 or RGB. However, for frequencies greater than -* 340 MHz scrambling has to be enabled. Because scrambling is -* not yet implemented, just limit to 340 MHz for now. +* 4K@60Hz 4:4:4 or RGB. */ -if (mode->clock >340000 ) +if (mode->clock >594000 )return MODE_CLOCK_HIGH ;return MODE_OK ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 44/60 clk: sunxi-ng: mp: fix parent rate change flag check
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 245090ab2636c0869527ce563afbfb8aff29e825 ]
CLK_SET_RATE_PARENT flag is checked on parent clock instead of current one. Fix that.
--- drivers/clk/sunxi-ng/ccu_mp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu_mp.c +1 -1
@@ -108,7 +108,7 @@ static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux, max_m = cmp->m.max ?:1 << cmp->m.width; max_p = cmp->p.max ?:1 << ((1 << cmp->p.width) -1 ); -if (!(clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT )) { +if (!clk_hw_can_set_rate_parent (&cmp->common.hw)) {ccu_mp_find_best (*parent_rate, rate, max_m, max_p, &m, &p); rate = *parent_rate / p / m; }else {
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 45/60 i2c: stm32f7: fix configuration of the digital filter
In reply to Greg Kroah-HartmanFrom: Alain Volmat <[email protected]>
[ Upstream commit 3d6a3d3a2a7a3a60a824e7c04e95fd50dec57812 ]
The digital filter related computation are present in the driver however the programming of the filter within the IP is missing. The maximum value for the DNF is wrong and should be 15 instead of 16.
--- drivers/i2c/busses/i2c-stm32f7.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-stm32f7.c +10 -1
@@ -53,6 +53,8 @@#define STM32F7_I2C_CR1_RXDMAEN BIT(15)#define STM32F7_I2C_CR1_TXDMAEN BIT(14)#define STM32F7_I2C_CR1_ANFOFF BIT(12) +#define STM32F7_I2C_CR1_DNF_MASK GENMASK(11, 8) +#define STM32F7_I2C_CR1_DNF (n) (((n) & 0xf) << 8)#define STM32F7_I2C_CR1_ERRIE BIT(7)#define STM32F7_I2C_CR1_TCIE BIT(6)#define STM32F7_I2C_CR1_STOPIE BIT(5)
@@ -151,7 +153,7 @@#define STM32F7_I2C_MAX_SLAVE 0x2#define STM32F7_I2C_DNF_DEFAULT 0 -#define STM32F7_I2C_DNF_MAX 16 +#define STM32F7_I2C_DNF_MAX 15#define STM32F7_I2C_ANALOG_FILTER_ENABLE 1#define STM32F7_I2C_ANALOG_FILTER_DELAY_MIN 50/* ns */
@@ -657,6 +659,13 @@ static void stm32f7_i2c_hw_config(struct stm32f7_i2c_dev *i2c_dev)else stm32f7_i2c_set_bits (i2c_dev->base +STM32F7_I2C_CR1 ,STM32F7_I2C_CR1_ANFOFF ); + +/* Program the Digital Filter */ +stm32f7_i2c_clr_bits (i2c_dev->base +STM32F7_I2C_CR1 , +STM32F7_I2C_CR1_DNF_MASK ); +stm32f7_i2c_set_bits (i2c_dev->base +STM32F7_I2C_CR1 , +STM32F7_I2C_CR1_DNF (i2c_dev->setup.dnf)); +stm32f7_i2c_set_bits (i2c_dev->base +STM32F7_I2C_CR1 ,STM32F7_I2C_CR1_PE ); }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 46/60 h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ade9679c159d5bbe14fb7e59e97daf6062872e2b ]
Fix a build error for undefined 'TI_PRE_COUNT' by adding it to asm-offsets.c.
h8300-linux-ld: arch/h8300/kernel/entry.o: in function resume_kernel': (.text+0x29a): undefined reference to TI_PRE_COUNT'
--- arch/h8300/kernel/asm-offsets.c | 3 +++ 1 file changed, 3 insertions(+)
arch/h8300/kernel/asm-offsets.c +3 -0
@@ -63,6 +63,9 @@ int main(void)OFFSET (TI_FLAGS , thread_info, flags);OFFSET (TI_CPU , thread_info, cpu);OFFSET (TI_PRE , thread_info, preempt_count); +#ifdef CONFIG_PREEMPTION +DEFINE (TI_PRE_COUNT , offsetof(struct thread_info , preempt_count)); +#endif return 0 ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 47/60 usb: dwc3: ulpi: fix checkpatch warning
In reply to Greg Kroah-HartmanFrom: Felipe Balbi <[email protected]>
commit 2a499b45295206e7f3dc76edadde891c06cc4447 upstream
no functional changes.
--- drivers/usb/dwc3/ulpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/ulpi.c +1 -1
@@ -19,7 +19,7 @@static int dwc3_ulpi_busyloop (struct dwc3 *dwc) { -unsigned count =1000 ; +unsigned int count =1000 ;u32 reg;while (count--) {
Greg Kroah-Hartman
maintainerPATCH 48/60 usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
commit fca3f138105727c3a22edda32d02f91ce1bf11c9 upstream
Originally the procedure of the ULPI transaction finish detection has been developed as a simple busy-loop with just decrementing counter and no delays. It's wrong since on different systems the loop will take a different time to complete. So if the system bus and CPU are fast enough to overtake the ULPI bus and the companion PHY reaction, then we'll get to take a false timeout error. Fix this by converting the busy-loop procedure to take the standard bus speed, address value and the registers access mode into account for the busy-loop delay calculation.
Here is the way the fix works. It's known that the ULPI bus is clocked with 60MHz signal. In accordance with [1] the ULPI bus protocol is created so to spend 5 and 6 clock periods for immediate register write and read operations respectively, and 6 and 7 clock periods - for the extended register writes and reads. Based on that we can easily pre-calculate the time which will be needed for the controller to perform a requested IO operation. Note we'll still preserve the attempts counter in case if the DWC USB3 controller has got some internals delays.
[1] UTMI+ Low Pin Interface (ULPI) Specification, Revision 1.1,
October 20, 2004, pp. 30 - 36.
--- drivers/usb/dwc3/ulpi.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/usb/dwc3/ulpi.c +15 -3
@@ -7,6 +7,8 @@* Author: Heikki Krogerus <[email protected]> */ +#include <linux/delay.h> +#include <linux/time64.h> #include <linux/ulpi/regs.h> #include "core.h"
@@ -17,12 +19,22 @@ DWC3_GUSB2PHYACC_ADDR(ULPI_ACCESS_EXTENDED) | \ DWC3_GUSB2PHYACC_EXTEND_ADDR(a) : DWC3_GUSB2PHYACC_ADDR(a)) -static int dwc3_ulpi_busyloop (struct dwc3 *dwc) +#define DWC3_ULPI_BASE_DELAY DIV_ROUND_UP(NSEC_PER_SEC, 60000000L) + +static int dwc3_ulpi_busyloop (struct dwc3 *dwc,u8 addr,bool read) { +unsigned long ns =5L *DWC3_ULPI_BASE_DELAY ;unsigned int count =1000 ;u32 reg; +if (addr >=ULPI_EXT_VENDOR_SPECIFIC ) + ns +=DWC3_ULPI_BASE_DELAY ; + +if (read) + ns +=DWC3_ULPI_BASE_DELAY ; +while (count--) { +ndelay (ns); reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYACC (0 ));if (reg &DWC3_GUSB2PHYACC_DONE )return 0 ;
@@ -47,7 +59,7 @@ static int dwc3_ulpi_read(struct device reg =DWC3_GUSB2PHYACC_NEWREGREQ |DWC3_ULPI_ADDR (addr);dwc3_writel (dwc->regs,DWC3_GUSB2PHYACC (0 ), reg); - ret =dwc3_ulpi_busyloop (dwc); + ret =dwc3_ulpi_busyloop (dwc, addr, true);if (ret)return ret;
@@ -71,7 +83,7 @@ static int dwc3_ulpi_write(struct device reg |=DWC3_GUSB2PHYACC_WRITE | val;dwc3_writel (dwc->regs,DWC3_GUSB2PHYACC (0 ), reg); -return dwc3_ulpi_busyloop (dwc); +return dwc3_ulpi_busyloop (dwc, addr, false); }static const struct ulpi_ops dwc3_ulpi_ops = {
Greg Kroah-Hartman
maintainerPATCH 49/60 rxrpc: Fix clearance of Tx/Rx ring when releasing a call
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit 7b5eab57cac45e270a0ad624ba157c5b30b3d44d upstream.
At the end of rxrpc_release_call(), rxrpc_cleanup_ring() is called to clear the Rx/Tx skbuff ring, but this doesn't lock the ring whilst it's accessing it. Unfortunately, rxrpc_resend() might be trying to retransmit a packet concurrently with this - and whilst it does lock the ring, this isn't protection against rxrpc_cleanup_call().
Fix this by removing the call to rxrpc_cleanup_ring() from rxrpc_release_call(). rxrpc_cleanup_ring() will be called again anyway from rxrpc_cleanup_call(). The earlier call is just an optimisation to recycle skbuffs more quickly.
Alternative solutions include rxrpc_release_call() could try to cancel the work item or wait for it to complete or rxrpc_cleanup_ring() could lock when accessing the ring (which would require a bh lock).
This can produce a report like the following:
BUG: KASAN: use-after-free in rxrpc_send_data_packet+0x19b4/0x1e70 net/rxrpc/output.c:372 Read of size 4 at addr ffff888011606e04 by task kworker/0:0/5 ... Workqueue: krxrpcd rxrpc_process_call Call Trace: ... kasan_report.cold+0x79/0xd5 mm/kasan/report.c:413 rxrpc_send_data_packet+0x19b4/0x1e70 net/rxrpc/output.c:372 rxrpc_resend net/rxrpc/call_event.c:266 [inline] rxrpc_process_call+0x1634/0x1f60 net/rxrpc/call_event.c:412 process_one_work+0x98d/0x15f0 kernel/workqueue.c:2275 ... Allocated by task 2318: ... sock_alloc_send_pskb+0x793/0x920 net/core/sock.c:2348 rxrpc_send_data+0xb51/0x2bf0 net/rxrpc/sendmsg.c:358 rxrpc_do_sendmsg+0xc03/0x1350 net/rxrpc/sendmsg.c:744 rxrpc_sendmsg+0x420/0x630 net/rxrpc/af_rxrpc.c:560 ... Freed by task 2318: ... kfree_skb+0x140/0x3f0 net/core/skbuff.c:704 rxrpc_free_skb+0x11d/0x150 net/rxrpc/skbuff.c:78 rxrpc_cleanup_ring net/rxrpc/call_object.c:485 [inline] rxrpc_release_call+0x5dd/0x860 net/rxrpc/call_object.c:552 rxrpc_release_calls_on_socket+0x21c/0x300 net/rxrpc/call_object.c:579 rxrpc_release_sock net/rxrpc/af_rxrpc.c:885 [inline] rxrpc_release+0x263/0x5a0 net/rxrpc/af_rxrpc.c:916 __sock_release+0xcd/0x280 net/socket.c:597 ... The buggy address belongs to the object at ffff888011606dc0 which belongs to the cache skbuff_head_cache of size 232
--- net/rxrpc/call_object.c | 2 -- 1 file changed, 2 deletions(-)
net/rxrpc/call_object.c +0 -2
@@ -507,8 +507,6 @@ void rxrpc_release_call(struct rxrpc_socrxrpc_disconnect_call (call);if (call->security) call->security->free_call_crypto (call); - -rxrpc_cleanup_ring (call);_leave ("" ); }
Greg Kroah-Hartman
maintainerPATCH 50/60 udp: fix skb_copy_and_csum_datagram with odd segment sizes
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
commit 52cbd23a119c6ebf40a527e53f3402d2ea38eccb upstream.
When iteratively computing a checksum with csum_block_add, track the offset "pos" to correctly rotate in csum_block_add when offset is odd.
The open coded implementation of skb_copy_and_csum_datagram did this. With the switch to __skb_datagram_iter calling csum_and_copy_to_iter, pos was reinitialized to 0 on each call.
Bring back the pos by passing it along with the csum to the callback.
Changes v1->v2
- pass csum value, instead of csump pointer (Alexander Duyck)
--- include/linux/uio.h | 8 +++++++- lib/iov_iter.c | 24 ++++++++++++++---------- net/core/datagram.c | 12 ++++++++++-- 3 files changed, 31 insertions(+), 13 deletions(-)
include/linux/uio.h +7 -1
@@ -261,7 +261,13 @@ static inline void iov_iter_reexpand(str { i->count = count; } -size_t csum_and_copy_to_iter (const void *addr,size_t bytes,void *csump,struct iov_iter *i); + +struct csum_state { +__wsum csum; +size_t off; +}; + +size_t csum_and_copy_to_iter (const void *addr,size_t bytes,void *csstate,struct iov_iter *i);size_t csum_and_copy_from_iter (void *addr,size_t bytes,__wsum *csum,struct iov_iter *i);bool csum_and_copy_from_iter_full (void *addr,size_t bytes,__wsum *csum,struct iov_iter *i); size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
lib/iov_iter.c +14 -10
@@ -570,12 +570,13 @@ static __wsum csum_and_memcpy(void *to, }static size_t csum_and_copy_to_pipe_iter (const void *addr,size_t bytes, -__wsum *csum,struct iov_iter *i) +struct csum_state *csstate, +struct iov_iter *i) {struct pipe_inode_info *pipe = i->pipe; +__wsum sum = csstate->csum; +size_t off = csstate->off;size_t n, r; -size_t off =0 ; -__wsum sum = *csum;int idx;if (!sanity (i))
@@ -596,7 +597,8 @@ static size_t csum_and_copy_to_pipe_iter addr += chunk; } i->count -= bytes; - *csum = sum; + csstate->csum = sum; + csstate->off = off;return bytes; }
@@ -1484,18 +1486,19 @@ bool csum_and_copy_from_iter_full(void * }EXPORT_SYMBOL (csum_and_copy_from_iter_full); -size_t csum_and_copy_to_iter (const void *addr,size_t bytes,void *csump, +size_t csum_and_copy_to_iter (const void *addr,size_t bytes,void *_csstate,struct iov_iter *i) { +struct csum_state *csstate = _csstate;const char *from = addr; -__wsum *csum = csump;__wsum sum, next; -size_t off =0 ; +size_t off;if (unlikely (iov_iter_is_pipe (i))) -return csum_and_copy_to_pipe_iter (addr, bytes, csum, i); +return csum_and_copy_to_pipe_iter (addr, bytes, _csstate, i); - sum = *csum; + sum = csstate->csum; + off = csstate->off;if (unlikely (iov_iter_is_discard (i))) {WARN_ON (1 );/* for now */ return 0 ;
@@ -1524,7 +1527,8 @@ size_t csum_and_copy_to_iter(const void off += v.iov_len; }) ) - *csum = sum; + csstate->csum = sum; + csstate->off = off;return bytes; }EXPORT_SYMBOL (csum_and_copy_to_iter);
net/core/datagram.c +10 -2
@@ -700,8 +700,16 @@ static int skb_copy_and_csum_datagram(co struct iov_iter *to, int len, __wsum *csump) { - return __skb_datagram_iter(skb, offset, to, len, true, -csum_and_copy_to_iter ,csump ); + struct csum_state csdata = { .csum = *csump }; +int ret; + + ret =__skb_datagram_iter (skb, offset, to, len, true, + csum_and_copy_to_iter, &csdata); +if (ret) +return ret; + + *csump = csdata.csum; +return 0 ; }/**
Greg Kroah-Hartman
maintainerPATCH 51/60 net: dsa: call teardown method on probe failure
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit 8fd54a73b7cda11548154451bdb4bde6d8ff74c7 upstream.
Since teardown is supposed to undo the effects of the setup method, it should be called in the error path for dsa_switch_setup, not just in dsa_switch_teardown.
--- net/dsa/dsa2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/dsa/dsa2.c +5 -2
@@ -399,18 +399,21 @@ static int dsa_switch_setup(struct dsa_s ds->slave_mii_bus =devm_mdiobus_alloc (ds->dev);if (!ds->slave_mii_bus) { err = -ENOMEM ; - goto unregister_notifier; + goto teardown; }dsa_slave_mii_bus_init (ds); err =mdiobus_register (ds->slave_mii_bus);if (err <0 ) - goto unregister_notifier; + goto teardown; }return 0 ; +teardown: +if (ds->ops->teardown) + ds->ops->teardown (ds); unregister_notifier:dsa_switch_unregister_notifier (ds); unregister_devlink:
Greg Kroah-Hartman
maintainerPATCH 52/60 net: gro: do not keep too many GRO packets in napi->rx_list
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 8dc1c444df193701910f5e80b5d4caaf705a8fb0 upstream.
Commit c80794323e82 ("net: Fix packet reordering caused by GRO and listified RX cooperation") had the unfortunate effect of adding latencies in common workloads.
Before the patch, GRO packets were immediately passed to upper stacks.
After the patch, we can accumulate quite a lot of GRO packets (depdending on NAPI budget).
My fix is counting in napi->rx_count number of segments instead of number of logical packets.
--- net/core/dev.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/core/dev.c +6 -5
@@ -5275,10 +5275,11 @@ static void gro_normal_list(struct napi_/* Queue one GRO_NORMAL SKB up for list processing. If batch size exceeded, * pass the whole batch up to the stack. */ -static void gro_normal_one (struct napi_struct *napi,struct sk_buff *skb) +static void gro_normal_one (struct napi_struct *napi,struct sk_buff *skb,int segs) {list_add_tail (&skb->list, &napi->rx_list); -if (++napi->rx_count >= gro_normal_batch) + napi->rx_count += segs; +if (napi->rx_count >= gro_normal_batch)gro_normal_list (napi); }
@@ -5317,7 +5318,7 @@ static int napi_gro_complete(struct napi } out: -gro_normal_one (napi, skb); +gro_normal_one (napi, skb,NAPI_GRO_CB (skb)->count);return NET_RX_SUCCESS ; }
@@ -5608,7 +5609,7 @@ static gro_result_t napi_skb_finish(stru {switch (ret) {case GRO_NORMAL : -gro_normal_one (napi, skb); +gro_normal_one (napi, skb,1 );break ;case GRO_DROP :
@@ -5696,7 +5697,7 @@ static gro_result_t napi_frags_finish(st__skb_push (skb,ETH_HLEN ); skb->protocol =eth_type_trans (skb, skb->dev);if (ret ==GRO_NORMAL ) -gro_normal_one (napi, skb); +gro_normal_one (napi, skb,1 );break ;case GRO_DROP :
Greg Kroah-Hartman
maintainerPATCH 53/60 net: fix iteration for sctp transport seq_files
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit af8085f3a4712c57d0dd415ad543bac85780375c upstream.
The sctp transport seq_file iterators take a reference to the transport in the ->start and ->next functions and releases the reference in the ->show function. The preferred handling for such resources is to release them in the subsequent ->next or ->stop function call.
Since Commit 1f4aace60b0e ("fs/seq_file.c: simplify seq_file iteration code and interface") there is no guarantee that ->show will be called after ->next, so this function can now leak references.
So move the sctp_transport_put() call to ->next and ->stop.
--- net/sctp/proc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
net/sctp/proc.c +12 -4
@@ -215,6 +215,12 @@ static void sctp_transport_seq_stop(stru {struct sctp_ht_iter *iter = seq->private; +if (v && v !=SEQ_START_TOKEN ) { +struct sctp_transport *transport = v; + +sctp_transport_put (transport); + } +sctp_transport_walk_stop (&iter->hti); }
@@ -222,6 +228,12 @@ static void *sctp_transport_seq_next(str {struct sctp_ht_iter *iter = seq->private; +if (v && v !=SEQ_START_TOKEN ) { +struct sctp_transport *transport = v; + +sctp_transport_put (transport); + } + ++*pos;return sctp_transport_get_next (seq_file_net (seq), &iter->hti);
@@ -277,8 +289,6 @@ static int sctp_assocs_seq_show(struct s sk->sk_rcvbuf);seq_printf (seq,"\n" ); -sctp_transport_put (transport); -return 0 ; }
@@ -354,8 +364,6 @@ static int sctp_remaddr_seq_show(structseq_printf (seq,"\n" ); } -sctp_transport_put (transport); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 54/60 net/vmw_vsock: improve locking in vsock_connect_timeout()
In reply to Greg Kroah-HartmanFrom: Norbert Slusarek <[email protected]>
commit 3d0bc44d39bca615b72637e340317b7899b7f911 upstream.
A possible locking issue in vsock_connect_timeout() was recognized by Eric Dumazet which might cause a null pointer dereference in vsock_transport_cancel_pkt(). This patch assures that vsock_transport_cancel_pkt() will be called within the lock, so a race condition won't occur which could result in vsk->transport to be set to NULL.
--- net/vmw_vsock/af_vsock.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/vmw_vsock/af_vsock.c +1 -4
@@ -1099,7 +1099,6 @@ static void vsock_connect_timeout(struct {struct sock *sk;struct vsock_sock *vsk; -int cancel =0 ; vsk = container_of(work, struct vsock_sock, connect_work.work); sk =sk_vsock (vsk);
@@ -1110,11 +1109,9 @@ static void vsock_connect_timeout(struct sk->sk_state =TCP_CLOSE ; sk->sk_err =ETIMEDOUT ; sk->sk_error_report (sk); - cancel =1 ; +vsock_transport_cancel_pkt (vsk); }release_sock (sk); -if (cancel) -vsock_transport_cancel_pkt (vsk);sock_put (sk); }
Greg Kroah-Hartman
maintainerPATCH 55/60 net: watchdog: hold device global xmit lock during tx disable
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
commit 3aa6bce9af0e25b735c9c1263739a5639a336ae8 upstream.
Prevent netif_tx_disable() running concurrently with dev_watchdog() by taking the device global xmit lock. Otherwise, the recommended:
netif_carrier_off(dev); netif_tx_disable(dev);
driver shutdown sequence can happen after the watchdog has already checked carrier, resulting in possible false alarms. This is because netif_tx_lock() only sets the frozen bit without maintaining the locks on the individual queues.
--- include/linux/netdevice.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/netdevice.h +2 -0
@@ -4044,6 +4044,7 @@ static inline void netif_tx_disable(strulocal_bh_disable (); cpu =smp_processor_id (); +spin_lock (&dev->tx_global_lock);for (i =0 ; i < dev->num_tx_queues; i++) {struct netdev_queue *txq =netdev_get_tx_queue (dev, i);
@@ -4051,6 +4052,7 @@ static inline void netif_tx_disable(strunetif_tx_stop_queue (txq);__netif_tx_unlock (txq); } +spin_unlock (&dev->tx_global_lock);local_bh_enable (); }
Greg Kroah-Hartman
maintainerPATCH 56/60 vsock/virtio: update credit only if socket is not closed
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
commit ce7536bc7398e2ae552d2fabb7e0e371a9f1fe46 upstream.
If the socket is closed or is being released, some resources used by virtio_transport_space_update() such as 'vsk->trans' may be released.
To avoid a use after free bug we should only update the available credit when we are sure the socket is still open and we have the lock held.
--- net/vmw_vsock/virtio_transport_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/vmw_vsock/virtio_transport_common.c +2 -2
@@ -1100,10 +1100,10 @@ void virtio_transport_recv_pkt(struct vi vsk =vsock_sk (sk); - space_available =virtio_transport_space_update (sk, pkt); -lock_sock (sk); + space_available =virtio_transport_space_update (sk, pkt); +/* Update CID in case it has changed after a transport reset event */ vsk->local_addr.svm_cid = dst.svm_cid;
Greg Kroah-Hartman
maintainerPATCH 57/60 vsock: fix locking in vsock_shutdown()
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
commit 1c5fae9c9a092574398a17facc31c533791ef232 upstream.
In vsock_shutdown() we touched some socket fields without holding the socket lock, such as 'state' and 'sk_flags'.
Also, after the introduction of multi-transport, we are accessing 'vsk->transport' in vsock_send_shutdown() without holding the lock and this call can be made while the connection is in progress, so the transport can change in the meantime.
To avoid issues, we hold the socket lock when we enter in vsock_shutdown() and release it when we leave.
Among the transports that implement the 'shutdown' callback, only hyperv_transport acquired the lock. Since the caller now holds it, we no longer take it.
--- net/vmw_vsock/af_vsock.c | 8 +++++--- net/vmw_vsock/hyperv_transport.c | 4 ---- 2 files changed, 5 insertions(+), 7 deletions(-)
net/vmw_vsock/af_vsock.c +5 -3
@@ -808,10 +808,12 @@ static int vsock_shutdown(struct socket*/ sk = sock->sk; + +lock_sock (sk);if (sock->state ==SS_UNCONNECTED ) { err = -ENOTCONN ;if (sk->sk_type ==SOCK_STREAM ) -return err; + goto out; }else { sock->state =SS_DISCONNECTING ; err =0 ;
@@ -820,10 +822,8 @@ static int vsock_shutdown(struct socket/* Receive and send shutdowns are treated alike. */ mode = mode & (RCV_SHUTDOWN |SEND_SHUTDOWN );if (mode) { -lock_sock (sk); sk->sk_shutdown |= mode; sk->sk_state_change (sk); -release_sock (sk);if (sk->sk_type ==SOCK_STREAM ) {sock_reset_flag (sk,SOCK_DONE );
@@ -831,6 +831,8 @@ static int vsock_shutdown(struct socket } } +out: +release_sock (sk);return err; }
net/vmw_vsock/hyperv_transport.c +0 -4
@@ -464,14 +464,10 @@ static void hvs_shutdown_lock_held(strucstatic int hvs_shutdown (struct vsock_sock *vsk,int mode) { -struct sock *sk =sk_vsock (vsk); -if (!(mode &SEND_SHUTDOWN ))return 0 ; -lock_sock (sk);hvs_shutdown_lock_held (vsk->trans, mode); -release_sock (sk);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 58/60 net/rds: restrict iovecs length for RDS_CMSG_RDMA_ARGS
In reply to Greg Kroah-HartmanFrom: Sabyrzhan Tasbolatov <[email protected]>
commit a11148e6fcce2ae53f47f0a442d098d860b4f7db upstream.
syzbot found WARNING in rds_rdma_extra_size [1] when RDS_CMSG_RDMA_ARGS control message is passed with user-controlled0x40001 bytes of args->nr_local, causing order >= MAX_ORDER condition.
The exact value 0x40001 can be checked with UIO_MAXIOV which is 0x400. So for kcalloc() 0x400 iovecs with sizeof(struct rds_iovec) = 0x10 is the closest limit, with 0x10 leftover.
Same condition is currently done in rds_cmsg_rdma_args().
[1] WARNING: mm/page_alloc.c:5011
[..]
Call Trace: alloc_pages_current+0x18c/0x2a0 mm/mempolicy.c:2267 alloc_pages include/linux/gfp.h:547 [inline] kmalloc_order+0x2e/0xb0 mm/slab_common.c:837 kmalloc_order_trace+0x14/0x120 mm/slab_common.c:853 kmalloc_array include/linux/slab.h:592 [inline] kcalloc include/linux/slab.h:621 [inline] rds_rdma_extra_size+0xb2/0x3b0 net/rds/rdma.c:568 rds_rm_size net/rds/send.c:928 [inline]
--- net/rds/rdma.c | 3 +++ 1 file changed, 3 insertions(+)
net/rds/rdma.c +3 -0
@@ -532,6 +532,9 @@ int rds_rdma_extra_size(struct rds_rdma_if (args->nr_local ==0 )return -EINVAL ; +if (args->nr_local >UIO_MAXIOV ) +return -EMSGSIZE ; + iov->iov =kcalloc (args->nr_local,sizeof (struct rds_iovec ),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 59/60 net/qrtr: restrict user-controlled length in qrtr_tun_write_iter()
In reply to Greg Kroah-HartmanFrom: Sabyrzhan Tasbolatov <[email protected]>
commit 2a80c15812372e554474b1dba0b1d8e467af295d upstream.
syzbot found WARNING in qrtr_tun_write_iter [1] when write_iter length exceeds KMALLOC_MAX_SIZE causing order >= MAX_ORDER condition.
Additionally, there is no check for 0 length write.
[1]
WARNING: mm/page_alloc.c:5011 [..] Call Trace: alloc_pages_current+0x18c/0x2a0 mm/mempolicy.c:2267 alloc_pages include/linux/gfp.h:547 [inline] kmalloc_order+0x2e/0xb0 mm/slab_common.c:837 kmalloc_order_trace+0x14/0x120 mm/slab_common.c:853 kmalloc include/linux/slab.h:557 [inline] kzalloc include/linux/slab.h:682 [inline] qrtr_tun_write_iter+0x8a/0x180 net/qrtr/tun.c:83 call_write_iter include/linux/fs.h:1901 [inline]
--- net/qrtr/tun.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/qrtr/tun.c +6 -0
@@ -80,6 +80,12 @@ static ssize_t qrtr_tun_write_iter(strucssize_t ret;void *kbuf; +if (!len) +return -EINVAL ; + +if (len >KMALLOC_MAX_SIZE ) +return -ENOMEM ; + kbuf =kzalloc (len,GFP_KERNEL );if (!kbuf)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 60/60 ovl: expand warning in ovl_d_real()
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit cef4cbff06fbc3be54d6d79ee139edecc2ee8598 upstream.
There was a syzbot report with this warning but insufficient information...
--- fs/overlayfs/super.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/overlayfs/super.c +8 -5
@@ -79,7 +79,7 @@ static void ovl_dentry_release(struct destatic struct dentry *ovl_d_real (struct dentry *dentry,const struct inode *inode) { -struct dentry *real; +struct dentry *real =NULL , *lower;/* It's an overlay file */ if (inode &&d_inode (dentry) == inode)
@@ -98,9 +98,10 @@ static struct dentry *ovl_d_real(structif (real && !inode &&ovl_has_upperdata (d_inode (dentry)))return real; - real =ovl_dentry_lowerdata (dentry); -if (!real) + lower =ovl_dentry_lowerdata (dentry); +if (!lower) goto bug; + real = lower;/* Handle recursion */ real =d_real (real, inode);
@@ -108,8 +109,10 @@ static struct dentry *ovl_d_real(structif (!inode || inode ==d_inode (real))return real; bug: -WARN (1 ,"ovl_d_real(%pd4, %s:%lu): real dentry not found\n" , dentry, - inode ? inode->i_sb->s_id :"NULL" , inode ? inode->i_ino :0 ); +WARN (1 ,"%s(%pd4, %s:%lu): real dentry (%p/%lu) not found\n" , + __func__, dentry, inode ? inode->i_sb->s_id :"NULL" , + inode ? inode->i_ino :0 , real, + real &&d_inode (real) ?d_inode (real)->i_ino :0 );return dentry; }
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.99 release. There are 60 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 Wed, 17 Feb 2021 15:27:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.99-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
The following lockdep warning was found during the arm64 db410c boot. And this is easily reproducible.
WARNING: possible recursive locking detected
5.4.99-rc1 #1 Not tainted
kworker/1:1/31 is trying to acquire lock:
ffff00000eb36940 (regulator_ww_class_mutex){+.+.}, at:create_regulator+0x23c/0x360
Summary
------------------------------------------------------------------------
kernel: 5.4.99-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.4.y
git commit: c65ed94f3071e59865975e91b52ec522a50f7ade
git describe: v5.4.98-61-gc65ed94f3071
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.4.y/build/v5.4.98-61-gc65ed94f3071
No regressions (compared to build v5.4.97-25-g539f3bba2f5b)
No fixes (compared to build v5.4.97-25-g539f3bba2f5b)
Ran 50148 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
- x86_64
Test Suites
-----------
* build
* linux-log-parser
* install-android-platform-tools-r2600
* kselftest-android
* kselftest-bpf
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-intel_pstate
* kselftest-livepatch
* kselftest-lkdtm
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-zram
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-dio-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* perf
* fwts
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-tc-testing
* kvm-unit-tests
* ltp-containers-tests
* ltp-cve-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-sched-tests
* ltp-syscalls-tests
* network-basic-tests
* v4l2-compliance
* kselftest-kexec
* kselftest-kvm
* kselftest-vm
* kselftest-x86
* ltp-controllers-tests
* ltp-fs-tests
* ltp-open-posix-tests
* ltp-tracing-tests
* rcutorture
* kselftest-
* kselftest-vsyscall-mode-native-
* ssuite
* timesync-off
--
Linaro LKFT
https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.99 release. There are 60 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 Wed, 17 Feb 2021 15:27:00 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.99 release. There are 60 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 Wed, 17 Feb 2021 15:27:00 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.99-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.99 release. There are 60 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.
Compiled and booted with no regressions on x86_64.
thanks,
Ross