From owner-svn-src-all@FreeBSD.ORG  Wed May  6 23:40:25 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B4BA08AD;
 Wed,  6 May 2015 23:40:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A36521033;
 Wed,  6 May 2015 23:40:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46NePLf014378;
 Wed, 6 May 2015 23:40:25 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46NePe1014377;
 Wed, 6 May 2015 23:40:25 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201505062340.t46NePe1014377@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
 using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Wed, 6 May 2015 23:40:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282571 - head/sys/amd64/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2015 23:40:25 -0000

Author: neel
Date: Wed May  6 23:40:24 2015
New Revision: 282571
URL: https://svnweb.freebsd.org/changeset/base/282571

Log:
  Check 'td_owepreempt' and yield the vcpu thread if it is set.
  
  This is done explicitly because a vcpu thread can be in a critical section
  for the entire time slice alloted to it. This in turn can delay the handling
  of the 'td_owepreempt'.
  
  Reviewed by:	jhb
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D2430

Modified:
  head/sys/amd64/include/vmm.h

Modified: head/sys/amd64/include/vmm.h
==============================================================================
--- head/sys/amd64/include/vmm.h	Wed May  6 23:26:51 2015	(r282570)
+++ head/sys/amd64/include/vmm.h	Wed May  6 23:40:24 2015	(r282571)
@@ -276,7 +276,13 @@ vcpu_is_running(struct vm *vm, int vcpu,
 static int __inline
 vcpu_should_yield(struct vm *vm, int vcpu)
 {
-	return (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED));
+
+	if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED))
+		return (1);
+	else if (curthread->td_owepreempt)
+		return (1);
+	else
+		return (0);
 }
 #endif