Skip to contentSkip to conversation

FAILED: patch "[PATCH] iwlwifi: mvm: don't allow sched scans without matches to be" failed to apply to 4.4-stable tree

PATCH [email protected] 3 participants 11 messages Mar 1, 2016

Subsystems (2)
Stable branch Intel wireless wifi link (iwlwifi)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 2001

From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: [PATCH] iwlwifi: mvm: don't allow sched scans without matches to be
started

The firmware can perform a scheduled scan with not matchsets passed, but it can't send notification that results were found. Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Cc <[email protected]> [3.17+]
Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +4 -0
index 9a15642f80dd..ea1e177c2ea1 100644
@@ -1298,6 +1298,10 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 		return -EBUSY;
 	}
 
+	/* we don't support "match all" in the firmware */
+	if (!req->n_match_sets)
+		return -EOPNOTSUPP;
+
 	ret = iwl_mvm_check_running_scans(mvm, type);
 	if (ret)
 		return ret;
#1 lore raw

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3 and it applied cleanly.

Do you want me to send it again anyway?

--
Cheers,
Luca.

Quoted 50 lines · On Tue, 2016-03-01 at 10:45 -0800, [email protected] wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit
id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: [PATCH] iwlwifi: mvm: don't allow sched scans without matches to be
 started

The firmware can perform a scheduled scan with not matchsets passed, but it can't send notification that results were found.  Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Cc <[email protected]> [3.17+]
Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644
@@ -1298,6 +1298,10 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm
 *mvm,
  		return -EBUSY;
  	}

drivers/net/wireless/intel/iwlwifi/mvm/scan.c +4 -0
+	/* we don't support "match all" in the firmware */
+	if (!req->n_match_sets)
+		return -EOPNOTSUPP;
+

  ret = iwl_mvm_check_running_scans(mvm, type); if (ret)
  return ret;

author maintainer
#2 lore raw
Quoted 4 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3 and it applied cleanly.

I think it breaks the build, can you try to test build it as well?

thanks,

greg k-h

#3 lore raw
Quoted 8 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 5 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3 and
it applied cleanly.

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

--
Luca.

#4 lore raw
Quoted 11 lines · Luciano
Quoted 8 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 5 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3 and
it applied cleanly.

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

Tried to do everything again, from scratch.  The patch applied cleanly and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

--
Luca.

author maintainer
#5 lore raw
Quoted 11 lines · Luciano
Quoted 10 lines · Luciano
Quoted 8 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 5 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3 and
it applied cleanly.

I think it breaks the build, can you try to test build it as well?

Quoted 8 lines
Quoted 1 line

Sure, I'm building it right now.

Tried to do everything again, from scratch.  The patch applied cleanly and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches-to-be-started.patch 
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 2001
|From: Luca Coelho <[email protected]>
|Date: Tue, 2 Feb 2016 15:11:15 +0200
|Subject: iwlwifi: mvm: don't allow sched scans without matches to be started
|
|From: Luca Coelho <[email protected]>
|
|commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.
|
|The firmware can perform a scheduled scan with not matchsets passed,
|but it can't send notification that results were found.  Since the
|userspace then cannot know when we got new results and the firmware
|wouldn't trigger a wake in case we are sleeping, it's better not to
|allow scans without matchsets.
|
|This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831
|
|Signed-off-by: Luca Coelho <[email protected]>
|Signed-off-by: Emmanuel Grumbach <[email protected]>
|Signed-off-by: Greg Kroah-Hartman <[email protected]>
|
|diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
|index 9a15642f80dd..ea1e177c2ea1 100644
|--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
|+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
--------------------------
File to patch:

That's the issue, things got renamed :(

#6 lore raw
Quoted 67 lines · On Tue, 2016-03-01 at 20:02 +0000, [email protected] wrote:
Quoted 17 lines · Luciano
Quoted 11 lines · Luciano
Quoted 9 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 6 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3
and
it applied cleanly.

Quoted 4 lines
Quoted 2 lines

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

Quoted 7 lines

Tried to do everything again, from scratch.  The patch applied cleanly
and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches-
to-be-started.patch 
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

Quoted 29 lines

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: iwlwifi: mvm: don't allow sched scans without matches to be started

From: Luca Coelho <[email protected]>

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found.  Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644

--------------------------
File to patch:

Quoted 1 line

That's the issue, things got renamed :(

Ah, okay, I should have realized that, sorry.

I thought you were using at least 'git am -3' or something to let git do its tricks on these minor issues.  I'll send the new patch for 4.4 right away (since I already have it after all). :)

--
Cheers,
Luca.

author maintainer
#7 lore raw
Quoted 68 lines · Luciano
Quoted 67 lines · On Tue, 2016-03-01 at 20:02 +0000, [email protected] wrote:
Quoted 17 lines · Luciano
Quoted 11 lines · Luciano
Quoted 9 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 6 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3
and
it applied cleanly.

Quoted 4 lines
Quoted 2 lines

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

Quoted 7 lines

Tried to do everything again, from scratch.  The patch applied cleanly
and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches-
to-be-started.patch 
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

Quoted 29 lines

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: iwlwifi: mvm: don't allow sched scans without matches to be started

From: Luca Coelho <[email protected]>

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found.  Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644

--------------------------
File to patch:

Quoted 7 lines
Quoted 1 line

That's the issue, things got renamed :(

