Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Fun set of conflict resolutions here...

For the mac80211 stuff, these were fortunately just parallel
adds.  Trivially resolved.

In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.

In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.

The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.

The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:

====================

    Due to bug fixes found by the syzkaller bot and taken into the for-rc
    branch after development for the 4.17 merge window had already started
    being taken into the for-next branch, there were fairly non-trivial
    merge issues that would need to be resolved between the for-rc branch
    and the for-next branch.  This merge resolves those conflicts and
    provides a unified base upon which ongoing development for 4.17 can
    be based.

    Conflicts:
            drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524
            (IB/mlx5: Fix cleanup order on unload) added to for-rc and
            commit b5ca15ad7e61 (IB/mlx5: Add proper representors support)
            add as part of the devel cycle both needed to modify the
            init/de-init functions used by mlx5.  To support the new
            representors, the new functions added by the cleanup patch
            needed to be made non-static, and the init/de-init list
            added by the representors patch needed to be modified to
            match the init/de-init list changes made by the cleanup
            patch.
    Updates:
            drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
            prototypes added by representors patch to reflect new function
            names as changed by cleanup patch
            drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
            stage list to match new order from cleanup patch
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 32 insertions, 9 deletions

diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 79089778725b..e3b45546d589 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -543,7 +543,8 @@ void flush_cache_mm(struct mm_struct *mm)
            rp3440, etc.  So, avoid it if the mm isn't too big.  */
         if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
             mm_total_size(mm) >= parisc_cache_flush_threshold) {
-                flush_tlb_all();
+                if (mm->context)
+                        flush_tlb_all();
                 flush_cache_all();
                 return;
         }
@@ -571,6 +572,8 @@ void flush_cache_mm(struct mm_struct *mm)
                         pfn = pte_pfn(*ptep);
                         if (!pfn_valid(pfn))
                                 continue;
+                        if (unlikely(mm->context))
+                                flush_tlb_page(vma, addr);
                         __flush_cache_page(vma, addr, PFN_PHYS(pfn));
                 }
         }
@@ -579,26 +582,46 @@ void flush_cache_mm(struct mm_struct *mm)
 void flush_cache_range(struct vm_area_struct *vma,
                 unsigned long start, unsigned long end)
 {
+        pgd_t *pgd;
+        unsigned long addr;
+
         if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
             end - start >= parisc_cache_flush_threshold) {
-                flush_tlb_range(vma, start, end);
+                if (vma->vm_mm->context)
+                        flush_tlb_range(vma, start, end);
                 flush_cache_all();
                 return;
         }
 
-        flush_user_dcache_range_asm(start, end);
-        if (vma->vm_flags & VM_EXEC)
-                flush_user_icache_range_asm(start, end);
-        flush_tlb_range(vma, start, end);
+        if (vma->vm_mm->context == mfsp(3)) {
+                flush_user_dcache_range_asm(start, end);
+                if (vma->vm_flags & VM_EXEC)
+                        flush_user_icache_range_asm(start, end);
+                flush_tlb_range(vma, start, end);
+                return;
+        }
+
+        pgd = vma->vm_mm->pgd;
+        for (addr = vma->vm_start; addr < vma->vm_end; addr += PAGE_SIZE) {
+                unsigned long pfn;
+                pte_t *ptep = get_ptep(pgd, addr);
+                if (!ptep)
+                        continue;
+                pfn = pte_pfn(*ptep);
+                if (pfn_valid(pfn)) {
+                        if (unlikely(vma->vm_mm->context))
+                                flush_tlb_page(vma, addr);
+                        __flush_cache_page(vma, addr, PFN_PHYS(pfn));
+                }
+        }
 }
 
 void
 flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long pfn)
 {
-        BUG_ON(!vma->vm_mm->context);
-
         if (pfn_valid(pfn)) {
-                flush_tlb_page(vma, vmaddr);
+                if (likely(vma->vm_mm->context))
+                        flush_tlb_page(vma, vmaddr);
                 __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
         }
 }