When running the 64-bit Book3s PR code without CONFIG_PREEMPT_NONE, we were doing a few things wrong, most notably access to PACA fields without making sure that the pointers stay stable accross the access (preempt_disable()). This patch moves to_svcpu towards a get/put model which allows us to disable preemption while accessing the shadow vcpu fields in the PACA. That way we can run preemptible and everyone's happy! Reported-by: Jörg Sommer <joerg@alea.gnuu.de> Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
		
			
				
	
	
		
			46 lines
		
	
	
	
		
			1.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			46 lines
		
	
	
	
		
			1.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License, version 2, as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 | 
						|
 *
 | 
						|
 * Copyright SUSE Linux Products GmbH 2010
 | 
						|
 *
 | 
						|
 * Authors: Alexander Graf <agraf@suse.de>
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef __ASM_KVM_BOOK3S_32_H__
 | 
						|
#define __ASM_KVM_BOOK3S_32_H__
 | 
						|
 | 
						|
static inline struct kvmppc_book3s_shadow_vcpu *svcpu_get(struct kvm_vcpu *vcpu)
 | 
						|
{
 | 
						|
	return to_book3s(vcpu)->shadow_vcpu;
 | 
						|
}
 | 
						|
 | 
						|
static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
#define PTE_SIZE	12
 | 
						|
#define VSID_ALL	0
 | 
						|
#define SR_INVALID	0x00000001	/* VSID 1 should always be unused */
 | 
						|
#define SR_KP		0x20000000
 | 
						|
#define PTE_V		0x80000000
 | 
						|
#define PTE_SEC		0x00000040
 | 
						|
#define PTE_M		0x00000010
 | 
						|
#define PTE_R		0x00000100
 | 
						|
#define PTE_C		0x00000080
 | 
						|
 | 
						|
#define SID_SHIFT	28
 | 
						|
#define ESID_MASK	0xf0000000
 | 
						|
#define VSID_MASK	0x00fffffff0000000ULL
 | 
						|
 | 
						|
#endif /* __ASM_KVM_BOOK3S_32_H__ */
 |