4.14.93-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH 10/105 xfrm: Fix bucket count reported to userspace
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca92e173ab34a4f7fc4128bd372bd96f1af6f507 ]
sadhcnt is reported by ip -s xfrm state count as "buckets count", not the hash mask.
--- net/xfrm/xfrm_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_state.c +1 -1
@@ -789,7 +789,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si) {spin_lock_bh (&net->xfrm.xfrm_state_lock); si->sadcnt = net->xfrm.state_num; - si->sadhcnt = net->xfrm.state_hmask; + si->sadhcnt = net->xfrm.state_hmask +1 ; si->sadhmcnt = xfrm_state_hashmax;spin_unlock_bh (&net->xfrm.xfrm_state_lock); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 12/105 netfilter: seqadj: re-load tcp header pointer after possible head reallocation
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 530aad77010b81526586dfc09130ec875cd084e4 ]
When adjusting sack block sequence numbers, skb_make_writable() gets called to make sure tcp options are all in the linear area, and buffer is not shared.
This can cause tcp header pointer to get reallocated, so we must reaload it to avoid memory corruption.
This bug pre-dates git history.
--- net/netfilter/nf_conntrack_seqadj.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_seqadj.c +4 -3
@@ -115,12 +115,12 @@ static void nf_ct_sack_block_adjust(struct sk_buff *skb,/* TCP SACK sequence number adjustment */ static unsigned int nf_ct_sack_adjust (struct sk_buff *skb,unsigned int protoff, -struct tcphdr *tcph,struct nf_conn *ct,enum ip_conntrack_info ctinfo) { -unsigned int dir, optoff, optend; +struct tcphdr *tcph = (void *)skb->data + protoff;struct nf_conn_seqadj *seqadj =nfct_seqadj (ct); +unsigned int dir, optoff, optend; optoff = protoff +sizeof (struct tcphdr ); optend = protoff + tcph->doff *4 ;
@@ -128,6 +128,7 @@ static unsigned int nf_ct_sack_adjust(struct sk_buff *skb,if (!skb_make_writable (skb, optend))return 0 ; + tcph = (void *)skb->data + protoff; dir =CTINFO2DIR (ctinfo);while (optoff < optend) {
@@ -207,7 +208,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb, ntohl(newack)); tcph->ack_seq = newack; - res =nf_ct_sack_adjust (skb, protoff, tcph, ct, ctinfo); + res =nf_ct_sack_adjust (skb, protoff, ct, ctinfo); out:spin_unlock_bh (&ct->lock);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 13/105 scsi: bnx2fc: Fix NULL dereference in error handling
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9ae4f8420ed7be4b13c96600e3568c144d101a23 ]
If "interface" is NULL then we can't release it and trying to will only lead to an Oops.
--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
@@ -2372,7 +2372,7 @@ static int _bnx2fc_create(struct net_device *netdev,if (!interface) { printk(KERN_ERR PFX "bnx2fc_interface_create failed\n"); rc = -ENOMEM ; - goto ifput_err; + goto netdev_err; }if (is_vlan_dev (netdev)) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 15/105 Input: synaptics - enable RMI on ThinkPad T560
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca5047286c9c93a01e1f471d00a6019536992954 ]
Before commit 7fd6d98b89f3 ("i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus"), enabling RMI on the T560 would cause the touchpad to stop working after resuming from suspend. Now that this issue is fixed, RMI can be enabled safely and works fine.
--- drivers/input/mouse/synaptics.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/mouse/synaptics.c +1 -0
@@ -171,6 +171,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0046" ,/* X250 */ "LEN004a" ,/* W541 */ "LEN005b" ,/* P50 */ +"LEN005e" ,/* T560 */ "LEN0071" ,/* T480 */ "LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073", /* X1 Carbon G5 (Elantech) */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 18/105 x86/mm: Fix guard hole handling
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 16877a5570e0c5f4270d5b17f9bab427bcae9514 ]
There is a guard hole at the beginning of the kernel address space, also used by hypervisors. It occupies 16 PGD entries.
This reserved range is not defined explicitely, it is calculated relative to other entities: direct mapping and user space ranges.
The calculation got broken by recent changes of the kernel memory layout:
LDT remap range is now mapped before direct mapping and makes the calculation invalid.
The breakage leads to crash on Xen dom0 boot[1].
Define the reserved range explicitely. It's part of kernel ABI (hypervisors expect it to be stable) and must not depend on changes in the rest of kernel memory layout.
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-11/msg03313.html
--- arch/x86/include/asm/pgtable_64_types.h | 5 +++++ arch/x86/mm/dump_pagetables.c | 8 ++++---- arch/x86/xen/mmu_pv.c | 11 ++++++----- 3 files changed, 15 insertions(+), 9 deletions(-)
arch/x86/include/asm/pgtable_64_types.h +5 -0
@@ -94,6 +94,11 @@ typedef struct { pteval_t pte; } pte_t;# define __VMEMMAP_BASE _AC(0xffffea0000000000, UL)#endif +#define GUARD_HOLE_PGD_ENTRY -256UL +#define GUARD_HOLE_SIZE (16UL << PGDIR_SHIFT) +#define GUARD_HOLE_BASE_ADDR (GUARD_HOLE_PGD_ENTRY << PGDIR_SHIFT) +#define GUARD_HOLE_END_ADDR (GUARD_HOLE_BASE_ADDR + GUARD_HOLE_SIZE) +#define LDT_PGD_ENTRY -240UL#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
arch/x86/mm/dump_pagetables.c +4 -4
@@ -465,11 +465,11 @@ static inline bool is_hypervisor_range(int idx) {#ifdef CONFIG_X86_64 /* -* ffff800000000000 - ffff87ffffffffff is reserved for -* the hypervisor. +* A hole in the beginning of kernel address space reserved +* for a hypervisor. */ -return (idx >=pgd_index (__PAGE_OFFSET) -16 ) && - (idx <pgd_index (__PAGE_OFFSET)); +return (idx >=pgd_index (GUARD_HOLE_BASE_ADDR )) && + (idx <pgd_index (GUARD_HOLE_END_ADDR ));#else return false;#endif
arch/x86/xen/mmu_pv.c +6 -5
@@ -614,19 +614,20 @@ static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd, unsigned long limit) {int i, nr, flush =0 ; -unsigned hole_low, hole_high; +unsigned hole_low =0 , hole_high =0 ;/* The limit is the last byte to be touched */ limit--;BUG_ON (limit >=FIXADDR_TOP ); +#ifdef CONFIG_X86_64 /* * 64-bit has a great big hole in the middle of the address -* space, which contains the Xen mappings. On 32-bit these -* will end up making a zero-sized hole and so is a no-op. +* space, which contains the Xen mappings. */ - hole_low =pgd_index (USER_LIMIT ); - hole_high =pgd_index (PAGE_OFFSET ); + hole_low =pgd_index (GUARD_HOLE_BASE_ADDR ); + hole_high =pgd_index (GUARD_HOLE_END_ADDR ); +#endif nr =pgd_index (limit) +1 ;for (i =0 ; i < nr; i++) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 19/105 x86/dump_pagetables: Fix LDT remap address marker
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 254eb5505ca0ca749d3a491fc6668b6c16647a99 ]
The LDT remap placement has been changed. It's now placed before the direct mapping in the kernel virtual address space for both paging modes.
Change address markers order accordingly.
--- arch/x86/mm/dump_pagetables.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/mm/dump_pagetables.c +2 -5
@@ -51,10 +51,10 @@ struct addr_marker {enum address_markers_idx {USER_SPACE_NR =0 ,KERNEL_SPACE_NR , -LOW_KERNEL_NR , -#if defined(CONFIG_MODIFY_LDT_SYSCALL ) && defined(CONFIG_X86_5LEVEL ) +#ifdef CONFIG_MODIFY_LDT_SYSCALL LDT_NR ,#endif +LOW_KERNEL_NR ,VMALLOC_START_NR ,VMEMMAP_START_NR ,#ifdef CONFIG_KASAN
@@ -62,9 +62,6 @@ enum address_markers_idx { KASAN_SHADOW_END_NR, #endif CPU_ENTRY_AREA_NR, -#if defined(CONFIG_MODIFY_LDT_SYSCALL ) && !defined(CONFIG_X86_5LEVEL ) - LDT_NR, -#endif #ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR,#endif
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 14/105 Input: omap-keypad - fix idle configuration to not block SoC idle states
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e2ca26ec4f01486661b55b03597c13e2b9c18b73 ]
With PM enabled, I noticed that pressing a key on the droid4 keyboard will block deeper idle states for the SoC. Let's fix this by using IRQF_ONESHOT and stop constantly toggling the device OMAP4_KBD_IRQENABLE register as suggested by Dmitry Torokhov <[email protected]>.
Quoted 1 line
From the hardware point of view, looks like we need to manage the registers
for OMAP4_KBD_IRQENABLE and OMAP4_KBD_WAKEUPENABLE together to avoid blocking deeper SoC idle states. And with toggling of OMAP4_KBD_IRQENABLE register now gone with IRQF_ONESHOT, also the SoC idle state problem is gone during runtime. We still also need to clear OMAP4_KBD_WAKEUPENABLE in omap4_keypad_close() though to pair it with omap4_keypad_open() to prevent blocking deeper SoC idle states after rmmod omap4-keypad.
--- drivers/input/keyboard/omap4-keypad.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/input/keyboard/omap4-keypad.c +4 -12
@@ -126,12 +126,8 @@ static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) {struct omap4_keypad *keypad_data = dev_id; -if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )) { -/* Disable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_VAL_IRQDISABLE ); +if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ))return IRQ_WAKE_THREAD ; - }return IRQ_NONE ; }
@@ -173,11 +169,6 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id)kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )); -/* enable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_DEF_IRQENABLE_EVENTEN | -OMAP4_DEF_IRQENABLE_LONGKEY ); -return IRQ_HANDLED ; }
@@ -214,9 +205,10 @@ static void omap4_keypad_close(struct input_dev *input)disable_irq (keypad_data->irq); -/* Disable interrupts */ +/* Disable interrupts and wake-up events */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE ,OMAP4_VAL_IRQDISABLE ); +kbd_writel (keypad_data,OMAP4_KBD_WAKEUPENABLE ,0 );/* clear pending interrupts */ kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
@@ -364,7 +356,7 @@ static int omap4_keypad_probe(struct platform_device *pdev) } error =request_threaded_irq (keypad_data->irq, omap4_keypad_irq_handler, - omap4_keypad_irq_thread_fn,0 , + omap4_keypad_irq_thread_fn,IRQF_ONESHOT ,"omap4-keypad" , keypad_data);if (error) {dev_err (&pdev->dev,"failed to register interrupt\n" );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 2/105 powerpc: Fix COFF zImage booting on old powermacs
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5564597d51c8ff5b88d95c76255e18b13b760879 ]
Commit 6975a783d7b4 ("powerpc/boot: Allow building the zImage wrapper as a relocatable ET_DYN", 2011-04-12) changed the procedure descriptor at the start of crt0.S to have a hard-coded start address of 0x500000 rather than a reference to _zimage_start, presumably because having a reference to a symbol introduced a relocation which is awkward to handle in a position-independent executable. Unfortunately, what is at 0x500000 in the COFF image is not the first instruction, but the procedure descriptor itself, that is, a word containing 0x500000, which is not a valid instruction. Hence, booting a COFF zImage results in a "DEFAULT CATCH!, code=FFF00700" message from Open Firmware.
This fixes the problem by (a) putting the procedure descriptor in the data section and (b) adding a branch to _zimage_start as the first instruction in the program.
--- arch/powerpc/boot/crt0.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/boot/crt0.S +3 -1
@@ -15,7 +15,7 @@ RELA = 7 RELACOUNT = 0x6ffffff9 - .text + .data /* A procedure descriptor used when booting this as a COFF file. * When making COFF, this comes first in the link and we're * linked at 0x500000.
@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9 .globl _zimage_start_opd _zimage_start_opd: .long 0x500000, 0, 0, 0 + .text + b _zimage_start #ifdef __powerpc64__ .balign 8
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 21/105 netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 708abf74dd87f8640871b814faa195fb5970b0e3 ]
In the error handling block, nla_nest_cancel(skb, atd) is called to cancel the nest operation. But then, ipset_nest_end(skb, atd) is unexpected called to end the nest operation. This patch calls the ipset_nest_end only on the branch that nla_nest_cancel is not called.
--- net/netfilter/ipset/ip_set_list_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -542,8 +542,8 @@ list_set_list(const struct ip_set *set, ret = -EMSGSIZE ; }else { cb->args[IPSET_CB_ARG0 ] = i; +ipset_nest_end (skb, atd); } -ipset_nest_end (skb, atd); out:rcu_read_unlock ();return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 5/105 ARM: imx: update the cpu power up timing setting on i.mx6sx
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1e434b703248580b7aaaf8a115d93e682f57d29f ]
The sw2iso count should cover ARM LDO ramp-up time, the MAX ARM LDO ramp-up time may be up to more than 100us on some boards, this patch sets sw2iso to 0xf (~384us) which is the reset value, and it is much more safe to cover different boards, since we have observed that some customer boards failed with current setting of 0x2.
--- arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/cpuidle-imx6sx.c +1 -1
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (2 ,1 ); +imx_gpc_set_arm_power_up_timing (0xf ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 8/105 checkstack.pl: fix for aarch64
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f1733a1d3cd32a9492f4cf866be37bb46e10163d ]
There is actually a space after "sp," like this,
ffff2000080813c8: a9bb7bfd stp x29, x30, [sp, #-80]!
Right now, checkstack.pl isn't able to print anything on aarch64, because it won't be able to match the stating objdump line of a function due to this missing space. Hence, it displays every stack as zero-size.
After this patch, checkpatch.pl is able to match the start of a function's objdump, and is then able to calculate each function's stack correctly.
--- scripts/checkstack.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/checkstack.pl +2 -2
@@ -46,8 +46,8 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; if ($arch eq 'aarch64') { - #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp,#-80]! - $re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o; + #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! + $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') { #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64 $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainercover 4.14.93-stable review
This is the start of the stable review cycle for the 4.14.93 release. There are 105 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 Sun Jan 13 13:10:07 UTC 2019. 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/v4.x/stable-review/patch-4.14.93-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-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.14.93-rc1
Boris Brezillon <[email protected]>
drm/vc4: Set ->is_yuv to false when num_planes == 1
Christophe Leroy <[email protected]>
lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
Lubomir Rintel <[email protected]>
power: supply: olpc_battery: correct the temperature units
Alexander Shishkin <[email protected]>
intel_th: msu: Fix an off-by-one in attribute store
Christian Borntraeger <[email protected]>
genwqe: Fix size check
Yan, Zheng <[email protected]>
ceph: don't update importing cap's mseq when handing cap export
Linus Torvalds <[email protected]>
sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c
Sohil Mehta <[email protected]>
iommu/vt-d: Handle domain agaw being less than iommu agaw
Sagi Grimberg <[email protected]>
rxe: fix error completion wr_id and qp_num
Dominique Martinet <[email protected]>
9p/net: put a lower bound on msize
Breno Leitao <[email protected]>
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Ard Biesheuvel <[email protected]>
arm64: relocatable: fix inconsistencies in linker script and options
Ard Biesheuvel <[email protected]>
arm64: drop linker script hack to hide __efistub_ symbols
Benjamin Coddington <[email protected]>
lockd: Show pid of lockd for remote locks
Ondrej Mosnacek <[email protected]>
selinux: policydb - fix byte order and alignment issues
Larry Finger <[email protected]>
b43: Fix error in cordic routine
Andreas Gruenbacher <[email protected]>
gfs2: Fix loop in gfs2_rbm_find
Andreas Gruenbacher <[email protected]>
gfs2: Get rid of potential double-freeing in gfs2_create_inode
Vasily Averin <[email protected]>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <[email protected]>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <[email protected]>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <[email protected]>
dlm: fixed memory leaks after failed ls_remove_names allocation
Hui Peng <[email protected]>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <[email protected]>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <[email protected]>
ALSA: cs46xx: Potential NULL dereference in probe
Damien Le Moal <[email protected]>
dm zoned: Fix target BIO completion handling
Mikulas Patocka <[email protected]>
dm verity: fix crash on bufio buffer that was allocated with vmalloc
Stefan Hajnoczi <[email protected]>
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Joel Stanley <[email protected]>
raid6/ppc: Fix build for clang
Joel Stanley <[email protected]>
powerpc/boot: Set target when cross-compiling for clang
Joel Stanley <[email protected]>
Makefile: Export clang toolchain variables
Masahiro Yamada <[email protected]>
kbuild: consolidate Clang compiler flags
Masahiro Yamada <[email protected]>
kbuild: add -no-integrated-as Clang option unconditionally
Matthias Kaehlcke <[email protected]>
md: raid10: remove VLAIS
Joel Stanley <[email protected]>
ftrace: Build with CPPFLAGS to get -Qunused-arguments
Joel Stanley <[email protected]>
powerpc: Disable -Wbuiltin-requires-header when setjmp is used
Nicholas Piggin <[email protected]>
powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
Vasily Averin <[email protected]>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <[email protected]>
sunrpc: fix cache_head leak due to queued request
Huang Ying <[email protected]>
mm, swap: fix swapoff with KSM pages
Dan Williams <[email protected]>
mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
Dan Williams <[email protected]>
mm, hmm: use devm semantics for hmm_devmem_{add, remove}Dan Williams <[email protected]>
mm, devm_memremap_pages: kill mapping "System RAM" support
Dan Williams <[email protected]>
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
Michal Hocko <[email protected]>
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Minchan Kim <[email protected]>
zram: fix double free backing device
David Herrmann <[email protected]>
fork: record start_time late
Martin Kelly <[email protected]>
tools: fix cross-compile var clobbering
Thomas Gleixner <[email protected]>
genirq/affinity: Don't return with empty affinity masks on error
Ewan D. Milne <[email protected]>
scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
Steffen Maier <[email protected]>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Yangtao Li <[email protected]>
serial/sunsu: fix refcount leak
Daniele Palmas <[email protected]>
qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
Kangjie Lu <[email protected]>
net: netxen: fix a missing check and an uninitialized use
Mantas Mikulėnas <[email protected]>
Input: synaptics - enable SMBus for HP EliteBook 840 G4
Uwe Kleine-König <[email protected]>
gpio: mvebu: only fail on missing clk if pwm is actually to be used
Michael S. Tsirkin <[email protected]>
virtio: fix test build after uio.h change
Masahiro Yamada <[email protected]>
kbuild: fix false positive warning/error about missing libelf
Sara Sharon <[email protected]>
mac80211: free skb fraglist before freeing the skb
Colin Ian King <[email protected]>
vxge: ensure data0 is initialized in when fetching firmware version information
Jason Martinsen <[email protected]>
lan78xx: Resolve issue with changing MAC address
Anssi Hannula <[email protected]>
net: macb: fix dropped RX frames due to a race
Anssi Hannula <[email protected]>
net: macb: fix random memory corruption on RX with 64-bit DMA
Dan Carpenter <[email protected]>
qed: Fix an error code qed_ll2_start_xmit()
Trond Myklebust <[email protected]>
SUNRPC: Fix a race with XPRT_CONNECTING
Yonglong Liu <[email protected]>
net: hns: Fix ping failed when use net bridge and send multicast
Yonglong Liu <[email protected]>
net: hns: Add mac pcs config when enable|disable mac
Yonglong Liu <[email protected]>
net: hns: Fix ntuple-filters status error.
Yonglong Liu <[email protected]>
net: hns: Avoid net reset caused by pause frames storm
Yonglong Liu <[email protected]>
net: hns: Free irq when exit from abnormal branch
Yonglong Liu <[email protected]>
net: hns: Clean rx fbd when ae stopped.
Yonglong Liu <[email protected]>
net: hns: Fixed bug that netdev was opened twice
Yonglong Liu <[email protected]>
net: hns: Some registers use wrong address according to the datasheet.
Yonglong Liu <[email protected]>
net: hns: All ports can not work when insmod hns ko after rmmod.
Yonglong Liu <[email protected]>
net: hns: Incorrect offset address used for some registers.
Arnd Bergmann <[email protected]>
w90p910_ether: remove incorrect __init annotation
Nathan Chancellor <[email protected]>
drivers: net: xgene: Remove unnecessary forward declarations
Sinan Kaya <[email protected]>
x86, hyperv: remove PCI dependency
Varun Prakash <[email protected]>
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Varun Prakash <[email protected]>
scsi: target: iscsi: cxgbit: fix csk leak
Sudarsana Reddy Kalluru <[email protected]>
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Sudarsana Reddy Kalluru <[email protected]>
bnx2x: Remove configured vlans as part of unload sequence.
Sudarsana Reddy Kalluru <[email protected]>
bnx2x: Clear fip MAC when fcoe offload support is disabled
Florian Westphal <[email protected]>
netfilter: nat: can't use dst_hold on noref dst
Pan Bian <[email protected]>
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Stefan Assmann <[email protected]>
i40e: fix mac filter delete when setting mac address
Kirill A. Shutemov <[email protected]>
x86/dump_pagetables: Fix LDT remap address marker
Kirill A. Shutemov <[email protected]>
x86/mm: Fix guard hole handling
YueHaibing <[email protected]>
ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
Thomas Falcon <[email protected]>
ibmvnic: Fix non-atomic memory allocation in IRQ context
Yussuf Khalil <[email protected]>
Input: synaptics - enable RMI on ThinkPad T560
Tony Lindgren <[email protected]>
Input: omap-keypad - fix idle configuration to not block SoC idle states
Dan Carpenter <[email protected]>
scsi: bnx2fc: Fix NULL dereference in error handling
Florian Westphal <[email protected]>
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
Steffen Klassert <[email protected]>
xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
Benjamin Poirier <[email protected]>
xfrm: Fix bucket count reported to userspace
Wei Yongjun <[email protected]>
xfrm: Fix error return code in xfrm_output_one()
Qian Cai <[email protected]>
checkstack.pl: fix for aarch64
Peter Hutterer <[email protected]>
Input: restore EV_ABS ABS_RESERVED
Fabio Estevam <[email protected]>
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Anson Huang <[email protected]>
ARM: imx: update the cpu power up timing setting on i.mx6sx
Hans de Goede <[email protected]>
HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
Michael Ellerman <[email protected]>
powerpc/mm: Fix linux page tables build with some configs
Paul Mackerras <[email protected]>
powerpc: Fix COFF zImage booting on old powermacs
Jerome Brunet <[email protected]>
pinctrl: meson: fix pull enable register calculation
-------------
Diffstat:
Makefile | 31 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 +- arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +- arch/arm64/Makefile | 2 +- arch/arm64/kernel/image.h | 44 +- arch/arm64/kernel/vmlinux.lds.S | 9 +- arch/powerpc/Makefile | 7 +- arch/powerpc/boot/Makefile | 5 + arch/powerpc/boot/crt0.S | 4 +- arch/powerpc/kernel/Makefile | 3 + arch/powerpc/kernel/signal_32.c | 20 +- arch/powerpc/kernel/signal_64.c | 44 +- arch/powerpc/mm/dump_linuxpagetables.c | 1 + arch/powerpc/xmon/Makefile | 5 +- arch/x86/include/asm/pgtable_64_types.h | 5 + arch/x86/mm/dump_pagetables.c | 15 +- arch/x86/xen/mmu_pv.c | 11 +- drivers/block/zram/zram_drv.c | 4 +- drivers/gpio/gpio-mvebu.c | 6 +- drivers/gpu/drm/vc4/vc4_plane.c | 1 + drivers/hid/hid-ids.h | 3 + drivers/hid/hid-ite.c | 1 + drivers/hv/Kconfig | 2 +- drivers/hwtracing/intel_th/msu.c | 3 +- drivers/infiniband/sw/rxe/rxe_resp.c | 13 +- drivers/input/keyboard/omap4-keypad.c | 16 +- drivers/input/mouse/synaptics.c | 2 + drivers/iommu/intel-iommu.c | 4 +- drivers/md/dm-verity-target.c | 24 +- drivers/md/dm-zoned-target.c | 122 ++--- drivers/md/raid10.c | 15 +- drivers/misc/genwqe/card_utils.c | 2 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 - drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 48 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 +- drivers/net/ethernet/cadence/macb_main.c | 14 +- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 503 ++++++++++++++------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 +- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +- drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 + drivers/net/ieee802154/ca8210.c | 4 +- drivers/net/usb/lan78xx.c | 4 + drivers/net/usb/qmi_wwan.c | 15 +- drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- drivers/pinctrl/meson/pinctrl-meson.c | 3 +- drivers/power/supply/olpc_battery.c | 4 +- drivers/s390/scsi/zfcp_aux.c | 6 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 3 +- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 +- drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 + drivers/tty/serial/sunsu.c | 31 +- drivers/vhost/vsock.c | 2 + fs/ceph/caps.c | 1 - fs/dlm/lock.c | 17 +- fs/dlm/lockspace.c | 2 +- fs/gfs2/inode.c | 18 +- fs/gfs2/rgrp.c | 2 +- fs/lockd/clntproc.c | 2 +- fs/lockd/xdr.c | 4 +- fs/lockd/xdr4.c | 4 +- include/linux/hmm.h | 4 +- include/uapi/linux/input-event-codes.h | 9 + kernel/fork.c | 13 +- kernel/irq/affinity.c | 15 +- kernel/memremap.c | 11 +- kernel/sched/fair.c | 43 +- lib/raid6/Makefile | 15 + lib/test_debug_virtual.c | 1 + mm/hmm.c | 131 ++---- mm/memory_hotplug.c | 16 + mm/swapfile.c | 3 +- net/9p/client.c | 21 + net/mac80211/status.c | 5 + net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/nf_conntrack_seqadj.c | 7 +- net/netfilter/nf_nat_core.c | 3 +- net/sunrpc/auth_gss/svcauth_gss.c | 8 +- net/sunrpc/cache.c | 10 +- net/sunrpc/xprtsock.c | 4 +- net/xfrm/xfrm_input.c | 7 +- net/xfrm/xfrm_output.c | 1 + net/xfrm/xfrm_state.c | 2 +- scripts/Makefile.build | 2 +- scripts/checkstack.pl | 4 +- security/selinux/ss/policydb.c | 51 ++- sound/pci/cs46xx/dsp_spos.c | 3 + sound/usb/mixer.c | 10 +- sound/usb/quirks-table.h | 3 + tools/cgroup/Makefile | 1 - tools/gpio/Makefile | 2 - tools/hv/Makefile | 1 - tools/iio/Makefile | 2 - tools/laptop/freefall/Makefile | 1 - tools/leds/Makefile | 1 - tools/perf/Makefile.perf | 6 - tools/power/acpi/Makefile.config | 3 - tools/scripts/Makefile.include | 18 + tools/spi/Makefile | 2 - tools/testing/nvdimm/test/iomap.c | 2 +- tools/usb/Makefile | 1 - tools/virtio/linux/kernel.h | 4 + tools/vm/Makefile | 1 - 112 files changed, 1035 insertions(+), 666 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 9/105 xfrm: Fix error return code in xfrm_output_one()
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 533555e5cbb6aa2d77598917871ae5b579fe724b ]
xfrm_output_one() does not return a error code when there is no dst_entry attached to the skb, it is still possible crash with a NULL pointer dereference in xfrm_output_resume(). Fix it by return error code -EHOSTUNREACH.
--- net/xfrm/xfrm_output.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_output.c +1 -0
@@ -103,6 +103,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)skb_dst_force (skb);if (!skb_dst (skb)) {XFRM_INC_STATS (net,LINUX_MIB_XFRMOUTERROR ); + err = -EHOSTUNREACH ; goto error_nolock; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 32/105 net: hns: All ports can not work when insmod hns ko after rmmod.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 308c6cafde0147616da45e3a928adae55c428deb ]
There are two test cases:
1. Remove the 4 modules:hns_enet_drv/hns_dsaf/hnae/hns_mdio, and install them again, must use "ifconfig down/ifconfig up" command pair to bring port to work.
This patch calls phy_stop function when init phy to fix this bug.
2. Remove the 2 modules:hns_enet_drv/hns_dsaf, and install them again, all ports can not use anymore, because of the phy devices register failed(phy devices already exists).
Phy devices are registered when hns_dsaf installed, this patch removes them when hns_dsaf removed.
The two cases are sometimes related, fixing the second case also requires fixing the first case, so fix them together.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 +++++++++++++++ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 3 +++ 2 files changed, 18 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +15 -0
@@ -783,6 +783,17 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)return rc; } +static void hns_mac_remove_phydev (struct hns_mac_cb *mac_cb) +{ +if (!to_acpi_device_node (mac_cb->fw_port) || !mac_cb->phy_dev) +return ; + +phy_device_remove (mac_cb->phy_dev); +phy_device_free (mac_cb->phy_dev); + + mac_cb->phy_dev =NULL ; +} +#define MAC_MEDIA_TYPE_MAX_LEN 16 static const struct {
@@ -1120,7 +1131,11 @@ void hns_mac_uninit(struct dsaf_device *dsaf_dev)int max_port_num =hns_mac_get_max_port_num (dsaf_dev);for (i =0 ; i < max_port_num; i++) { +if (!dsaf_dev->mac_cb[i]) +continue ; + dsaf_dev->misc_op->cpld_reset_led (dsaf_dev->mac_cb[i]); +hns_mac_remove_phydev (dsaf_dev->mac_cb[i]); dsaf_dev->mac_cb[i] =NULL ; } }
drivers/net/ethernet/hisilicon/hns/hns_enet.c +3 -0
@@ -1286,6 +1286,9 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)if (h->phy_if ==PHY_INTERFACE_MODE_XGMII ) phy_dev->autoneg = false; +if (h->phy_if ==PHY_INTERFACE_MODE_SGMII ) +phy_stop (phy_dev); +return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 33/105 net: hns: Some registers use wrong address according to the datasheet.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4ad26f117b6ea0f5d5f1592127bafb5ec65904d3 ]
According to the hip06 datasheet:
1.Six registers use wrong address:
RCB_COM_SF_CFG_INTMASK_RING
RCB_COM_SF_CFG_RING_STS
RCB_COM_SF_CFG_RING
RCB_COM_SF_CFG_INTMASK_BD
RCB_COM_SF_CFG_BD_RINT_STS DSAF_INODE_VC1_IN_PKT_NUM_0_REG
2.The offset of DSAF_INODE_VC1_IN_PKT_NUM_0_REG should be
0x103C + 0x80 * all_chn_num
3.The offset to show the value of DSAF_INODE_IN_DATA_STP_DISC_0_REG
is wrong, so the value of DSAF_INODE_SW_VLAN_TAG_DISC_0_REG will be overwrite
These registers are only used in "ethtool -d", so that did not cause ndev to misfunction.
--- .../ethernet/hisilicon/hns/hns_dsaf_main.c | 242 +++++++++--------- .../net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 12 +- 2 files changed, 127 insertions(+), 127 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +121 -121
@@ -2278,237 +2278,237 @@ void hns_dsaf_get_regs(struct dsaf_device *ddev, u32 port, void *data) DSAF_INODE_BD_ORDER_STATUS_0_REG + j * 4); p[223 + i] =dsaf_read_dev (ddev,DSAF_INODE_SW_VLAN_TAG_DISC_0_REG + j *4 ); - p[224 + i] =dsaf_read_dev (ddev, + p[226 + i] =dsaf_read_dev (ddev,DSAF_INODE_IN_DATA_STP_DISC_0_REG + j *4 ); } - p[227 ] =dsaf_read_dev (ddev,DSAF_INODE_GE_FC_EN_0_REG + port *4 ); + p[229 ] =dsaf_read_dev (ddev,DSAF_INODE_GE_FC_EN_0_REG + port *4 );for (i =0 ; i <DSAF_INODE_NUM /DSAF_COMM_CHN ; i++) { j = i *DSAF_COMM_CHN + port; - p[228 + i] =dsaf_read_dev (ddev, + p[230 + i] =dsaf_read_dev (ddev,DSAF_INODE_VC0_IN_PKT_NUM_0_REG + j *4 ); } - p[231 ] =dsaf_read_dev (ddev, -DSAF_INODE_VC1_IN_PKT_NUM_0_REG + port *4 ); + p[233 ] =dsaf_read_dev (ddev, +DSAF_INODE_VC1_IN_PKT_NUM_0_REG + port *0x80 );/* dsaf inode registers */ for (i =0 ; i <HNS_DSAF_SBM_NUM (ddev) /DSAF_COMM_CHN ; i++) { j = i *DSAF_COMM_CHN + port; - p[232 + i] =dsaf_read_dev (ddev, + p[234 + i] =dsaf_read_dev (ddev,DSAF_SBM_CFG_REG_0_REG + j *0x80 ); - p[235 + i] =dsaf_read_dev (ddev, + p[237 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CFG_0_XGE_REG_0_REG + j *0x80 ); - p[238 + i] =dsaf_read_dev (ddev, + p[240 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CFG_1_REG_0_REG + j *0x80 ); - p[241 + i] =dsaf_read_dev (ddev, + p[243 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CFG_2_XGE_REG_0_REG + j *0x80 ); - p[244 + i] =dsaf_read_dev (ddev, + p[246 + i] =dsaf_read_dev (ddev,DSAF_SBM_FREE_CNT_0_0_REG + j *0x80 ); - p[245 + i] =dsaf_read_dev (ddev, + p[249 + i] =dsaf_read_dev (ddev,DSAF_SBM_FREE_CNT_1_0_REG + j *0x80 ); - p[248 + i] =dsaf_read_dev (ddev, + p[252 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CNT_0_0_REG + j *0x80 ); - p[251 + i] =dsaf_read_dev (ddev, + p[255 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CNT_1_0_REG + j *0x80 ); - p[254 + i] =dsaf_read_dev (ddev, + p[258 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CNT_2_0_REG + j *0x80 ); - p[257 + i] =dsaf_read_dev (ddev, + p[261 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CNT_3_0_REG + j *0x80 ); - p[260 + i] =dsaf_read_dev (ddev, + p[264 + i] =dsaf_read_dev (ddev,DSAF_SBM_INER_ST_0_REG + j *0x80 ); - p[263 + i] =dsaf_read_dev (ddev, + p[267 + i] =dsaf_read_dev (ddev,DSAF_SBM_MIB_REQ_FAILED_TC_0_REG + j *0x80 ); - p[266 + i] =dsaf_read_dev (ddev, + p[270 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_CNT_0_REG + j *0x80 ); - p[269 + i] =dsaf_read_dev (ddev, + p[273 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_DROP_CNT_0_REG + j *0x80 ); - p[272 + i] =dsaf_read_dev (ddev, + p[276 + i] =dsaf_read_dev (ddev,DSAF_SBM_INF_OUTPORT_CNT_0_REG + j *0x80 ); - p[275 + i] =dsaf_read_dev (ddev, + p[279 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC0_CNT_0_REG + j *0x80 ); - p[278 + i] =dsaf_read_dev (ddev, + p[282 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC1_CNT_0_REG + j *0x80 ); - p[281 + i] =dsaf_read_dev (ddev, + p[285 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC2_CNT_0_REG + j *0x80 ); - p[284 + i] =dsaf_read_dev (ddev, + p[288 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC3_CNT_0_REG + j *0x80 ); - p[287 + i] =dsaf_read_dev (ddev, + p[291 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC4_CNT_0_REG + j *0x80 ); - p[290 + i] =dsaf_read_dev (ddev, + p[294 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC5_CNT_0_REG + j *0x80 ); - p[293 + i] =dsaf_read_dev (ddev, + p[297 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC6_CNT_0_REG + j *0x80 ); - p[296 + i] =dsaf_read_dev (ddev, + p[300 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_INPORT_TC7_CNT_0_REG + j *0x80 ); - p[299 + i] =dsaf_read_dev (ddev, + p[303 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_REQ_CNT_0_REG + j *0x80 ); - p[302 + i] =dsaf_read_dev (ddev, + p[306 + i] =dsaf_read_dev (ddev,DSAF_SBM_LNK_RELS_CNT_0_REG + j *0x80 ); - p[305 + i] =dsaf_read_dev (ddev, + p[309 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CFG_3_REG_0_REG + j *0x80 ); - p[308 + i] =dsaf_read_dev (ddev, + p[312 + i] =dsaf_read_dev (ddev,DSAF_SBM_BP_CFG_4_REG_0_REG + j *0x80 ); }/* dsaf onode registers */ for (i =0 ; i <DSAF_XOD_NUM ; i++) { - p[311 + i] =dsaf_read_dev (ddev, + p[315 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_TSA_TC0_TC3_CFG_0_REG + i *0x90 ); - p[319 + i] =dsaf_read_dev (ddev, + p[323 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_TSA_TC4_TC7_CFG_0_REG + i *0x90 ); - p[327 + i] =dsaf_read_dev (ddev, + p[331 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_BW_TC0_TC3_CFG_0_REG + i *0x90 ); - p[335 + i] =dsaf_read_dev (ddev, + p[339 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_BW_TC4_TC7_CFG_0_REG + i *0x90 ); - p[343 + i] =dsaf_read_dev (ddev, + p[347 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_BW_OFFSET_CFG_0_REG + i *0x90 ); - p[351 + i] =dsaf_read_dev (ddev, + p[355 + i] =dsaf_read_dev (ddev,DSAF_XOD_ETS_TOKEN_CFG_0_REG + i *0x90 ); } - p[359 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_0_0_REG + port *0x90 ); - p[360 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_1_0_REG + port *0x90 ); - p[361 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_2_0_REG + port *0x90 ); + p[363 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_0_0_REG + port *0x90 ); + p[364 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_1_0_REG + port *0x90 ); + p[365 ] =dsaf_read_dev (ddev,DSAF_XOD_PFS_CFG_2_0_REG + port *0x90 );for (i =0 ; i <DSAF_XOD_BIG_NUM /DSAF_COMM_CHN ; i++) { j = i *DSAF_COMM_CHN + port; - p[362 + i] =dsaf_read_dev (ddev, + p[366 + i] =dsaf_read_dev (ddev,DSAF_XOD_GNT_L_0_REG + j *0x90 ); - p[365 + i] =dsaf_read_dev (ddev, + p[369 + i] =dsaf_read_dev (ddev,DSAF_XOD_GNT_H_0_REG + j *0x90 ); - p[368 + i] =dsaf_read_dev (ddev, + p[372 + i] =dsaf_read_dev (ddev,DSAF_XOD_CONNECT_STATE_0_REG + j *0x90 ); - p[371 + i] =dsaf_read_dev (ddev, + p[375 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVPKT_CNT_0_REG + j *0x90 ); - p[374 + i] =dsaf_read_dev (ddev, + p[378 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVTC0_CNT_0_REG + j *0x90 ); - p[377 + i] =dsaf_read_dev (ddev, + p[381 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVTC1_CNT_0_REG + j *0x90 ); - p[380 + i] =dsaf_read_dev (ddev, + p[384 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVTC2_CNT_0_REG + j *0x90 ); - p[383 + i] =dsaf_read_dev (ddev, + p[387 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVTC3_CNT_0_REG + j *0x90 ); - p[386 + i] =dsaf_read_dev (ddev, + p[390 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVVC0_CNT_0_REG + j *0x90 ); - p[389 + i] =dsaf_read_dev (ddev, + p[393 + i] =dsaf_read_dev (ddev,DSAF_XOD_RCVVC1_CNT_0_REG + j *0x90 ); } - p[392 ] =dsaf_read_dev (ddev, + p[396 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN0_CNT_0_REG + port *0x90 ); - p[393 ] =dsaf_read_dev (ddev, + p[397 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN1_CNT_0_REG + port *0x90 ); - p[394 ] =dsaf_read_dev (ddev, + p[398 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN2_CNT_0_REG + port *0x90 ); - p[395 ] =dsaf_read_dev (ddev, + p[399 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN3_CNT_0_REG + port *0x90 ); - p[396 ] =dsaf_read_dev (ddev, + p[400 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN4_CNT_0_REG + port *0x90 ); - p[397 ] =dsaf_read_dev (ddev, + p[401 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN5_CNT_0_REG + port *0x90 ); - p[398 ] =dsaf_read_dev (ddev, + p[402 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN6_CNT_0_REG + port *0x90 ); - p[399 ] =dsaf_read_dev (ddev, + p[403 ] =dsaf_read_dev (ddev,DSAF_XOD_XGE_RCVIN7_CNT_0_REG + port *0x90 ); - p[400 ] =dsaf_read_dev (ddev, + p[404 ] =dsaf_read_dev (ddev,DSAF_XOD_PPE_RCVIN0_CNT_0_REG + port *0x90 ); - p[401 ] =dsaf_read_dev (ddev, + p[405 ] =dsaf_read_dev (ddev,DSAF_XOD_PPE_RCVIN1_CNT_0_REG + port *0x90 ); - p[402 ] =dsaf_read_dev (ddev, + p[406 ] =dsaf_read_dev (ddev,DSAF_XOD_ROCEE_RCVIN0_CNT_0_REG + port *0x90 ); - p[403 ] =dsaf_read_dev (ddev, + p[407 ] =dsaf_read_dev (ddev,DSAF_XOD_ROCEE_RCVIN1_CNT_0_REG + port *0x90 ); - p[404 ] =dsaf_read_dev (ddev, + p[408 ] =dsaf_read_dev (ddev,DSAF_XOD_FIFO_STATUS_0_REG + port *0x90 );/* dsaf voq registers */ for (i =0 ; i <DSAF_VOQ_NUM /DSAF_COMM_CHN ; i++) { j = (i *DSAF_COMM_CHN + port) *0x90 ; - p[405 + i] =dsaf_read_dev (ddev, + p[409 + i] =dsaf_read_dev (ddev,DSAF_VOQ_ECC_INVERT_EN_0_REG + j); - p[408 + i] =dsaf_read_dev (ddev, + p[412 + i] =dsaf_read_dev (ddev,DSAF_VOQ_SRAM_PKT_NUM_0_REG + j); - p[411 + i] =dsaf_read_dev (ddev,DSAF_VOQ_IN_PKT_NUM_0_REG + j); - p[414 + i] =dsaf_read_dev (ddev, + p[415 + i] =dsaf_read_dev (ddev,DSAF_VOQ_IN_PKT_NUM_0_REG + j); + p[418 + i] =dsaf_read_dev (ddev,DSAF_VOQ_OUT_PKT_NUM_0_REG + j); - p[417 + i] =dsaf_read_dev (ddev, + p[421 + i] =dsaf_read_dev (ddev,DSAF_VOQ_ECC_ERR_ADDR_0_REG + j); - p[420 + i] =dsaf_read_dev (ddev,DSAF_VOQ_BP_STATUS_0_REG + j); - p[423 + i] =dsaf_read_dev (ddev,DSAF_VOQ_SPUP_IDLE_0_REG + j); - p[426 + i] =dsaf_read_dev (ddev, + p[424 + i] =dsaf_read_dev (ddev,DSAF_VOQ_BP_STATUS_0_REG + j); + p[427 + i] =dsaf_read_dev (ddev,DSAF_VOQ_SPUP_IDLE_0_REG + j); + p[430 + i] =dsaf_read_dev (ddev,DSAF_VOQ_XGE_XOD_REQ_0_0_REG + j); - p[429 + i] =dsaf_read_dev (ddev, + p[433 + i] =dsaf_read_dev (ddev,DSAF_VOQ_XGE_XOD_REQ_1_0_REG + j); - p[432 + i] =dsaf_read_dev (ddev, + p[436 + i] =dsaf_read_dev (ddev,DSAF_VOQ_PPE_XOD_REQ_0_REG + j); - p[435 + i] =dsaf_read_dev (ddev, + p[439 + i] =dsaf_read_dev (ddev,DSAF_VOQ_ROCEE_XOD_REQ_0_REG + j); - p[438 + i] =dsaf_read_dev (ddev, + p[442 + i] =dsaf_read_dev (ddev,DSAF_VOQ_BP_ALL_THRD_0_REG + j); }/* dsaf tbl registers */ - p[441 ] =dsaf_read_dev (ddev,DSAF_TBL_CTRL_0_REG ); - p[442 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_MSK_0_REG ); - p[443 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_SRC_0_REG ); - p[444 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_STS_0_REG ); - p[445 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_ADDR_0_REG ); - p[446 ] =dsaf_read_dev (ddev,DSAF_TBL_LINE_ADDR_0_REG ); - p[447 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_HIGH_0_REG ); - p[448 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_LOW_0_REG ); - p[449 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_4_0_REG ); - p[450 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_3_0_REG ); - p[451 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_2_0_REG ); - p[452 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_1_0_REG ); - p[453 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_0_0_REG ); - p[454 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_UCAST_CFG_0_REG ); - p[455 ] =dsaf_read_dev (ddev,DSAF_TBL_LIN_CFG_0_REG ); - p[456 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RDATA_HIGH_0_REG ); - p[457 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RDATA_LOW_0_REG ); - p[458 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA4_0_REG ); - p[459 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA3_0_REG ); - p[460 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA2_0_REG ); - p[461 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA1_0_REG ); - p[462 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA0_0_REG ); - p[463 ] =dsaf_read_dev (ddev,DSAF_TBL_LIN_RDATA_0_REG ); + p[445 ] =dsaf_read_dev (ddev,DSAF_TBL_CTRL_0_REG ); + p[446 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_MSK_0_REG ); + p[447 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_SRC_0_REG ); + p[448 ] =dsaf_read_dev (ddev,DSAF_TBL_INT_STS_0_REG ); + p[449 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_ADDR_0_REG ); + p[450 ] =dsaf_read_dev (ddev,DSAF_TBL_LINE_ADDR_0_REG ); + p[451 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_HIGH_0_REG ); + p[452 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_LOW_0_REG ); + p[453 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_4_0_REG ); + p[454 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_3_0_REG ); + p[455 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_2_0_REG ); + p[456 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_1_0_REG ); + p[457 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_MCAST_CFG_0_0_REG ); + p[458 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_UCAST_CFG_0_REG ); + p[459 ] =dsaf_read_dev (ddev,DSAF_TBL_LIN_CFG_0_REG ); + p[460 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RDATA_HIGH_0_REG ); + p[461 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RDATA_LOW_0_REG ); + p[462 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA4_0_REG ); + p[463 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA3_0_REG ); + p[464 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA2_0_REG ); + p[465 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA1_0_REG ); + p[466 ] =dsaf_read_dev (ddev,DSAF_TBL_TCAM_RAM_RDATA0_0_REG ); + p[467 ] =dsaf_read_dev (ddev,DSAF_TBL_LIN_RDATA_0_REG );for (i =0 ; i <DSAF_SW_PORT_NUM ; i++) { j = i *0x8 ; - p[464 +2 * i] =dsaf_read_dev (ddev, + p[468 +2 * i] =dsaf_read_dev (ddev,DSAF_TBL_DA0_MIS_INFO1_0_REG + j); - p[465 +2 * i] =dsaf_read_dev (ddev, + p[469 +2 * i] =dsaf_read_dev (ddev,DSAF_TBL_DA0_MIS_INFO0_0_REG + j); } - p[480 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO2_0_REG ); - p[481 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO1_0_REG ); - p[482 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO0_0_REG ); - p[483 ] =dsaf_read_dev (ddev,DSAF_TBL_PUL_0_REG ); - p[484 ] =dsaf_read_dev (ddev,DSAF_TBL_OLD_RSLT_0_REG ); - p[485 ] =dsaf_read_dev (ddev,DSAF_TBL_OLD_SCAN_VAL_0_REG ); - p[486 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_CTRL_0_REG ); - p[487 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_STAT_0_REG ); - p[488 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_STAT_2_0_REG ); - p[489 ] =dsaf_read_dev (ddev,DSAF_TBL_LKUP_NUM_I_0_REG ); - p[490 ] =dsaf_read_dev (ddev,DSAF_TBL_LKUP_NUM_O_0_REG ); - p[491 ] =dsaf_read_dev (ddev,DSAF_TBL_UCAST_BCAST_MIS_INFO_0_0_REG ); + p[484 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO2_0_REG ); + p[485 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO1_0_REG ); + p[486 ] =dsaf_read_dev (ddev,DSAF_TBL_SA_MIS_INFO0_0_REG ); + p[487 ] =dsaf_read_dev (ddev,DSAF_TBL_PUL_0_REG ); + p[488 ] =dsaf_read_dev (ddev,DSAF_TBL_OLD_RSLT_0_REG ); + p[489 ] =dsaf_read_dev (ddev,DSAF_TBL_OLD_SCAN_VAL_0_REG ); + p[490 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_CTRL_0_REG ); + p[491 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_STAT_0_REG ); + p[492 ] =dsaf_read_dev (ddev,DSAF_TBL_DFX_STAT_2_0_REG ); + p[493 ] =dsaf_read_dev (ddev,DSAF_TBL_LKUP_NUM_I_0_REG ); + p[494 ] =dsaf_read_dev (ddev,DSAF_TBL_LKUP_NUM_O_0_REG ); + p[495 ] =dsaf_read_dev (ddev,DSAF_TBL_UCAST_BCAST_MIS_INFO_0_0_REG );/* dsaf other registers */ - p[492 ] =dsaf_read_dev (ddev,DSAF_INODE_FIFO_WL_0_REG + port *0x4 ); - p[493 ] =dsaf_read_dev (ddev,DSAF_ONODE_FIFO_WL_0_REG + port *0x4 ); - p[494 ] =dsaf_read_dev (ddev,DSAF_XGE_GE_WORK_MODE_0_REG + port *0x4 ); - p[495 ] =dsaf_read_dev (ddev, + p[496 ] =dsaf_read_dev (ddev,DSAF_INODE_FIFO_WL_0_REG + port *0x4 ); + p[497 ] =dsaf_read_dev (ddev,DSAF_ONODE_FIFO_WL_0_REG + port *0x4 ); + p[498 ] =dsaf_read_dev (ddev,DSAF_XGE_GE_WORK_MODE_0_REG + port *0x4 ); + p[499 ] =dsaf_read_dev (ddev,DSAF_XGE_APP_RX_LINK_UP_0_REG + port *0x4 ); - p[496 ] =dsaf_read_dev (ddev,DSAF_NETPORT_CTRL_SIG_0_REG + port *0x4 ); - p[497 ] =dsaf_read_dev (ddev,DSAF_XGE_CTRL_SIG_CFG_0_REG + port *0x4 ); + p[500 ] =dsaf_read_dev (ddev,DSAF_NETPORT_CTRL_SIG_0_REG + port *0x4 ); + p[501 ] =dsaf_read_dev (ddev,DSAF_XGE_CTRL_SIG_CFG_0_REG + port *0x4 );if (!is_ver1) - p[498 ] =dsaf_read_dev (ddev,DSAF_PAUSE_CFG_REG + port *0x4 ); + p[502 ] =dsaf_read_dev (ddev,DSAF_PAUSE_CFG_REG + port *0x4 );/* mark end of dsaf regs */ -for (i =499 ; i <504 ; i++) +for (i =503 ; i <504 ; i++) p[i] =0xdddddddd ; }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +6 -6
@@ -176,7 +176,7 @@#define DSAF_INODE_IN_DATA_STP_DISC_0_REG 0x1A50#define DSAF_INODE_GE_FC_EN_0_REG 0x1B00#define DSAF_INODE_VC0_IN_PKT_NUM_0_REG 0x1B50 -#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x1C00 +#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x103C#define DSAF_INODE_IN_PRIO_PAUSE_BASE_REG 0x1C00#define DSAF_INODE_IN_PRIO_PAUSE_BASE_OFFSET 0x100#define DSAF_INODE_IN_PRIO_PAUSE_OFFSET 0x50
@@ -404,11 +404,11 @@#define RCB_ECC_ERR_ADDR4_REG 0x460#define RCB_ECC_ERR_ADDR5_REG 0x464 -#define RCB_COM_SF_CFG_INTMASK_RING 0x480 -#define RCB_COM_SF_CFG_RING_STS 0x484 -#define RCB_COM_SF_CFG_RING 0x488 -#define RCB_COM_SF_CFG_INTMASK_BD 0x48C -#define RCB_COM_SF_CFG_BD_RINT_STS 0x470 +#define RCB_COM_SF_CFG_INTMASK_RING 0x470 +#define RCB_COM_SF_CFG_RING_STS 0x474 +#define RCB_COM_SF_CFG_RING 0x478 +#define RCB_COM_SF_CFG_INTMASK_BD 0x47C +#define RCB_COM_SF_CFG_BD_RINT_STS 0x480#define RCB_COM_RCB_RD_BD_BUSY 0x490#define RCB_COM_RCB_FBD_CRT_EN 0x494#define RCB_COM_AXI_WR_ERR_INTMASK 0x498
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 36/105 net: hns: Free irq when exit from abnormal branch
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c82bd077e1ba3dd586569c733dc6d3dd4b0e43cd ]
1.In "hns_nic_init_irq", if request irq fail at index i,
the function return directly without releasing irq resources that already requested.
2.In "hns_nic_net_up" after "hns_nic_init_irq",
if exceptional branch occurs, irqs that already requested are not release.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +22 -1
@@ -1384,6 +1384,22 @@ static int hns_nic_init_affinity_mask(int q_num, int ring_idx,return cpu; } +static void hns_nic_free_irq (int q_num,struct hns_nic_priv *priv) +{ +int i; + +for (i =0 ; i < q_num *2 ; i++) { +if (priv->ring_data[i].ring->irq_init_flag ==RCB_IRQ_INITED ) { +irq_set_affinity_hint (priv->ring_data[i].ring->irq, +NULL ); +free_irq (priv->ring_data[i].ring->irq, + &priv->ring_data[i]); + priv->ring_data[i].ring->irq_init_flag = +RCB_IRQ_NOT_INITED ; + } + } +} +static int hns_nic_init_irq (struct hns_nic_priv *priv) {struct hnae_handle *h = priv->ae_handle;
@@ -1409,7 +1425,7 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv)if (ret) {netdev_err (priv->netdev,"request irq(%d) fail\n" , rd->ring->irq); -return ret; + goto out_free_irq; }disable_irq (rd->ring->irq);
@@ -1424,6 +1440,10 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv) }return 0 ; + +out_free_irq: +hns_nic_free_irq (h->q_num, priv); +return ret; }static int hns_nic_net_up (struct net_device *ndev)
@@ -1471,6 +1491,7 @@ static int hns_nic_net_up(struct net_device *ndev)for (j = i -1 ; j >=0 ; j--)hns_nic_ring_close (ndev, j); +hns_nic_free_irq (h->q_num, priv);set_bit (NIC_STATE_DOWN , &priv->state);return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 37/105 net: hns: Avoid net reset caused by pause frames storm
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a57275d35576fdd89d8c771eedf1e7cf97e0dfa6 ]
There will be a large number of MAC pause frames on the net, which caused tx timeout of net device. And then the net device was reset to try to recover it. So that is not useful, and will cause some other problems.
So need doubled ndev->watchdog_timeo if device watchdog occurred until watchdog_timeo up to 40s and then try resetting to recover it.
When collecting dfx information such as hardware registers when tx timeout. Some registers for count were cleared when read. So need move this task before update net state which also read the count registers.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +10 -2
@@ -1609,11 +1609,19 @@ static int hns_nic_net_stop(struct net_device *ndev) }static void hns_tx_timeout_reset (struct hns_nic_priv *priv); +#define HNS_TX_TIMEO_LIMIT (40 * HZ)static void hns_nic_net_timeout (struct net_device *ndev) {struct hns_nic_priv *priv =netdev_priv (ndev); -hns_tx_timeout_reset (priv); +if (ndev->watchdog_timeo <HNS_TX_TIMEO_LIMIT ) { + ndev->watchdog_timeo *=2 ; +netdev_info (ndev,"watchdog_timo changed to %d.\n" , + ndev->watchdog_timeo); + }else { + ndev->watchdog_timeo =HNS_NIC_TX_TIMEOUT ; +hns_tx_timeout_reset (priv); + } } static int hns_nic_do_ioctl(struct net_device *netdev, struct ifreq *ifr,
@@ -2193,11 +2201,11 @@ static void hns_nic_service_task(struct work_struct *work) = container_of(work, struct hns_nic_priv, service_task);struct hnae_handle *h = priv->ae_handle; +hns_nic_reset_subtask (priv);hns_nic_update_link_status (priv->netdev); h->dev->ops->update_led_status (h);hns_nic_update_stats (priv->netdev); -hns_nic_reset_subtask (priv);hns_nic_service_event_complete (priv); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 39/105 net: hns: Add mac pcs config when enable|disable mac
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 726ae5c9e5f0c18eca8ea5296b526242c3e89822 ]
In some case, when mac enable|disable and adjust link, may cause hard to link(or abnormal) between mac and phy. This patch adds the code for rx PCS to avoid this bug.
Disable the rx PCS when driver disable the gmac, and enable the rx PCS when driver enable the mac.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 ++++++++++---- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +10 -4
@@ -67,11 +67,14 @@ static void hns_gmac_enable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*enable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,1 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* enable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,0 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,1 ); + } }static void hns_gmac_disable (void *mac_drv,enum mac_commom_mode mode)
@@ -79,11 +82,14 @@ static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*disable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,0 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* disable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,1 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,0 ); + } }/* hns_gmac_get_en - get port enable
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +1 -0
@@ -534,6 +534,7 @@#define GMAC_LD_LINK_COUNTER_REG 0x01D0UL#define GMAC_LOOP_REG 0x01DCUL#define GMAC_RECV_CONTROL_REG 0x01E0UL +#define GMAC_PCS_RX_EN_REG 0x01E4UL#define GMAC_VLAN_CODE_REG 0x01E8UL#define GMAC_RX_OVERRUN_CNT_REG 0x01ECUL#define GMAC_RX_LENGTHFIELD_ERR_CNT_REG 0x01F4UL
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 24/105 bnx2x: Remove configured vlans as part of unload sequence.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 04f05230c5c13b1384f66f5186a68d7499e34622 ]
Vlans are not getting removed when drivers are unloaded. The recent storm firmware versions had added safeguards against re-configuring an already configured vlan. As a result, PF inner reload flows (e.g., mtu change) might trigger an assertion.
This change is going to remove vlans (same as we do for MACs) when doing a chip cleanup during unload.
--- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 34 +++++++++++++++---- .../net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 ++- 2 files changed, 30 insertions(+), 8 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +27 -7
@@ -8462,6 +8462,7 @@ int bnx2x_set_vlan_one(struct bnx2x *bp, u16 vlan,/* Fill a user request section if needed */ if (!test_bit (RAMROD_CONT , ramrod_flags)) { ramrod_param.user_req.u.vlan.vlan = vlan; +__set_bit (BNX2X_VLAN , &ramrod_param.user_req.vlan_mac_flags);/* Set the command: ADD or DEL */ if (set) ramrod_param.user_req.cmd =BNX2X_VLAN_MAC_ADD ;
@@ -8482,6 +8483,27 @@ int bnx2x_set_vlan_one(struct bnx2x *bp, u16 vlan,return rc; } +static int bnx2x_del_all_vlans (struct bnx2x *bp) +{ +struct bnx2x_vlan_mac_obj *vlan_obj = &bp->sp_objs[0 ].vlan_obj; +unsigned long ramrod_flags =0 , vlan_flags =0 ; +struct bnx2x_vlan_entry *vlan; +int rc; + +__set_bit (RAMROD_COMP_WAIT , &ramrod_flags); +__set_bit (BNX2X_VLAN , &vlan_flags); + rc = vlan_obj->delete_all (bp, vlan_obj, &vlan_flags, &ramrod_flags); +if (rc) +return rc; + +/* Mark that hw forgot all entries */ +list_for_each_entry (vlan, &bp->vlan_reg, link) + vlan->hw = false; + bp->vlan_cnt =0 ; + +return 0 ; +} +int bnx2x_del_all_macs (struct bnx2x *bp,struct bnx2x_vlan_mac_obj *mac_obj,int mac_type,bool wait_for_comp)
@@ -9320,6 +9342,11 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link)BNX2X_ERR ("Failed to schedule DEL commands for UC MACs list: %d\n" , rc); +/* Remove all currently configured VLANs */ + rc =bnx2x_del_all_vlans (bp); +if (rc <0 ) +BNX2X_ERR ("Failed to delete all VLANs\n" ); +/* Disable LLH */ if (!CHIP_IS_E1 (bp))REG_WR (bp,NIG_REG_LLH0_FUNC_EN + port*8 ,0 );
@@ -13006,13 +13033,6 @@ static void bnx2x_vlan_configure(struct bnx2x *bp, bool set_rx_mode)int bnx2x_vlan_reconfigure_vid (struct bnx2x *bp) { -struct bnx2x_vlan_entry *vlan; - -/* The hw forgot all entries after reload */ -list_for_each_entry (vlan, &bp->vlan_reg, link) - vlan->hw = false; - bp->vlan_cnt =0 ; -/* Don't set rx mode here. Our caller will do it. */ bnx2x_vlan_configure (bp, false);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +3 -1
@@ -265,6 +265,7 @@ enum {BNX2X_ETH_MAC ,BNX2X_ISCSI_ETH_MAC ,BNX2X_NETQ_ETH_MAC , +BNX2X_VLAN ,BNX2X_DONT_CONSUME_CAM_CREDIT , BNX2X_DONT_CONSUME_CAM_CREDIT_DEST, };
@@ -272,7 +273,8 @@ enum {#define BNX2X_VLAN_MAC_CMP_MASK (1 << BNX2X_UC_LIST_MAC | \ 1 << BNX2X_ETH_MAC | \ 1 << BNX2X_ISCSI_ETH_MAC | \ - 1 << BNX2X_NETQ_ETH_MAC) + 1 << BNX2X_NETQ_ETH_MAC | \ + 1 << BNX2X_VLAN)#define BNX2X_VLAN_MAC_CMP_FLAGS (flags) \ ((flags) & BNX2X_VLAN_MAC_CMP_MASK)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 42/105 qed: Fix an error code qed_ll2_start_xmit()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f07d4276892d97671e880190ff195a288b2d8d92 ]
We accidentally deleted the code to set "rc = -ENOMEM;" and this patch adds it back.
--- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/qlogic/qed/qed_ll2.c +1 -0
@@ -2351,6 +2351,7 @@ static int qed_ll2_start_xmit(struct qed_dev *cdev, struct sk_buff *skb)if (unlikely (dma_mapping_error (&cdev->pdev->dev, mapping))) {DP_NOTICE (cdev,"Unable to map frag - dropping packet\n" ); + rc = -ENOMEM ; goto err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 43/105 net: macb: fix random memory corruption on RX with 64-bit DMA
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e100a897bf9b19089e57f236f2398c9e0538900e ]
64-bit DMA addresses are split in upper and lower halves that are written in separate fields on GEM. For RX, bit 0 of the address is used as the ownership bit (RX_USED). When the RX_USED bit is unset the controller is allowed to write data to the buffer.
The driver does not guarantee that the controller already sees the upper half when the RX_USED bit is cleared, possibly resulting in the controller writing an incoming frame to an address with an incorrect upper half and therefore possibly corrupting unrelated system memory.
Fix that by adding the necessary DMA memory barrier between the writes.
This corruption was observed on a ZynqMP based system.
--- drivers/net/ethernet/cadence/macb_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/cadence/macb_main.c +5 -0
@@ -675,6 +675,11 @@ static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_if (bp->hw_dma_cap &HW_DMA_CAP_64B ) { desc_64 =macb_64b_desc (bp, desc); desc_64->addrh =upper_32_bits (addr); +/* The low bits of RX address contain the RX_USED bit, clearing +* of which allows packet RX. Make sure the high bits are also +* visible to HW at that point. +*/ +dma_wmb (); }#endif desc->addr =lower_32_bits (addr);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 44/105 net: macb: fix dropped RX frames due to a race
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8159ecab0db9095902d4c73605fb8787f5c7d653 ]
Bit RX_USED set to 0 in the address field allows the controller to write data to the receive buffer descriptor.
The driver does not ensure the ctrl field is ready (cleared) when the controller sees the RX_USED=0 written by the driver. The ctrl field might only be cleared after the controller has already updated it according to a newly received frame, causing the frame to be discarded in gem_rx() due to unexpected ctrl field contents.
A message is logged when the above scenario occurs:
macb ff0b0000.ethernet eth0: not whole frame pointed by descriptor
Fix the issue by ensuring that when the controller sees RX_USED=0 the ctrl field is already cleared.
This issue was observed on a ZynqMP based system.
--- drivers/net/ethernet/cadence/macb_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/macb_main.c +7 -2
@@ -923,14 +923,19 @@ static void gem_rx_refill(struct macb *bp)if (entry == bp->rx_ring_size -1 ) paddr |=MACB_BIT (RX_WRAP ); -macb_set_addr (bp, desc, paddr); desc->ctrl =0 ; +/* Setting addr clears RX_USED and allows reception, +* make sure ctrl is cleared first to avoid a race. +*/ +dma_wmb (); +macb_set_addr (bp, desc, paddr);/* properly align Ethernet header */ skb_reserve (skb,NET_IP_ALIGN ); }else { - desc->addr &= ~MACB_BIT (RX_USED ); desc->ctrl =0 ; +dma_wmb (); + desc->addr &= ~MACB_BIT (RX_USED ); } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 45/105 lan78xx: Resolve issue with changing MAC address
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 15515aaaa69659c502003926a2067ee76176148a ]
Current state for the lan78xx driver does not allow for changing the MAC address of the interface, without either removing the module (if you compiled it that way) or rebooting the machine. If you attempt to change the MAC address, ifconfig will show the new address, however, the system/interface will not respond to any traffic using that configuration. A few short-term options to work around this are to unload the module and reload it with the new MAC address, change the interface to "promisc", or reboot with the correct configuration to change the MAC.
This patch enables the ability to change the MAC address via fairly normal means... ifdown <interface>
modify entry in /etc/network/interfaces OR a similar method
ifup <interface>
Then test via any network communication, such as ICMP requests to gateway.
My only test platform for this patch has been a raspberry pi model 3b+.
-----
--- drivers/net/usb/lan78xx.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/usb/lan78xx.c +4 -0
@@ -2212,6 +2212,10 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) ret =lan78xx_write_reg (dev,RX_ADDRL , addr_lo); ret =lan78xx_write_reg (dev,RX_ADDRH , addr_hi); +/* Added to support MAC address changes */ + ret =lan78xx_write_reg (dev,MAF_LO (0 ), addr_lo); + ret =lan78xx_write_reg (dev,MAF_HI (0 ), addr_hi |MAF_HI_VALID_ ); +return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 46/105 vxge: ensure data0 is initialized in when fetching firmware version information
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f7db2beb4c2c6cc8111f5ab90fc7363ca91107b6 ]
Currently variable data0 is not being initialized so a garbage value is being passed to vxge_hw_vpath_fw_api and this value is being written to the rts_access_steer_data0 register. There are other occurrances where data0 is being initialized to zero (e.g. in function vxge_hw_upgrade_read_version) so I think it makes sense to ensure data0 is initialized likewise to 0.
Detected by CoverityScan, CID#140696 ("Uninitialized scalar variable")
--- drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/neterion/vxge/vxge-config.c +1 -1
@@ -808,7 +808,7 @@ __vxge_hw_vpath_fw_ver_get(struct __vxge_hw_virtualpath *vpath,struct vxge_hw_device_date *fw_date = &hw_info->fw_date;struct vxge_hw_device_version *flash_version = &hw_info->flash_version;struct vxge_hw_device_date *flash_date = &hw_info->flash_date; -u64 data0, data1 =0 , steer_ctrl =0 ; +u64 data0 =0 , data1 =0 , steer_ctrl =0 ;enum vxge_hw_status status; status = vxge_hw_vpath_fw_api(vpath,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 47/105 mac80211: free skb fraglist before freeing the skb
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 34b1e0e9efe101822e83cc62d22443ed3867ae7a ]
mac80211 uses the frag list to build AMSDU. When freeing the skb, it may not be really freed, since someone is still holding a reference to it.
In that case, when TCP skb is being retransmitted, the pointer to the frag list is being reused, while the data in there is no longer valid.
Since we will never get frag list from the network stack, as mac80211 doesn't advertise the capability, we can safely free and nullify it before releasing the SKB.
--- net/mac80211/status.c | 5 +++++ 1 file changed, 5 insertions(+)
net/mac80211/status.c +5 -0
@@ -545,6 +545,11 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, }ieee80211_led_tx (local); + +if (skb_has_frag_list (skb)) { +kfree_skb_list (skb_shinfo (skb)->frag_list); +skb_shinfo (skb)->frag_list =NULL ; + } }/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 49/105 virtio: fix test build after uio.h change
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c5c08bed843c2b2c048c16d1296d7631d7c1620e ]
--- tools/virtio/linux/kernel.h | 4 ++++ 1 file changed, 4 insertions(+)
tools/virtio/linux/kernel.h +4 -0
@@ -23,6 +23,10 @@#define PAGE_MASK (~(PAGE_SIZE-1))#define PAGE_ALIGN (x) ((x + PAGE_SIZE - 1) & PAGE_MASK) +/* generic data direction definitions */ +#define READ 0 +#define WRITE 1 +typedef unsigned long long phys_addr_t ;typedef unsigned long long dma_addr_t ;typedef size_t __kernel_size_t ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 50/105 gpio: mvebu: only fail on missing clk if pwm is actually to be used
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c8da642d41a6811c21177c9994aa7dc35be67d46 ]
The gpio IP on Armada 370 at offset 0x18180 has neither a clk nor pwm registers. So there is no need for a clk as the pwm isn't used anyhow. So only check for the clk in the presence of the pwm registers. This fixes a failure to probe the gpio driver for the above mentioned gpio device.
--- drivers/gpio/gpio-mvebu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpio/gpio-mvebu.c +3 -3
@@ -777,9 +777,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev, "marvell,armada-370-gpio"))return 0 ; -if (IS_ERR (mvchip->clk)) -return PTR_ERR (mvchip->clk); -/* * There are only two sets of PWM configuration registers for * all the GPIO lines on those SoCs which this driver reserves
@@ -790,6 +787,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev,if (!res)return 0 ; +if (IS_ERR (mvchip->clk)) +return PTR_ERR (mvchip->clk); +/* * Use set A for lines of GPIO chip with id 0, B for GPIO chip * with id 1. Don't allow further GPIO chips to be used for PWM.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 25/105 bnx2x: Send update-svid ramrod with retry/poll flags enabled
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9061193c4ee065d3240fde06767c2e06ec61decc ]
Driver sends update-SVID ramrod in the MFW notification path. If there is a pending ramrod, driver doesn't retry the command and storm firmware will never be updated with the SVID value. The patch adds changes to send update-svid ramrod in process context with retry/poll flags set.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -0
@@ -1278,6 +1278,7 @@ enum sp_rtnl_flag {BNX2X_SP_RTNL_TX_STOP ,BNX2X_SP_RTNL_GET_DRV_VERSION ,BNX2X_SP_RTNL_CHANGE_UDP_PORT , + BNX2X_SP_RTNL_UPDATE_SVID, }; enum bnx2x_iov_flag {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +9 -1
@@ -2925,6 +2925,10 @@ static void bnx2x_handle_update_svid_cmd(struct bnx2x *bp) func_params.f_obj = &bp->func_obj; func_params.cmd =BNX2X_F_CMD_SWITCH_UPDATE ; +/* Prepare parameters for function state transitions */ +__set_bit (RAMROD_COMP_WAIT , &func_params.ramrod_flags); +__set_bit (RAMROD_RETRY , &func_params.ramrod_flags); +if (IS_MF_UFP (bp) ||IS_MF_BD (bp)) {int func =BP_ABS_FUNC (bp);u32 val;
@@ -4301,7 +4305,8 @@ static void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)bnx2x_handle_eee_event (bp);if (val &DRV_STATUS_OEM_UPDATE_SVID ) -bnx2x_handle_update_svid_cmd (bp); +bnx2x_schedule_sp_rtnl (bp, +BNX2X_SP_RTNL_UPDATE_SVID ,0 );if (bp->link_vars.periodic_flags &PERIODIC_FLAGS_LINK_EVENT ) {
@@ -10369,6 +10374,9 @@ static void bnx2x_sp_rtnl_task(struct work_struct *work) &bp->sp_rtnl_state))bnx2x_update_mng_version (bp); +if (test_and_clear_bit (BNX2X_SP_RTNL_UPDATE_SVID , &bp->sp_rtnl_state)) +bnx2x_handle_update_svid_cmd (bp); +if (test_and_clear_bit (BNX2X_SP_RTNL_CHANGE_UDP_PORT , &bp->sp_rtnl_state)) {if (bnx2x_udp_port_update (bp)) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 52/105 net: netxen: fix a missing check and an uninitialized use
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d134e486e831defd26130770181f01dfc6195f7d ]
When netxen_rom_fast_read() fails, "bios" is left uninitialized and may contain random value, thus should not be used.
The fix ensures that if netxen_rom_fast_read() fails, we return "-EIO".
--- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +2 -1
@@ -1125,7 +1125,8 @@ netxen_validate_firmware(struct netxen_adapter *adapter)return -EINVAL ; } val =nx_get_bios_version (adapter); -netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios); +if (netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios)) +return -EIO ;if ((__force u32 )val != bios) {dev_err (&pdev->dev,"%s: firmware bios is incompatible\n" , fw_name[fw_type]);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 54/105 serial/sunsu: fix refcount leak
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d430aff8cd0c57502d873909c184e3b5753f8b88 ]
The function of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller.
su_get_type() doesn't do that. The match node are used as an identifier to compare against the current node, so we can directly drop the refcount after getting the node from the path as it is not used as pointer.
Fix this by use a single variable and drop the refcount right after of_find_node_by_path().
--- drivers/tty/serial/sunsu.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
drivers/tty/serial/sunsu.c +26 -5
@@ -1393,22 +1393,43 @@ static inline struct console *SUNSU_CONSOLE(void)static enum su_type su_get_type (struct device_node *dp) {struct device_node *ap =of_find_node_by_path ("/aliases" ); +enum su_type rc =SU_PORT_PORT ;if (ap) {const char *keyb =of_get_property (ap,"keyboard" ,NULL );const char *ms =of_get_property (ap,"mouse" ,NULL ); +struct device_node *match;if (keyb) { -if (dp ==of_find_node_by_path (keyb)) -return SU_PORT_KBD ; + match =of_find_node_by_path (keyb); + +/* +* The pointer is used as an identifier not +* as a pointer, we can drop the refcount on +* the of__node immediately after getting it. +*/ +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_KBD ; + goto out; + } }if (ms) { -if (dp ==of_find_node_by_path (ms)) -return SU_PORT_MS ; + match =of_find_node_by_path (ms); + +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_MS ; + goto out; + } } } -return SU_PORT_PORT ; +out: +of_node_put (ap); +return rc; }static int su_probe (struct platform_device *op)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 57/105 genirq/affinity: Dont return with empty affinity masks on error
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 0211e12dd0a5385ecffd3557bc570dbad7fcf245 upstream.
When the allocation of node_to_possible_cpumask fails, then irq_create_affinity_masks() returns with a pointer to the empty affinity masks array, which will cause malfunction.
Reorder the allocations so the masks array allocation comes last and every failure path returns NULL.
--- kernel/irq/affinity.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
kernel/irq/affinity.c +8 -7
@@ -108,7 +108,7 @@ irq_create_affinity_masks(int nvecs, conint affv = nvecs - affd->pre_vectors - affd->post_vectors;int last_affv = affv + affd->pre_vectors;nodemask_t nodemsk =NODE_MASK_NONE ; -struct cpumask *masks; +struct cpumask *masks =NULL ;cpumask_var_t nmsk, *node_to_possible_cpumask;/*
@@ -121,13 +121,13 @@ irq_create_affinity_masks(int nvecs, conif (!zalloc_cpumask_var (&nmsk,GFP_KERNEL ))return NULL ; - masks =kcalloc (nvecs,sizeof (*masks),GFP_KERNEL ); -if (!masks) - goto out; - node_to_possible_cpumask =alloc_node_to_possible_cpumask ();if (!node_to_possible_cpumask) - goto out; + goto outcpumsk; + + masks =kcalloc (nvecs,sizeof (*masks),GFP_KERNEL ); +if (!masks) + goto outnodemsk;/* Fill out vectors at the beginning that don't need affinity */ for (curvec =0 ; curvec < affd->pre_vectors; curvec++)
@@ -192,8 +192,9 @@ done:/* Fill out vectors at the end that don't need affinity */ for (; curvec < nvecs; curvec++)cpumask_copy (masks + curvec, irq_default_affinity); +outnodemsk:free_node_to_possible_cpumask (node_to_possible_cpumask); -out: +outcpumsk:free_cpumask_var (nmsk);return masks; }
Greg Kroah-Hartman
maintainerPATCH 58/105 tools: fix cross-compile var clobbering
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kelly <[email protected]>
commit 7ed1c1901fe52e6c5828deb155920b44b0adabb1 upstream.
Currently a number of Makefiles break when used with toolchains that pass extra flags in CC and other cross-compile related variables (such as --sysroot).
Thus we get this error when we use a toolchain that puts --sysroot in the CC var:
~/src/linux/tools$ make iio
[snip]
iio_event_monitor.c:18:10: fatal error: unistd.h: No such file or directory
#include <unistd.h>
^~~~~~~~~~This occurs because we clobber several env vars related to cross-compiling with lines like this:
CC = $(CROSS_COMPILE)gcc
Although this will point to a valid cross-compiler, we lose any extra flags that might exist in the CC variable, which can break toolchains that rely on them (for example, those that use --sysroot).
This easily shows up using a Yocto SDK:
$ . [snip]/sdk/environment-setup-cortexa8hf-neon-poky-linux-gnueabi
$ echo $CC arm-poky-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a8 --sysroot=[snip]/sdk/sysroots/cortexa8hf-neon-poky-linux-gnueabi
$ echo $CROSS_COMPILE arm-poky-linux-gnueabi-
$ echo ${CROSS_COMPILE}gcc
krm-poky-linux-gnueabi-gccAlthough arm-poky-linux-gnueabi-gcc is a cross-compiler, we've lost the --sysroot and other flags that enable us to find the right libraries to link against, so we can't find unistd.h and other libraries and headers. Normally with the --sysroot flag we would find unistd.h in the sdk directory in the sysroot:
$ find [snip]/sdk/sysroots -path '*/usr/include/unistd.h' [snip]/sdk/sysroots/cortexa8hf-neon-poky-linux-gnueabi/usr/include/unistd.h
The perf Makefile adds CC = $(CROSS_COMPILE)gcc if and only if CC is not already set, and it compiles correctly with the above toolchain.
So, generalize the logic that perf uses in the common Makefile and remove the manual CC = $(CROSS_COMPILE)gcc lines from each Makefile.
Note that this patch does not fix cross-compile for all the tools (some have other bugs), but it does fix it for all except usb and acpi, which still have other unrelated issues.
I tested both with and without the patch on native and cross-build and there appear to be no regressions.
--- tools/cgroup/Makefile | 1 - tools/gpio/Makefile | 2 -- tools/hv/Makefile | 1 - tools/iio/Makefile | 2 -- tools/laptop/freefall/Makefile | 1 - tools/leds/Makefile | 1 - tools/perf/Makefile.perf | 6 ------ tools/power/acpi/Makefile.config | 3 --- tools/scripts/Makefile.include | 18 ++++++++++++++++++ tools/spi/Makefile | 2 -- tools/usb/Makefile | 1 - tools/vm/Makefile | 1 - 12 files changed, 18 insertions(+), 21 deletions(-)
tools/cgroup/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for cgroup tools -CC = $(CROSS_COMPILE)gcc CFLAGS = -Wall -Wextra all: cgroup_event_listener
tools/gpio/Makefile +0 -2
@@ -12,8 +12,6 @@ endif # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS += -r -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include ALL_TARGETS := lsgpio gpio-hammer gpio-event-mon
tools/hv/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for Hyper-V tools -CC = $(CROSS_COMPILE)gcc WARNINGS = -Wall -Wextra CFLAGS = $(WARNINGS) -g $(shell getconf LFS_CFLAGS)
tools/iio/Makefile +0 -2
@@ -12,8 +12,6 @@ endif # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS += -r -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include ALL_TARGETS := iio_event_monitor lsiio iio_generic_buffer
tools/laptop/freefall/Makefile +0 -1
@@ -2,7 +2,6 @@ PREFIX ?= /usr SBINDIR ?= sbin INSTALL ?= install -CC = $(CROSS_COMPILE)gcc TARGET = freefall
tools/leds/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for LEDs tools -CC = $(CROSS_COMPILE)gcc CFLAGS = -Wall -Wextra -g -I../../include/uapi all: uledmon led_hw_brightness_mon
tools/perf/Makefile.perf +0 -6
@@ -144,12 +144,6 @@ define allow-override $(eval $(1) = $(2))) endef -# Allow setting CC and AR and LD, or setting CROSS_COMPILE as a prefix. -$(call allow-override,CC,$(CROSS_COMPILE)gcc) -$(call allow-override,AR,$(CROSS_COMPILE)ar) -$(call allow-override,LD,$(CROSS_COMPILE)ld) -$(call allow-override,CXX,$(CROSS_COMPILE)g++) - LD += $(EXTRA_LDFLAGS) HOSTCC ?= gcc
tools/power/acpi/Makefile.config +0 -3
@@ -56,9 +56,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} # to compile vs uClibc, that can be done here as well. CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- CROSS_COMPILE ?= $(CROSS) -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)gcc -STRIP = $(CROSS_COMPILE)strip HOSTCC = gcc # check if compiler option is supported
tools/scripts/Makefile.include +18 -0
@@ -42,6 +42,24 @@ EXTRA_WARNINGS += -Wformat CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) +# Makefiles suck: This macro sets a default value of $(2) for the +# variable named by $(1), unless the variable has been set by +# environment or command line. This is necessary for CC and AR +# because make sets default values, so the simpler ?= approach +# won't work as expected. +define allow-override + $(if $(or $(findstring environment,$(origin $(1))),\ + $(findstring command line,$(origin $(1)))),,\ + $(eval $(1) = $(2))) +endef + +# Allow setting various cross-compile vars or setting CROSS_COMPILE as a prefix. +$(call allow-override,CC,$(CROSS_COMPILE)gcc) +$(call allow-override,AR,$(CROSS_COMPILE)ar) +$(call allow-override,LD,$(CROSS_COMPILE)ld) +$(call allow-override,CXX,$(CROSS_COMPILE)g++) +$(call allow-override,STRIP,$(CROSS_COMPILE)strip) + ifeq ($(CC_NO_CLANG), 1) EXTRA_WARNINGS += -Wstrict-aliasing=3 endif
tools/spi/Makefile +0 -2
@@ -11,8 +11,6 @@ endif # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS += -r -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include ALL_TARGETS := spidev_test spidev_fdx
tools/usb/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for USB tools -CC = $(CROSS_COMPILE)gcc PTHREAD_LIBS = -lpthread WARNINGS = -Wall -Wextra CFLAGS = $(WARNINGS) -g -I../include
tools/vm/Makefile +0 -1
@@ -6,7 +6,6 @@ TARGETS=page-types slabinfo page_owner_s LIB_DIR = ../lib/api LIBS = $(LIB_DIR)/libapi.a -CC = $(CROSS_COMPILE)gcc CFLAGS = -Wall -Wextra -I../lib/ LDFLAGS = $(LIBS)
Greg Kroah-Hartman
maintainerPATCH 60/105 zram: fix double free backing device
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minchan Kim <[email protected]>
commit 5547932dc67a48713eece4fa4703bfdf0cfcb818 upstream.
If blkdev_get fails, we shouldn't do blkdev_put. Otherwise, kernel emits below log. This patch fixes it.
WARNING: CPU: 0 PID: 1893 at fs/block_dev.c:1828 blkdev_put+0x105/0x120
Modules linked in:
CPU: 0 PID: 1893 Comm: swapoff Not tainted 4.19.0+ #453
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014
RIP: 0010:blkdev_put+0x105/0x120
Call Trace:
__x64_sys_swapoff+0x46d/0x490
do_syscall_64+0x5a/0x190
entry_SYSCALL_64_after_hwframe+0x49/0xbe
irq event stamp: 4466
hardirqs last enabled at (4465): __free_pages_ok+0x1e3/0x490
hardirqs last disabled at (4466): trace_hardirqs_off_thunk+0x1a/0x1c
softirqs last enabled at (3420): __do_softirq+0x333/0x446
softirqs last disabled at (3407): irq_exit+0xd1/0xe0--- drivers/block/zram/zram_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/block/zram/zram_drv.c +3 -1
@@ -366,8 +366,10 @@ static ssize_t backing_dev_store(struct bdev =bdgrab (I_BDEV (inode)); err =blkdev_get (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , zram); -if (err <0 ) +if (err <0 ) { + bdev =NULL ; goto out; + } nr_pages =i_size_read (inode) >>PAGE_SHIFT ; bitmap_sz =BITS_TO_LONGS (nr_pages) *sizeof (long );
Greg Kroah-Hartman
maintainerPATCH 61/105 hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit b15c87263a69272423771118c653e9a1d0672caa upstream.
We have received a bug report that an injected MCE about faulty memory prevents memory offline to succeed on 4.4 base kernel. The underlying reason was that the HWPoison page has an elevated reference count and the migration keeps failing. There are two problems with that. First of all it is dubious to migrate the poisoned page because we know that accessing that memory is possible to fail. Secondly it doesn't make any sense to migrate a potentially broken content and preserve the memory corruption over to a new location.
Oscar has found out that 4.4 and the current upstream kernels behave slightly differently with his simply testcase
===
int main(void)
{
int ret;
int i;
int fd;
char *array = malloc(4096);
char *array_locked = malloc(4096);
fd = open("/tmp/data", O_RDONLY);
read(fd, array, 4095);
for (i = 0; i < 4096; i++)
array_locked[i] = 'd';
ret = mlock((void *)PAGE_ALIGN((unsigned long)array_locked), sizeof(array_locked));
if (ret)
perror("mlock");
sleep (20);
ret = madvise((void *)PAGE_ALIGN((unsigned long)array_locked), 4096, MADV_HWPOISON);
if (ret)
perror("madvise");
for (i = 0; i < 4096; i++)
array_locked[i] = 'd';
return 0;
}===
+ offline this memory.
In 4.4 kernels he saw the hwpoisoned page to be returned back to the LRU list
kernel: [<ffffffff81019ac9>] dump_trace+0x59/0x340 kernel: [<ffffffff81019e9a>] show_stack_log_lvl+0xea/0x170 kernel: [<ffffffff8101ac71>] show_stack+0x21/0x40 kernel: [<ffffffff8132bb90>] dump_stack+0x5c/0x7c kernel: [<ffffffff810815a1>] warn_slowpath_common+0x81/0xb0 kernel: [<ffffffff811a275c>] __pagevec_lru_add_fn+0x14c/0x160 kernel: [<ffffffff811a2eed>] pagevec_lru_move_fn+0xad/0x100 kernel: [<ffffffff811a334c>] __lru_cache_add+0x6c/0xb0 kernel: [<ffffffff81195236>] add_to_page_cache_lru+0x46/0x70 kernel: [<ffffffffa02b4373>] extent_readpages+0xc3/0x1a0 [btrfs] kernel: [<ffffffff811a16d7>] __do_page_cache_readahead+0x177/0x200 kernel: [<ffffffff811a18c8>] ondemand_readahead+0x168/0x2a0 kernel: [<ffffffff8119673f>] generic_file_read_iter+0x41f/0x660 kernel: [<ffffffff8120e50d>] __vfs_read+0xcd/0x140 kernel: [<ffffffff8120e9ea>] vfs_read+0x7a/0x120 kernel: [<ffffffff8121404b>] kernel_read+0x3b/0x50 kernel: [<ffffffff81215c80>] do_execveat_common.isra.29+0x490/0x6f0 kernel: [<ffffffff81215f08>] do_execve+0x28/0x30 kernel: [<ffffffff81095ddb>] call_usermodehelper_exec_async+0xfb/0x130 kernel: [<ffffffff8161c045>] ret_from_fork+0x55/0x80
And that latter confuses the hotremove path because an LRU page is attempted to be migrated and that fails due to an elevated reference count. It is quite possible that the reuse of the HWPoisoned page is some kind of fixed race condition but I am not really sure about that.
With the upstream kernel the failure is slightly different. The page doesn't seem to have LRU bit set but isolate_movable_page simply fails and do_migrate_range simply puts all the isolated pages back to LRU and therefore no progress is made and scan_movable_pages finds same set of pages over and over again.
Fix both cases by explicitly checking HWPoisoned pages before we even try to get reference on the page, try to unmap it if it is still mapped. As explained by Naoya:
: Hwpoison code never unmapped those for no big reason because : Ksm pages never dominate memory, so we simply didn't have strong : motivation to save the pages.
Also put WARN_ON(PageLRU) in case there is a race and we can hit LRU HWPoison pages which shouldn't happen but I couldn't convince myself about that. Naoya has noted the following:
: Theoretically no such gurantee, because try_to_unmap() doesn't have a : guarantee of success and then memory_failure() returns immediately : when hwpoison_user_mappings fails.
: Or the following code (comes after hwpoison_user_mappings block) also impli= : es
: that the target page can still have PageLRU flag.
:
: /*
: * Torn down by someone else?
: */
: if (PageLRU(p) && !PageSwapCache(p) && p->mapping =3D=3D NULL) {
: action_result(pfn, MF_MSG_TRUNCATED_LRU, MF_IGNORED); : res =3D -EBUSY; : goto out;
: }
:
: So I think it's OK to keep "if (WARN_ON(PageLRU(page)))" block in : current version of your patch.
--- mm/memory_hotplug.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
mm/memory_hotplug.c +16 -0
@@ -35,6 +35,7 @@#include <linux/memblock.h> #include <linux/bootmem.h> #include <linux/compaction.h> +#include <linux/rmap.h> #include <asm/tlbflush.h>
@@ -1391,6 +1392,21 @@ do_migrate_range(unsigned long start_pfn pfn =page_to_pfn (compound_head (page)) +hpage_nr_pages (page) -1 ; +/* +* HWPoison pages have elevated reference counts so the migration would +* fail on them. It also doesn't make any sense to migrate them in the +* first place. Still try to unmap such a page in case it is still mapped +* (e.g. current hwpoison implementation doesn't unmap KSM pages but keep +* the unmap as the catch all safety net). +*/ +if (PageHWPoison (page)) { +if (WARN_ON (PageLRU (page))) +isolate_lru_page (page); +if (page_mapped (page)) +try_to_unmap (page,TTU_IGNORE_MLOCK |TTU_IGNORE_ACCESS ); +continue ; + } +if (!get_page_unless_zero (page))continue ;/*
Greg Kroah-Hartman
maintainerPATCH 27/105 scsi: target: iscsi: cxgbit: add missing spin_lock_init()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9e6371d3c6913ff1707fb2c0274c9925f7aaef80 ]
Add missing spin_lock_init() for cdev->np_lock.
--- drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/target/iscsi/cxgbit/cxgbit_main.c +1 -0
@@ -58,6 +58,7 @@ static void *cxgbit_uld_add(const struct cxgb4_lld_info *lldi)return ERR_PTR (-ENOMEM );kref_init (&cdev->kref); +spin_lock_init (&cdev->np_lock); cdev->lldi = *lldi;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 29/105 drivers: net: xgene: Remove unnecessary forward declarations
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2ab4c3426c0cf711d7147e3f559638e4ab88960e ]
Clang warns:
drivers/net/ethernet/apm/xgene/xgene_enet_main.c:33:36: warning:
tentative array definition assumed to have one element
static const struct acpi_device_id xgene_enet_acpi_match[];
^1 warning generated.
Both xgene_enet_acpi_match and xgene_enet_of_match are defined before their uses at the bottom of the file so this is unnecessary. When CONFIG_ACPI is disabled, ACPI_PTR becomes NULL so xgene_enet_acpi_match doesn't need to be defined.
--- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +0 -3
@@ -29,9 +29,6 @@#define RES_RING_CSR 1#define RES_RING_CMD 2 -static const struct of_device_id xgene_enet_of_match[]; -static const struct acpi_device_id xgene_enet_acpi_match[]; -static void xgene_enet_init_bufpool (struct xgene_enet_desc_ring *buf_pool) {struct xgene_enet_raw_desc16 *raw_desc;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 30/105 w90p910_ether: remove incorrect __init annotation
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 51367e423c6501a26e67d91a655d2bc892303462 ]
The get_mac_address() function is normally inline, but when it is not, we get a warning that this configuration is broken:
WARNING: vmlinux.o(.text+0x4aff00): Section mismatch in reference from the function w90p910_ether_setup() to the function .init.text:get_mac_address() The function w90p910_ether_setup() references
the function __init get_mac_address().
This is often because w90p910_ether_setup lacks a __init
Remove the __init to make it always do the right thing.
--- drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/nuvoton/w90p910_ether.c +1 -1
@@ -912,7 +912,7 @@ static const struct net_device_ops w90p910_ether_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static void __init get_mac_address (struct net_device *dev) +static void get_mac_address (struct net_device *dev) {struct w90p910_ether *ether =netdev_priv (dev);struct platform_device *pdev;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 31/105 net: hns: Incorrect offset address used for some registers.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4e1d4be681b2c26fd874adbf584bf034573ac45d ]
According to the hip06 Datasheet:
1. The offset of INGRESS_SW_VLAN_TAG_DISC should be 0x1A00+4*all_chn_num
2. The offset of INGRESS_IN_DATA_STP_DISC should be 0x1A50+4*all_chn_num
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +2 -2
@@ -2159,9 +2159,9 @@ void hns_dsaf_update_stats(struct dsaf_device *dsaf_dev, u32 node_num) DSAF_INODE_LOCAL_ADDR_FALSE_NUM_0_REG + 0x80 * (u64)node_num); hw_stats->vlan_drop +=dsaf_read_dev (dsaf_dev, -DSAF_INODE_SW_VLAN_TAG_DISC_0_REG +0x80 * (u64 )node_num); +DSAF_INODE_SW_VLAN_TAG_DISC_0_REG +4 * (u64 )node_num); hw_stats->stp_drop +=dsaf_read_dev (dsaf_dev, -DSAF_INODE_IN_DATA_STP_DISC_0_REG +0x80 * (u64 )node_num); +DSAF_INODE_IN_DATA_STP_DISC_0_REG +4 * (u64 )node_num);/* pfc pause frame statistics stored in dsaf inode*/ if ((node_num <DSAF_SERVICE_NW_NUM ) && !is_ver1) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 22/105 netfilter: nat: cant use dst_hold on noref dst
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 542fbda0f08f1cbbc250f9e59f7537649651d0c8 ]
The dst entry might already have a zero refcount, waiting on rcu list to be free'd. Using dst_hold() transitions its reference count to 1, and next dst release will try to free it again -- resulting in a double free:
WARNING: CPU: 1 PID: 0 at include/net/dst.h:239 nf_xfrm_me_harder+0xe7/0x130 [nf_nat] RIP: 0010:nf_xfrm_me_harder+0xe7/0x130 [nf_nat] Code: 48 8b 5c 24 60 65 48 33 1c 25 28 00 00 00 75 53 48 83 c4 68 5b 5d 41 5c c3 85 c0 74 0d 8d 48 01 f0 0f b1 0a 74 86 85 c0 75 f3 <0f> 0b e9 7b ff ff ff 29 c6 31 d2 b9 20 00 48 00 4c 89 e7 e8 31 27 Call Trace: nf_nat_ipv4_out+0x78/0x90 [nf_nat_ipv4] nf_hook_slow+0x36/0xd0 ip_output+0x9f/0xd0 ip_forward+0x328/0x440 ip_rcv+0x8a/0xb0
Use dst_hold_safe instead and bail out if we cannot take a reference.
--- net/netfilter/nf_nat_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_nat_core.c +2 -1
@@ -97,7 +97,8 @@ int nf_xfrm_me_harder(struct net *net, struct sk_buff *skb, unsigned int family) dst =skb_dst (skb);if (dst->xfrm) dst = ((struct xfrm_dst *)dst)->route; -dst_hold (dst); +if (!dst_hold_safe (dst)) +return -EHOSTUNREACH ; dst =xfrm_lookup (net, dst, &fl, skb->sk,0 );if (IS_ERR (dst))
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 64/105 mm, hmm: use devm semantics for hmm_devmem_{add, remove}
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 58ef15b765af0d2cbe6799ec564f1dc485010ab8 upstream.
devm semantics arrange for resources to be torn down when device-driver-probe fails or when device-driver-release completes. Similar to devm_memremap_pages() there is no need to support an explicit remove operation when the users properly adhere to devm semantics.
Note that devm_kzalloc() automatically handles allocating node-local memory.
--- include/linux/hmm.h | 4 - mm/hmm.c | 127 +++++++++------------------------------------------- 2 files changed, 25 insertions(+), 106 deletions(-)
include/linux/hmm.h +1 -3
@@ -437,8 +437,7 @@ struct hmm_devmem {* enough and allocate struct page for it. * * The device driver can wrap the hmm_devmem struct inside a private device -* driver struct. The device driver must call hmm_devmem_remove() before the -* device goes away and before freeing the hmm_devmem struct memory. +* driver struct. */ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, struct device *device,
@@ -446,7 +445,6 @@ struct hmm_devmem *hmm_devmem_add(conststruct hmm_devmem *hmm_devmem_add_resource (const struct hmm_devmem_ops *ops,struct device *device,struct resource *res); -void hmm_devmem_remove (struct hmm_devmem *devmem);/* * hmm_devmem_page_set_drvdata - set per-page driver data field
mm/hmm.c +24 -103
218 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 74/105 kbuild: consolidate Clang compiler flags
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit 238bcbc4e07fad2fff99c5b157d0c37ccd4d093c upstream.
Collect basic Clang options such as --target, --prefix, --gcc-toolchain, -no-integrated-as into a single variable CLANG_FLAGS so that it can be easily reused in other parts of Makefile.
--- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Makefile +6 -7
@@ -479,18 +479,17 @@ endif ifeq ($(cc-name),clang) ifneq ($(CROSS_COMPILE),) -CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%)) +CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) -CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR) +CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) endif ifneq ($(GCC_TOOLCHAIN),) -CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) +CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) -KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) -KBUILD_CFLAGS += -no-integrated-as -KBUILD_AFLAGS += -no-integrated-as +CLANG_FLAGS += -no-integrated-as +KBUILD_CFLAGS += $(CLANG_FLAGS) +KBUILD_AFLAGS += $(CLANG_FLAGS) endif RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
Greg Kroah-Hartman
maintainerPATCH 75/105 Makefile: Export clang toolchain variables
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
commit 3bd9805090af843b25f97ffe5049f20ade1d86d6 upstream.
The powerpc makefile will use these in it's boot wrapper.
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -490,6 +490,7 @@ endif CLANG_FLAGS += -no-integrated-as KBUILD_CFLAGS += $(CLANG_FLAGS) KBUILD_AFLAGS += $(CLANG_FLAGS) +export CLANG_FLAGS endif RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
Greg Kroah-Hartman
maintainerPATCH 76/105 powerpc/boot: Set target when cross-compiling for clang
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
commit 813af51f5d30a2da6a2523c08465f9726e51772e upstream.
Clang needs to be told which target it is building for when cross compiling.
[nc: Use 'ifeq ($(cc-name),clang)' instead of 'ifdef CONFIG_CC_IS_CLANG'
because that config does not exist in 4.14; the Kconfig rewrite that added that config happened in 4.18]
--- arch/powerpc/boot/Makefile | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/boot/Makefile +5 -0
@@ -49,6 +49,11 @@ endif BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc +ifeq ($(cc-name),clang) +BOOTCFLAGS += $(CLANG_FLAGS) +BOOTAFLAGS += $(CLANG_FLAGS) +endif + ifdef CONFIG_DEBUG_INFO BOOTCFLAGS += -g endif
Greg Kroah-Hartman
maintainerPATCH 78/105 vhost/vsock: fix uninitialized vhost_vsock->guest_cid
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Hajnoczi <[email protected]>
commit a72b69dc083a931422cc8a5e33841aff7d5312f2 upstream.
The vhost_vsock->guest_cid field is uninitialized when /dev/vhost-vsock is opened until the VHOST_VSOCK_SET_GUEST_CID ioctl is called.
kvmalloc(..., GFP_KERNEL | __GFP_RETRY_MAYFAIL) does not zero memory. All other vhost_vsock fields are initialized explicitly so just initialize this field too.
--- drivers/vhost/vsock.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/vhost/vsock.c +2 -0
@@ -522,6 +522,8 @@ static int vhost_vsock_dev_open(struct i goto out; } + vsock->guest_cid =0 ;/* no CID assigned yet */ +atomic_set (&vsock->queued_replies,0 ); vqs[VSOCK_VQ_TX ] = &vsock->vqs[VSOCK_VQ_TX ];
Greg Kroah-Hartman
maintainerPATCH 79/105 dm verity: fix crash on bufio buffer that was allocated with vmalloc
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit e4b069e0945fa14c71cf8b5b89f8b1b2aa68dbc2 upstream.
Since commit d1ac3ff008fb ("dm verity: switch to using asynchronous hash crypto API") dm-verity uses asynchronous crypto calls for verification, so that it can use hardware with asynchronous processing of crypto operations.
These asynchronous calls don't support vmalloc memory, but the buffer data can be allocated with vmalloc if dm-bufio is short of memory and uses a reserved buffer that was preallocated in dm_bufio_client_create().
Fix verity_hash_update() so that it deals with vmalloc'd memory correctly.
--- drivers/md/dm-verity-target.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
drivers/md/dm-verity-target.c +20 -4
@@ -139,10 +139,26 @@ static int verity_hash_update(struct dm_ {struct scatterlist sg; -sg_init_one (&sg, data, len); -ahash_request_set_crypt (req, &sg,NULL , len); - -return verity_complete_op (res,crypto_ahash_update (req)); +if (likely (!is_vmalloc_addr (data))) { +sg_init_one (&sg, data, len); +ahash_request_set_crypt (req, &sg,NULL , len); +return verity_complete_op (res,crypto_ahash_update (req)); + }else { +do { +int r; +size_t this_step =min_t (size_t, len,PAGE_SIZE -offset_in_page (data)); +flush_kernel_vmap_range ((void *)data, this_step); +sg_init_table (&sg,1 ); +sg_set_page (&sg,vmalloc_to_page (data), this_step,offset_in_page (data)); +ahash_request_set_crypt (req, &sg,NULL , this_step); + r =verity_complete_op (res,crypto_ahash_update (req)); +if (unlikely (r)) +return r; + data += this_step; + len -= this_step; + }while (len); +return 0 ; + } }/*
Greg Kroah-Hartman
maintainerPATCH 81/105 ALSA: cs46xx: Potential NULL dereference in probe
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 1524f4e47f90b27a3ac84efbdd94c63172246a6f upstream.
The "chip->dsp_spos_instance" can be NULL on some of the ealier error paths in snd_cs46xx_create().
--- sound/pci/cs46xx/dsp_spos.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/cs46xx/dsp_spos.c +3 -0
@@ -900,6 +900,9 @@ int cs46xx_dsp_proc_done (struct snd_cs4struct dsp_spos_instance * ins = chip->dsp_spos_instance;int i; +if (!ins) +return 0 ; +snd_info_free_entry (ins->proc_sym_info_entry); ins->proc_sym_info_entry =NULL ;
Greg Kroah-Hartman
maintainerPATCH 80/105 dm zoned: Fix target BIO completion handling
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit d57f9da890696af1484f4a47f7f123560197865a upstream.
struct bioctx includes the ref refcount_t to track the number of I/O fragments used to process a target BIO as well as ensure that the zone of the BIO is kept in the active state throughout the lifetime of the BIO. However, since decrementing of this reference count is done in the target .end_io method, the function bio_endio() must be called multiple times for read and write target BIOs, which causes problems with the value of the __bi_remaining struct bio field for chained BIOs (e.g. the clone BIO passed by dm core is large and splits into fragments by the block layer), resulting in incorrect values and inconsistencies with the BIO_CHAIN flag setting. This is turn triggers the BUG_ON() call:
BUG_ON(atomic_read(&bio->__bi_remaining) <= 0);
in bio_remaining_done() called from bio_endio().
Fix this ensuring that bio_endio() is called only once for any target BIO by always using internal clone BIOs for processing any read or write target BIO. This allows reference counting using the target BIO context counter to trigger the target BIO completion bio_endio() call once all data, metadata and other zone work triggered by the BIO complete.
Overall, this simplifies the code too as the target .end_io becomes unnecessary and differences between read and write BIO issuing and completion processing disappear.
--- drivers/md/dm-zoned-target.c | 122 +++++++++++++------------------------------ 1 file changed, 38 insertions(+), 84 deletions(-)
drivers/md/dm-zoned-target.c +38 -84
@@ -20,7 +20,6 @@ struct dmz_bioctx {struct dm_zone *zone;struct bio *bio;atomic_t ref; -blk_status_t status; };/*
@@ -78,65 +77,66 @@ static inline void dmz_bio_endio(struct {struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); -if (bioctx->status ==BLK_STS_OK && status !=BLK_STS_OK ) - bioctx->status = status; -bio_endio (bio); +if (status !=BLK_STS_OK && bio->bi_status ==BLK_STS_OK ) + bio->bi_status = status; + +if (atomic_dec_and_test (&bioctx->ref)) { +struct dm_zone *zone = bioctx->zone; + +if (zone) { +if (bio->bi_status !=BLK_STS_OK && +bio_op (bio) ==REQ_OP_WRITE && +dmz_is_seq (zone)) +set_bit (DMZ_SEQ_WRITE_ERR , &zone->flags); +dmz_deactivate_zone (zone); + } +bio_endio (bio); + } }/* -* Partial clone read BIO completion callback. This terminates the +* Completion callback for an internally cloned target BIO. This terminates the * target BIO when there are no more references to its context. */ -static void dmz_read_bio_end_io (struct bio *bio) +static void dmz_clone_endio (struct bio *clone) { -struct dmz_bioctx *bioctx = bio->bi_private; -blk_status_t status = bio->bi_status; +struct dmz_bioctx *bioctx = clone->bi_private; +blk_status_t status = clone->bi_status; -bio_put (bio); +bio_put (clone);dmz_bio_endio (bioctx->bio, status); }/* -* Issue a BIO to a zone. The BIO may only partially process the +* Issue a clone of a target BIO. The clone may only partially process the * original target BIO. */ -static int dmz_submit_read_bio (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio,sector_t chunk_block, -unsigned int nr_blocks) +static int dmz_submit_bio (struct dmz_target *dmz,struct dm_zone *zone, +struct bio *bio,sector_t chunk_block, +unsigned int nr_blocks) {struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); -sector_t sector;struct bio *clone; -/* BIO remap sector */ - sector =dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); - -/* If the read is not partial, there is no need to clone the BIO */ -if (nr_blocks ==dmz_bio_blocks (bio)) { -/* Setup and submit the BIO */ - bio->bi_iter.bi_sector = sector; -atomic_inc (&bioctx->ref); -generic_make_request (bio); -return 0 ; - } - -/* Partial BIO: we need to clone the BIO */ clone =bio_clone_fast (bio,GFP_NOIO , dmz->bio_set);if (!clone)return -ENOMEM ; -/* Setup the clone */ - clone->bi_iter.bi_sector = sector; +bio_set_dev (clone, dmz->dev->bdev); + clone->bi_iter.bi_sector = +dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); clone->bi_iter.bi_size =dmz_blk2sect (nr_blocks) <<SECTOR_SHIFT ; - clone->bi_end_io = dmz_read_bio_end_io; + clone->bi_end_io = dmz_clone_endio; clone->bi_private = bioctx;bio_advance (bio, clone->bi_iter.bi_size); -/* Submit the clone */ atomic_inc (&bioctx->ref);generic_make_request (clone); +if (bio_op (bio) ==REQ_OP_WRITE &&dmz_is_seq (zone)) + zone->wp_block += nr_blocks; +return 0 ; }
@@ -214,7 +214,7 @@ static int dmz_handle_read(struct dmz_taif (nr_blocks) {/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); - ret =dmz_submit_read_bio (dmz, rzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, rzone, bio, chunk_block, nr_blocks);if (ret)return ret; chunk_block += nr_blocks;
@@ -229,25 +229,6 @@ static int dmz_handle_read(struct dmz_ta }/* -* Issue a write BIO to a zone. -*/ -static void dmz_submit_write_bio (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio,sector_t chunk_block, -unsigned int nr_blocks) -{ -struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); - -/* Setup and submit the BIO */ -bio_set_dev (bio, dmz->dev->bdev); - bio->bi_iter.bi_sector =dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); -atomic_inc (&bioctx->ref); -generic_make_request (bio); - -if (dmz_is_seq (zone)) - zone->wp_block += nr_blocks; -} - -/* * Write blocks directly in a data zone, at the write pointer. * If a buffer zone is assigned, invalidate the blocks written * in place.
@@ -265,7 +246,9 @@ static int dmz_handle_direct_write(strucreturn -EROFS ;/* Submit write */ -dmz_submit_write_bio (dmz, zone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, zone, bio, chunk_block, nr_blocks); +if (ret) +return ret;/* * Validate the blocks in the data zone and invalidate
@@ -301,7 +284,9 @@ static int dmz_handle_buffered_write(strreturn -EROFS ;/* Submit write */ -dmz_submit_write_bio (dmz, bzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, bzone, bio, chunk_block, nr_blocks); +if (ret) +return ret;/* * Validate the blocks in the buffer zone
@@ -600,7 +585,6 @@ static int dmz_map(struct dm_target *ti, bioctx->zone =NULL ; bioctx->bio = bio;atomic_set (&bioctx->ref,1 ); - bioctx->status =BLK_STS_OK ;/* Set the BIO pending in the flush list */ if (!nr_sectors &&bio_op (bio) ==REQ_OP_WRITE ) {
@@ -624,35 +608,6 @@ static int dmz_map(struct dm_target *ti, }/* -* Completed target BIO processing. -*/ -static int dmz_end_io (struct dm_target *ti,struct bio *bio,blk_status_t *error) -{ -struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); - -if (bioctx->status ==BLK_STS_OK && *error) - bioctx->status = *error; - -if (!atomic_dec_and_test (&bioctx->ref)) -return DM_ENDIO_INCOMPLETE ; - -/* Done */ - bio->bi_status = bioctx->status; - -if (bioctx->zone) { -struct dm_zone *zone = bioctx->zone; - -if (*error &&bio_op (bio) ==REQ_OP_WRITE ) { -if (dmz_is_seq (zone)) -set_bit (DMZ_SEQ_WRITE_ERR , &zone->flags); - } -dmz_deactivate_zone (zone); - } - -return DM_ENDIO_DONE ; -} - -/* * Get zoned device information. */ static int dmz_get_zoned_device (struct dm_target *ti,char *path)
@@ -946,7 +901,6 @@ static struct target_type dmz_type = { .ctr = dmz_ctr, .dtr = dmz_dtr, .map = dmz_map, - .end_io = dmz_end_io, .io_hints = dmz_io_hints, .prepare_ioctl = dmz_prepare_ioctl, .postsuspend = dmz_suspend,
Greg Kroah-Hartman
maintainerPATCH 84/105 dlm: fixed memory leaks after failed ls_remove_names allocation
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit b982896cdb6e6a6b89d86dfb39df489d9df51e14 upstream.
If allocation fails on last elements of array need to free already allocated elements.
v2: just move existing out_rsbtbl label to right place
Fixes 789924ba635f ("dlm: fix race between remove and lookup")
Cc: [email protected] # 3.6
--- fs/dlm/lockspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dlm/lockspace.c +1 -1
@@ -680,11 +680,11 @@ static int new_lockspace(const char *namkfree (ls->ls_recover_buf); out_lkbidr:idr_destroy (&ls->ls_lkbidr); + out_rsbtbl:for (i =0 ; i <DLM_REMOVE_NAMES_MAX ; i++) {if (ls->ls_remove_names[i])kfree (ls->ls_remove_names[i]); } - out_rsbtbl:vfree (ls->ls_rsbtbl); out_lsfree:if (do_unreg)
Greg Kroah-Hartman
maintainerPATCH 85/105 dlm: possible memory leak on error path in create_lkb()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit 23851e978f31eda8b2d01bd410d3026659ca06c7 upstream.
Fixes 3d6aa675fff9 ("dlm: keep lkbs in idr")
Cc: [email protected] # 3.1
--- fs/dlm/lock.c | 1 + 1 file changed, 1 insertion(+)
fs/dlm/lock.c +1 -0
@@ -1210,6 +1210,7 @@ static int create_lkb(struct dlm_ls *ls,if (rv <0 ) {log_error (ls,"create_lkb idr error %d" , rv); +dlm_free_lkb (lkb);return rv; }
Greg Kroah-Hartman
maintainerPATCH 86/105 dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit c0174726c3976e67da8649ac62cae43220ae173a upstream.
Fixes 6d40c4a708e0 ("dlm: improve error and debug messages")
Cc: [email protected] # 3.5
--- fs/dlm/lock.c | 2 ++ 1 file changed, 2 insertions(+)
fs/dlm/lock.c +2 -0
@@ -4177,6 +4177,7 @@ static int receive_convert(struct dlm_ls (unsigned long long )lkb->lkb_recover_seq, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
@@ -4230,6 +4231,7 @@ static int receive_unlock(struct dlm_ls lkb->lkb_id, lkb->lkb_remid, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
Greg Kroah-Hartman
maintainerPATCH 89/105 gfs2: Fix loop in gfs2_rbm_find
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
commit 2d29f6b96d8f80322ed2dd895bca590491c38d34 upstream.
Fix the resource group wrap-around logic in gfs2_rbm_find that commit e579ed4f44 broke. The bug can lead to unnecessary repeated scanning of the same bitmaps; there is a risk that future changes will turn this into an endless loop.
--- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/rgrp.c +1 -1
@@ -1695,9 +1695,9 @@ static int gfs2_rbm_find(struct gfs2_rbm goto next_iter; }if (ret == -E2BIG ) { + n += rbm->bii - initial_bii; rbm->bii =0 ; rbm->offset =0 ; - n += (rbm->bii - initial_bii); goto res_covered_end_of_rgrp; }return ret;
Greg Kroah-Hartman
maintainerPATCH 90/105 b43: Fix error in cordic routine
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 8ea3819c0bbef57a51d8abe579e211033e861677 upstream.
The cordic routine for calculating sines and cosines that was added in commit 6f98e62a9f1b ("b43: update cordic code to match current specs") contains an error whereby a quantity declared u32 can in fact go negative.
This problem was detected by Priit Laes who is switching b43 to use the routine in the library functions of the kernel.
--- drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/b43/phy_common.c +1 -1
@@ -616,7 +616,7 @@ struct b43_c32 b43_cordic(int theta)u8 i;s32 tmp;s8 signx =1 ; -u32 angle =0 ; +s32 angle =0 ;struct b43_c32 ret = { .i =39797 , .q =0 , };while (theta > (180 <<16 ))
Greg Kroah-Hartman
maintainerPATCH 91/105 selinux: policydb - fix byte order and alignment issues
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Mosnacek <[email protected]>
commit 5df275cd4cf51c86d49009f1397132f284ba515e upstream.
Do the LE conversions before doing the Infiniband-related range checks. The incorrect checks are otherwise causing a failure to load any policy with an ibendportcon rule on BE systems. This can be reproduced by running (on e.g. ppc64):
cat >my_module.cil <<EOF
(type test_ibendport_t)
(roletype object_r test_ibendport_t)
(ibendportcon mlx4_0 1 (system_u object_r test_ibendport_t ((s0) (s0)))) EOF
semodule -i my_module.cil
Also, fix loading/storing the 64-bit subnet prefix for OCON_IBPKEY to use a correctly aligned buffer.
Finally, do not use the 'nodebuf' (u32) buffer where 'buf' (__le32) should be used instead.
Tested internally on a ppc64 machine with a RHEL 7 kernel with this patch applied.
--- security/selinux/ss/policydb.c | 51 ++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 15 deletions(-)
security/selinux/ss/policydb.c +36 -15
@@ -2107,6 +2107,7 @@ static int ocontext_read(struct policydb {int i, j, rc;u32 nel, len; +__be64 prefixbuf[1 ];__le32 buf[3 ];struct ocontext *l, *c;u32 nodebuf[8 ];
@@ -2216,21 +2217,30 @@ static int ocontext_read(struct policydb goto out;break ; } -case OCON_IBPKEY : - rc =next_entry (nodebuf, fp,sizeof (u32) *4 ); +case OCON_IBPKEY : { +u32 pkey_lo, pkey_hi; + + rc =next_entry (prefixbuf, fp,sizeof (u64)); +if (rc) + goto out; + +/* we need to have subnet_prefix in CPU order */ + c->u.ibpkey.subnet_prefix =be64_to_cpu (prefixbuf[0 ]); + + rc =next_entry (buf, fp,sizeof (u32) *2 );if (rc) goto out; - c->u.ibpkey.subnet_prefix =be64_to_cpu (*((__be64 *)nodebuf)); + pkey_lo =le32_to_cpu (buf[0 ]); + pkey_hi =le32_to_cpu (buf[1 ]); -if (nodebuf[2 ] >0xffff || - nodebuf[3 ] >0xffff ) { +if (pkey_lo >U16_MAX || pkey_hi >U16_MAX ) { rc = -EINVAL ; goto out; } - c->u.ibpkey.low_pkey =le32_to_cpu (nodebuf[2 ]); - c->u.ibpkey.high_pkey =le32_to_cpu (nodebuf[3 ]); + c->u.ibpkey.low_pkey = pkey_lo; + c->u.ibpkey.high_pkey = pkey_hi; rc = context_read_and_validate(&c->context[0], p,
@@ -2238,7 +2248,10 @@ static int ocontext_read(struct policydbif (rc) goto out;break ; -case OCON_IBENDPORT : + } +case OCON_IBENDPORT : { +u32 port; + rc =next_entry (buf, fp,sizeof (u32) *2 );if (rc) goto out;
@@ -2248,12 +2261,13 @@ static int ocontext_read(struct policydbif (rc) goto out; -if (buf[1 ] >0xff || buf[1 ] ==0 ) { + port =le32_to_cpu (buf[1 ]); +if (port >U8_MAX || port ==0 ) { rc = -EINVAL ; goto out; } - c->u.ibendport.port =le32_to_cpu (buf[1 ]); + c->u.ibendport.port = port; rc = context_read_and_validate(&c->context[0], p,
@@ -2261,7 +2275,8 @@ static int ocontext_read(struct policydbif (rc) goto out;break ; - } + }/* end case */ + }/* end switch */ } } rc =0 ;
@@ -3104,6 +3119,7 @@ static int ocontext_write(struct policyd {unsigned int i, j, rc;size_t nel, len; +__be64 prefixbuf[1 ];__le32 buf[3 ];u32 nodebuf[8 ];struct ocontext *c;
@@ -3191,12 +3207,17 @@ static int ocontext_write(struct policydreturn rc;break ;case OCON_IBPKEY : - *((__be64 *)nodebuf) =cpu_to_be64 (c->u.ibpkey.subnet_prefix); +/* subnet_prefix is in CPU order */ + prefixbuf[0 ] =cpu_to_be64 (c->u.ibpkey.subnet_prefix); - nodebuf[2 ] =cpu_to_le32 (c->u.ibpkey.low_pkey); - nodebuf[3 ] =cpu_to_le32 (c->u.ibpkey.high_pkey); + rc =put_entry (prefixbuf,sizeof (u64),1 , fp); +if (rc) +return rc; + + buf[0 ] =cpu_to_le32 (c->u.ibpkey.low_pkey); + buf[1 ] =cpu_to_le32 (c->u.ibpkey.high_pkey); - rc =put_entry (nodebuf,sizeof (u32),4 , fp); + rc =put_entry (buf,sizeof (u32),2 , fp);if (rc)return rc; rc =context_write (p, &c->context[0 ], fp);
Greg Kroah-Hartman
maintainerPATCH 92/105 lockd: Show pid of lockd for remote locks
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
commit b8eee0e90f9797b747113638bc75e739b192ad38 upstream.
Commit 9d5b86ac13c5 ("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks") specified that the l_pid returned for F_GETLK on a local file that has a remote lock should be the pid of the lock manager process. That commit, while updating other filesystems, failed to update lockd, such that locks created by lockd had their fl_pid set to that of the remote process holding the lock. Fix that here to be the pid of lockd.
Also, fix the client case so that the returned lock pid is negative, which indicates a remote lock on a remote file.
--- fs/lockd/clntproc.c | 2 +- fs/lockd/xdr.c | 4 ++-- fs/lockd/xdr4.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
fs/lockd/clntproc.c +1 -1
@@ -442,7 +442,7 @@ nlmclnt_test(struct nlm_rqst *req, struc fl->fl_start = req->a_res.lock.fl.fl_start; fl->fl_end = req->a_res.lock.fl.fl_end; fl->fl_type = req->a_res.lock.fl.fl_type; - fl->fl_pid =0 ; + fl->fl_pid = -req->a_res.lock.fl.fl_pid;break ;default : status =nlm_stat_to_errno (req->a_res.status);
fs/lockd/xdr.c +2 -2
@@ -127,7 +127,7 @@ nlm_decode_lock(__be32 *p, struct nlm_lolocks_init_lock (fl); fl->fl_owner = current->files; - fl->fl_pid = (pid_t )lock->svid; + fl->fl_pid = current->tgid; fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ;/* as good as anything else */ start =ntohl (*p++);
@@ -269,7 +269,7 @@ nlmsvc_decode_shareargs(struct svc_rqstmemset (lock,0 ,sizeof (*lock));locks_init_lock (&lock->fl); lock->svid = ~(u32 )0 ; - lock->fl.fl_pid = (pid_t )lock->svid; + lock->fl.fl_pid = current->tgid; if (!(p = nlm_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller,
fs/lockd/xdr4.c +2 -2
@@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_llocks_init_lock (fl); fl->fl_owner = current->files; - fl->fl_pid = (pid_t )lock->svid; + fl->fl_pid = current->tgid; fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ;/* as good as anything else */ p =xdr_decode_hyper (p, &start);
@@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqstmemset (lock,0 ,sizeof (*lock));locks_init_lock (&lock->fl); lock->svid = ~(u32 )0 ; - lock->fl.fl_pid = (pid_t )lock->svid; + lock->fl.fl_pid = current->tgid; if (!(p = nlm4_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller,
Greg Kroah-Hartman
maintainerPATCH 93/105 arm64: drop linker script hack to hide __efistub_ symbols
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit dd6846d774693bfa27d7db4dae5ea67dfe373fa1 upstream.
Commit 1212f7a16af4 ("scripts/kallsyms: filter arm64's __efistub_ symbols") updated the kallsyms code to filter out symbols with the __efistub_ prefix explicitly, so we no longer require the hack in our linker script to emit them as absolute symbols.
--- arch/arm64/kernel/image.h | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
arch/arm64/kernel/image.h +17 -27
@@ -76,16 +76,6 @@ __efistub_stext_offset = stext - _text;/* -* Prevent the symbol aliases below from being emitted into the kallsyms -* table, by forcing them to be absolute symbols (which are conveniently -* ignored by scripts/kallsyms) rather than section relative symbols. -* The distinction is only relevant for partial linking, and only for symbols -* that are defined within a section declaration (which is not the case for -* the definitions below) so the resulting values will be identical. -*/ -#define KALLSYMS_HIDE (sym) ABSOLUTE(sym) - -/* * The EFI stub has its own symbol namespace prefixed by __efistub_, to * isolate it from the kernel proper. The following symbols are legally * accessed by the stub, so provide some aliases to make them accessible.
@@ -94,27 +84,27 @@ __efistub_stext_offset = stext - _text;* linked at. The routines below are all implemented in assembler in a * position independent manner */ -__efistub_memcmp =KALLSYMS_HIDE (__pi_memcmp); -__efistub_memchr =KALLSYMS_HIDE (__pi_memchr); -__efistub_memcpy =KALLSYMS_HIDE (__pi_memcpy); -__efistub_memmove =KALLSYMS_HIDE (__pi_memmove); -__efistub_memset =KALLSYMS_HIDE (__pi_memset); -__efistub_strlen =KALLSYMS_HIDE (__pi_strlen); -__efistub_strnlen =KALLSYMS_HIDE (__pi_strnlen); -__efistub_strcmp =KALLSYMS_HIDE (__pi_strcmp); -__efistub_strncmp =KALLSYMS_HIDE (__pi_strncmp); -__efistub___flush_dcache_area =KALLSYMS_HIDE (__pi___flush_dcache_area); +__efistub_memcmp = __pi_memcmp; +__efistub_memchr = __pi_memchr; +__efistub_memcpy = __pi_memcpy; +__efistub_memmove = __pi_memmove; +__efistub_memset = __pi_memset; +__efistub_strlen = __pi_strlen; +__efistub_strnlen = __pi_strnlen; +__efistub_strcmp = __pi_strcmp; +__efistub_strncmp = __pi_strncmp; +__efistub___flush_dcache_area = __pi___flush_dcache_area;#ifdef CONFIG_KASAN -__efistub___memcpy =KALLSYMS_HIDE (__pi_memcpy); -__efistub___memmove =KALLSYMS_HIDE (__pi_memmove); -__efistub___memset =KALLSYMS_HIDE (__pi_memset); +__efistub___memcpy = __pi_memcpy; +__efistub___memmove = __pi_memmove; +__efistub___memset = __pi_memset;#endif -__efistub__text =KALLSYMS_HIDE (_text); -__efistub__end =KALLSYMS_HIDE (_end); -__efistub__edata =KALLSYMS_HIDE (_edata); -__efistub_screen_info =KALLSYMS_HIDE (screen_info); +__efistub__text = _text; +__efistub__end = _end; +__efistub__edata = _edata; +__efistub_screen_info = screen_info;#endif
Greg Kroah-Hartman
maintainerPATCH 94/105 arm64: relocatable: fix inconsistencies in linker script and options
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit 3bbd3db86470c701091fb1d67f1fab6621debf50 upstream.
readelf complains about the section layout of vmlinux when building with CONFIG_RELOCATABLE=y (for KASLR):
readelf: Warning: [21]: Link field (0) should index a symtab section.
readelf: Warning: [21]: Info field (0) should index a relocatable section.
Also, it seems that our use of '-pie -shared' is contradictory, and thus ambiguous. In general, the way KASLR is wired up at the moment is highly tailored to how ld.bfd happens to implement (and conflate) PIE executables and shared libraries, so given the current effort to support other toolchains, let's fix some of these issues as well.
- Drop the -pie linker argument and just leave -shared. In ld.bfd, the differences between them are unclear (except for the ELF type of the produced image [0]) but lld chokes on seeing both at the same time.
- Rename the .rela output section to .rela.dyn, as is customary for shared libraries and PIE executables, so that it is not misidentified by readelf as a static relocation section (producing the warnings above).
- Pass the -z notext and -z norelro options to explicitly instruct the linker to permit text relocations, and to omit the RELRO program header (which requires a certain section layout that we don't adhere to in the kernel). These are the defaults for current versions of ld.bfd.
- Discard .eh_frame and .gnu.hash sections to avoid them from being emitted between .head.text and .text, screwing up the section layout.
These changes only affect the ELF image, and produce the same binary image.
[0] b9dce7f1ba01 ("arm64: kernel: force ET_DYN ELF type for ...")
--- arch/arm64/Makefile | 2 +- arch/arm64/kernel/vmlinux.lds.S | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-)
arch/arm64/Makefile +1 -1
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour # for relative relocs, since this leads to better Image compression # with the relocation offsets always being zero. -LDFLAGS_vmlinux += -pie -shared -Bsymbolic \ +LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \ $(call ld-option, --no-apply-dynamic-relocs) endif
arch/arm64/kernel/vmlinux.lds.S +5 -4
@@ -99,7 +99,8 @@ SECTIONS *(.discard) *(.discard.*) *(.interp .dynamic) - *(.dynsym .dynstr .hash) + *(.dynsym .dynstr .hash .gnu.hash) + *(.eh_frame) } . = KIMAGE_VADDR + TEXT_OFFSET;
@@ -176,12 +177,12 @@ SECTIONS PERCPU_SECTION(L1_CACHE_BYTES) - .rela : ALIGN(8) { + .rela.dyn : ALIGN(8) { *(.rela .rela*) } - __rela_offset = ABSOLUTE(ADDR(.rela) - KIMAGE_VADDR); - __rela_size = SIZEOF(.rela); + __rela_offset = ABSOLUTE(ADDR(.rela.dyn) - KIMAGE_VADDR); + __rela_size = SIZEOF(.rela.dyn); . = ALIGN(SEGMENT_ALIGN); __initdata_end = .;
Greg Kroah-Hartman
maintainerPATCH 96/105 9p/net: put a lower bound on msize
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
commit 574d356b7a02c7e1b01a1d9cba8a26b3c2888f45 upstream.
If the requested msize is too small (either from command line argument or from the server version reply), we won't get any work done. If it's *really* too small, nothing will work, and this got caught by syzbot recently (on a new kmem_cache_create_usercopy() call)
Just set a minimum msize to 4k in both code paths, until someone complains they have a use-case for a smaller msize.
We need to check in both mount option and server reply individually because the msize for the first version request would be unchecked with just a global check on clnt->msize.
--- net/9p/client.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
net/9p/client.c +21 -0
@@ -181,6 +181,12 @@ static int parse_opts(char *opts, struct ret = r;continue ; } +if (option <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"msize should be at least 4k\n" ); + ret = -EINVAL ; +continue ; + } clnt->msize = option;break ;case Opt_trans:
@@ -996,10 +1002,18 @@ static int p9_client_version(struct p9_celse if (!strncmp (version,"9P2000" ,6 )) c->proto_version = p9_proto_legacy;else { +p9_debug (P9_DEBUG_ERROR , +"server returned an unknown version: %s\n" , version); err = -EREMOTEIO ; goto error; } +if (msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"server returned a msize < 4096: %d\n" , msize); + err = -EREMOTEIO ; + goto error; + }if (msize < c->msize) c->msize = msize;
@@ -1064,6 +1078,13 @@ struct p9_client *p9_client_create(constif (clnt->msize > clnt->trans_mod->maxsize) clnt->msize = clnt->trans_mod->maxsize; +if (clnt->msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"Please specify a msize of at least 4k\n" ); + err = -EINVAL ; + goto free_client; + } + err =p9_client_version (clnt);if (err) goto close_trans;
Greg Kroah-Hartman
maintainerPATCH 97/105 rxe: fix error completion wr_id and qp_num
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
commit e48d8ed9c6193502d849b35767fd18e20bbd7ba2 upstream.
Error completions must still contain a valid wr_id and qp_num such that the consumer can rely on. Correctly fill these fields in receive error completions.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +9 -4
@@ -845,11 +845,16 @@ static enum resp_states do_complete(strumemset (&cqe,0 ,sizeof (cqe)); - wc->wr_id = wqe->wr_id; - wc->status = qp->resp.status; - wc->qp = &qp->ibqp; +if (qp->rcq->is_user) { + uwc->status = qp->resp.status; + uwc->qp_num = qp->ibqp.qp_num; + uwc->wr_id = wqe->wr_id; + }else { + wc->status = qp->resp.status; + wc->qp = &qp->ibqp; + wc->wr_id = wqe->wr_id; + } -/* fields after status are not required for errors */ if (wc->status ==IB_WC_SUCCESS ) { wc->opcode = (pkt->mask &RXE_IMMDT_MASK && pkt->mask & RXE_WRITE_MASK) ?
Greg Kroah-Hartman
maintainerPATCH 101/105 genwqe: Fix size check
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit fdd669684655c07dacbdb0d753fd13833de69a33 upstream.
Calling the test program genwqe_cksum with the default buffer size of 2MB triggers the following kernel warning on s390:
WARNING: CPU: 30 PID: 9311 at mm/page_alloc.c:3189 __alloc_pages_nodemask+0x45c/0xbe0
CPU: 30 PID: 9311 Comm: genwqe_cksum Kdump: loaded Not tainted 3.10.0-957.el7.s390x #1
task: 00000005e5d13980 ti: 00000005e7c6c000 task.ti: 00000005e7c6c000
Krnl PSW : 0704c00180000000 00000000002780ac (__alloc_pages_nodemask+0x45c/0xbe0)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 EA:3
Krnl GPRS: 00000000002932b8 0000000000b73d7c 0000000000000010 0000000000000009
0000000000000041 00000005e7c6f9b8 0000000000000001 00000000000080d0
0000000000000000 0000000000b70500 0000000000000001 0000000000000000
0000000000b70528 00000000007682c0 0000000000277df2 00000005e7c6f9a0
Krnl Code: 000000000027809e: de7195001000 ed 1280(114,%r9),0(%r1)
00000000002780a4: a774fead brc 7,277dfe
#00000000002780a8: a7f40001 brc 15,2780aa
>00000000002780ac: 92011000 mvi 0(%r1),1
00000000002780b0: a7f4fea7 brc 15,277dfe
00000000002780b4: 9101c6b6 tm 1718(%r12),1
00000000002780b8: a784ff3a brc 8,277f2c
00000000002780bc: a7f4fe2e brc 15,277d18
Call Trace:
([<0000000000277df2>] __alloc_pages_nodemask+0x1a2/0xbe0)
[<000000000013afae>] s390_dma_alloc+0xfe/0x310
[<000003ff8065f362>] __genwqe_alloc_consistent+0xfa/0x148 [genwqe_card]
[<000003ff80658f7a>] genwqe_mmap+0xca/0x248 [genwqe_card]
[<00000000002b2712>] mmap_region+0x4e2/0x778
[<00000000002b2c54>] do_mmap+0x2ac/0x3e0
[<0000000000292d7e>] vm_mmap_pgoff+0xd6/0x118
[<00000000002b081c>] SyS_mmap_pgoff+0xdc/0x268
[<00000000002b0a34>] SyS_old_mmap+0x8c/0xb0
[<000000000074e518>] sysc_tracego+0x14/0x1e
[<000003ffacf87dc6>] 0x3ffacf87dc6turns out the check in __genwqe_alloc_consistent uses "> MAX_ORDER" while the mm code uses ">= MAX_ORDER". Fix genwqe.
--- drivers/misc/genwqe/card_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/genwqe/card_utils.c +1 -1
@@ -217,7 +217,7 @@ u32 genwqe_crc32(u8 *buff, size_t len, uvoid *__genwqe_alloc_consistent (struct genwqe_dev *cd,size_t size,dma_addr_t *dma_handle) { -if (get_order (size) >MAX_ORDER ) +if (get_order (size) >=MAX_ORDER )return NULL ; return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
Greg Kroah-Hartman
maintainerPATCH 67/105 sunrpc: fix cache_head leak due to queued request
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit 4ecd55ea074217473f94cfee21bb72864d39f8d7 upstream.
After commit d202cce8963d, an expired cache_head can be removed from the cache_detail's hash.
However, the expired cache_head may be waiting for a reply from a previously submitted request. Such a cache_head has an increased refcounter and therefore it won't be freed after cache_put(freeme).
Because the cache_head was removed from the hash it cannot be found during cache_clean() and can be leaked forever, together with stalled cache_request and other taken resources.
In our case we noticed it because an entry in the export cache was holding a reference on a filesystem.
Fixes d202cce8963d ("sunrpc: never return expired entries in sunrpc_cache_lookup")
--- net/sunrpc/cache.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/sunrpc/cache.c +9 -1
@@ -54,6 +54,11 @@ static void cache_init(struct cache_head h->last_refresh = now; } +static void cache_fresh_locked (struct cache_head *head,time_t expiry, +struct cache_detail *detail); +static void cache_fresh_unlocked (struct cache_head *head, +struct cache_detail *detail); +struct cache_head *sunrpc_cache_lookup (struct cache_detail *detail,struct cache_head *key,int hash) {
@@ -95,6 +100,7 @@ struct cache_head *sunrpc_cache_lookup(sif (cache_is_expired (detail, tmp)) {hlist_del_init (&tmp->cache_list); detail->entries --; +cache_fresh_locked (tmp,0 , detail); freeme = tmp;break ; }
@@ -110,8 +116,10 @@ struct cache_head *sunrpc_cache_lookup(scache_get (new);write_unlock (&detail->hash_lock); -if (freeme) +if (freeme) { +cache_fresh_unlocked (freeme, detail);cache_put (freeme, detail); + }return new; }EXPORT_SYMBOL_GPL (sunrpc_cache_lookup);
Greg Kroah-Hartman
maintainerPATCH 68/105 sunrpc: use SVC_NET() in svcauth_gss_* functions
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit b8be5674fa9a6f3677865ea93f7803c4212f3e10 upstream.
--- net/sunrpc/auth_gss/svcauth_gss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sunrpc/auth_gss/svcauth_gss.c +4 -4
@@ -1120,7 +1120,7 @@ static int svcauth_gss_legacy_init(strucstruct kvec *resv = &rqstp->rq_res.head[0 ];struct rsi *rsip, rsikey;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);memset (&rsikey,0 ,sizeof (rsikey)); ret = gss_read_verf(gc, argv, authp,
@@ -1231,7 +1231,7 @@ static int svcauth_gss_proxy_init(structuint64_t handle;int status;int ret; -struct net *net = rqstp->rq_xprt->xpt_net; +struct net *net =SVC_NET (rqstp);struct sunrpc_net *sn =net_generic (net, sunrpc_net_id);memset (&ud,0 ,sizeof (ud));
@@ -1422,7 +1422,7 @@ svcauth_gss_accept(struct svc_rqst *rqst__be32 *rpcstart;__be32 *reject_stat = resv->iov_base + resv->iov_len;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);dprintk ("RPC: svcauth_gss: argv->iov_len = %zd\n" , argv->iov_len);
@@ -1710,7 +1710,7 @@ svcauth_gss_release(struct svc_rqst *rqsstruct rpc_gss_wire_cred *gc = &gsd->clcred;struct xdr_buf *resbuf = &rqstp->rq_res;int stat = -EINVAL ; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);if (gc->gc_proc !=RPC_GSS_PROC_DATA ) goto out;
Greg Kroah-Hartman
maintainerPATCH 70/105 powerpc: Disable -Wbuiltin-requires-header when setjmp is used
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
commit aea447141c7e7824b81b49acd1bc785506fba46e upstream.
The powerpc kernel uses setjmp which causes a warning when building with clang:
In file included from arch/powerpc/xmon/xmon.c:51:
./arch/powerpc/include/asm/setjmp.h:15:13: error: declaration of built-in function 'setjmp' requires inclusion of the header <setjmp.h>
[-Werror,-Wbuiltin-requires-header]
extern long setjmp(long *);
^
./arch/powerpc/include/asm/setjmp.h:16:13: error: declaration of
built-in function 'longjmp' requires inclusion of the header <setjmp.h>
[-Werror,-Wbuiltin-requires-header]
extern void longjmp(long *, long);
^This *is* the header and we're not using the built-in setjump but rather the one in arch/powerpc/kernel/misc.S. As the compiler warning does not make sense, it for the files where setjmp is used.
--- arch/powerpc/kernel/Makefile | 3 +++ arch/powerpc/xmon/Makefile | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
arch/powerpc/kernel/Makefile +3 -0
@@ -5,6 +5,9 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' +# Disable clang warning for using setjmp without setjmp.h header +CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) + subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror ifeq ($(CONFIG_PPC64),y)
arch/powerpc/xmon/Makefile +4 -1
@@ -1,7 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for xmon -subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror +# Disable clang warning for using setjmp without setjmp.h header +subdir-ccflags-y := $(call cc-disable-warning, builtin-requires-header) + +subdir-ccflags-$(CONFIG_PPC_WERROR) += -Werror GCOV_PROFILE := n UBSAN_SANITIZE := n
Greg Kroah-Hartman
maintainerPATCH 72/105 md: raid10: remove VLAIS
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Kaehlcke <[email protected]>
commit 584ed9fa9532f8b9d5955628ff87ee3b2ab9f5a9 upstream.
The raid10 driver can't be built with clang since it uses a variable length array in a structure (VLAIS):
drivers/md/raid10.c:4583:17: error: fields must have a constant size:
'variable length array in structure' extension will never be supported
Allocate the r10bio struct with kmalloc instead of using the VLAIS construct.
Shaohua: set the MD_RECOVERY_INTR bit
Neil Brown: use GFP_NOIO
--- drivers/md/raid10.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/md/raid10.c +10 -5
@@ -4591,15 +4591,18 @@ static int handle_reshape_read_error(str/* Use sync reads to get the blocks from somewhere else */ int sectors = r10_bio->sectors;struct r10conf *conf = mddev->private; -struct { -struct r10bio r10_bio; -struct r10dev devs[conf->copies]; - } on_stack; -struct r10bio *r10b = &on_stack.r10_bio; +struct r10bio *r10b;int slot =0 ;int idx =0 ;struct page **pages; + r10b =kmalloc (sizeof (*r10b) + +sizeof (struct r10dev ) * conf->copies,GFP_NOIO ); +if (!r10b) { +set_bit (MD_RECOVERY_INTR , &mddev->recovery); +return -ENOMEM ; + } +/* reshape IOs share pages from .devs[0].bio */ pages =get_resync_pages (r10_bio->devs[0 ].bio)->pages;
@@ -4648,11 +4651,13 @@ static int handle_reshape_read_error(str/* couldn't read this block, must give up */ set_bit (MD_RECOVERY_INTR , &mddev->recovery); +kfree (r10b);return -EIO ; } sectors -= s; idx++; } +kfree (r10b);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 105/105 drm/vc4: Set ->is_yuv to false when num_planes == 1
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
commit 2b02a05bdc3a62d36e0d0b015351897109e25991 upstream.
When vc4_plane_state is duplicated ->is_yuv is left assigned to its previous value, and we never set it back to false when switching to a non-YUV format.
Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch of the vc4_plane_setup_clipping_and_scaling() function.
--- drivers/gpu/drm/vc4/vc4_plane.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/vc4/vc4_plane.c +1 -0
@@ -354,6 +354,7 @@ static int vc4_plane_setup_clipping_and_if (vc4_state->is_unity) vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; }else { + vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ; vc4_state->y_scaling[1 ] =VC4_SCALING_NONE ; }
Greg Kroah-Hartman
maintainerPATCH 98/105 iommu/vt-d: Handle domain agaw being less than iommu agaw
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sohil Mehta <[email protected]>
commit 3569dd07aaad71920c5ea4da2d5cc9a167c1ffd4 upstream.
The Intel IOMMU driver opportunistically skips a few top level page tables from the domain paging directory while programming the IOMMU context entry. However there is an implicit assumption in the code that domain's adjusted guest address width (agaw) would always be greater than IOMMU's agaw.
The IOMMU capabilities in an upcoming platform cause the domain's agaw to be lower than IOMMU's agaw. The issue is seen when the IOMMU supports both 4-level and 5-level paging. The domain builds a 4-level page table based on agaw of 2. However the IOMMU's agaw is set as 3 (5-level). In this case the code incorrectly tries to skip page page table levels. This causes the IOMMU driver to avoid programming the context entry. The fix handles this case and programs the context entry accordingly.
--- drivers/iommu/intel-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +2 -2
@@ -2093,7 +2093,7 @@ static int domain_context_mapping_one(st* than default. Unnecessary for PT mode. */ if (translation !=CONTEXT_TT_PASS_THROUGH ) { -for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { +for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) { ret = -ENOMEM ; pgd =phys_to_virt (dma_pte_addr (pgd));if (!dma_pte_present (pgd))
@@ -2107,7 +2107,7 @@ static int domain_context_mapping_one(st translation =CONTEXT_TT_MULTI_LEVEL ;context_set_address_root (context,virt_to_phys (pgd)); -context_set_address_width (context, iommu->agaw); +context_set_address_width (context, agaw); }else {/* * In pass through mode, AW must be programmed to
Greg Kroah-Hartman
maintainerPATCH 69/105 powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Piggin <[email protected]>
commit 6977f95e63b9b3fb4a5973481a800dd9f48a1338 upstream.
--- arch/powerpc/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/Makefile +6 -1
@@ -236,7 +236,12 @@ endif # Work around a gcc code-gen bug with -fno-omit-frame-pointer. ifeq ($(CONFIG_FUNCTION_TRACER),y) -KBUILD_CFLAGS += -mno-sched-epilog +# Work around gcc code-gen bugs with -pg / -fno-omit-frame-pointer in gcc <= 4.8 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44199 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52828 +ifneq ($(cc-name),clang) +KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, -mno-sched-epilog) +endif endif cpu-as-$(CONFIG_4xx) += -Wa,-m405
Greg Kroah-Hartman
maintainerPATCH 103/105 power: supply: olpc_battery: correct the temperature units
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lubomir Rintel <[email protected]>
commit ed54ffbe554f0902689fd6d1712bbacbacd11376 upstream.
According to [1] and [2], the temperature values are in tenths of degree Celsius. Exposing the Celsius value makes the battery appear on fire:
$ upower -i /org/freedesktop/UPower/devices/battery_olpc_battery
...
temperature: 236.9 degrees CTested on OLPC XO-1 and OLPC XO-1.75 laptops.
[1] include/linux/power_supply.h
[2] Documentation/power/power_supply_class.txt
--- drivers/power/supply/olpc_battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/supply/olpc_battery.c +2 -2
@@ -427,14 +427,14 @@ static int olpc_bat_get_property(structif (ret)return ret; - val->intval = (s16 )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (s16 )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_TEMP_AMBIENT : ret =olpc_ec_cmd (EC_AMB_TEMP ,NULL ,0 , (void *)&ec_word,2 );if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (int )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_CHARGE_COUNTER : ret =olpc_ec_cmd (EC_BAT_ACR ,NULL ,0 , (void *)&ec_word,2 );
Greg Kroah-Hartman
maintainerPATCH 63/105 mm, devm_memremap_pages: kill mapping "System RAM" support
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 06489cfbd915ff36c8e36df27f1c2dc60f97ca56 upstream.
Given the fact that devm_memremap_pages() requires a percpu_ref that is torn down by devm_memremap_pages_release() the current support for mapping RAM is broken.
Support for remapping "System RAM" has been broken since the beginning and there is no existing user of this this code path, so just kill the support and make it an explicit error.
This cleanup also simplifies a follow-on patch to fix the error path when setting a devm release action for devm_memremap_pages_release() fails.
--- kernel/memremap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
kernel/memremap.c +3 -6
@@ -379,15 +379,12 @@ void *devm_memremap_pages(struct device is_ram =region_intersects (align_start, align_size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ); -if (is_ram ==REGION_MIXED ) { -WARN_ONCE (1 ,"%s attempted on mixed region %pr\n" , - __func__, res); +if (is_ram !=REGION_DISJOINT ) { +WARN_ONCE (1 ,"%s attempted on %s region %pr\n" , __func__, + is_ram ==REGION_MIXED ?"mixed" :"ram" , res);return ERR_PTR (-ENXIO ); } -if (is_ram ==REGION_INTERSECTS ) -return __va (res->start); -if (!ref)return ERR_PTR (-EINVAL );
Greg Kroah-Hartman
maintainerPATCH 104/105 lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
commit 10fdf838e5f540beca466e9d1325999c072e5d3f upstream.
On several arches, virt_to_phys() is in io.h
Build fails without it:
CC lib/test_debug_virtual.olib/test_debug_virtual.c: In function 'test_debug_virtual_init':lib/test_debug_virtual.c:26:7: error: implicit declaration of function 'virt_to_phys' [-Werror=implicit-function-declaration]
pa = virt_to_phys(va);
^--- lib/test_debug_virtual.c | 1 + 1 file changed, 1 insertion(+)
lib/test_debug_virtual.c +1 -0
@@ -5,6 +5,7 @@#include <linux/vmalloc.h> #include <linux/slab.h> #include <linux/sizes.h> +#include <linux/io.h> #include <asm/page.h> #ifdef CONFIG_MIPS
Greg Kroah-Hartman
maintainerPATCH 71/105 ftrace: Build with CPPFLAGS to get -Qunused-arguments
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
When building to record the mcount locations the kernel uses KBUILD_CFLAGS but not KBUILD_CPPFLAGS. This means it lacks -Qunused-arguments when building with clang, resulting in a lot of noisy warnings.
--- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.build +1 -1
@@ -242,7 +242,7 @@ else sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ - "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \ + "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \ "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; recordmcount_source := $(srctree)/scripts/recordmcount.pl
Greg Kroah-Hartman
maintainerPATCH 99/105 sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit c40f7d74c741a907cfaeb73a7697081881c497d0 upstream.
Zhipeng Xie, Xie XiuQi and Sargun Dhillon reported lockups in the scheduler under high loads, starting at around the v4.18 time frame, and Zhipeng Xie tracked it down to bugs in the rq->leaf_cfs_rq_list manipulation.
Do a (manual) revert of:
a9e7f6544b9c ("sched/fair: Fix O(nr_cgroups) in load balance path")
It turns out that the list_del_leaf_cfs_rq() introduced by this commit is a surprising property that was not considered in followup commits such as:
9c2791f936ef ("sched/fair: Fix hierarchical order in rq->leaf_cfs_rq_list")
As Vincent Guittot explains:
"I think that there is a bigger problem with commit a9e7f6544b9c and
cfs_rq throttling:
Let take the example of the following topology TG2 --> TG1 --> root:
1) The 1st time a task is enqueued, we will add TG2 cfs_rq then TG1 cfs_rq to leaf_cfs_rq_list and we are sure to do the whole branch in one path because it has never been used and can't be throttled so tmp_alone_branch will point to leaf_cfs_rq_list at the end.
2) Then TG1 is throttled
3) and we add TG3 as a new child of TG1.
4) The 1st enqueue of a task on TG3 will add TG3 cfs_rq just before TG1
cfs_rq and tmp_alone_branch will stay on rq->leaf_cfs_rq_list.
With commit a9e7f6544b9c, we can del a cfs_rq from rq->leaf_cfs_rq_list. So if the load of TG1 cfs_rq becomes NULL before step 2) above, TG1 cfs_rq is removed from the list.
Then at step 4), TG3 cfs_rq is added at the beginning of rq->leaf_cfs_rq_list but tmp_alone_branch still points to TG3 cfs_rq because its throttled parent can't be enqueued when the lock is released. tmp_alone_branch doesn't point to rq->leaf_cfs_rq_list whereas it should.
So if TG3 cfs_rq is removed or destroyed before tmp_alone_branch points on another TG cfs_rq, the next TG cfs_rq that will be added, will be linked outside rq->leaf_cfs_rq_list - which is bad.
In addition, we can break the ordering of the cfs_rq in rq->leaf_cfs_rq_list but this ordering is used to update and propagate the update from leaf down to root."
Instead of trying to work through all these cases and trying to reproduce the very high loads that produced the lockup to begin with, simplify the code temporarily by reverting a9e7f6544b9c - which change was clearly not thought through completely.
This (hopefully) gives us a kernel that doesn't lock up so people can continue to enjoy their holidays without worrying about regressions. ;-)
[ mingo: Wrote changelog, fixed weird spelling in code comment while at it. ]
--- kernel/sched/fair.c | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-)
kernel/sched/fair.c +9 -34
@@ -369,10 +369,9 @@ static inline void list_del_leaf_cfs_rq( } } -/* Iterate thr' all leaf cfs_rq's on a runqueue */ -#define for_each_leaf_cfs_rq_safe (rq, cfs_rq, pos) \ - list_for_each_entry_safe(cfs_rq, pos, &rq->leaf_cfs_rq_list, \ - leaf_cfs_rq_list) +/* Iterate through all leaf cfs_rq's on a runqueue: */ +#define for_each_leaf_cfs_rq (rq, cfs_rq) \ + list_for_each_entry_rcu(cfs_rq, &rq->leaf_cfs_rq_list, leaf_cfs_rq_list)/* Do the two (enqueued) entities belong to the same group ? */ static inline struct cfs_rq *
@@ -465,8 +464,8 @@ static inline void list_del_leaf_cfs_rq( { } -#define for_each_leaf_cfs_rq_safe (rq, cfs_rq, pos) \ - for (cfs_rq = &rq->cfs, pos = NULL; cfs_rq; cfs_rq = pos) +#define for_each_leaf_cfs_rq (rq, cfs_rq) \ + for (cfs_rq = &rq->cfs; cfs_rq; cfs_rq = NULL)static inline struct sched_entity *parent_entity (struct sched_entity *se) {
@@ -6970,27 +6969,10 @@ static void attach_tasks(struct lb_env *#ifdef CONFIG_FAIR_GROUP_SCHED -static inline bool cfs_rq_is_decayed (struct cfs_rq *cfs_rq) -{ -if (cfs_rq->load.weight) -return false; - -if (cfs_rq->avg.load_sum) -return false; - -if (cfs_rq->avg.util_sum) -return false; - -if (cfs_rq->runnable_load_sum) -return false; - -return true; -} -static void update_blocked_averages (int cpu) {struct rq *rq =cpu_rq (cpu); -struct cfs_rq *cfs_rq, *pos; +struct cfs_rq *cfs_rq;struct rq_flags rf;rq_lock_irqsave (rq, &rf);
@@ -7000,7 +6982,7 @@ static void update_blocked_averages(int* Iterates the task_group tree in a bottom up fashion, see * list_add_leaf_cfs_rq() for details. */ -for_each_leaf_cfs_rq_safe (rq, cfs_rq, pos) { +for_each_leaf_cfs_rq (rq, cfs_rq) {struct sched_entity *se;/* throttled entities do not contribute to load */
@@ -7014,13 +6996,6 @@ static void update_blocked_averages(int se = cfs_rq->tg->se[cpu];if (se && !skip_blocked_update (se))update_load_avg (se,0 ); - -/* -* There can be a lot of idle CPU cgroups. Don't let fully -* decayed cfs_rqs linger on the list. -*/ -if (cfs_rq_is_decayed (cfs_rq)) -list_del_leaf_cfs_rq (cfs_rq); }rq_unlock_irqrestore (rq, &rf); }
@@ -9580,10 +9555,10 @@ const struct sched_class fair_sched_clas#ifdef CONFIG_SCHED_DEBUG void print_cfs_stats (struct seq_file *m,int cpu) { -struct cfs_rq *cfs_rq, *pos; +struct cfs_rq *cfs_rq;rcu_read_lock (); -for_each_leaf_cfs_rq_safe (cpu_rq (cpu), cfs_rq, pos) +for_each_leaf_cfs_rq (cpu_rq (cpu), cfs_rq)print_cfs_rq (m, cpu, cfs_rq);rcu_read_unlock (); }
Greg Kroah-Hartman
maintainerPATCH 102/105 intel_th: msu: Fix an off-by-one in attribute store
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit ec5b5ad6e272d8d6b92d1007f79574919862a2d2 upstream.
The 'nr_pages' attribute of the 'msc' subdevices parses a comma-separated list of window sizes, passed from userspace. However, there is a bug in the string parsing logic wherein it doesn't exclude the comma character from the range of characters as it consumes them. This leads to an out-of-bounds access given a sufficiently long list. For example:
Quoted 5 lines
# echo 8,8,8,8 > /sys/bus/intel_th/devices/0-msc0/nr_pages ================================================================== BUG: KASAN: slab-out-of-bounds in memchr+0x1e/0x40 Read of size 1 at addr ffff8803ffcebcd1 by task sh/825
Quoted 8 lines
CPU: 3 PID: 825 Comm: npktest.sh Tainted: G W 4.20.0-rc1+ Call Trace: dump_stack+0x7c/0xc0 print_address_description+0x6c/0x23c ? memchr+0x1e/0x40 kasan_report.cold.5+0x241/0x308 memchr+0x1e/0x40 nr_pages_store+0x203/0xd00 [intel_th_msu]
Fix this by accounting for the comma character.
--- drivers/hwtracing/intel_th/msu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/intel_th/msu.c +2 -1
@@ -1431,7 +1431,8 @@ nr_pages_store(struct device *dev, strucif (!end)break ; - len -= end - p; +/* consume the number and the following comma, hence +1 */ + len -= end - p +1 ; p = end +1 ; }while (len);
Greg Kroah-Hartman
maintainerPATCH 100/105 ceph: dont update importing caps mseq when handing cap export
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yan, Zheng <[email protected]>
commit 3c1392d4c49962a31874af14ae9ff289cb2b3851 upstream.
Updating mseq makes client think importer mds has accepted all prior cap messages and importer mds knows what caps client wants. Actually some cap messages may have been dropped because of mseq mismatch.
If mseq is left untouched, importing cap's mds_wanted later will get reset by cap import message.
--- fs/ceph/caps.c | 1 - 1 file changed, 1 deletion(-)
fs/ceph/caps.c +0 -1
@@ -3438,7 +3438,6 @@ retry: tcap->cap_id = t_cap_id; tcap->seq = t_seq -1 ; tcap->issue_seq = t_seq -1 ; - tcap->mseq = t_mseq; tcap->issued |= issued; tcap->implemented |= issued;if (cap == ci->i_auth_cap)
Greg Kroah-Hartman
maintainerPATCH 95/105 powerpc/tm: Set MSR[TS] just prior to recheckpoint
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
commit e1c3743e1a20647c53b719dbf28b48f45d23f2cd upstream.
On a signal handler return, the user could set a context with MSR[TS] bits set, and these bits would be copied to task regs->msr.
At restore_tm_sigcontexts(), after current task regs->msr[TS] bits are set, several __get_user() are called and then a recheckpoint is executed.
This is a problem since a page fault (in kernel space) could happen when calling __get_user(). If it happens, the process MSR[TS] bits were already set, but recheckpoint was not executed, and SPRs are still invalid.
The page fault can cause the current process to be de-scheduled, with MSR[TS] active and without tm_recheckpoint() being called. More importantly, without TEXASR[FS] bit set also.
Since TEXASR might not have the FS bit set, and when the process is scheduled back, it will try to reclaim, which will be aborted because of the CPU is not in the suspended state, and, then, recheckpoint. This recheckpoint will restore thread->texasr into TEXASR SPR, which might be zero, hitting a BUG_ON().
kernel BUG at /build/linux-sf3Co9/linux-4.9.30/arch/powerpc/kernel/tm.S:434! cpu 0xb: Vector: 700 (Program Check) at [c00000041f1576d0] pc: c000000000054550: restore_gprs+0xb0/0x180 lr: 0000000000000000 sp: c00000041f157950 msr: 8000000100021033 current = 0xc00000041f143000 paca = 0xc00000000fb86300 softe: 0 irq_happened: 0x01 pid = 1021, comm = kworker/11:1 kernel BUG at /build/linux-sf3Co9/linux-4.9.30/arch/powerpc/kernel/tm.S:434! Linux version 4.9.0-3-powerpc64le ([email protected]) (gcc version 6.3.0 20170516 (Debian 6.3.0-18) ) #1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26) enter ? for help [c00000041f157b30] c00000000001bc3c tm_recheckpoint.part.11+0x6c/0xa0 [c00000041f157b70] c00000000001d184 __switch_to+0x1e4/0x4c0 [c00000041f157bd0] c00000000082eeb8 __schedule+0x2f8/0x990 [c00000041f157cb0] c00000000082f598 schedule+0x48/0xc0 [c00000041f157ce0] c0000000000f0d28 worker_thread+0x148/0x610 [c00000041f157d80] c0000000000f96b0 kthread+0x120/0x140 [c00000041f157e30] c00000000000c0e0 ret_from_kernel_thread+0x5c/0x7c
This patch simply delays the MSR[TS] set, so, if there is any page fault in the __get_user() section, it does not have regs->msr[TS] set, since the TM structures are still invalid, thus avoiding doing TM operations for in-kernel exceptions and possible process reschedule.
With this patch, the MSR[TS] will only be set just before recheckpointing and setting TEXASR[FS] = 1, thus avoiding an interrupt with TM registers in invalid state.
Other than that, if CONFIG_PREEMPT is set, there might be a preemption just after setting MSR[TS] and before tm_recheckpoint(), thus, this block must be atomic from a preemption perspective, thus, calling preempt_disable/enable() on this code.
It is not possible to move tm_recheckpoint to happen earlier, because it is required to get the checkpointed registers from userspace, with __get_user(), thus, the only way to avoid this undesired behavior is delaying the MSR[TS] set.
The 32-bits signal handler seems to be safe this current issue, but, it might be exposed to the preemption issue, thus, disabling preemption in this chunk of code.
Changes from v2:
* Run the critical section with preempt_disable.
--- arch/powerpc/kernel/signal_32.c | 20 +++++++++++++++++- arch/powerpc/kernel/signal_64.c | 44 +++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 15 deletions(-)
arch/powerpc/kernel/signal_32.c +19 -1
@@ -866,7 +866,23 @@ static long restore_tm_user_regs(struct/* If TM bits are set to the reserved value, it's an invalid context */ if (MSR_TM_RESV (msr_hi))return 1 ; -/* Pull in the MSR TM bits from the user context */ + +/* +* Disabling preemption, since it is unsafe to be preempted +* with MSR[TS] set without recheckpointing. +*/ +preempt_disable (); + +/* +* CAUTION: +* After regs->MSR[TS] being updated, make sure that get_user(), +* put_user() or similar functions are *not* called. These +* functions can generate page faults which will cause the process +* to be de-scheduled with MSR[TS] set but without calling +* tm_recheckpoint(). This can cause a bug. +* +* Pull in the MSR TM bits from the user context +*/ regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr_hi &MSR_TS_MASK );/* Now, recheckpoint. This loads up all of the checkpointed (older) * registers, including FP and V[S]Rs. After recheckpointing, the
@@ -891,6 +907,8 @@ static long restore_tm_user_regs(struct }#endif +preempt_enable (); +return 0 ; }#endif
arch/powerpc/kernel/signal_64.c +30 -14
62 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 66/105 mm, swap: fix swapoff with KSM pages
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huang Ying <[email protected]>
commit 7af7a8e19f0c5425ff639b0f0d2d244c2a647724 upstream.
KSM pages may be mapped to the multiple VMAs that cannot be reached from one anon_vma. So during swapin, a new copy of the page need to be generated if a different anon_vma is needed, please refer to comments of ksm_might_need_to_copy() for details.
During swapoff, unuse_vma() uses anon_vma (if available) to locate VMA and virtual address mapped to the page, so not all mappings to a swapped out KSM page could be found. So in try_to_unuse(), even if the swap count of a swap entry isn't zero, the page needs to be deleted from swap cache, so that, in the next round a new page could be allocated and swapin for the other mappings of the swapped out KSM page.
But this contradicts with the THP swap support. Where the THP could be deleted from swap cache only after the swap count of every swap entry in the huge swap cluster backing the THP has reach 0. So try_to_unuse() is changed in commit e07098294adf ("mm, THP, swap: support to reclaim swap space for THP swapped out") to check that before delete a page from swap cache, but this has broken KSM swapoff too.
Fortunately, KSM is for the normal pages only, so the original behavior for KSM pages could be restored easily via checking PageTransCompound(). That is how this patch works.
The bug is introduced by e07098294adf ("mm, THP, swap: support to reclaim swap space for THP swapped out"), which is merged by v4.14-rc1. So I think we should backport the fix to from 4.14 on. But Hugh thinks it may be rare for the KSM pages being in the swap device when swapoff, so nobody reports the bug so far.
--- mm/swapfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/swapfile.c +2 -1
@@ -2218,7 +2218,8 @@ int try_to_unuse(unsigned int type, bool*/ if (PageSwapCache (page) &&likely (page_private (page) == entry.val) && - !page_swapped (page)) + (!PageTransCompound (page) || + !swap_page_trans_huge_swapped (si, entry)))delete_from_swap_cache (compound_head (page));/*
Greg Kroah-Hartman
maintainerPATCH 87/105 dlm: memory leaks on error path in dlm_user_request()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Averin <[email protected]>
commit d47b41aceeadc6b58abc9c7c6485bef7cfb75636 upstream.
According to comment in dlm_user_request() ua should be freed in dlm_free_lkb() after successful attach to lkb.
However ua is attached to lkb not in set_lock_args() but later, inside request_lock().
Fixes 597d0cae0f99 ("[DLM] dlm: user locks")
Cc: [email protected] # 2.6.19
--- fs/dlm/lock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
fs/dlm/lock.c +7 -7
@@ -5792,20 +5792,20 @@ int dlm_user_request(struct dlm_ls *ls, goto out; } } - -/* After ua is attached to lkb it will be freed by dlm_free_lkb(). -When DLM_IFL_USER is set, the dlm knows that this is a userspace -lock and that lkb_astparam is the dlm_user_args structure. */ - error =set_lock_args (mode, &ua->lksb, flags, namelen, timeout_cs, fake_astfn, ua, fake_bastfn, &args); - lkb->lkb_flags |=DLM_IFL_USER ; -if (error) { +kfree (ua->lksb.sb_lvbptr); + ua->lksb.sb_lvbptr =NULL ; +kfree (ua);__put_lkb (ls, lkb); goto out; } +/* After ua is attached to lkb it will be freed by dlm_free_lkb(). +When DLM_IFL_USER is set, the dlm knows that this is a userspace +lock and that lkb_astparam is the dlm_user_args structure. */ + lkb->lkb_flags |=DLM_IFL_USER ; error =request_lock (ls, lkb, name, namelen, &args);switch (error) {
Greg Kroah-Hartman
maintainerPATCH 88/105 gfs2: Get rid of potential double-freeing in gfs2_create_inode
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
commit 6ff9b09e00a441599f3aacdf577254455a048bc9 upstream.
In gfs2_create_inode, after setting and releasing the acl / default_acl, the acl / default_acl pointers are not set to NULL as they should be. In that state, when the function reaches label fail_free_acls, gfs2_create_inode will try to release the same acls again.
Fix that by setting the pointers to NULL after releasing the acls. Slightly simplify the logic. Also, posix_acl_release checks for NULL already, so there is no need to duplicate those checks here.
--- fs/gfs2/inode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/gfs2/inode.c +9 -9
@@ -743,17 +743,19 @@ static int gfs2_create_inode(struct inodthe gfs2 structures. */ if (default_acl) { error =__gfs2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); +if (error) + goto fail_gunlock3;posix_acl_release (default_acl); + default_acl =NULL ; }if (acl) { -if (!error) - error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); + error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); +if (error) + goto fail_gunlock3;posix_acl_release (acl); + acl =NULL ; } -if (error) - goto fail_gunlock3; - error =security_inode_init_security (&ip->i_inode, &dip->i_inode, name, &gfs2_initxattrs,NULL );if (error)
@@ -788,10 +790,8 @@ fail_free_inode: }gfs2_rsqa_delete (ip,NULL ); fail_free_acls: -if (default_acl) -posix_acl_release (default_acl); -if (acl) -posix_acl_release (acl); +posix_acl_release (default_acl); +posix_acl_release (acl); fail_gunlock:gfs2_dir_no_add (&da);gfs2_glock_dq_uninit (ghs);
Greg Kroah-Hartman
maintainerPATCH 65/105 mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 02917e9f8676207a4c577d4d94eae12bf348e9d7 upstream.
At Maintainer Summit, Greg brought up a topic I proposed around EXPORT_SYMBOL_GPL usage. The motivation was considerations for when EXPORT_SYMBOL_GPL is warranted and the criteria for taking the exceptional step of reclassifying an existing export. Specifically, I wanted to make the case that although the line is fuzzy and hard to specify in abstract terms, it is nonetheless clear that devm_memremap_pages() and HMM (Heterogeneous Memory Management) have crossed it. The devm_memremap_pages() facility should have been EXPORT_SYMBOL_GPL from the beginning, and HMM as a derivative of that functionality should have naturally picked up that designation as well.
Contrary to typical rules, the HMM infrastructure was merged upstream with zero in-tree consumers. There was a promise at the time that those users would be merged "soon", but it has been over a year with no drivers arriving. While the Nouveau driver is about to belatedly make good on that promise it is clear that HMM was targeted first and foremost at an out-of-tree consumer.
HMM is derived from devm_memremap_pages(), a facility Christoph and I spearheaded to support persistent memory. It combines a device lifetime model with a dynamically created 'struct page' / memmap array for any physical address range. It enables coordination and control of the many code paths in the kernel built to interact with memory via 'struct page' objects. With HMM the integration goes even deeper by allowing device drivers to hook and manipulate page fault and page free events.
One interpretation of when EXPORT_SYMBOL is suitable is when it is exporting stable and generic leaf functionality. The devm_memremap_pages() facility continues to see expanding use cases, peer-to-peer DMA being the most recent, with no clear end date when it will stop attracting reworks and semantic changes. It is not suitable to export devm_memremap_pages() as a stable 3rd party driver API due to the fact that it is still changing and manipulates core behavior. Moreover, it is not in the best interest of the long term development of the core memory management subsystem to permit any external driver to effectively define its own system-wide memory management policies with no encouragement to engage with upstream.
I am also concerned that HMM was designed in a way to minimize further engagement with the core-MM. That, with these hooks in place, device-drivers are free to implement their own policies without much consideration for whether and how the core-MM could grow to meet that need. Going forward not only should HMM be EXPORT_SYMBOL_GPL, but the core-MM should be allowed the opportunity and stimulus to change and address these new use cases as first class functionality.
Original changelog:
hmm_devmem_add(), and hmm_devmem_add_resource() duplicated devm_memremap_pages() and are now simple now wrappers around the core facility to inject a dev_pagemap instance into the global pgmap_radix and hook page-idle events. The devm_memremap_pages() interface is base infrastructure for HMM. HMM has more and deeper ties into the kernel memory management implementation than base ZONE_DEVICE which is itself a EXPORT_SYMBOL_GPL facility.
Originally, the HMM page structure creation routines copied the devm_memremap_pages() code and reused ZONE_DEVICE. A cleanup to unify the implementations was discussed during the initial review:
http://lkml.iu.edu/hypermail/linux/kernel/1701.2/00812.html Recent work to extend devm_memremap_pages() for the peer-to-peer-DMA facility enabled this cleanup to move forward.
In addition to the integration with devm_memremap_pages() HMM depends on other GPL-only symbols:
mmu_notifier_unregister_no_release
percpu_ref
region_intersects
__class_create
It goes further to consume / indirectly expose functionality that is not exported to any other driver:
alloc_pages_vma
walk_page_range
HMM is derived from devm_memremap_pages(), and extends deep core-kernel fundamentals. Similar to devm_memremap_pages(), mark its entry points EXPORT_SYMBOL_GPL().
--- mm/hmm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/hmm.c +2 -2
@@ -1041,7 +1041,7 @@ struct hmm_devmem *hmm_devmem_add(constreturn devmem; } -EXPORT_SYMBOL (hmm_devmem_add); +EXPORT_SYMBOL_GPL (hmm_devmem_add); struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops, struct device *device,
@@ -1095,7 +1095,7 @@ struct hmm_devmem *hmm_devmem_add_resourreturn devmem; } -EXPORT_SYMBOL (hmm_devmem_add_resource); +EXPORT_SYMBOL_GPL (hmm_devmem_add_resource);/* * A device driver that wants to handle multiple devices memory through a
Greg Kroah-Hartman
maintainerPATCH 83/105 ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Peng <[email protected]>
commit cbb2ebf70daf7f7d97d3811a2ff8e39655b8c184 upstream.
In create_composite_quirk, the terminating condition of for loops is quirk->ifnum < 0. So any composite quirks should end with struct snd_usb_audio_quirk object with ifnum < 0.
for (quirk = quirk_comp->data; quirk->ifnum >= 0; ++quirk) {
.....
}the data field of Bower's & Wilkins PX headphones usb device device quirks do not end with {.ifnum = -1}, wihch may result in out-of-bound read.
This Patch fix the bug by adding an ending quirk object.
--- sound/usb/quirks-table.h | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/quirks-table.h +3 -0
@@ -3321,6 +3321,9 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge } } }, + { + .ifnum = -1 + }, } } },
Greg Kroah-Hartman
maintainerPATCH 82/105 ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit f4351a199cc120ff9d59e06d02e8657d08e6cc46 upstream.
The parser for the processing unit reads bNrInPins field before the bLength sanity check, which may lead to an out-of-bound access when a malformed descriptor is given. Fix it by assignment after the bLength check.
--- sound/usb/mixer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/usb/mixer.c +8 -2
@@ -1888,7 +1888,7 @@ static int build_audio_procunit(struct m char *name) {struct uac_processing_unit_descriptor *desc = raw_desc; -int num_ins = desc->bNrInPins; +int num_ins;struct usb_mixer_elem_info *cval;struct snd_kcontrol *kctl;int i, err, nameid, type, len;
@@ -1903,7 +1903,13 @@ static int build_audio_procunit(struct m 0, NULL, default_value_info }; -if (desc->bLength <13 || desc->bLength <13 + num_ins || +if (desc->bLength <13 ) { +usb_audio_err (state->chip,"invalid %s descriptor (id %d)\n" , name, unitid); +return -EINVAL ; + } + + num_ins = desc->bNrInPins; +if (desc->bLength <13 + num_ins || desc->bLength < num_ins +uac_processing_unit_bControlSize (desc, state->mixer->protocol)) {usb_audio_err (state->chip,"invalid %s descriptor (id %d)\n" , name, unitid);return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 77/105 raid6/ppc: Fix build for clang
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
commit e213574a449f7a57d4202c1869bbc7680b6b5521 upstream.
We cannot build these files with clang as it does not allow altivec instructions in assembly when -msoft-float is passed.
Quoted 8 lines · Jinsong Ji
We currently disable Altivec/VSX support when enabling soft-float. So any usage of vector builtins will break.
Enable Altivec/VSX with soft-float may need quite some clean up work, so I guess this is currently a limitation.
Removing -msoft-float will make it work (and we are lucky that no floating point instructions will be generated as well).
This is a workaround until the issue is resolved in clang.
[nc: Use 'ifeq ($(cc-name),clang)' instead of 'ifdef CONFIG_CC_IS_CLANG'
because that config does not exist in 4.14; the Kconfig rewrite that added that config happened in 4.18]
--- lib/raid6/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
lib/raid6/Makefile +15 -0
@@ -18,6 +18,21 @@ quiet_cmd_unroll = UNROLL $@ ifeq ($(CONFIG_ALTIVEC),y) altivec_flags := -maltivec $(call cc-option,-mabi=altivec) + +ifeq ($(cc-name),clang) +# clang ppc port does not yet support -maltivec when -msoft-float is +# enabled. A future release of clang will resolve this +# https://bugs.llvm.org/show_bug.cgi?id=31177 +CFLAGS_REMOVE_altivec1.o += -msoft-float +CFLAGS_REMOVE_altivec2.o += -msoft-float +CFLAGS_REMOVE_altivec4.o += -msoft-float +CFLAGS_REMOVE_altivec8.o += -msoft-float +CFLAGS_REMOVE_altivec8.o += -msoft-float +CFLAGS_REMOVE_vpermxor1.o += -msoft-float +CFLAGS_REMOVE_vpermxor2.o += -msoft-float +CFLAGS_REMOVE_vpermxor4.o += -msoft-float +CFLAGS_REMOVE_vpermxor8.o += -msoft-float +endif endif # The GCC option -ffreestanding is required in order to compile code containing
Greg Kroah-Hartman
maintainerPATCH 73/105 kbuild: add -no-integrated-as Clang option unconditionally
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit dbe27a002ef8573168cb64e181458ea23a74e2b6 upstream.
We are still a way off the Clang's integrated assembler support for the kernel. Hence, -no-integrated-as is mandatory to build the kernel with Clang. If you had an ancient version of Clang that does not recognize this option, you would not be able to compile the kernel anyway.
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -489,8 +489,8 @@ CLANG_GCC_TC := --gcc-toolchain=$(GCC_TO endif KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) -KBUILD_CFLAGS += $(call cc-option, -no-integrated-as) -KBUILD_AFLAGS += $(call cc-option, -no-integrated-as) +KBUILD_CFLAGS += -no-integrated-as +KBUILD_AFLAGS += -no-integrated-as endif RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
Greg Kroah-Hartman
maintainerPATCH 28/105 x86, hyperv: remove PCI dependency
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c629421a990033ba539eb8585e73a2e6fa9ea631 ]
Need to be able to boot without PCI devices present.
--- drivers/hv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hv/Kconfig +1 -1
@@ -2,7 +2,7 @@ menu "Microsoft Hyper-V guest support" config HYPERV tristate "Microsoft Hyper-V client drivers" - depends on X86 && ACPI && PCI && X86_LOCAL_APIC && HYPERVISOR_GUEST + depends on X86 && ACPI && X86_LOCAL_APIC && HYPERVISOR_GUEST select PARAVIRT help Select this option to run Linux as a Hyper-V client operating
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 26/105 scsi: target: iscsi: cxgbit: fix csk leak
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 801df68d617e3cb831f531c99fa6003620e6b343 ]
csk leak can happen if a new TCP connection gets established after cxgbit_accept_np() returns, to fix this leak free remaining csk in cxgbit_free_np().
--- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/target/iscsi/cxgbit/cxgbit_cm.c +4 -1
@@ -631,8 +631,11 @@ static void cxgbit_send_halfclose(struct cxgbit_sock *csk)static void cxgbit_arp_failure_discard (void *handle,struct sk_buff *skb) { +struct cxgbit_sock *csk = handle; +pr_debug ("%s cxgbit_device %p\n" , __func__, handle);kfree_skb (skb); +cxgbit_put_csk (csk); }static void cxgbit_abort_arp_failure (void *handle,struct sk_buff *skb)
@@ -1147,7 +1150,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req) rpl5->opt0 =cpu_to_be64 (opt0); rpl5->opt2 =cpu_to_be32 (opt2);set_wr_txq (skb,CPL_PRIORITY_SETUP , csk->ctrlq_idx); -t4_set_arp_err_handler (skb,NULL , cxgbit_arp_failure_discard); +t4_set_arp_err_handler (skb, csk, cxgbit_arp_failure_discard);cxgbit_l2t_send (csk->com.cdev, skb, csk->l2t); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 62/105 mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 808153e1187fa77ac7d7dad261ff476888dcf398 upstream.
devm_memremap_pages() is a facility that can create struct page entries for any arbitrary range and give drivers the ability to subvert core aspects of page management.
Specifically the facility is tightly integrated with the kernel's memory hotplug functionality. It injects an altmap argument deep into the architecture specific vmemmap implementation to allow allocating from specific reserved pages, and it has Linux specific assumptions about page structure reference counting relative to get_user_pages() and get_user_pages_fast(). It was an oversight and a mistake that this was not marked EXPORT_SYMBOL_GPL from the outset.
Again, devm_memremap_pagex() exposes and relies upon core kernel internal assumptions and will continue to evolve along with 'struct page', memory hotplug, and support for new memory types / topologies. Only an in-kernel GPL-only driver is expected to keep up with this ongoing evolution. This interface, and functionality derived from this interface, is not suitable for kernel-external drivers.
--- kernel/memremap.c | 2 +- tools/testing/nvdimm/test/iomap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/memremap.c +1 -1
@@ -482,7 +482,7 @@ void *devm_memremap_pages(struct devicedevres_free (page_map);return ERR_PTR (error); } -EXPORT_SYMBOL (devm_memremap_pages); +EXPORT_SYMBOL_GPL (devm_memremap_pages);unsigned long vmem_altmap_offset (struct vmem_altmap *altmap) {
tools/testing/nvdimm/test/iomap.c +1 -1
@@ -114,7 +114,7 @@ void *__wrap_devm_memremap_pages(structreturn nfit_res->buf + offset - nfit_res->res.start;return devm_memremap_pages (dev, res, ref, altmap); } -EXPORT_SYMBOL (__wrap_devm_memremap_pages); +EXPORT_SYMBOL_GPL (__wrap_devm_memremap_pages);pfn_t __wrap_phys_to_pfn_t (phys_addr_t addr,unsigned long flags) {
Greg Kroah-Hartman
maintainerPATCH 59/105 fork: record start_time late
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Herrmann <[email protected]>
commit 7b55851367136b1efd84d98fea81ba57a98304cf upstream.
This changes the fork(2) syscall to record the process start_time after initializing the basic task structure but still before making the new process visible to user-space.
Technically, we could record the start_time anytime during fork(2). But this might lead to scenarios where a start_time is recorded long before a process becomes visible to user-space. For instance, with userfaultfd(2) and TLS, user-space can delay the execution of fork(2) for an indefinite amount of time (and will, if this causes network access, or similar).
By recording the start_time late, it much closer reflects the point in time where the process becomes live and can be observed by other processes.
Lastly, this makes it much harder for user-space to predict and control the start_time they get assigned. Previously, user-space could fork a process and stall it in copy_thread_tls() before its pid is allocated, but after its start_time is recorded. This can be misused to later-on cycle through PIDs and resume the stalled fork(2) yielding a process that has the same pid and start_time as a process that existed before. This can be used to circumvent security systems that identify processes by their pid+start_time combination.
Even though user-space was always aware that start_time recording is flaky (but several projects are known to still rely on start_time-based identification), changing the start_time to be recorded late will help mitigate existing attacks and make it much harder for user-space to control the start_time a process gets assigned.
--- kernel/fork.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
kernel/fork.c +11 -2
@@ -1672,8 +1672,6 @@ static __latent_entropy struct task_struposix_cpu_timers_init (p); - p->start_time =ktime_get_ns (); - p->real_start_time =ktime_get_boot_ns (); p->io_context =NULL ; p->audit_context =NULL ;cgroup_fork (p);
@@ -1838,6 +1836,17 @@ static __latent_entropy struct task_stru goto bad_fork_free_pid;/* +* From this point on we must avoid any synchronous user-space +* communication until we take the tasklist-lock. In particular, we do +* not want user-space to be able to predict the process start-time by +* stalling fork(2) after we recorded the start_time but before it is +* visible to the system. +*/ + + p->start_time =ktime_get_ns (); + p->real_start_time =ktime_get_boot_ns (); + +/* * Make it visible to the rest of the system, but dont wake it up yet. * Need tasklist lock for parent etc handling! */
Greg Kroah-Hartman
maintainerPATCH 56/105 scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ewan D. Milne <[email protected]>
commit 4e87eb2f46ea547d12a276b2e696ab934d16cfb6 upstream.
Certain older adapters such as the OneConnect OCe10100 may not have a valid wqpcnt value. In this case, do not set queue->page_count to 0 in lpfc_sli4_queue_alloc() as this will prevent the driver from initializing.
--- drivers/scsi/lpfc/lpfc_sli.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_sli.c +2 -1
@@ -13941,7 +13941,8 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *p hw_page_size))/hw_page_size;/* If needed, Adjust page count to match the max the adapter supports */ -if (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt) +if (phba->sli4_hba.pc_sli4_params.wqpcnt && + (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt)) queue->page_count = phba->sli4_hba.pc_sli4_params.wqpcnt;INIT_LIST_HEAD (&queue->list);
Greg Kroah-Hartman
maintainerPATCH 55/105 scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Maier <[email protected]>
commit 60a161b7e5b2a252ff0d4c622266a7d8da1120ce upstream.
Suppose adapter (open) recovery is between opened QDIO queues and before (the end of) initial posting of status read buffers (SRBs). This time window can be seconds long due to FSF_PROT_HOST_CONNECTION_INITIALIZING causing by design looping with exponential increase sleeps in the function performing exchange config data during recovery [zfcp_erp_adapter_strat_fsf_xconf()]. Recovery triggered by local link up.
Suppose an event occurs for which the FCP channel would send an unsolicited notification to zfcp by means of a previously posted SRB. We saw it with local cable pull (link down) in multi-initiator zoning with multiple NPIV-enabled subchannels of the same shared FCP channel.
As soon as zfcp_erp_adapter_strategy_open_fsf() starts posting the initial status read buffers from within the adapter's ERP thread, the channel does send an unsolicited notification.
Since v2.6.27 commit d26ab06ede83 ("[SCSI] zfcp: receiving an unsolicted status can lead to I/O stall"), zfcp_fsf_status_read_handler() schedules adapter->stat_work to re-fill the just consumed SRB from a work item.
Now the ERP thread and the work item post SRBs in parallel. Both contexts call the helper function zfcp_status_read_refill(). The tracking of missing (to be posted / re-filled) SRBs is not thread-safe due to separate atomic_read() and atomic_dec(), in order to depend on posting success. Hence, both contexts can see atomic_read(&adapter->stat_miss) == 1. One of the two contexts posts one too many SRB. Zfcp gets QDIO_ERROR_SLSB_STATE on the output queue (trace tag "qdireq1") leading to zfcp_erp_adapter_shutdown() in zfcp_qdio_handler_error().
An obvious and seemingly clean fix would be to schedule stat_work from the ERP thread and wait for it to finish. This would serialize all SRB re-fills. However, we already have another work item wait on the ERP
thread: adapter->scan_work runs zfcp_fc_scan_ports() which calls zfcp_fc_eval_gpn_ft(). The latter calls zfcp_erp_wait() to wait for all the open port recoveries during zfcp auto port scan, but in fact it waits for any pending recovery including an adapter recovery. This approach leads to a deadlock. [see also v3.19 commit 18f87a67e6d6 ("zfcp: auto port scan resiliency"); v2.6.37 commit d3e1088d6873
("[SCSI] zfcp: No ERP escalation on gpn_ft eval");
v2.6.28 commit fca55b6fb587
("[SCSI] zfcp: fix deadlock between wq triggered port scan and ERP") fixing v2.6.27 commit c57a39a45a76
("[SCSI] zfcp: wait until adapter is finished with ERP during auto-port"); v2.6.27 commit cc8c282963bd
("[SCSI] zfcp: Automatically attach remote ports")]
Instead make the accounting of missing SRBs atomic for parallel execution in both the ERP thread and adapter->stat_work.
--- drivers/s390/scsi/zfcp_aux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/scsi/zfcp_aux.c +3 -3
@@ -274,16 +274,16 @@ static void zfcp_free_low_mem_buffers(st*/ int zfcp_status_read_refill (struct zfcp_adapter *adapter) { -while (atomic_read (&adapter->stat_miss) >0 ) +while (atomic_add_unless (&adapter->stat_miss,-1 ,0 ))if (zfcp_fsf_status_read (adapter->qdio)) { +atomic_inc (&adapter->stat_miss);/* undo add -1 */ if (atomic_read (&adapter->stat_miss) >= adapter->stat_read_buf_num) {zfcp_erp_adapter_reopen (adapter,0 ,"axsref1" );return 1 ; }break ; - }else -atomic_dec (&adapter->stat_miss); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 53/105 qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d667044f49513d55fcfefe4fa8f8d96091782901 ]
This patch fixes qmap header retrieval when modem is configured for dl data aggregation.
--- drivers/net/usb/qmi_wwan.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/net/usb/qmi_wwan.c +8 -7
@@ -151,17 +151,18 @@ static bool qmimux_has_slaves(struct usbnet *dev)static int qmimux_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { -unsigned int len, offset =sizeof (struct qmimux_hdr ); +unsigned int len, offset =0 ;struct qmimux_hdr *hdr;struct net_device *net;struct sk_buff *skbn; +u8 qmimux_hdr_sz =sizeof (*hdr); -while (offset < skb->len) { - hdr = (struct qmimux_hdr *)skb->data; +while (offset + qmimux_hdr_sz < skb->len) { + hdr = (struct qmimux_hdr *)(skb->data + offset); len =be16_to_cpu (hdr->pkt_len);/* drop the packet, bogus length */ -if (offset + len > skb->len) +if (offset + len + qmimux_hdr_sz > skb->len)return 0 ;/* control packet, we do not know what to do */
@@ -176,7 +177,7 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb)return 0 ; skbn->dev = net; -switch (skb->data[offset] &0xf0 ) { +switch (skb->data[offset + qmimux_hdr_sz] &0xf0 ) {case 0x40 : skbn->protocol =htons (ETH_P_IP );break ;
@@ -188,12 +189,12 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb) goto skip; } -skb_put_data (skbn, skb->data + offset, len); +skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, len);if (netif_rx (skbn) !=NET_RX_SUCCESS )return 0 ; skip: - offset += len +sizeof (struct qmimux_hdr ); + offset += len + qmimux_hdr_sz; }return 1 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 51/105 Input: synaptics - enable SMBus for HP EliteBook 840 G4
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7a71712293ba303aad928f580b89addb0be2892e ]
dmesg reports that "Your touchpad (PNP: SYN3052 SYN0100 SYN0002 PNP0f13) says it can support a different bus."
I've tested the offered psmouse.synaptics_intertouch=1 with 4.18.x and 4.19.x and it seems to work well. No problems seen with suspend/resume.
Also, it appears that RMI/SMBus mode is actually required for 3-4 finger multitouch gestures to work -- otherwise they are not reported at all.
Information from dmesg in both modes:
psmouse serio3: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1,
caps: 0xf00123/0x840300/0x2e800/0x0, board id: 3139, fw id: 2000742
psmouse serio3: synaptics: Trying to set up SMBus access rmi4_smbus 6-002c: registering SMbus-connected sensor rmi4_f01 rmi4-00.fn01: found RMI device,
manufacturer: Synaptics, product: TM3139-001, fw id: 2000742
--- drivers/input/mouse/synaptics.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/mouse/synaptics.c +1 -0
@@ -179,6 +179,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f" ,/* T450s */ +"SYN3052" ,/* HP EliteBook 840 G4 */ "SYN3221" ,/* HP 15-ay000 */ NULL };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 48/105 kbuild: fix false positive warning/error about missing libelf
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ef7cfd00b2caf6edeb7f169682b64be2d0a798cf ]
For the same reason as commit 25896d073d8a ("x86/build: Fix compiler support check for CONFIG_RETPOLINE"), you cannot put this $(error ...) into the parse stage of the top Makefile.
Perhaps I'd propose a more sophisticated solution later, but this is the best I can do for now.
--- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
Makefile +8 -5
@@ -954,11 +954,6 @@ ifdef CONFIG_STACK_VALIDATION ifeq ($(has_libelf),1) objtool_target := tools/objtool FORCE else - ifdef CONFIG_UNWINDER_ORC - $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - else - $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - endif SKIP_STACK_VALIDATION := 1 export SKIP_STACK_VALIDATION endif
@@ -1102,6 +1097,14 @@ uapi-asm-generic: PHONY += prepare-objtool prepare-objtool: $(objtool_target) +ifeq ($(SKIP_STACK_VALIDATION),1) +ifdef CONFIG_UNWINDER_ORC + @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 + @false +else + @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 +endif +endif # Check for CONFIG flags that require compiler support. Abort the build # after .config has been processed, but before the kernel build starts.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 40/105 net: hns: Fix ping failed when use net bridge and send multicast
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6adafc356e20189193b38ee6b9af7743078bf6b4 ]
Create a net bridge, add eth and vnet to the bridge. The vnet is used by a virtual machine. When ping the virtual machine from the outside host and the virtual machine send multicast at the same time, the ping package will lost.
The multicast package send to the eth, eth will send it to the bridge too, and the bridge learn the mac of eth. When outside host ping the virtual mechine, it will match the promisc entry of the eth which is not expected, and the bridge send it to eth not to vnet, cause ping lost.
So this patch change promisc tcam entry position to the END of 512 tcam entries, which indicate lower priority. And separate one promisc entry to
two: mc & uc, to avoid package match the wrong tcam entry.
--- .../ethernet/hisilicon/hns/hns_dsaf_main.c | 257 +++++++++++++++--- 1 file changed, 216 insertions(+), 41 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +216 -41
@@ -934,6 +934,62 @@ static void hns_dsaf_tcam_mc_cfg(spin_unlock_bh (&dsaf_dev->tcam_lock); } +/** +* hns_dsaf_tcam_uc_cfg_vague - INT +* @dsaf_dev: dsa fabric device struct pointer +* @address, +* @ptbl_tcam_data, +*/ +static void hns_dsaf_tcam_uc_cfg_vague (struct dsaf_device *dsaf_dev, +u32 address, +struct dsaf_tbl_tcam_data *tcam_data, +struct dsaf_tbl_tcam_data *tcam_mask, +struct dsaf_tbl_tcam_ucast_cfg *tcam_uc) +{ +spin_lock_bh (&dsaf_dev->tcam_lock); +hns_dsaf_tbl_tcam_addr_cfg (dsaf_dev, address); +hns_dsaf_tbl_tcam_data_cfg (dsaf_dev, tcam_data); +hns_dsaf_tbl_tcam_ucast_cfg (dsaf_dev, tcam_uc); +hns_dsaf_tbl_tcam_match_cfg (dsaf_dev, tcam_mask); +hns_dsaf_tbl_tcam_data_ucast_pul (dsaf_dev); + +/*Restore Match Data*/ + tcam_mask->tbl_tcam_data_high =0xffffffff ; + tcam_mask->tbl_tcam_data_low =0xffffffff ; +hns_dsaf_tbl_tcam_match_cfg (dsaf_dev, tcam_mask); + +spin_unlock_bh (&dsaf_dev->tcam_lock); +} + +/** +* hns_dsaf_tcam_mc_cfg_vague - INT +* @dsaf_dev: dsa fabric device struct pointer +* @address, +* @ptbl_tcam_data, +* @ptbl_tcam_mask +* @ptbl_tcam_mcast +*/ +static void hns_dsaf_tcam_mc_cfg_vague (struct dsaf_device *dsaf_dev, +u32 address, +struct dsaf_tbl_tcam_data *tcam_data, +struct dsaf_tbl_tcam_data *tcam_mask, +struct dsaf_tbl_tcam_mcast_cfg *tcam_mc) +{ +spin_lock_bh (&dsaf_dev->tcam_lock); +hns_dsaf_tbl_tcam_addr_cfg (dsaf_dev, address); +hns_dsaf_tbl_tcam_data_cfg (dsaf_dev, tcam_data); +hns_dsaf_tbl_tcam_mcast_cfg (dsaf_dev, tcam_mc); +hns_dsaf_tbl_tcam_match_cfg (dsaf_dev, tcam_mask); +hns_dsaf_tbl_tcam_data_mcast_pul (dsaf_dev); + +/*Restore Match Data*/ + tcam_mask->tbl_tcam_data_high =0xffffffff ; + tcam_mask->tbl_tcam_data_low =0xffffffff ; +hns_dsaf_tbl_tcam_match_cfg (dsaf_dev, tcam_mask); + +spin_unlock_bh (&dsaf_dev->tcam_lock); +} +/** * hns_dsaf_tcam_mc_invld - INT * @dsaf_id: dsa fabric id
@@ -1491,6 +1547,27 @@ static u16 hns_dsaf_find_empty_mac_entry(struct dsaf_device *dsaf_dev)return DSAF_INVALID_ENTRY_IDX ; } +/** +* hns_dsaf_find_empty_mac_entry_reverse +* search dsa fabric soft empty-entry from the end +* @dsaf_dev: dsa fabric device struct pointer +*/ +static u16 hns_dsaf_find_empty_mac_entry_reverse (struct dsaf_device *dsaf_dev) +{ +struct dsaf_drv_priv *priv =hns_dsaf_dev_priv (dsaf_dev); +struct dsaf_drv_soft_mac_tbl *soft_mac_entry; +int i; + + soft_mac_entry = priv->soft_mac_tbl + (DSAF_TCAM_SUM -1 ); +for (i = (DSAF_TCAM_SUM -1 ); i >0 ; i--) { +/* search all entry from end to start.*/ +if (soft_mac_entry->index ==DSAF_INVALID_ENTRY_IDX ) +return i; + soft_mac_entry--; + } +return DSAF_INVALID_ENTRY_IDX ; +} +/** * hns_dsaf_set_mac_key - set mac key * @dsaf_dev: dsa fabric device struct pointer
@@ -2666,58 +2743,156 @@ int hns_dsaf_get_regs_count(void)return DSAF_DUMP_REGS_NUM ; } -/* Reserve the last TCAM entry for promisc support */ -#define dsaf_promisc_tcam_entry (port) \ - (DSAF_TCAM_SUM - DSAFV2_MAC_FUZZY_TCAM_NUM + (port)) -void hns_dsaf_set_promisc_tcam (struct dsaf_device *dsaf_dev, -u32 port,bool enable) +static void set_promisc_tcam_enable (struct dsaf_device *dsaf_dev,u32 port) { +struct dsaf_tbl_tcam_ucast_cfg tbl_tcam_ucast = {0 ,1 ,0 ,0 ,0x80 }; +struct dsaf_tbl_tcam_data tbl_tcam_data_mc = {0x01000000 , port}; +struct dsaf_tbl_tcam_data tbl_tcam_mask_uc = {0x01000000 ,0xf }; +struct dsaf_tbl_tcam_mcast_cfg tbl_tcam_mcast = {0 ,0 , {0 } };struct dsaf_drv_priv *priv =hns_dsaf_dev_priv (dsaf_dev); -struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl; -u16 entry_index; -struct dsaf_drv_tbl_tcam_key tbl_tcam_data, tbl_tcam_mask; -struct dsaf_tbl_tcam_mcast_cfg mac_data = {0 }; +struct dsaf_tbl_tcam_data tbl_tcam_data_uc = {0 , port}; +struct dsaf_drv_mac_single_dest_entry mask_entry; +struct dsaf_drv_tbl_tcam_key temp_key, mask_key; +struct dsaf_drv_soft_mac_tbl *soft_mac_entry; +u16 entry_index =DSAF_INVALID_ENTRY_IDX ; +struct dsaf_drv_tbl_tcam_key mac_key; +struct hns_mac_cb *mac_cb; +u8 addr[ETH_ALEN ] = {0 }; +u8 port_num; +u16 mskid; -if ((AE_IS_VER1 (dsaf_dev->dsaf_ver)) ||HNS_DSAF_IS_DEBUG (dsaf_dev)) +/* promisc use vague table match with vlanid = 0 & macaddr = 0 */ +hns_dsaf_set_mac_key (dsaf_dev, &mac_key,0x00 , port, addr); + entry_index =hns_dsaf_find_soft_mac_entry (dsaf_dev, &mac_key); +if (entry_index !=DSAF_INVALID_ENTRY_IDX )return ; -/* find the tcam entry index for promisc */ - entry_index =dsaf_promisc_tcam_entry (port); - -memset (&tbl_tcam_data,0 ,sizeof (tbl_tcam_data)); -memset (&tbl_tcam_mask,0 ,sizeof (tbl_tcam_mask)); - -/* config key mask */ -if (enable) { -dsaf_set_field (tbl_tcam_data.low.bits.port_vlan, -DSAF_TBL_TCAM_KEY_PORT_M , -DSAF_TBL_TCAM_KEY_PORT_S , port); -dsaf_set_field (tbl_tcam_mask.low.bits.port_vlan, -DSAF_TBL_TCAM_KEY_PORT_M , -DSAF_TBL_TCAM_KEY_PORT_S ,0xf ); - -/* SUB_QID */ -dsaf_set_bit (mac_data.tbl_mcast_port_msk[0 ], -DSAF_SERVICE_NW_NUM , true); - mac_data.tbl_mcast_item_vld = true;/* item_vld bit */ +/* put promisc tcam entry in the end. */ +/* 1. set promisc unicast vague tcam entry. */ + entry_index =hns_dsaf_find_empty_mac_entry_reverse (dsaf_dev); +if (entry_index ==DSAF_INVALID_ENTRY_IDX ) { +dev_err (dsaf_dev->dev, +"enable uc promisc failed (port:%#x)\n" , + port); +return ; + } + + mac_cb = dsaf_dev->mac_cb[port]; + (void )hns_mac_get_inner_port_num (mac_cb,0 , &port_num); + tbl_tcam_ucast.tbl_ucast_out_port = port_num; + +/* config uc vague table */ +hns_dsaf_tcam_uc_cfg_vague (dsaf_dev, entry_index, &tbl_tcam_data_uc, + &tbl_tcam_mask_uc, &tbl_tcam_ucast); + +/* update software entry */ + soft_mac_entry = priv->soft_mac_tbl; + soft_mac_entry += entry_index; + soft_mac_entry->index = entry_index; + soft_mac_entry->tcam_key.high.val = mac_key.high.val; + soft_mac_entry->tcam_key.low.val = mac_key.low.val; +/* step back to the START for mc. */ + soft_mac_entry = priv->soft_mac_tbl; + +/* 2. set promisc multicast vague tcam entry. */ + entry_index =hns_dsaf_find_empty_mac_entry_reverse (dsaf_dev); +if (entry_index ==DSAF_INVALID_ENTRY_IDX ) { +dev_err (dsaf_dev->dev, +"enable mc promisc failed (port:%#x)\n" , + port); +return ; + } + +memset (&mask_entry,0x0 ,sizeof (mask_entry)); +memset (&mask_key,0x0 ,sizeof (mask_key)); +memset (&temp_key,0x0 ,sizeof (temp_key)); + mask_entry.addr[0 ] =0x01 ; +hns_dsaf_set_mac_key (dsaf_dev, &mask_key, mask_entry.in_vlan_id, + port, mask_entry.addr); + tbl_tcam_mcast.tbl_mcast_item_vld =1 ; + tbl_tcam_mcast.tbl_mcast_old_en =0 ; + +if (port <DSAF_SERVICE_NW_NUM ) { + mskid = port; + }else if (port >=DSAF_BASE_INNER_PORT_NUM ) { + mskid = port -DSAF_BASE_INNER_PORT_NUM +DSAF_SERVICE_NW_NUM ; }else { - mac_data.tbl_mcast_item_vld = false;/* item_vld bit */ +dev_err (dsaf_dev->dev,"%s,pnum(%d)error,key(%#x:%#x)\n" , + dsaf_dev->ae_dev.name, port, + mask_key.high.val, mask_key.low.val); +return ; } -dev_dbg (dsaf_dev->dev, -"set_promisc_entry, %s Mac key(%#x:%#x) entry_index%d\n" , - dsaf_dev->ae_dev.name, tbl_tcam_data.high.val, - tbl_tcam_data.low.val, entry_index); +dsaf_set_bit (tbl_tcam_mcast.tbl_mcast_port_msk[mskid /32 ], + mskid %32 ,1 ); +memcpy (&temp_key, &mask_key,sizeof (mask_key)); +hns_dsaf_tcam_mc_cfg_vague (dsaf_dev, entry_index, &tbl_tcam_data_mc, + (struct dsaf_tbl_tcam_data *)(&mask_key), + &tbl_tcam_mcast); -/* config promisc entry with mask */ -hns_dsaf_tcam_mc_cfg (dsaf_dev, entry_index, - (struct dsaf_tbl_tcam_data *)&tbl_tcam_data, - (struct dsaf_tbl_tcam_data *)&tbl_tcam_mask, - &mac_data); +/* update software entry */ + soft_mac_entry += entry_index; + soft_mac_entry->index = entry_index; + soft_mac_entry->tcam_key.high.val = temp_key.high.val; + soft_mac_entry->tcam_key.low.val = temp_key.low.val; +} -/* config software entry */ +static void set_promisc_tcam_disable (struct dsaf_device *dsaf_dev,u32 port) +{ +struct dsaf_tbl_tcam_data tbl_tcam_data_mc = {0x01000000 , port}; +struct dsaf_tbl_tcam_ucast_cfg tbl_tcam_ucast = {0 ,0 ,0 ,0 ,0 }; +struct dsaf_tbl_tcam_mcast_cfg tbl_tcam_mcast = {0 ,0 , {0 } }; +struct dsaf_drv_priv *priv =hns_dsaf_dev_priv (dsaf_dev); +struct dsaf_tbl_tcam_data tbl_tcam_data_uc = {0 ,0 }; +struct dsaf_tbl_tcam_data tbl_tcam_mask = {0 ,0 }; +struct dsaf_drv_soft_mac_tbl *soft_mac_entry; +u16 entry_index =DSAF_INVALID_ENTRY_IDX ; +struct dsaf_drv_tbl_tcam_key mac_key; +u8 addr[ETH_ALEN ] = {0 }; + +/* 1. delete uc vague tcam entry. */ +/* promisc use vague table match with vlanid = 0 & macaddr = 0 */ +hns_dsaf_set_mac_key (dsaf_dev, &mac_key,0x00 , port, addr); + entry_index =hns_dsaf_find_soft_mac_entry (dsaf_dev, &mac_key); + +if (entry_index ==DSAF_INVALID_ENTRY_IDX ) +return ; + +/* config uc vague table */ +hns_dsaf_tcam_uc_cfg_vague (dsaf_dev, entry_index, &tbl_tcam_data_uc, + &tbl_tcam_mask, &tbl_tcam_ucast); +/* update soft management table. */ + soft_mac_entry = priv->soft_mac_tbl; soft_mac_entry += entry_index; - soft_mac_entry->index = enable ? entry_index :DSAF_INVALID_ENTRY_IDX ; + soft_mac_entry->index =DSAF_INVALID_ENTRY_IDX ; +/* step back to the START for mc. */ + soft_mac_entry = priv->soft_mac_tbl; + +/* 2. delete mc vague tcam entry. */ + addr[0 ] =0x01 ; +memset (&mac_key,0x0 ,sizeof (mac_key)); +hns_dsaf_set_mac_key (dsaf_dev, &mac_key,0x00 , port, addr); + entry_index =hns_dsaf_find_soft_mac_entry (dsaf_dev, &mac_key); + +if (entry_index ==DSAF_INVALID_ENTRY_IDX ) +return ; + +/* config mc vague table */ +hns_dsaf_tcam_mc_cfg_vague (dsaf_dev, entry_index, &tbl_tcam_data_mc, + &tbl_tcam_mask, &tbl_tcam_mcast); +/* update soft management table. */ + soft_mac_entry += entry_index; + soft_mac_entry->index =DSAF_INVALID_ENTRY_IDX ; +} + +/* Reserve the last TCAM entry for promisc support */ +void hns_dsaf_set_promisc_tcam (struct dsaf_device *dsaf_dev, +u32 port,bool enable) +{ +if (enable) +set_promisc_tcam_enable (dsaf_dev, port); +else +set_promisc_tcam_disable (dsaf_dev, port); }int hns_dsaf_wait_pkt_clean (struct dsaf_device *dsaf_dev,int port)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 41/105 SUNRPC: Fix a race with XPRT_CONNECTING
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit cf76785d30712d90185455e752337acdb53d2a5d ]
Ensure that we clear XPRT_CONNECTING before releasing the XPRT_LOCK so that we don't have races between the (asynchronous) socket setup code and tasks in xprt_connect().
--- net/sunrpc/xprtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/xprtsock.c +2 -2
@@ -2223,8 +2223,8 @@ static void xs_udp_setup_socket(struct work_struct *work)trace_rpc_socket_connect (xprt, sock,0 ); status =0 ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
@@ -2451,8 +2451,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) } status = -EAGAIN ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 38/105 net: hns: Fix ntuple-filters status error.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7e74a19ca522aec7c2be201a7ae1d1d57ded409b ]
The ntuple-filters features is forced on by chip. But it shows "ntuple-filters: off [fixed]" when use ethtool. This patch make it correct with "ntuple-filters: on [fixed]".
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -2486,7 +2486,7 @@ static int hns_nic_dev_probe(struct platform_device *pdev) ndev->min_mtu =MAC_MIN_MTU ;switch (priv->enet_ver) {case AE_VERSION_2 : - ndev->features |=NETIF_F_TSO |NETIF_F_TSO6 ; + ndev->features |=NETIF_F_TSO |NETIF_F_TSO6 |NETIF_F_NTUPLE ; ndev->hw_features |=NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM |NETIF_F_RXCSUM |NETIF_F_SG |NETIF_F_GSO |NETIF_F_GRO |NETIF_F_TSO |NETIF_F_TSO6 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 35/105 net: hns: Clean rx fbd when ae stopped.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 31f6b61d810654fb3ef43f4d8afda0f44b142fad ]
If there are packets in hardware when changing the speed or duplex, it may cause hardware hang up.
This patch adds the code to wait rx fbd clean up when ae stopped.
--- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +3 -0
@@ -379,6 +379,9 @@ void hns_ae_stop(struct hnae_handle *handle)hns_ae_ring_enable_all (handle,0 ); +/* clean rx fbd. */ +hns_rcb_wait_fbd_clean (handle->qs, handle->q_num,RCB_INT_FLAG_RX ); + (void )hns_mac_vm_config_bc_en (mac_cb,0 , false); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 34/105 net: hns: Fixed bug that netdev was opened twice
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5778b13b64eca5549d242686f2f91a2c80c8fa40 ]
After resetting dsaf to try to repair chip error such as ecc error, the net device will be open if net interface is up. But at this time if there is the users set the net device up with the command ifconfig, the net device will be opened twice consecutively.
Function napi_enable was called when open device. And Kernel panic will be occurred if it was called twice consecutively. Such as follow:
static inline void napi_enable(struct napi_struct *n)
{
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
smp_mb__before_clear_bit();
clear_bit(NAPI_STATE_SCHED, &n->state);
}[37255.571996] Kernel panic - not syncing: BUG! [37255.595234] Call trace: [37255.597694] [<ffff80000008ab48>] dump_backtrace+0x0/0x1a0 [37255.603114] [<ffff80000008ad08>] show_stack+0x20/0x28 [37255.608187] [<ffff8000009c4944>] dump_stack+0x98/0xb8 [37255.613258] [<ffff8000009c149c>] panic+0x10c/0x26c [37255.618070] [<ffff80000070f134>] hns_nic_net_up+0x30c/0x4e0 [37255.623664] [<ffff80000070f39c>] hns_nic_net_open+0x94/0x12c [37255.629346] [<ffff80000084be78>] __dev_open+0xf4/0x168 [37255.634504] [<ffff80000084c1ac>] __dev_change_flags+0x98/0x15c [37255.640359] [<ffff80000084c29c>] dev_change_flags+0x2c/0x68 [37255.769580] [<ffff8000008dc400>] devinet_ioctl+0x650/0x704 [37255.775086] [<ffff8000008ddc38>] inet_ioctl+0x98/0xb4 [37255.780159] [<ffff800000827b7c>] sock_do_ioctl+0x44/0x84 [37255.785490] [<ffff800000828e04>] sock_ioctl+0x248/0x30c [37255.790737] [<ffff80000026dc6c>] do_vfs_ioctl+0x480/0x618 [37255.796156] [<ffff80000026de94>] SyS_ioctl+0x90/0xa4 [37255.801139] SMP: stopping secondary CPUs [37255.805079] kbox: catch panic event. [37255.809586] collected_len = 128928, LOG_BUF_LEN_LOCAL = 131072 [37255.816103] flush cache 0xffff80003f000000 size 0x800000 [37255.822192] flush cache 0xffff80003f000000 size 0x800000 [37255.828289] flush cache 0xffff80003f000000 size 0x800000 [37255.834378] kbox: no notify die func register. no need to notify [37255.840413] ---[ end Kernel panic - not syncing: BUG!
This patchset fix this bug according to the flag NIC_STATE_DOWN.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +3 -0
@@ -1433,6 +1433,9 @@ static int hns_nic_net_up(struct net_device *ndev)int i, j;int ret; +if (!test_bit (NIC_STATE_DOWN , &priv->state)) +return 0 ; + ret =hns_nic_init_irq (priv);if (ret !=0 ) {netdev_err (ndev,"hns init irq failed! ret=%d\n" , ret);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 23/105 bnx2x: Clear fip MAC when fcoe offload support is disabled
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bbf666c1af916ed74795493c564df6fad462cc80 ]
On some customer setups it was observed that shmem contains a non-zero fip MAC for 57711 which would lead to enabling of SW FCoE.
Add a software workaround to clear the bad fip mac address if no FCoE connections are supported.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +3 -1
@@ -11733,8 +11733,10 @@ static void bnx2x_get_fcoe_info(struct bnx2x *bp)* If maximum allowed number of connections is zero - * disable the feature. */ -if (!bp->cnic_eth_dev.max_fcoe_conn) +if (!bp->cnic_eth_dev.max_fcoe_conn) { bp->flags |=NO_FCOE_FLAG ; +eth_zero_addr (bp->fip_mac); + } }static void bnx2x_get_cnic_info (struct bnx2x *bp)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 7/105 Input: restore EV_ABS ABS_RESERVED
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c201e3808e0e4be9b98d192802085a9f491bd80c ]
ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
--- include/uapi/linux/input-event-codes.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/uapi/linux/input-event-codes.h +9 -0
@@ -742,6 +742,15 @@#define ABS_MISC 0x28 +/* +* 0x2e is reserved and should not be used in input drivers. +* It was used by HID as ABS_MISC+6 and userspace needs to detect if +* the next ABS_* event is correct or is just ABS_MISC + n. +* We define here ABS_RESERVED so userspace can rely on it and detect +* the situation described above. +*/ +#define ABS_RESERVED 0x2e +#define ABS_MT_SLOT 0x2f/* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31/* Minor axis (omit if circular) */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 6/105 ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f15096f12a4e9340168df5fdd9201aa8ed60d59e ]
According to bindings/regulator/fixed-regulator.txt the 'clocks' and 'clock-names' properties are not valid ones.
In order to turn on the Wifi clock the correct location for describing the CLKO2 clock is via a mmc-pwrseq handle, so do it accordingly.
--- arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7d-nitrogen7.dts +7 -2
@@ -117,13 +117,17 @@ compatible = "regulator-fixed"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; - clock-names = "slow"; regulator-name = "reg_wlan"; startup-delay-us = <70000>; gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; + clock-names = "ext_clock"; + }; }; &adc1 {
@@ -430,6 +434,7 @@ bus-width = <4>; non-removable; vmmc-supply = <®_wlan>; + mmc-pwrseq = <&usdhc2_pwrseq>; cap-power-off-card; keep-power-in-suspend; status = "okay";
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 4/105 HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4050207485e47e00353e87f2fe2166083e282688 ]
The 258a:6a88 keyboard-dock shipped with the Prowise PT301 tablet is likely another ITE based design. The controller die is directly bonded to the PCB with a blob of black glue on top so there are no markings and the 258a vendor-id used is unknown anywhere. But the keyboard has the exact same hotkeys mapped to Fn+F1 - F10 as the other ITE8595 keyboard I have *and* it has the same quirky behavior wrt the rfkill hotkey.
Either way as said this keyboard has the same quirk for its rfkill / airplane mode hotkey as the ITE 8595 chip, it only sends a single release event when pressed and released, it never sends a press event.
This commit adds the 258a:6a88 USB id to the hid-ite id-table, fixing the rfkill key not working on this keyboard.
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-ite.c | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -17,6 +17,9 @@#ifndef HID_IDS_H_FILE #define HID_IDS_H_FILE +#define USB_VENDOR_ID_258A 0x258a +#define USB_DEVICE_ID_258A_6A88 0x6a88 +#define USB_VENDOR_ID_3M 0x0596#define USB_DEVICE_ID_3M1968 0x0500#define USB_DEVICE_ID_3M2256 0x0502
drivers/hid/hid-ite.c +1 -0
@@ -42,6 +42,7 @@ static int ite_event(struct hid_device *hdev, struct hid_field *field,static const struct hid_device_id ite_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_ITE ,USB_DEVICE_ID_ITE8595 ) }, + {HID_USB_DEVICE (USB_VENDOR_ID_258A ,USB_DEVICE_ID_258A_6A88 ) }, { } };MODULE_DEVICE_TABLE (hid, ite_devices);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 3/105 powerpc/mm: Fix linux page tables build with some configs
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 462951cd32e1496dc64b00051dfb777efc8ae5d8 ]
For some configs the build fails with:
arch/powerpc/mm/dump_linuxpagetables.c: In function 'populate_markers':
arch/powerpc/mm/dump_linuxpagetables.c:306:39: error: 'PKMAP_BASE' undeclared (first use in this function) arch/powerpc/mm/dump_linuxpagetables.c:314:50: error: 'LAST_PKMAP' undeclared (first use in this function)
These come from highmem.h, including that fixes the build.
--- arch/powerpc/mm/dump_linuxpagetables.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/mm/dump_linuxpagetables.c +1 -0
@@ -19,6 +19,7 @@#include <linux/hugetlb.h> #include <linux/io.h> #include <linux/mm.h> +#include <linux/highmem.h> #include <linux/sched.h> #include <linux/seq_file.h> #include <asm/fixmap.h>
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 20/105 i40e: fix mac filter delete when setting mac address
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 158daed16efb1170694e420ae06ba8ba954d82e5 ]
A previous commit moved the ether_addr_copy() in i40e_set_mac() before the mac filter del/add to avoid a race. However it wasn't taken into account that this alters the mac address being handed to i40e_del_mac_filter().
Also changed i40e_add_mac_filter() to operate on netdev->dev_addr, hopefully that makes the code easier to read.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -7
@@ -1554,17 +1554,17 @@ static int i40e_set_mac(struct net_device *netdev, void *p)netdev_info (netdev,"set new mac address %pM\n" , addr->sa_data);/* Copy the address first, so that we avoid a possible race with -* .set_rx_mode(). If we copy after changing the address in the filter -* list, we might open ourselves to a narrow race window where -* .set_rx_mode could delete our dev_addr filter and prevent traffic -* from passing. +* .set_rx_mode(). +* - Remove old address from MAC filter +* - Copy new address +* - Add new address to MAC filter */ -ether_addr_copy (netdev->dev_addr, addr->sa_data); -spin_lock_bh (&vsi->mac_filter_hash_lock);i40e_del_mac_filter (vsi, netdev->dev_addr); -i40e_add_mac_filter (vsi, addr->sa_data); +ether_addr_copy (netdev->dev_addr, addr->sa_data); +i40e_add_mac_filter (vsi, netdev->dev_addr);spin_unlock_bh (&vsi->mac_filter_hash_lock); +if (vsi->type ==I40E_VSI_MAIN ) {i40e_status ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 16/105 ibmvnic: Fix non-atomic memory allocation in IRQ context
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1d1bbc37f89b0559c9e913682f2489d89cfde6b8 ]
ibmvnic_reset allocated new reset work item objects in a non-atomic context. This can be called from a tasklet, generating the output below. Allocate work items with the GFP_ATOMIC flag instead.
BUG: sleeping function called from invalid context at mm/slab.h:421 in_atomic(): 1, irqs_disabled(): 1, pid: 93, name: kworker/0:2 INFO: lockdep is turned off. irq event stamp: 66049 hardirqs last enabled at (66048): [<c000000000122468>] tasklet_action_common.isra.12+0x78/0x1c0 hardirqs last disabled at (66049): [<c000000000befce8>] _raw_spin_lock_irqsave+0x48/0xf0 softirqs last enabled at (66044): [<c000000000a8ac78>] dev_deactivate_queue.constprop.28+0xc8/0x160 softirqs last disabled at (66045): [<c0000000000306e0>] call_do_softirq+0x14/0x24 CPU: 0 PID: 93 Comm: kworker/0:2 Kdump: loaded Not tainted 4.20.0-rc6-00001-g1b50a8f03706 #7 Workqueue: events linkwatch_event Call Trace: [c0000003fffe7ae0] [c000000000bc83e4] dump_stack+0xe8/0x164 (unreliable) [c0000003fffe7b30] [c00000000015ba0c] ___might_sleep+0x2dc/0x320 [c0000003fffe7bb0] [c000000000391514] kmem_cache_alloc_trace+0x3e4/0x440 [c0000003fffe7c30] [d000000005b2309c] ibmvnic_reset+0x16c/0x360 [ibmvnic] [c0000003fffe7cc0] [d000000005b29834] ibmvnic_tasklet+0x1054/0x2010 [ibmvnic] [c0000003fffe7e00] [c0000000001224c8] tasklet_action_common.isra.12+0xd8/0x1c0 [c0000003fffe7e60] [c000000000bf1238] __do_softirq+0x1a8/0x64c [c0000003fffe7f90] [c0000000000306e0] call_do_softirq+0x14/0x24 [c0000003f3967980] [c00000000001ba50] do_softirq_own_stack+0x60/0xb0 [c0000003f39679c0] [c0000000001218a8] do_softirq+0xa8/0x100 [c0000003f39679f0] [c000000000121a74] __local_bh_enable_ip+0x174/0x180 [c0000003f3967a60] [c000000000bf003c] _raw_spin_unlock_bh+0x5c/0x80 [c0000003f3967a90] [c000000000a8ac78] dev_deactivate_queue.constprop.28+0xc8/0x160 [c0000003f3967ad0] [c000000000a8c8b0] dev_deactivate_many+0xd0/0x520 [c0000003f3967b70] [c000000000a8cd40] dev_deactivate+0x40/0x60 [c0000003f3967ba0] [c000000000a5e0c4] linkwatch_do_dev+0x74/0xd0 [c0000003f3967bd0] [c000000000a5e694] __linkwatch_run_queue+0x1a4/0x1f0 [c0000003f3967c30] [c000000000a5e728] linkwatch_event+0x48/0x60 [c0000003f3967c50] [c0000000001444e8] process_one_work+0x238/0x710 [c0000003f3967d20] [c000000000144a48] worker_thread+0x88/0x4e0 [c0000003f3967db0] [c00000000014e3a8] kthread+0x178/0x1c0 [c0000003f3967e20] [c00000000000bfd0] ret_from_kernel_thread+0x5c/0x6c
--- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -1596,7 +1596,7 @@ static void ibmvnic_reset(struct ibmvnic_adapter *adapter, } } - rwi =kzalloc (sizeof (*rwi),GFP_KERNEL ); + rwi =kzalloc (sizeof (*rwi),GFP_ATOMIC );if (!rwi) {mutex_unlock (&adapter->rwi_lock);ibmvnic_close (netdev);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 17/105 ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8e41cae64b08fe2e86a9ffb88b295c6b4b3a3322 ]
gcc warning this:
drivers/net/ieee802154/ca8210.c:730:10: warning:
comparison is always false due to limited range of data type [-Wtype-limits]
'len' is u8 type, we get it from buf[1] adding 2, which can overflow. This patch change the type of 'len' to unsigned int to avoid this,also fix the gcc warning.
--- drivers/net/ieee802154/ca8210.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ieee802154/ca8210.c +2 -2
@@ -722,7 +722,7 @@ static void ca8210_mlme_reset_worker(struct work_struct *work)static void ca8210_rx_done (struct cas_control *cas_ctl) {u8 *buf; -u8 len; +unsigned int len;struct work_priv_container *mlme_reset_wpc;struct ca8210_priv *priv = cas_ctl->priv;
@@ -731,7 +731,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl)if (len >CA8210_SPI_BUF_SIZE ) {dev_crit ( &priv->spi->dev, -"Received packet len (%d) erroneously long\n" , +"Received packet len (%u) erroneously long\n" , len ); goto finish;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 11/105 xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0152eee6fc3b84298bb6a79961961734e8afa5b8 ]
Since commit 222d7dbd258d ("net: prevent dst uses after free") skb_dst_force() might clear the dst_entry attached to the skb. The xfrm code doesn't expect this to happen, so we crash with a NULL pointer dereference in this case.
Fix it by checking skb_dst(skb) for NULL after skb_dst_force() and drop the packet in case the dst_entry was cleared. We also move the skb_dst_force() to a codepath that is not used when the transformation was offloaded, because in this case we don't have a dst_entry attached to the skb.
The output and forwarding path was already fixed by commit 9e1437937807 ("xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry.")
--- net/xfrm/xfrm_input.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/xfrm/xfrm_input.c +6 -1
@@ -341,6 +341,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) skb->sp->xvec[skb->sp->len++] = x; +skb_dst_force (skb); +if (!skb_dst (skb)) { +XFRM_INC_STATS (net,LINUX_MIB_XFRMINERROR ); + goto drop; + } + lock:spin_lock (&x->lock);
@@ -380,7 +386,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)XFRM_SKB_CB (skb)->seq.input.low = seq;XFRM_SKB_CB (skb)->seq.input.hi = seq_hi; -skb_dst_force (skb);dev_hold (skb->dev);if (crypto_done)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 1/105 pinctrl: meson: fix pull enable register calculation
In reply to Greg Kroah-Hartman4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 614b1868a125a0ba24be08f3a7fa832ddcde6bca ]
We just changed the code so we apply bias disable on the correct register but forgot to align the register calculation. The result is that we apply the change on the correct register, but possibly at the incorrect offset/bit
This went undetected because offsets tends to be the same between REG_PULL and REG_PULLEN for a given pin the EE controller. This is not true for the AO controller.
--- drivers/pinctrl/meson/pinctrl-meson.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson.c +2 -1
@@ -272,7 +272,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,case PIN_CONFIG_BIAS_DISABLE :dev_dbg (pc->dev,"pin %u: disable bias\n" , pin); -meson_calc_reg_and_bit (bank, pin,REG_PULL , ®, &bit); +meson_calc_reg_and_bit (bank, pin,REG_PULLEN , ®, + &bit); ret =regmap_update_bits (pc->reg_pullen, reg,BIT (bit),0 );if (ret)
Signature · 1 line
2.19.1
Re: [PATCH 4.14 093/105] arm64: drop linker script hack to hide __efistub_ symbols
In reply to Greg Kroah-HartmanQuoted 5 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Ard Biesheuvel <[email protected]>
commit
dd6846d774693bfa27d7db4dae5ea67dfe373fa1upstream.Commit
1212f7a16af4("scripts/kallsyms: filter arm64's__efistub_symbols") updated the kallsyms code to filter out symbols with the__efistub_prefix explicitly, so we no longer require the hack in our linker script to emit them as absolute symbols.
!!!
Sorry, I think we should pick 1212f7a16af4 ("scripts/kallsyms: filter arm64's __efistub_ symbols") for 4.14 to go with this patch.
My usual gitfu to see the first tag that contained a commit git describe --contains "$tag" | sed 's/~.*//' says next-20180319 which isn't something I recognize or would have expected. I see the changed code in 4.19.y LTS but not 4.14.y LTS.
Quoted 77 lines
Cc Nick Desaulniers <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>Signed-off-by Will Deacon <[email protected]>[ND: adjusted for context]Signed-off-by Nick Desaulniers <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/arm64/kernel/image.h | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-)arch/arm64/kernel/image.h +17
-27@@ -76,16 +76,6 @@ __efistub_stext_offset = stext - _text;/* -* Prevent the symbol aliases below from being emitted into the kallsyms -* table, by forcing them to be absolute symbols (which are conveniently -* ignored by scripts/kallsyms) rather than section relative symbols. -* The distinction is only relevant for partial linking, and only for symbols -* that are defined within a section declaration (which is not the case for -* the definitions below) so the resulting values will be identical. -*/ -#define KALLSYMS_HIDE (sym) ABSOLUTE(sym) - -/* * The EFI stub has its own symbol namespace prefixed by __efistub_, to * isolate it from the kernel proper. The following symbols are legally * accessed by the stub, so provide some aliases to make them accessible. @@ -94,27 +84,27 @@ __efistub_stext_offset = stext - _text;* linked at. The routines below are all implemented in assembler in a * position independent manner */ -__efistub_memcmp =KALLSYMS_HIDE (__pi_memcmp); -__efistub_memchr =KALLSYMS_HIDE (__pi_memchr); -__efistub_memcpy =KALLSYMS_HIDE (__pi_memcpy); -__efistub_memmove =KALLSYMS_HIDE (__pi_memmove); -__efistub_memset =KALLSYMS_HIDE (__pi_memset); -__efistub_strlen =KALLSYMS_HIDE (__pi_strlen); -__efistub_strnlen =KALLSYMS_HIDE (__pi_strnlen); -__efistub_strcmp =KALLSYMS_HIDE (__pi_strcmp); -__efistub_strncmp =KALLSYMS_HIDE (__pi_strncmp); -__efistub___flush_dcache_area =KALLSYMS_HIDE (__pi___flush_dcache_area); +__efistub_memcmp = __pi_memcmp; +__efistub_memchr = __pi_memchr; +__efistub_memcpy = __pi_memcpy; +__efistub_memmove = __pi_memmove; +__efistub_memset = __pi_memset; +__efistub_strlen = __pi_strlen; +__efistub_strnlen = __pi_strnlen; +__efistub_strcmp = __pi_strcmp; +__efistub_strncmp = __pi_strncmp; +__efistub___flush_dcache_area = __pi___flush_dcache_area;#ifdef CONFIG_KASAN -__efistub___memcpy =KALLSYMS_HIDE (__pi_memcpy); -__efistub___memmove =KALLSYMS_HIDE (__pi_memmove); -__efistub___memset =KALLSYMS_HIDE (__pi_memset); +__efistub___memcpy = __pi_memcpy; +__efistub___memmove = __pi_memmove; +__efistub___memset = __pi_memset;#endif -__efistub__text =KALLSYMS_HIDE (_text); -__efistub__end =KALLSYMS_HIDE (_end); -__efistub__edata =KALLSYMS_HIDE (_edata); -__efistub_screen_info =KALLSYMS_HIDE (screen_info); +__efistub__text = _text; +__efistub__end = _end; +__efistub__edata = _edata; +__efistub_screen_info = screen_info;#endif
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.93 release. There are 105 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 Sun Jan 13 13:10:07 UTC 2019. 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/v4.x/stable-review/patch-4.14.93-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerRe: [PATCH 4.14 093/105] arm64: drop linker script hack to hide __efistub_ symbols
In reply to Nick DesaulniersQuoted 16 lines · Nick Desaulniers
Quoted 5 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Ard Biesheuvel <[email protected]>
commit
dd6846d774693bfa27d7db4dae5ea67dfe373fa1upstream.Commit
1212f7a16af4("scripts/kallsyms: filter arm64's__efistub_symbols") updated the kallsyms code to filter out symbols with the__efistub_prefix explicitly, so we no longer require the hack in our linker script to emit them as absolute symbols.
Quoted 8 lines
!!!
Sorry, I think we should pick1212f7a16af4("scripts/kallsyms: filter arm64's__efistub_symbols") for 4.14 to go with this patch.My usual gitfu to see the first tag that contained a commit
git describe --contains "$tag" | sed 's/~.*//'says next-20180319 which isn't something I recognize or would have expected. I see the changed code in 4.19.y LTS but not 4.14.y LTS.
Now added, thanks.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.93 release. There are 105 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 Sun Jan 13 13:10:07 UTC 2019. 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/v4.x/stable-review/patch-4.14.93-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.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.
Summary
------------------------------------------------------------------------
kernel: 4.14.93-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 8d67d2bf2fc76d64fdff2d95f6a98bf4cea01e95
git describe: v4.14.92-106-g8d67d2bf2fc7
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.92-106-g8d67d2bf2fc7
No regressions (compared to build v4.14.92)
No fixes (compared to build v4.14.92)
Ran 21633 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* boot
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* spectre-meltdown-checker-test
* ltp-hugetlb-tests
* ltp-open-posix-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.93 release. There are 105 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 Sun Jan 13 13:10:07 UTC 2019. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 317 pass: 317 fail: 0
Guenter
Re: [PATCH 4.14 058/105] tools: fix cross-compile var clobbering
In reply to Greg Kroah-HartmanHi Greg,
Quoted 8 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kelly <[email protected]>
commit
7ed1c1901fe52e6c5828deb155920b44b0adabb1upstream.
This was fixed upstream by 755396163148 ("tools: power/acpi, revert to LD = gcc")
Signature · 2 lines
Regards Sudip
Re: [PATCH 4.14 024/105] bnx2x: Remove configured vlans as part of unload sequence.
In reply to Greg Kroah-HartmanHi Greg,
Quoted 6 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
04f05230c5c13b1384f66f5186a68d7499e34622]
This was fixed upstream by 38355a5f9a22 ("bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw")
Signature · 2 lines
Regards Sudip
Re: [PATCH 4.14 058/105] tools: fix cross-compile var clobbering
In reply to Sudip MukherjeeQuoted 7 lines · Sudip Mukherjee
Hi Greg,
Quoted 3 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
Quoted 10 lines
Quoted 5 lines
------------------
From: Martin Kelly <[email protected]>
commit
7ed1c1901fe52e6c5828deb155920b44b0adabb1upstream.This was fixed upstream by 755396163148 ("tools: power/acpi, revert to LD = gcc")
Yes, both patches should be applied. This patch fixed a bunch of Makefiles but caused a regression in power/acpi, which is fixed by 755396163148.
Greg Kroah-Hartman
maintainerRe: [PATCH 4.14 024/105] bnx2x: Remove configured vlans as part of unload sequence.
In reply to Sudip MukherjeeQuoted 5 lines · Sudip Mukherjee
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
Quoted 8 lines
Quoted 5 lines
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
04f05230c5c13b1384f66f5186a68d7499e34622]This was fixed upstream by
38355a5f9a22("bnx2x: Fix NULL pointer dereference inbnx2x_del_all_vlans()on some hw")
Thanks for catching this, queued up to a bunch of trees now.
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 4.14 058/105] tools: fix cross-compile var clobbering
In reply to Martin KellyQuoted 14 lines · Martin Kelly
Quoted 13 lines · Sudip Mukherjee
Hi Greg,
Quoted 8 lines · Greg Kroah-Hartman
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kelly <[email protected]>
commit
7ed1c1901fe52e6c5828deb155920b44b0adabb1upstream.
Quoted 8 lines
Quoted 4 lines
This was fixed upstream by 755396163148 ("tools: power/acpi, revert to LD = gcc")
Yes, both patches should be applied. This patch fixed a bunch of Makefiles but caused a regression in power/acpi, which is fixed by 755396163148.
Thanks all, now queued up.
greg k-h