linux-kernel - linux-next: manual merge of the kvm tree with the powerpc-merge-mpe tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150424121036.55fabf0f@canb.auug.org.au>
Date:	Fri, 24 Apr 2015 12:10:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>,
	Michael Ellerman <mpe@...erman.id.au>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
	Alexander Graf <agraf@...e.de>,
	Paul Mackerras <paulus@...ba.org>
Subject: linux-next: manual merge of the kvm tree with the powerpc-merge-mpe
 tree

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/powerpc/kvm/book3s_hv_rm_mmu.c between commit dac565706791 ("KVM:
PPC: Remove page table walk helpers") from the powerpc-merge-mpe tree
and commit a4bd6eb07ca7 ("KVM: PPC: Book3S HV: Add helpers for
lock/unlock hpte") from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/powerpc/kvm/book3s_hv_rm_mmu.c
index d839f08cb903,f6bf0b1de6d7..000000000000
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@@ -134,12 -131,25 +134,6 @@@ static void remove_revmap_chain(struct 
  	unlock_rmap(rmap);
  }
  
- static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)
 -static pte_t lookup_linux_pte_and_update(pgd_t *pgdir, unsigned long hva,
 -			      int writing, unsigned long *pte_sizep)
--{
- 	asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");
- 	hpte[0] = cpu_to_be64(hpte_v);
 -	pte_t *ptep;
 -	unsigned long ps = *pte_sizep;
 -	unsigned int hugepage_shift;
 -
 -	ptep = find_linux_pte_or_hugepte(pgdir, hva, &hugepage_shift);
 -	if (!ptep)
 -		return __pte(0);
 -	if (hugepage_shift)
 -		*pte_sizep = 1ul << hugepage_shift;
 -	else
 -		*pte_sizep = PAGE_SIZE;
 -	if (ps > *pte_sizep)
 -		return __pte(0);
 -	return kvmppc_read_update_linux_pte(ptep, writing, hugepage_shift);
--}
--
  long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
  		       long pte_index, unsigned long pteh, unsigned long ptel,
  		       pgd_t *pgdir, bool realmode, unsigned long *pte_idx_ret)

Content of type "application/pgp-signature" skipped