From owner-svn-src-all@freebsd.org Wed Oct 14 23:47:09 2015 Return-Path: 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 917EDA15C1D; Wed, 14 Oct 2015 23:47:09 +0000 (UTC) (envelope-from cem@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 5EFA8834; Wed, 14 Oct 2015 23:47:09 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ENl8F5050579; Wed, 14 Oct 2015 23:47:08 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ENl8Rv050578; Wed, 14 Oct 2015 23:47:08 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201510142347.t9ENl8Rv050578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Wed, 14 Oct 2015 23:47:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289343 - head/sys/dev/ntb/ntb_hw 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 23:47:09 -0000 Author: cem Date: Wed Oct 14 23:47:08 2015 New Revision: 289343 URL: https://svnweb.freebsd.org/changeset/base/289343 Log: NTB: Reserve link event doorbell callback on Xeon Consumers that registered on this bit would never see a callback and it is likely a mistake. This does not affect if_ntb, which limits itself to a single doorbell callback. Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Oct 14 23:46:15 2015 (r289342) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Oct 14 23:47:08 2015 (r289343) @@ -110,6 +110,7 @@ struct ntb_db_cb { void *data; struct ntb_softc *ntb; struct callout irq_work; + bool reserved; }; struct ntb_softc { @@ -513,6 +514,12 @@ ntb_setup_xeon_msix(struct ntb_softc *nt return (ENXIO); } } + + /* + * Prevent consumers from registering callbacks on the link event irq + * slot, from which they will never be called back. + */ + ntb->db_cb[num_vectors - 1].reserved = true; return (0); } @@ -1302,15 +1309,17 @@ int ntb_register_db_callback(struct ntb_softc *ntb, unsigned int idx, void *data, ntb_db_callback func) { + struct ntb_db_cb *db_cb = &ntb->db_cb[idx]; - if (idx >= ntb->allocated_interrupts || ntb->db_cb[idx].callback) { + if (idx >= ntb->allocated_interrupts || db_cb->callback || + db_cb->reserved) { device_printf(ntb->device, "Invalid Index.\n"); return (EINVAL); } - ntb->db_cb[idx].callback = func; - ntb->db_cb[idx].data = data; - callout_init(&ntb->db_cb[idx].irq_work, 1); + db_cb->callback = func; + db_cb->data = data; + callout_init(&db_cb->irq_work, 1); unmask_ldb_interrupt(ntb, idx);