* [PATCH 0/2] ath9k: few memory fixes
@ 2008-12-03 2:21 Luis R. Rodriguez
2008-12-03 2:21 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
0 siblings, 1 reply; 4+ messages in thread
From: Luis R. Rodriguez @ 2008-12-03 2:21 UTC (permalink / raw)
To: linville, linville
Cc: Sujith.Manoharan, senthilkumar, Luis R. Rodriguez, linux-wireless,
ath9k-devel
This series addresses some memory issues present on ath9k
regarding allocation and not handling failed DMA maps. These
two patches replace the patch titled:
[PATCH] ath9k: Use GFP_ATOMIC when allocating private area
But also adds the failed DMA checks.
I've merged the ath_tx_setup_buffer() failure case into the DMA checks.
Luis
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ath9k: Check for pci_map_single() errors
2008-12-03 2:21 [PATCH 0/2] ath9k: few memory fixes Luis R. Rodriguez
@ 2008-12-03 2:21 ` Luis R. Rodriguez
2008-12-03 2:21 ` [PATCH 2/2] ath9k: Use GFP_ATOMIC when allocating TX private area Luis R. Rodriguez
2008-12-03 2:23 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
0 siblings, 2 replies; 4+ messages in thread
From: Luis R. Rodriguez @ 2008-12-03 2:21 UTC (permalink / raw)
To: linville, linville
Cc: Sujith.Manoharan, senthilkumar, Luis R. Rodriguez, linux-wireless,
ath9k-devel
pci_map_single() can fail so detect those errors with
pci_dma_mapping_error() and deal with them accordingly.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/ath9k/beacon.c | 16 +++++++++++++++-
drivers/net/wireless/ath9k/recv.c | 15 +++++++++++++++
drivers/net/wireless/ath9k/xmit.c | 23 +++++++++++++++++++++--
3 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c
index e80d9b9..a393761 100644
--- a/drivers/net/wireless/ath9k/beacon.c
+++ b/drivers/net/wireless/ath9k/beacon.c
@@ -192,6 +192,13 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
pci_map_single(sc->pdev, skb->data,
skb->len,
PCI_DMA_TODEVICE);
+ if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
+ dev_kfree_skb(skb);
+ bf->bf_mpdu = NULL;
+ DPRINTF(sc, ATH_DBG_CONFIG,
+ "pci_dma_mapping_error() on beaconing\n");
+ return NULL;
+ }
skb = ieee80211_get_buffered_bc(sc->hw, vif);
@@ -396,11 +403,18 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
memcpy(&hdr[1], &val, sizeof(val));
}
+ bf->bf_mpdu = skb;
bf->bf_buf_addr = bf->bf_dmacontext =
pci_map_single(sc->pdev, skb->data,
skb->len,
PCI_DMA_TODEVICE);
- bf->bf_mpdu = skb;
+ if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
+ dev_kfree_skb(skb);
+ bf->bf_mpdu = NULL;
+ DPRINTF(sc, ATH_DBG_CONFIG,
+ "pci_dma_mapping_error() on beacon alloc\n");
+ return -ENOMEM;
+ }
return 0;
}
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c
index ba6194a..63d34fd 100644
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -309,6 +309,14 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
bf->bf_buf_addr = pci_map_single(sc->pdev, skb->data,
sc->sc_rxbufsize,
PCI_DMA_FROMDEVICE);
+ if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
+ dev_kfree_skb(skb);
+ bf->bf_mpdu = NULL;
+ DPRINTF(sc, ATH_DBG_CONFIG,
+ "pci_dma_mapping_error() on RX init\n");
+ error = -ENOMEM;
+ break;
+ }
bf->bf_dmacontext = bf->bf_buf_addr;
}
sc->sc_rxlink = NULL;
@@ -594,6 +602,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
bf->bf_buf_addr = pci_map_single(sc->pdev, requeue_skb->data,
sc->sc_rxbufsize,
PCI_DMA_FROMDEVICE);
+ if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
+ dev_kfree_skb(requeue_skb);
+ bf->bf_mpdu = NULL;
+ DPRINTF(sc, ATH_DBG_CONFIG,
+ "pci_dma_mapping_error() on RX\n");
+ break;
+ }
bf->bf_dmacontext = bf->bf_buf_addr;
/*
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 413fbdd..ef209b5 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -1653,7 +1653,7 @@ static void ath_txq_drain_pending_buffers(struct ath_softc *sc,
}
}
-static void ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,
+static int ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,
struct sk_buff *skb,
struct ath_tx_control *txctl)
{
@@ -1712,9 +1712,18 @@ static void ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,
/* DMA setup */
bf->bf_mpdu = skb;
+
bf->bf_dmacontext = pci_map_single(sc->pdev, skb->data,
skb->len, PCI_DMA_TODEVICE);
+ if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_dmacontext))) {
+ bf->bf_mpdu = NULL;
+ DPRINTF(sc, ATH_DBG_CONFIG,
+ "pci_dma_mapping_error() on TX\n");
+ return -ENOMEM;
+ }
+
bf->bf_buf_addr = bf->bf_dmacontext;
+ return 0;
}
/* FIXME: tx power */
@@ -1786,10 +1795,12 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
spin_unlock_bh(&txctl->txq->axq_lock);
}
+/* Upon failure caller should free skb */
int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb,
struct ath_tx_control *txctl)
{
struct ath_buf *bf;
+ int r;
/* Check if a tx buffer is available */
@@ -1800,7 +1811,15 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb,
return -1;
}
- ath_tx_setup_buffer(sc, bf, skb, txctl);
+ r = ath_tx_setup_buffer(sc, bf, skb, txctl);
+ if (r) {
+ spin_lock_bh(&sc->sc_txbuflock);
+ DPRINTF(sc, ATH_DBG_FATAL, "TX mem alloc failure\n");
+ list_add_tail(&bf->list, &sc->sc_txbuf);
+ spin_unlock_bh(&sc->sc_txbuflock);
+ return r;
+ }
+
ath_tx_start_dma(sc, bf, txctl);
return 0;
--
1.5.6.rc2.15.g457bb.dirty
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ath9k: Use GFP_ATOMIC when allocating TX private area
2008-12-03 2:21 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
@ 2008-12-03 2:21 ` Luis R. Rodriguez
2008-12-03 2:23 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
1 sibling, 0 replies; 4+ messages in thread
From: Luis R. Rodriguez @ 2008-12-03 2:21 UTC (permalink / raw)
To: linville, linville
Cc: Sujith.Manoharan, senthilkumar, Luis R. Rodriguez, linux-wireless,
ath9k-devel
Using GFP_KERNEL was wrong and produces a 'scheduling while atomic'
bug. Also, check for proper return values now, in case allocation
fails.
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/ath9k/xmit.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index ef209b5..c815198 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -1663,7 +1663,9 @@ static int ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,
int hdrlen;
__le16 fc;
- tx_info_priv = kzalloc(sizeof(*tx_info_priv), GFP_KERNEL);
+ tx_info_priv = kzalloc(sizeof(*tx_info_priv), GFP_ATOMIC);
+ if (!tx_info_priv)
+ return -ENOMEM;
tx_info->rate_driver_data[0] = tx_info_priv;
hdrlen = ieee80211_get_hdrlen_from_skb(skb);
fc = hdr->frame_control;
--
1.5.6.rc2.15.g457bb.dirty
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ath9k: Check for pci_map_single() errors
2008-12-03 2:21 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
2008-12-03 2:21 ` [PATCH 2/2] ath9k: Use GFP_ATOMIC when allocating TX private area Luis R. Rodriguez
@ 2008-12-03 2:23 ` Luis R. Rodriguez
1 sibling, 0 replies; 4+ messages in thread
From: Luis R. Rodriguez @ 2008-12-03 2:23 UTC (permalink / raw)
To: Luis Rodriguez
Cc: linville@tuxdriver.com, Sujith Manoharan,
Senthilkumar Balasubramanian, linux-wireless@vger.kernel.org,
ath9k-devel@lists.ath9k.org
On Tue, Dec 02, 2008 at 06:21:05PM -0800, Luis Rodriguez wrote:
> pci_map_single() can fail so detect those errors with
> pci_dma_mapping_error() and deal with them accordingly.
>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
> drivers/net/wireless/ath9k/beacon.c | 16 +++++++++++++++-
> drivers/net/wireless/ath9k/recv.c | 15 +++++++++++++++
> drivers/net/wireless/ath9k/xmit.c | 23 +++++++++++++++++++++--
> 3 files changed, 51 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c
> index e80d9b9..a393761 100644
> --- a/drivers/net/wireless/ath9k/beacon.c
> +++ b/drivers/net/wireless/ath9k/beacon.c
> @@ -192,6 +192,13 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
> pci_map_single(sc->pdev, skb->data,
> skb->len,
> PCI_DMA_TODEVICE);
> + if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
> + dev_kfree_skb(skb);
Bleh, these are all wrong, they should be dev_kfree_skb_any(skb).
Luis
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-12-03 2:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-03 2:21 [PATCH 0/2] ath9k: few memory fixes Luis R. Rodriguez
2008-12-03 2:21 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
2008-12-03 2:21 ` [PATCH 2/2] ath9k: Use GFP_ATOMIC when allocating TX private area Luis R. Rodriguez
2008-12-03 2:23 ` [PATCH 1/2] ath9k: Check for pci_map_single() errors Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).