From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoffer Dall <cdall@cs.columbia.edu>, Marc Zyngier <maz@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sean Christopherson <sean.j.christopherson@intel.com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Sun, 9 Aug 2020 18:55:43 +1000 [thread overview]
Message-ID: <20200809185543.4dffd5e1@canb.auug.org.au> (raw)
In-Reply-To: <20200713144036.7afe4e76@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2549 bytes --]
Hi all,
On Mon, 13 Jul 2020 14:40:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kvm/mmu.c
>
> between commit:
>
> c1a33aebe91d ("KVM: arm64: Use common KVM implementation of MMU memory caches")
>
> from the kvm tree and commit:
>
> a0e50aa3f4a8 ("KVM: arm64: Factor out stage 2 page table data from struct kvm")
>
> from the kvm-arm tree.
>
> I fixed it up (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.
>
> diff --cc arch/arm64/kvm/mmu.c
> index 838aad520f1c,cd14c831d56f..000000000000
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@@ -124,11 -127,44 +127,12 @@@ static void stage2_dissolve_pud(struct
> put_page(virt_to_page(pudp));
> }
>
> - static void clear_stage2_pgd_entry(struct kvm *kvm, pgd_t *pgd, phys_addr_t addr)
> -static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache,
> - int min, int max)
> -{
> - void *page;
> -
> - BUG_ON(max > KVM_NR_MEM_OBJS);
> - if (cache->nobjs >= min)
> - return 0;
> - while (cache->nobjs < max) {
> - page = (void *)__get_free_page(GFP_PGTABLE_USER);
> - if (!page)
> - return -ENOMEM;
> - cache->objects[cache->nobjs++] = page;
> - }
> - return 0;
> -}
> -
> -static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc)
> -{
> - while (mc->nobjs)
> - free_page((unsigned long)mc->objects[--mc->nobjs]);
> -}
> -
> -static void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc)
> -{
> - void *p;
> -
> - BUG_ON(!mc || !mc->nobjs);
> - p = mc->objects[--mc->nobjs];
> - return p;
> -}
> -
> + static void clear_stage2_pgd_entry(struct kvm_s2_mmu *mmu, pgd_t *pgd, phys_addr_t addr)
> {
> + struct kvm *kvm = mmu->kvm;
> p4d_t *p4d_table __maybe_unused = stage2_p4d_offset(kvm, pgd, 0UL);
> stage2_pgd_clear(kvm, pgd);
> - kvm_tlb_flush_vmid_ipa(kvm, addr);
> + kvm_tlb_flush_vmid_ipa(mmu, addr, S2_NO_LEVEL_HINT);
> stage2_p4d_free(kvm, p4d_table);
> put_page(virt_to_page(pgd));
> }
This is now a conflict between the kvm-arm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-09 8:55 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 4:40 linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell
2020-08-09 8:55 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 3:06 Stephen Rothwell
2023-03-31 2:26 Stephen Rothwell
2022-12-01 2:16 Stephen Rothwell
2022-12-01 15:23 ` Marc Zyngier
2022-12-01 1:09 Stephen Rothwell
2022-12-01 0:57 Stephen Rothwell
2022-12-01 0:36 Stephen Rothwell
2022-12-01 0:24 Stephen Rothwell
2022-07-18 5:19 Stephen Rothwell
2022-05-05 4:47 Stephen Rothwell
2021-12-17 4:19 Stephen Rothwell
2021-12-09 22:01 broonie
2021-06-25 5:24 Stephen Rothwell
2021-06-25 5:20 Stephen Rothwell
2021-06-25 5:15 Stephen Rothwell
2021-06-23 5:53 Stephen Rothwell
2021-06-22 5:31 Stephen Rothwell
2021-04-22 4:43 Stephen Rothwell
2021-04-22 4:39 Stephen Rothwell
2020-07-13 4:39 Stephen Rothwell
2020-08-09 8:54 ` Stephen Rothwell
2020-03-25 3:23 Stephen Rothwell
2018-10-18 2:46 Stephen Rothwell
2017-04-10 3:52 Stephen Rothwell
2017-04-10 6:26 ` Christoffer Dall
2016-07-24 6:04 Stephen Rothwell
2016-07-24 5:59 Stephen Rothwell
2016-07-20 5:27 Stephen Rothwell
2015-10-16 3:53 Stephen Rothwell
2015-10-16 4:20 ` Wu, Feng
2014-11-26 6:19 Stephen Rothwell
2014-11-26 11:39 ` Christoffer Dall
2014-09-25 5:32 Stephen Rothwell
2014-09-18 3:52 Stephen Rothwell
2014-09-18 15:13 ` Marc Zyngier
2014-09-08 6:04 Stephen Rothwell
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=20200809185543.4dffd5e1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cdall@cs.columbia.edu \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).