2013-04-02 10:52:02

by Zefir Kurtisi

Subject: [PATCH] ath9k: fix DFS detector called in softirq context

Signed-off-by: Zefir Kurtisi <[email protected]>
---
.../net/wireless/ath/ath9k/dfs_pattern_detector.c | 4 ++--
drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 467b600..73fe8d6 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@ -143,14 +143,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
u32 sz, i;
struct channel_detector *cd;

- cd = kmalloc(sizeof(*cd), GFP_KERNEL);
+ cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
if (cd == NULL)
goto fail;

INIT_LIST_HEAD(&cd->head);
cd->freq = freq;
sz = sizeof(cd->detectors) * dpd->num_radar_types;
- cd->detectors = kzalloc(sz, GFP_KERNEL);
+ cd->detectors = kzalloc(sz, GFP_ATOMIC);
if (cd->detectors == NULL)
goto fail;

diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
index 91b8dce..5e48c55 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
@@ -218,7 +218,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts)
{
struct pulse_elem *p = pool_get_pulse_elem();
if (p == NULL) {
- p = kmalloc(sizeof(*p), GFP_KERNEL);
+ p = kmalloc(sizeof(*p), GFP_ATOMIC);
if (p == NULL) {
DFS_POOL_STAT_INC(pulse_alloc_error);
return false;
@@ -299,7 +299,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde,
ps.deadline_ts = ps.first_ts + ps.dur;
new_ps = pool_get_pseq_elem();
if (new_ps == NULL) {
- new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);
+ new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);
if (new_ps == NULL) {
DFS_POOL_STAT_INC(pseq_alloc_error);
return false;
--
1.7.4.1

2013-04-03 18:00:54

by John W. Linville

Subject: Re: [PATCH] ath9k: fix DFS detector called in softirq context

It looks like this could apply to 3.9 -- should it be applied there?

On Tue, Apr 02, 2013 at 12:51:48PM +0200, Zefir Kurtisi wrote:
> Signed-off-by: Zefir Kurtisi <[email protected]>
> ---
> .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 4 ++--
> drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
> index 467b600..73fe8d6 100644
> --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
> +++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
> @@ -143,14 +143,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
> u32 sz, i;
> struct channel_detector *cd;
>
> - cd = kmalloc(sizeof(*cd), GFP_KERNEL);
> + cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
> if (cd == NULL)
> goto fail;
>
> INIT_LIST_HEAD(&cd->head);
> cd->freq = freq;
> sz = sizeof(cd->detectors) * dpd->num_radar_types;
> - cd->detectors = kzalloc(sz, GFP_KERNEL);
> + cd->detectors = kzalloc(sz, GFP_ATOMIC);
> if (cd->detectors == NULL)
> goto fail;
>
> diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
> index 91b8dce..5e48c55 100644
> --- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
> +++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
> @@ -218,7 +218,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts)
> {
> struct pulse_elem *p = pool_get_pulse_elem();
> if (p == NULL) {
> - p = kmalloc(sizeof(*p), GFP_KERNEL);
> + p = kmalloc(sizeof(*p), GFP_ATOMIC);
> if (p == NULL) {
> DFS_POOL_STAT_INC(pulse_alloc_error);
> return false;
> @@ -299,7 +299,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde,
> ps.deadline_ts = ps.first_ts + ps.dur;
> new_ps = pool_get_pseq_elem();
> if (new_ps == NULL) {
> - new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);
> + new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);
> if (new_ps == NULL) {
> DFS_POOL_STAT_INC(pseq_alloc_error);
> return false;
> --
> 1.7.4.1
>
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2013-04-04 08:01:57

by Zefir Kurtisi

Subject: Re: [PATCH] ath9k: fix DFS detector called in softirq context

On 04/03/2013 07:46 PM, John W. Linville wrote:
> It looks like this could apply to 3.9 -- should it be applied there?
>

Yes it should. Thanks.