public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Guo Ren <guoren@kernel•org>, Andrew Morton <akpm@linux-foundation•org>
Cc: Guo Ren <guoren@linux•alibaba.com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: linux-next: manual merge of the csky tree with the mm tree
Date: Tue, 15 Aug 2023 10:46:04 +1000	[thread overview]
Message-ID: <20230815104604.54f65293@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1981 bytes --]

Hi all,

Today's linux-next merge of the csky tree got a conflict in:

  arch/csky/abiv2/cacheflush.c

between commit:

  1222e1310d64 ("csky: implement the new page table range API")

from the mm tree and commit:

  1362d15ffb59 ("csky: pgtable: Invalidate stale I-cache lines in update_mmu_cache")

from the csky tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/csky/abiv2/cacheflush.c
index d05a551af5d5,500eb8f69397..000000000000
--- a/arch/csky/abiv2/cacheflush.c
+++ b/arch/csky/abiv2/cacheflush.c
@@@ -16,23 -15,22 +16,22 @@@ void update_mmu_cache_range(struct vm_f
  
  	flush_tlb_page(vma, address);
  
 -	if (!pfn_valid(pte_pfn(*pte)))
 +	if (!pfn_valid(pfn))
  		return;
  
 -	page = pfn_to_page(pte_pfn(*pte));
 -	if (page == ZERO_PAGE(0))
 +	folio = page_folio(pfn_to_page(pfn));
 +
 +	if (test_and_set_bit(PG_dcache_clean, &folio->flags))
  		return;
  
 -	if (test_and_set_bit(PG_dcache_clean, &page->flags))
 -		return;
 +	for (i = 0; i < folio_nr_pages(folio); i++) {
 +		unsigned long addr = (unsigned long) kmap_local_folio(folio,
 +								i * PAGE_SIZE);
  
 -	addr = (unsigned long) kmap_atomic(page);
 -
 -	icache_inv_range(address, address + PAGE_SIZE);
 -	dcache_wb_range(addr, addr + PAGE_SIZE);
 -
 -	kunmap_atomic((void *) addr);
++		icache_inv_range(address, address + PAGE_SIZE);
 +		dcache_wb_range(addr, addr + PAGE_SIZE);
- 		if (vma->vm_flags & VM_EXEC)
- 			icache_inv_range(addr, addr + PAGE_SIZE);
 +		kunmap_local((void *) addr);
 +	}
  }
  
  void flush_icache_deferred(struct mm_struct *mm)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2023-08-15  0:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-15  0:46 Stephen Rothwell [this message]
2023-08-15  3:11 ` linux-next: manual merge of the csky tree with the mm tree Guo Ren
2023-08-15  3:18   ` Matthew Wilcox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230815104604.54f65293@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=guoren@kernel$(echo .)org \
    --cc=guoren@linux$(echo .)alibaba.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=willy@infradead$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox