# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 658419c4e60f399bf0a97f9c81b9e3bd6494040e
# Parent  4837d282c2c82370944307b0989c03f6bfa2df78
remove vtlb_lock.
As Tristan pointed out, vtlb_lock is unnecesary.
PATCHNAME: remove_vtlb_lock

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 4837d282c2c8 -r 658419c4e60f xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Thu Jun 15 11:33:30 2006 +0900
+++ b/xen/arch/ia64/xen/domain.c	Thu Jun 15 11:33:35 2006 +0900
@@ -301,7 +301,6 @@ int arch_domain_create(struct domain *d)
 	d->xen_vaend = XEN_END_ADDR;
 	d->arch.shared_info_va = SHAREDINFO_ADDR;
 	d->arch.breakimm = 0x1000;
-	seqlock_init(&d->arch.vtlb_lock);
 
 	if (is_idle_domain(d))
 	    return 0;
diff -r 4837d282c2c8 -r 658419c4e60f xen/arch/ia64/xen/faults.c
--- a/xen/arch/ia64/xen/faults.c	Thu Jun 15 11:33:30 2006 +0900
+++ b/xen/arch/ia64/xen/faults.c	Thu Jun 15 11:33:35 2006 +0900
@@ -214,8 +214,6 @@ void ia64_do_page_fault (unsigned long a
 	// FIXME should validate address here
 	unsigned long pteval;
 	unsigned long is_data = !((isr >> IA64_ISR_X_BIT) & 1UL);
-	seqlock_t* vtlb_lock = &current->domain->arch.vtlb_lock;
-	unsigned long seq;
 	IA64FAULT fault;
 
 	if ((isr & IA64_ISR_IR) && handle_lazy_cover(current, regs)) return;
@@ -232,14 +230,16 @@ void ia64_do_page_fault (unsigned long a
 	}
 
  again:
-	seq = read_seqbegin(vtlb_lock);
 	fault = vcpu_translate(current,address,is_data,&pteval,&itir,&iha);
 	if (fault == IA64_NO_FAULT || fault == IA64_USE_TLB) {
 		u64 logps;
 		struct p2m_entry entry;
 		pteval = translate_domain_pte(pteval, address, itir, &logps, &entry);
 		vcpu_itc_no_srlz(current,is_data?2:1,address,pteval,-1UL,logps);
-		if (read_seqretry(vtlb_lock, seq) || p2m_entry_retry(&entry)) {
+		if ((fault == IA64_USE_TLB && !current->arch.dtlb.pte.p) ||
+		    p2m_entry_retry(&entry)) {
+			/* dtlb has been purged in-between.  This dtlb was
+			   matching.  Undo the work.  */
 			vcpu_flush_tlb_vhpt_range(address & ((1 << logps) - 1),
 			                          logps);
 			goto again;
diff -r 4837d282c2c8 -r 658419c4e60f xen/arch/ia64/xen/vhpt.c
--- a/xen/arch/ia64/xen/vhpt.c	Thu Jun 15 11:33:30 2006 +0900
+++ b/xen/arch/ia64/xen/vhpt.c	Thu Jun 15 11:33:35 2006 +0900
@@ -152,9 +152,7 @@ void domain_flush_vtlb_all (void)
 {
 	int cpu = smp_processor_id ();
 	struct vcpu *v;
-	seqlock_t* vtlb_lock = &current->domain->arch.vtlb_lock;
-
-	write_seqlock(vtlb_lock);
+
 	for_each_vcpu (current->domain, v)
 		if (v->processor == cpu)
 			vcpu_flush_vtlb_all ();
@@ -163,7 +161,6 @@ void domain_flush_vtlb_all (void)
 				(v->processor,
 				 (void(*)(void *))vcpu_flush_vtlb_all,
 				 NULL,1,1);
-	write_sequnlock(vtlb_lock);
 }
 
 static void cpu_flush_vhpt_range (int cpu, u64 vadr, u64 addr_range)
@@ -190,7 +187,6 @@ void vcpu_flush_tlb_vhpt_range (u64 vadr
 
 void domain_flush_vtlb_range (struct domain *d, u64 vadr, u64 addr_range)
 {
-	seqlock_t* vtlb_lock = &d->arch.vtlb_lock;
 	struct vcpu *v;
 
 #if 0
@@ -201,7 +197,6 @@ void domain_flush_vtlb_range (struct dom
 	}
 #endif
 
-	write_seqlock(vtlb_lock);
 	for_each_vcpu (d, v) {
 		/* Purge TC entries.
 		   FIXME: clear only if match.  */
@@ -218,7 +213,6 @@ void domain_flush_vtlb_range (struct dom
 
 	/* ptc.ga  */
 	ia64_global_tlb_purge(vadr,vadr+addr_range,PAGE_SHIFT);
-	write_sequnlock(vtlb_lock);
 }
 
 static void flush_tlb_vhpt_all (struct domain *d)
@@ -230,8 +224,6 @@ static void flush_tlb_vhpt_all (struct d
 	local_flush_tlb_all ();
 }
 
-// this is called when a domain is destroyed
-// so that there is no race.
 void domain_flush_destroy (struct domain *d)
 {
 	/* Very heavy...  */
@@ -241,10 +233,8 @@ void domain_flush_destroy (struct domain
 
 void flush_tlb_mask(cpumask_t mask)
 {
-    seqlock_t* vtlb_lock = &current->domain->arch.vtlb_lock;
     int cpu;
 
-    write_seqlock(vtlb_lock);
     cpu = smp_processor_id();
     if (cpu_isset (cpu, mask)) {
         cpu_clear(cpu, mask);
@@ -252,13 +242,11 @@ void flush_tlb_mask(cpumask_t mask)
     }
 
     if (cpus_empty(mask))
-        goto out;
+        return;
 
     for_each_cpu_mask (cpu, mask)
         smp_call_function_single
             (cpu, (void (*)(void *))flush_tlb_vhpt_all, NULL, 1, 1);
-out:
-    write_sequnlock(vtlb_lock);
 }
 
 void zero_vhpt_stats(void)
diff -r 4837d282c2c8 -r 658419c4e60f xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h	Thu Jun 15 11:33:30 2006 +0900
+++ b/xen/include/asm-ia64/domain.h	Thu Jun 15 11:33:35 2006 +0900
@@ -100,9 +100,6 @@ struct arch_domain {
     void *efi_runtime;
     /* Metaphysical address to fpswa_interface_t in domain firmware memory is set. */
     void *fpswa_inf;
-
-    // protect v->itlb, v->dtlb and vhpt
-    seqlock_t   vtlb_lock ____cacheline_aligned_in_smp;
 };
 #define xen_vastart arch.xen_vastart
 #define xen_vaend arch.xen_vaend