]> xenbits.xensource.com Git - xen.git/commitdiff
livepatch: Wrong usage of spinlock on debug console.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 9 Jun 2017 13:31:28 +0000 (09:31 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 12 Jun 2017 13:06:03 +0000 (09:06 -0400)
If we have a large amount of livepatches and want to print them
on the console using 'xl debug-keys x' we eventually hit
the preemption check:

  if ( i && !(i % 64) )
  {
spin_unlock(&payload_lock);
process_pending_softirqs();
if ( spin_trylock(&payload_lock) )
return

<facepalm> The effect is that we have just effectively
taken the lock and returned without unlocking!

Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-and-tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
(cherry picked from commit 75dfe7c566c36e0af4714557a666827f49b69191)
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
xen/common/livepatch.c

index f14bcbc8cdc603f9df14ac999755a781a775d698..df67a1aa2c243874a2605e8a52f391662a8589ca 100644 (file)
@@ -1642,7 +1642,7 @@ static void livepatch_printall(unsigned char key)
             {
                 spin_unlock(&payload_lock);
                 process_pending_softirqs();
-                if ( spin_trylock(&payload_lock) )
+                if ( !spin_trylock(&payload_lock) )
                 {
                     printk("Couldn't reacquire lock. Try again.\n");
                     return;