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

From: Michael Ellerman <mpe@ellerman•id.au>
To: broonie@kernel•org, Paolo Bonzini <pbonzini@redhat•com>,
	KVM <kvm@vger•kernel.org>
Cc: Alexey Kardashevskiy <aik@ozlabs•ru>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	"Maciej S . Szmigiero" <maciej.szmigiero@oracle•com>,
	Sean Christopherson <seanjc@google•com>
Subject: Re: linux-next: manual merge of the kvm tree with the kvm tree
Date: Thu, 16 Dec 2021 15:47:12 +1100	[thread overview]
Message-ID: <87wnk5kvfz.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <20211215131033.2541027-1-broonie@kernel.org>

broonie@kernel•org writes:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
>   arch/powerpc/kvm/book3s_hv.c
>
> between commit:
>
>   511d25d6b789f ("KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots")
>
> from the kvm tree and commits:

That's from the powerpc tree.

>   537a17b314930 ("KVM: Let/force architectures to deal with arch specific memslot data")
>   eaaaed137eccb ("KVM: PPC: Avoid referencing userspace memory region in memslot updates")
>
> from the kvm 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.

Thanks.

Paolo, if you want to avoid the conflict going to Linus, I have that
commit (and others) in a topic branch here (based on rc2):

  https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/log/?h=topic/ppc-kvm


cheers


> diff --cc arch/powerpc/kvm/book3s_hv.c
> index f64e45d6c0f4c,51e1c29a6fa08..0000000000000
> --- a/arch/powerpc/kvm/book3s_hv.c
> +++ b/arch/powerpc/kvm/book3s_hv.c
> @@@ -4866,21 -4854,17 +4866,22 @@@ static void kvmppc_core_free_memslot_hv
>   }
>   
>   static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
> - 					struct kvm_memory_slot *slot,
> - 					const struct kvm_userspace_memory_region *mem,
> - 					enum kvm_mr_change change)
> + 				const struct kvm_memory_slot *old,
> + 				struct kvm_memory_slot *new,
> + 				enum kvm_mr_change change)
>   {
> - 	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
> - 
>   	if (change == KVM_MR_CREATE) {
> - 		unsigned long size = array_size(npages, sizeof(*slot->arch.rmap));
>  -		new->arch.rmap = vzalloc(array_size(new->npages,
>  -					  sizeof(*new->arch.rmap)));
> ++		unsigned long size = array_size(new->npages,
> ++						sizeof(*new->arch.rmap));
>  +
>  +		if ((size >> PAGE_SHIFT) > totalram_pages())
>  +			return -ENOMEM;
>  +
> - 		slot->arch.rmap = vzalloc(size);
> - 		if (!slot->arch.rmap)
> ++		new->arch.rmap = vzalloc(size);
> + 		if (!new->arch.rmap)
>   			return -ENOMEM;
> + 	} else if (change != KVM_MR_DELETE) {
> + 		new->arch.rmap = old->arch.rmap;
>   	}
>   
>   	return 0;

next prev parent reply	other threads:[~2021-12-16  4:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-15 13:10 linux-next: manual merge of the kvm tree with the kvm tree broonie
2021-12-16  4:47 ` Michael Ellerman [this message]
2021-12-17 17:07   ` Paolo Bonzini

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=87wnk5kvfz.fsf@mpe.ellerman.id.au \
    --to=mpe@ellerman$(echo .)id.au \
    --cc=aik@ozlabs$(echo .)ru \
    --cc=broonie@kernel$(echo .)org \
    --cc=kvm@vger$(echo .)kernel.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=maciej.szmigiero@oracle$(echo .)com \
    --cc=pbonzini@redhat$(echo .)com \
    --cc=seanjc@google$(echo .)com \
    /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