From owner-svn-src-all@freebsd.org Tue Oct 11 17:00:30 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F19BC0CE37;
Tue, 11 Oct 2016 17:00:30 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 11FD4796;
Tue, 11 Oct 2016 17:00:30 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9BH0T1W026712;
Tue, 11 Oct 2016 17:00:29 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9BH0Trk026711;
Tue, 11 Oct 2016 17:00:29 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201610111700.u9BH0Trk026711@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Tue, 11 Oct 2016 17:00:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r307059 - head/sys/kern
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Oct 2016 17:00:30 -0000
Author: gonzo
Date: Tue Oct 11 17:00:29 2016
New Revision: 307059
URL: https://svnweb.freebsd.org/changeset/base/307059
Log:
INTRNG - fix MSI/MSIX release path
Use isrc in attached MSI data structure instead of using map's
isrc directly. map's isrc is set to NULL on IRQ deactivation
which happens prior to pci_release_msi so MSI_RELEASE_MSI
receives array of NULLs
Reviewed by: mmel
Differential Revision: https://reviews.freebsd.org/D8206
Modified:
head/sys/kern/subr_intr.c
Modified: head/sys/kern/subr_intr.c
==============================================================================
--- head/sys/kern/subr_intr.c Tue Oct 11 16:53:50 2016 (r307058)
+++ head/sys/kern/subr_intr.c Tue Oct 11 17:00:29 2016 (r307059)
@@ -145,6 +145,7 @@ static u_int intrcnt_index;
static struct intr_irqsrc *intr_map_get_isrc(u_int res_id);
static void intr_map_set_isrc(u_int res_id, struct intr_irqsrc *isrc);
+static struct intr_map_data * intr_map_get_map_data(u_int res_id);
static void intr_map_copy_map_data(u_int res_id, device_t *dev, intptr_t *xref,
struct intr_map_data **data);
@@ -1309,6 +1310,7 @@ intr_release_msi(device_t pci, device_t
{
struct intr_irqsrc **isrc;
struct intr_pic *pic;
+ struct intr_map_data_msi *msi;
int i, err;
pic = pic_lookup(NULL, xref);
@@ -1321,8 +1323,14 @@ intr_release_msi(device_t pci, device_t
isrc = malloc(sizeof(*isrc) * count, M_INTRNG, M_WAITOK);
- for (i = 0; i < count; i++)
- isrc[i] = intr_map_get_isrc(irqs[i]);
+ for (i = 0; i < count; i++) {
+ msi = (struct intr_map_data_msi *)
+ intr_map_get_map_data(irqs[i]);
+ KASSERT(msi->hdr.type == INTR_MAP_DATA_MSI,
+ ("%s: irq %d map data is not MSI", __func__,
+ irqs[i]));
+ isrc[i] = msi->isrc;
+ }
err = MSI_RELEASE_MSI(pic->pic_dev, child, count, isrc);
@@ -1369,6 +1377,7 @@ intr_release_msix(device_t pci, device_t
{
struct intr_irqsrc *isrc;
struct intr_pic *pic;
+ struct intr_map_data_msi *msi;
int err;
pic = pic_lookup(NULL, xref);
@@ -1379,7 +1388,12 @@ intr_release_msix(device_t pci, device_t
("%s: Found a non-MSI controller: %s", __func__,
device_get_name(pic->pic_dev)));
- isrc = intr_map_get_isrc(irq);
+ msi = (struct intr_map_data_msi *)
+ intr_map_get_map_data(irq);
+ KASSERT(msi->hdr.type == INTR_MAP_DATA_MSI,
+ ("%s: irq %d map data is not MSI", __func__,
+ irq));
+ isrc = msi->isrc;
if (isrc == NULL) {
intr_unmap_irq(irq);
return (EINVAL);
@@ -1516,6 +1530,24 @@ intr_map_set_isrc(u_int res_id, struct i
/*
* Get a copy of intr_map_entry data
*/
+static struct intr_map_data *
+intr_map_get_map_data(u_int res_id)
+{
+ struct intr_map_data *data;
+
+ data = NULL;
+ mtx_lock(&irq_map_lock);
+ if (res_id >= irq_map_count || irq_map[res_id] == NULL)
+ panic("Attempt to copy invalid resource id: %u\n", res_id);
+ data = irq_map[res_id]->map_data;
+ mtx_unlock(&irq_map_lock);
+
+ return (data);
+}
+
+/*
+ * Get a copy of intr_map_entry data
+ */
static void
intr_map_copy_map_data(u_int res_id, device_t *map_dev, intptr_t *map_xref,
struct intr_map_data **data)