Ah, okay, I should have realized that, sorry.

I thought you were using at least 'git am -3' or something to let git do its tricks on these minor issues.  I'll send the new patch for 4.4 right away (since I already have it after all). :)

I use quilt, not git until I apply the patches when the tree is released.

thanks,

greg k-h

#8 lore raw
Quoted 71 lines · On 03/01/2016 10:11 PM, [email protected] wrote:
Quoted 70 lines · Luciano
Quoted 68 lines · On Tue, 2016-03-01 at 20:02 +0000, [email protected] wrote:
Quoted 17 lines · Luciano
Quoted 11 lines · Luciano
Quoted 9 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 6 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3
and
it applied cleanly.

Quoted 4 lines
Quoted 2 lines

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

Quoted 7 lines

Tried to do everything again, from scratch. The patch applied cleanly
and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches-
to-be-started.patch
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

Quoted 29 lines

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00
2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: iwlwifi: mvm: don't allow sched scans without matches to be started

From: Luca Coelho <[email protected]>

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found. Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644

--------------------------
File to patch:

That's the issue, things got renamed :(

Quoted 9 lines
Quoted 5 lines

Ah, okay, I should have realized that, sorry.

I thought you were using at least 'git am -3' or something to let git do its tricks on these minor issues. I'll send the new patch for 4.4 right away (since I already have it after all). :)

I use quilt, not git until I apply the patches when the tree is released.

Greg, do you want to resend all the patches that failed due to the directory restruturation?

#9 lore raw
Quoted 95 lines · Emmanuel
Quoted 93 lines · On 03/01/2016 10:11 PM, [email protected] wrote:
Quoted 91 lines · Luciano
Quoted 80 lines · On Tue, 2016-03-01 at 20:02 +0000, [email protected] wrote:
Quoted 20 lines · Luciano
Quoted 13 lines · Luciano
Quoted 10 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] rg wrote:
Quoted 7 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of
4.4.3
and
it applied cleanly.

Quoted 5 lines
Quoted 3 lines

I think it breaks the build, can you try to test build it as
well?

Sure, I'm building it right now.

Quoted 8 lines

Tried to do everything again, from scratch.  The patch applied
cleanly
and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-
matches-
to-be-started.patch
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

Quoted 36 lines

 From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00
2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: iwlwifi: mvm: don't allow sched scans without matches to
be started

From: Luca Coelho <[email protected]>

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found.  Since the
userspace then cannot know when we got new results and the firmware
wouldn't trigger a wake in case we are sleeping, it's better not to
allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]
Quoted 1 line
Signed-off-by Greg Kroah-Hartman <[email protected]
Quoted 1 line
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644

--------------------------
File to patch:

Quoted 1 line

That's the issue, things got renamed :(

Ah, okay, I should have realized that, sorry.

I thought you were using at least 'git am -3' or something to let git
do its tricks on these minor issues.  I'll send the new patch for 4.4
right away (since I already have it after all). :)

Quoted 6 lines
Quoted 3 lines

I use quilt, not git until I apply the patches when the tree is released.

Greg, do you want to resend all the patches that failed due to the directory restruturation?

This probably happens with *all* wireless patches...

--
Luca.

author maintainer
#10 lore raw
In reply to Grumbach, Emmanuel
Quoted 80 lines · Emmanuel
Quoted 77 lines · On 03/01/2016 10:11 PM, [email protected] wrote:
Quoted 75 lines · Luciano
Quoted 67 lines · On Tue, 2016-03-01 at 20:02 +0000, [email protected] wrote:
Quoted 17 lines · Luciano
Quoted 11 lines · Luciano
Quoted 9 lines · On Tue, 2016-03-01 at 19:42 +0000, [email protected] wrote:
Quoted 6 lines · Luciano

Hi Greg,

This is strange... I just tried to cherry-pick it on top of 4.4.3
and
it applied cleanly.

Quoted 4 lines
Quoted 2 lines

I think it breaks the build, can you try to test build it as well?

Sure, I'm building it right now.

Quoted 7 lines

Tried to do everything again, from scratch. The patch applied cleanly
and the iwlwifi driver built without any problems.

Pastebin of the output here:

http://pastebin.coelho.fi/cc3fd7dd9016d944.txt

Ah, I can't use cherry-pick:

$ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches-
to-be-started.patch
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

Quoted 29 lines

From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00
2001
From: Luca Coelho <[email protected]>
Date: Tue, 2 Feb 2016 15:11:15 +0200
Subject: iwlwifi: mvm: don't allow sched scans without matches to be started

From: Luca Coelho <[email protected]>

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found. Since the userspace then cannot know when we got new results and the firmware wouldn't trigger a wake in case we are sleeping, it's better not to allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Signed-off-by Luca Coelho <[email protected]>
Signed-off-by Emmanuel Grumbach <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +0 -0
index 9a15642f80dd..ea1e177c2ea1 100644

--------------------------
File to patch:

Quoted 1 line

That's the issue, things got renamed :(

Ah, okay, I should have realized that, sorry.

I thought you were using at least 'git am -3' or something to let git do its tricks on these minor issues. I'll send the new patch for 4.4 right away (since I already have it after all). :)

Quoted 6 lines
Quoted 3 lines

I use quilt, not git until I apply the patches when the tree is released.

Greg, do you want to resend all the patches that failed due to the directory restruturation?

Yes, please do.