From owner-svn-src-all@FreeBSD.ORG  Mon Mar 11 17:36:37 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C885FD8A;
 Mon, 11 Mar 2013 17:36:37 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A40DE282;
 Mon, 11 Mar 2013 17:36:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BHabFv026603;
 Mon, 11 Mar 2013 17:36:37 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2BHabAD026602;
 Mon, 11 Mar 2013 17:36:37 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201303111736.r2BHabAD026602@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Mon, 11 Mar 2013 17:36:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248171 - head/usr.sbin/bhyve
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.14
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: Mon, 11 Mar 2013 17:36:37 -0000

Author: neel
Date: Mon Mar 11 17:36:37 2013
New Revision: 248171
URL: http://svnweb.freebsd.org/changeset/base/248171

Log:
  Convert the offset into the bar that contains the MSI-X table to an offset
  into the MSI-X table before using it to calculate the table index.
  
  In the common case where the MSI-X table is located at the begining of the
  BAR these two offsets are identical and thus the code was working by accident.
  
  This change will fix the case where the MSI-X table is located in the middle
  or at the end of the BAR that contains it.
  
  Obtained from:	NetApp

Modified:
  head/usr.sbin/bhyve/pci_passthru.c

Modified: head/usr.sbin/bhyve/pci_passthru.c
==============================================================================
--- head/usr.sbin/bhyve/pci_passthru.c	Mon Mar 11 17:29:09 2013	(r248170)
+++ head/usr.sbin/bhyve/pci_passthru.c	Mon Mar 11 17:36:37 2013	(r248171)
@@ -279,6 +279,7 @@ msix_table_read(struct passthru_softc *s
 	int index;
 
 	pi = sc->psc_pi;
+	offset -= pi->pi_msix.table_offset;
 
 	index = offset / MSIX_TABLE_ENTRY_SIZE;
 	if (index >= pi->pi_msix.table_count)
@@ -323,6 +324,8 @@ msix_table_write(struct vmctx *ctx, int 
 	int error, index;
 
 	pi = sc->psc_pi;
+	offset -= pi->pi_msix.table_offset;
+
 	index = offset / MSIX_TABLE_ENTRY_SIZE;
 	if (index >= pi->pi_msix.table_count)
 		return;