21a6592999
mtx interface for NDIS_LOCK/UNLOCK. This should result in less
CPU utilization on behalf of the ndis driver. Additionally, this
commit also fixes a potential LOR in the ndis_tick code, by
not locking inside the ndis_tick function, but instead delegating
that work to the helpers called through IoQueueWorkItem. The
way that this is currently set up for NDIS prevents us from
simply implementing a callout_init_mtx mechanism.
However, the helper functions that handle the various timeout
cases implement fine-grained locking using the spinlocks provided
by the NDIS-compat layer, and using the mtx that is added with
this commit. This leaves the following ndis_softc members operated
on in ndis_tick in an unlocked context:
* ndis_hang_timer - Only modified outside of ndis_tick once, before
the first callout_reset to schedule ndis_tick
* ifp->if_oerrors - Only incremented in two places, which should be
an atomic op
* ndis_tx_timer - Assigned to 5 (when guaranteed to be 0) or 0
(in txeof), to indicate to ndis_tick what to
do. This is the only member of which I was
suspicious for needing the NDIS_LOCK here. My
testing (and another's) have been fine so far.
* ndis_stat_callout - Only uses a simple set of callout routines,
callout_reset only called by ndis_tick after
the initial reset, and then callout_drain is
used exactly once in shutdown code.
The benefit is that ndis_tick doesn't acquire NDIS_LOCK unless one of
the timeout conditions is flagged, and it still obeys the locking
order semantics that are dictated by the NDIS layer at the moment. I
have been investigating a more thorough s/spinlock/mtx/ of the NDIS
layer, but the simplest naive approach (replace KeAcquireSpinLock
with an mtx implementation) has anti-succeeded for me so far. This
is a good first step though.
Tested by: onemda@gmail.com
Reviewed by: current@, jhb, thompsa
Proposed by: jhb
190 lines
5.2 KiB
C
190 lines
5.2 KiB
C
/*-
|
|
* Copyright (c) 2003
|
|
* Bill Paul <wpaul@windriver.com>. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by Bill Paul.
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
|
* THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#define NDIS_DEFAULT_NODENAME "FreeBSD NDIS node"
|
|
#define NDIS_NODENAME_LEN 32
|
|
|
|
/* For setting/getting OIDs from userspace. */
|
|
|
|
struct ndis_oid_data {
|
|
uint32_t oid;
|
|
uint32_t len;
|
|
#ifdef notdef
|
|
uint8_t data[1];
|
|
#endif
|
|
};
|
|
|
|
struct ndis_pci_type {
|
|
uint16_t ndis_vid;
|
|
uint16_t ndis_did;
|
|
uint32_t ndis_subsys;
|
|
char *ndis_name;
|
|
};
|
|
|
|
struct ndis_pccard_type {
|
|
const char *ndis_vid;
|
|
const char *ndis_did;
|
|
char *ndis_name;
|
|
};
|
|
|
|
struct ndis_shmem {
|
|
list_entry ndis_list;
|
|
bus_dma_tag_t ndis_stag;
|
|
bus_dmamap_t ndis_smap;
|
|
void *ndis_saddr;
|
|
ndis_physaddr ndis_paddr;
|
|
};
|
|
|
|
struct ndis_cfglist {
|
|
ndis_cfg ndis_cfg;
|
|
struct sysctl_oid *ndis_oid;
|
|
TAILQ_ENTRY(ndis_cfglist) link;
|
|
};
|
|
|
|
/*
|
|
* Helper struct to make parsing information
|
|
* elements easier.
|
|
*/
|
|
struct ndis_ie {
|
|
uint8_t ni_oui[3];
|
|
uint8_t ni_val;
|
|
};
|
|
|
|
TAILQ_HEAD(nch, ndis_cfglist);
|
|
|
|
#define NDIS_INITIALIZED(sc) (sc->ndis_block->nmb_devicectx != NULL)
|
|
|
|
#define NDIS_TXPKTS 64
|
|
#define NDIS_INC(x) \
|
|
(x)->ndis_txidx = ((x)->ndis_txidx + 1) % NDIS_TXPKTS
|
|
|
|
|
|
#define NDIS_EVENTS 4
|
|
#define NDIS_EVTINC(x) (x) = ((x) + 1) % NDIS_EVENTS
|
|
|
|
struct ndis_evt {
|
|
uint32_t ne_sts;
|
|
uint32_t ne_len;
|
|
char *ne_buf;
|
|
};
|
|
|
|
struct ndis_vap {
|
|
struct ieee80211vap vap;
|
|
|
|
int (*newstate)(struct ieee80211vap *,
|
|
enum ieee80211_state, int);
|
|
};
|
|
#define NDIS_VAP(vap) ((struct ndis_vap *)(vap))
|
|
|
|
struct ndis_softc {
|
|
struct ifnet *ifp;
|
|
struct ifmedia ifmedia; /* media info */
|
|
u_long ndis_hwassist;
|
|
uint32_t ndis_v4tx;
|
|
uint32_t ndis_v4rx;
|
|
bus_space_handle_t ndis_bhandle;
|
|
bus_space_tag_t ndis_btag;
|
|
void *ndis_intrhand;
|
|
struct resource *ndis_irq;
|
|
struct resource *ndis_res;
|
|
struct resource *ndis_res_io;
|
|
int ndis_io_rid;
|
|
struct resource *ndis_res_mem;
|
|
int ndis_mem_rid;
|
|
struct resource *ndis_res_altmem;
|
|
int ndis_altmem_rid;
|
|
struct resource *ndis_res_am; /* attribute mem (pccard) */
|
|
int ndis_am_rid;
|
|
struct resource *ndis_res_cm; /* common mem (pccard) */
|
|
struct resource_list ndis_rl;
|
|
int ndis_rescnt;
|
|
struct mtx ndis_mtx;
|
|
uint8_t ndis_irql;
|
|
device_t ndis_dev;
|
|
int ndis_unit;
|
|
ndis_miniport_block *ndis_block;
|
|
ndis_miniport_characteristics *ndis_chars;
|
|
interface_type ndis_type;
|
|
struct callout ndis_stat_callout;
|
|
int ndis_maxpkts;
|
|
ndis_oid *ndis_oids;
|
|
int ndis_oidcnt;
|
|
int ndis_txidx;
|
|
int ndis_txpending;
|
|
ndis_packet **ndis_txarray;
|
|
ndis_handle ndis_txpool;
|
|
int ndis_sc;
|
|
ndis_cfg *ndis_regvals;
|
|
struct nch ndis_cfglist_head;
|
|
int ndis_80211;
|
|
int ndis_link;
|
|
uint32_t ndis_sts;
|
|
uint32_t ndis_filter;
|
|
int ndis_if_flags;
|
|
int ndis_skip;
|
|
|
|
int ndis_devidx;
|
|
interface_type ndis_iftype;
|
|
driver_object *ndis_dobj;
|
|
io_workitem *ndis_tickitem;
|
|
io_workitem *ndis_startitem;
|
|
io_workitem *ndis_resetitem;
|
|
io_workitem *ndis_inputitem;
|
|
kdpc ndis_rxdpc;
|
|
bus_dma_tag_t ndis_parent_tag;
|
|
list_entry ndis_shlist;
|
|
bus_dma_tag_t ndis_mtag;
|
|
bus_dma_tag_t ndis_ttag;
|
|
bus_dmamap_t *ndis_mmaps;
|
|
bus_dmamap_t *ndis_tmaps;
|
|
int ndis_mmapcnt;
|
|
struct ndis_evt ndis_evt[NDIS_EVENTS];
|
|
int ndis_evtpidx;
|
|
int ndis_evtcidx;
|
|
struct ifqueue ndis_rxqueue;
|
|
kspin_lock ndis_rxlock;
|
|
|
|
struct taskqueue *ndis_tq; /* private task queue */
|
|
struct task ndis_scantask;
|
|
struct task ndis_authtask;
|
|
struct task ndis_assoctask;
|
|
int (*ndis_newstate)(struct ieee80211com *,
|
|
enum ieee80211_state, int);
|
|
int ndis_tx_timer;
|
|
int ndis_hang_timer;
|
|
};
|
|
|
|
#define NDIS_LOCK(_sc) mtx_lock(&(_sc)->ndis_mtx)
|
|
#define NDIS_UNLOCK(_sc) mtx_unlock(&(_sc)->ndis_mtx)
|