Re: [PATCH] ath10k: add configurable debugging.

2017-06-01 Thread Kalle Valo 
Adrian Chadd  writes:

 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
 @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t
 priv_size, struct device *dev,
  ar->hw_rev = hw_rev;
  ar->hif.ops = hif_ops;
  ar->hif.bus = bus;
 +ar->debug_mask = ath10k_debug_mask;
 +ar->trace_debug_mask = ath10k_debug_mask;
>>>
>>> Until now tracing has been always enabled, irrespective what debug_mask
>>> has contained. Now you are changing that and by default log messages are
>>> not delivered through tracing until user enables them. So I think to
>>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
>>> (0x) by default and the user can modify the mask per device via
>>> the debugfs file.
>>>
>>> But is it really needed to be able to filter trace messages? debug_mask
>>> I understand, but not sure about trace_debug_mask.
>>
>> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
>> is relatively small and if needed you can pass filter expressions with
>> trace-cmd record.
>
> The reason for configuring it via a mask is that:
>
> * the previous behaviour is "always call debug(), conditionally print,
> always pass to trace"
>
> This meant that function arguments were evaluated even if things
> weren't being printed.
>
> So to avoid that in the default case, there are now two masks. If I
> have one mask then I can only trace what is being printed, which is
> not desired. I'd like to be able to have no overhead when doing no
> debugging, a little overhead when doing tracing (and only the items
> being traced), and then printing when I want to print.

Ok, so you want also filter tracing messages. Any particular reason for
that, limited storage space or something else? Just curious.

So what's the most expensive part here, the actual function call to
ath10k_dbg() or va_start()/ve_end() within the function? And do you have
before and after throughput numbers for this? And maybe also with
CONFIG_ATH10K_DEBUG is disabled, which should be the most fastest. It
would be good to know how much this has affect on performance.

We could of course always change ath10k_dbg()/ath10k_dbg_dump() to
inline functions (or maybe even cpp macros) but if va_start()/va_end()
are the expensive part that won't help.

-- 
Kalle Valo

Re: [PATCH] ath10k: add configurable debugging.

2017-06-01 Thread Adrian Chadd 
On 1 June 2017 at 06:24, Kalle Valo  wrote:
> Arend van Spriel  writes:
>
>> On 31-05-17 14:16, Kalle Valo wrote:
>>> Adrian Chadd  writes:
>>>
 This adds a few configurable debugging options:

 * driver debugging and tracing is now configurable per device
 * driver debugging and tracing is now configurable at runtime
 * the debugging / tracing is not run at all (besides a mask check)
   unless the specific debugging bitmap field is configured.

 Signed-off-by: Adrian Chadd 
>>>
>>> [...]
>>>
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
 @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t
 priv_size, struct device *dev,
 ar->hw_rev = hw_rev;
 ar->hif.ops = hif_ops;
 ar->hif.bus = bus;
 +   ar->debug_mask = ath10k_debug_mask;
 +   ar->trace_debug_mask = ath10k_debug_mask;
>>>
>>> Until now tracing has been always enabled, irrespective what debug_mask
>>> has contained. Now you are changing that and by default log messages are
>>> not delivered through tracing until user enables them. So I think to
>>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
>>> (0x) by default and the user can modify the mask per device via
>>> the debugfs file.
>>>
>>> But is it really needed to be able to filter trace messages? debug_mask
>>> I understand, but not sure about trace_debug_mask.
>>
>> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
>> is relatively small and if needed you can pass filter expressions with
>> trace-cmd record.
>
> I also think that this is how it should work. For example, if you have
> tracing enabled in wpasupplicant/hostapd with the command below you can
> get a lot of information in one file with relatively little overhead:
>
> trace-cmd record -e mac80211 -e cfg80211 -e ath10k
>
> But if user is forced to use debugfs to enable ath10k tracing that is
> quite a step backwards.
>

I agree that is how it should work, but i can't see how you do it on
ath10k without the debug overhead always being there.

If there's a way to know /a/ trace watch is going on from the kernel
then it could be flipped on for that, but i didn't see any obvious
"trace enable" / "trace disable" hooks.



-a

Re: [PATCH] ath10k: add configurable debugging.

2017-06-01 Thread Kalle Valo 
Arend van Spriel  writes:

> On 31-05-17 14:16, Kalle Valo wrote:
>> Adrian Chadd  writes:
>> 
>>> This adds a few configurable debugging options:
>>>
>>> * driver debugging and tracing is now configurable per device
>>> * driver debugging and tracing is now configurable at runtime
>>> * the debugging / tracing is not run at all (besides a mask check)
>>>   unless the specific debugging bitmap field is configured.
>>>
>>> Signed-off-by: Adrian Chadd 
>> 
>> [...]
>> 
>>> --- a/drivers/net/wireless/ath/ath10k/core.c
>>> +++ b/drivers/net/wireless/ath/ath10k/core.c
>>> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t
>>> priv_size, struct device *dev,
>>> ar->hw_rev = hw_rev;
>>> ar->hif.ops = hif_ops;
>>> ar->hif.bus = bus;
>>> +   ar->debug_mask = ath10k_debug_mask;
>>> +   ar->trace_debug_mask = ath10k_debug_mask;
>> 
>> Until now tracing has been always enabled, irrespective what debug_mask
>> has contained. Now you are changing that and by default log messages are
>> not delivered through tracing until user enables them. So I think to
>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
>> (0x) by default and the user can modify the mask per device via
>> the debugfs file.
>> 
>> But is it really needed to be able to filter trace messages? debug_mask
>> I understand, but not sure about trace_debug_mask.
>
> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
> is relatively small and if needed you can pass filter expressions with
> trace-cmd record.

I also think that this is how it should work. For example, if you have
tracing enabled in wpasupplicant/hostapd with the command below you can
get a lot of information in one file with relatively little overhead:

trace-cmd record -e mac80211 -e cfg80211 -e ath10k

But if user is forced to use debugfs to enable ath10k tracing that is
quite a step backwards.

-- 
Kalle Valo

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Adrian Chadd 
On 31 May 2017 at 14:28, Arend van Spriel  wrote:
> On 31-05-17 22:23, Adrian Chadd wrote:
>> On 31 May 2017 at 13:20, Arend van Spriel  
>> wrote:
>>> On 31-05-17 14:16, Kalle Valo wrote:
 Adrian Chadd  writes:

> This adds a few configurable debugging options:
>
> * driver debugging and tracing is now configurable per device
> * driver debugging and tracing is now configurable at runtime
> * the debugging / tracing is not run at all (besides a mask check)
>   unless the specific debugging bitmap field is configured.
>
> Signed-off-by: Adrian Chadd 

 [...]

> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
> struct device *dev,
>  ar->hw_rev = hw_rev;
>  ar->hif.ops = hif_ops;
>  ar->hif.bus = bus;
> +ar->debug_mask = ath10k_debug_mask;
> +ar->trace_debug_mask = ath10k_debug_mask;

 Until now tracing has been always enabled, irrespective what debug_mask
 has contained. Now you are changing that and by default log messages are
 not delivered through tracing until user enables them. So I think to
 keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
 (0x) by default and the user can modify the mask per device via
 the debugfs file.

 But is it really needed to be able to filter trace messages? debug_mask
 I understand, but not sure about trace_debug_mask.
>>>
>>> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
>>> is relatively small and if needed you can pass filter expressions with
>>> trace-cmd record.
>>
>> The reason for configuring it via a mask is that:
>>
>> * the previous behaviour is "always call debug(), conditionally print,
>> always pass to trace"
>>
>> This meant that function arguments were evaluated even if things
>> weren't being printed.
>>
>> So to avoid that in the default case, there are now two masks. If I
>> have one mask then I can only trace what is being printed, which is
>> not desired. I'd like to be able to have no overhead when doing no
>> debugging, a little overhead when doing tracing (and only the items
>> being traced), and then printing when I want to print.
>
> Well, it is up to you. Have to clariy though that if you are not
> actually recording a trace there is (almost) no overhead. We have
> Kconfig to compile tracing code in and I see no performance impact with
> tracing code. Only when doing tracing you will get little overhead.

The tracing mask is only there to avoid calling debug() all the time
for events that aren't being debugged. That definitely has a cost.



-adrian

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Arend van Spriel 
On 31-05-17 22:23, Adrian Chadd wrote:
> On 31 May 2017 at 13:20, Arend van Spriel  
> wrote:
>> On 31-05-17 14:16, Kalle Valo wrote:
>>> Adrian Chadd  writes:
>>>
 This adds a few configurable debugging options:

 * driver debugging and tracing is now configurable per device
 * driver debugging and tracing is now configurable at runtime
 * the debugging / tracing is not run at all (besides a mask check)
   unless the specific debugging bitmap field is configured.

 Signed-off-by: Adrian Chadd 
>>>
>>> [...]
>>>
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
 @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
 struct device *dev,
  ar->hw_rev = hw_rev;
  ar->hif.ops = hif_ops;
  ar->hif.bus = bus;
 +ar->debug_mask = ath10k_debug_mask;
 +ar->trace_debug_mask = ath10k_debug_mask;
>>>
>>> Until now tracing has been always enabled, irrespective what debug_mask
>>> has contained. Now you are changing that and by default log messages are
>>> not delivered through tracing until user enables them. So I think to
>>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
>>> (0x) by default and the user can modify the mask per device via
>>> the debugfs file.
>>>
>>> But is it really needed to be able to filter trace messages? debug_mask
>>> I understand, but not sure about trace_debug_mask.
>>
>> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
>> is relatively small and if needed you can pass filter expressions with
>> trace-cmd record.
> 
> The reason for configuring it via a mask is that:
> 
> * the previous behaviour is "always call debug(), conditionally print,
> always pass to trace"
> 
> This meant that function arguments were evaluated even if things
> weren't being printed.
> 
> So to avoid that in the default case, there are now two masks. If I
> have one mask then I can only trace what is being printed, which is
> not desired. I'd like to be able to have no overhead when doing no
> debugging, a little overhead when doing tracing (and only the items
> being traced), and then printing when I want to print.

Well, it is up to you. Have to clariy though that if you are not
actually recording a trace there is (almost) no overhead. We have
Kconfig to compile tracing code in and I see no performance impact with
tracing code. Only when doing tracing you will get little overhead.

Regards,
Arend

> -adrian
>

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Adrian Chadd 
On 31 May 2017 at 13:20, Arend van Spriel  wrote:
> On 31-05-17 14:16, Kalle Valo wrote:
>> Adrian Chadd  writes:
>>
>>> This adds a few configurable debugging options:
>>>
>>> * driver debugging and tracing is now configurable per device
>>> * driver debugging and tracing is now configurable at runtime
>>> * the debugging / tracing is not run at all (besides a mask check)
>>>   unless the specific debugging bitmap field is configured.
>>>
>>> Signed-off-by: Adrian Chadd 
>>
>> [...]
>>
>>> --- a/drivers/net/wireless/ath/ath10k/core.c
>>> +++ b/drivers/net/wireless/ath/ath10k/core.c
>>> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
>>> struct device *dev,
>>>  ar->hw_rev = hw_rev;
>>>  ar->hif.ops = hif_ops;
>>>  ar->hif.bus = bus;
>>> +ar->debug_mask = ath10k_debug_mask;
>>> +ar->trace_debug_mask = ath10k_debug_mask;
>>
>> Until now tracing has been always enabled, irrespective what debug_mask
>> has contained. Now you are changing that and by default log messages are
>> not delivered through tracing until user enables them. So I think to
>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
>> (0x) by default and the user can modify the mask per device via
>> the debugfs file.
>>
>> But is it really needed to be able to filter trace messages? debug_mask
>> I understand, but not sure about trace_debug_mask.
>
> FWIW, in brcmfmac I decided not to filter trace messages. The overhead
> is relatively small and if needed you can pass filter expressions with
> trace-cmd record.

The reason for configuring it via a mask is that:

* the previous behaviour is "always call debug(), conditionally print,
always pass to trace"

This meant that function arguments were evaluated even if things
weren't being printed.

So to avoid that in the default case, there are now two masks. If I
have one mask then I can only trace what is being printed, which is
not desired. I'd like to be able to have no overhead when doing no
debugging, a little overhead when doing tracing (and only the items
being traced), and then printing when I want to print.



-adrian

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Arend van Spriel 
On 31-05-17 14:16, Kalle Valo wrote:
> Adrian Chadd  writes:
> 
>> This adds a few configurable debugging options:
>>
>> * driver debugging and tracing is now configurable per device
>> * driver debugging and tracing is now configurable at runtime
>> * the debugging / tracing is not run at all (besides a mask check)
>>   unless the specific debugging bitmap field is configured.
>>
>> Signed-off-by: Adrian Chadd 
> 
> [...]
> 
>> --- a/drivers/net/wireless/ath/ath10k/core.c
>> +++ b/drivers/net/wireless/ath/ath10k/core.c
>> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
>> struct device *dev,
>>  ar->hw_rev = hw_rev;
>>  ar->hif.ops = hif_ops;
>>  ar->hif.bus = bus;
>> +ar->debug_mask = ath10k_debug_mask;
>> +ar->trace_debug_mask = ath10k_debug_mask;
> 
> Until now tracing has been always enabled, irrespective what debug_mask
> has contained. Now you are changing that and by default log messages are
> not delivered through tracing until user enables them. So I think to
> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
> (0x) by default and the user can modify the mask per device via
> the debugfs file.
> 
> But is it really needed to be able to filter trace messages? debug_mask
> I understand, but not sure about trace_debug_mask.

FWIW, in brcmfmac I decided not to filter trace messages. The overhead
is relatively small and if needed you can pass filter expressions with
trace-cmd record.

Regards,
Arend

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Kalle Valo 
Adrian Chadd  writes:

> This adds a few configurable debugging options:
>
> * driver debugging and tracing is now configurable per device
> * driver debugging and tracing is now configurable at runtime
> * the debugging / tracing is not run at all (besides a mask check)
>   unless the specific debugging bitmap field is configured.
>
> Signed-off-by: Adrian Chadd 

[...]

> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
> struct device *dev,
>   ar->hw_rev = hw_rev;
>   ar->hif.ops = hif_ops;
>   ar->hif.bus = bus;
> + ar->debug_mask = ath10k_debug_mask;
> + ar->trace_debug_mask = ath10k_debug_mask;

Until now tracing has been always enabled, irrespective what debug_mask
has contained. Now you are changing that and by default log messages are
not delivered through tracing until user enables them. So I think to
keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
(0x) by default and the user can modify the mask per device via
the debugfs file.

But is it really needed to be able to filter trace messages? debug_mask
I understand, but not sure about trace_debug_mask.

-- 
Kalle Valo

Re: [PATCH] ath10k: add configurable debugging.

2017-05-31 Thread Kalle Valo 
Adrian Chadd  writes:

> This adds a few configurable debugging options:
>
> * driver debugging and tracing is now configurable per device

So this means that there's a debugfs file
/sys/kernel/debug/ieee80211/phy0/ath10k/debug for every ath10k device.
Sounds like a good idea. I just don't like the name of file, would
debug_mask be more descriptive?

> * driver debugging and tracing is now configurable at runtime

Correction, debug_mask has been always to possible change via
/sys/module/ath10k_core/parameters/debug_mask file. Now it doesn't work
anymore, which is ok, but I think we should make it clear for users as
well.

I wonder would that work if we change the mask to 0444:

module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);

> * the debugging / tracing is not run at all (besides a mask check)
>   unless the specific debugging bitmap field is configured.

So I guess with this you mean that the function ath10k_dbg() is not
called if debug messages are disabled? This is something which is good
to do in another patch. And the original assumption was that if you care
about performance you won't even enable CONFIG_ATH10K_DEBUG, so that
path was not optimised in any way. How much benefit does this bring?

> --- a/drivers/net/wireless/ath/ath10k/debug.c
> +++ b/drivers/net/wireless/ath/ath10k/debug.c
> @@ -2418,6 +2418,79 @@ int ath10k_debug_create(struct ath10k *ar)
>   return 0;
>  }
>  
> +#ifdef   CONFIG_ATH10K_DEBUGFS
> +static ssize_t ath10k_write_debug_mask(struct file *file,
> +const char __user *ubuf,
> +size_t count, loff_t *ppos)
> +{

The ifdef looks wrong, it's already inside CONFIG_ATH10K_DEBUGFS. Was it
supposed to be CONFIG_ATH10K_DEBUG?

-- 
Kalle Valo

Re: [PATCH] ath10k: add configurable debugging.

2017-05-19 Thread Kalle Valo 
Adrian Chadd  writes:

> This adds a few configurable debugging options:
>
> * driver debugging and tracing is now configurable per device
> * driver debugging and tracing is now configurable at runtime
> * the debugging / tracing is not run at all (besides a mask check)
>   unless the specific debugging bitmap field is configured.
>
> Signed-off-by: Adrian Chadd 

Oops, I accidentaly replied to the wrong version of the patch. This is a
perfect example why adding version to the subject is so important:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#patch_version_missing

But anyway, this is what I wrote in v1:

ath10k-check found some trivial whitespace problems:

drivers/net/wireless/ath/ath10k/debug.h:207: return is not a function,
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:209: return is not a function,
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:210: return is not a function,
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:214: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.h:218: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.c:2430: code indent should use
tabs where possible
drivers/net/wireless/ath/ath10k/debug.c:2430: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2431: code indent should use
tabs where possible
drivers/net/wireless/ath/ath10k/debug.c:2431: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2464: code indent should use
tabs where possible
drivers/net/wireless/ath/ath10k/debug.c:2464: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2465: code indent should use
tabs where possible
drivers/net/wireless/ath/ath10k/debug.c:2465: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2493: Please don't use multiple blank 
lines
drivers/net/wireless/ath/ath10k/debug.c:2525: Symbolic permissions
'S_IRUSR' are not preferred. Consider using octal permissions '0400'.
drivers/net/wireless/ath/ath10k/debug.c:2527: Symbolic permissions
'S_IRUSR' are not preferred. Consider using octal permissions '0400'.
drivers/net/wireless/ath/ath10k/debug.c:2620: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.c:2640: Alignment should match open 
parenthesis

I fixed those in the pending branch:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending=bd8c3bdce70adc201037b2eb7eda0a83911ef375

I'll look at this more closely later.

-- 
Kalle Valo

Re: [PATCH] ath10k: add configurable debugging.

2017-05-19 Thread Kalle Valo 
Adrian Chadd  writes:

> This adds a few configurable debugging options:
>
> * driver debugging and tracing is now configurable per device
> * driver debugging and tracing is now configurable at runtime
> * the debugging / tracing is not run at all (besides a mask check)
>   unless the specific debugging bitmap field is configured.
>
> Signed-off-by: Adrian Chadd 

ath10k-check found some trivial whitespace problems:

drivers/net/wireless/ath/ath10k/debug.h:207: return is not a function, 
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:209: return is not a function, 
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:210: return is not a function, 
parentheses are not required
drivers/net/wireless/ath/ath10k/debug.h:214: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.h:218: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.c:2430: code indent should use tabs where 
possible
drivers/net/wireless/ath/ath10k/debug.c:2430: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2431: code indent should use tabs where 
possible
drivers/net/wireless/ath/ath10k/debug.c:2431: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2464: code indent should use tabs where 
possible
drivers/net/wireless/ath/ath10k/debug.c:2464: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2465: code indent should use tabs where 
possible
drivers/net/wireless/ath/ath10k/debug.c:2465: please, no spaces at the start of 
a line
drivers/net/wireless/ath/ath10k/debug.c:2493: Please don't use multiple blank 
lines
drivers/net/wireless/ath/ath10k/debug.c:2525: Symbolic permissions 'S_IRUSR' 
are not preferred. Consider using octal permissions '0400'.
drivers/net/wireless/ath/ath10k/debug.c:2527: Symbolic permissions 'S_IRUSR' 
are not preferred. Consider using octal permissions '0400'.
drivers/net/wireless/ath/ath10k/debug.c:2620: Alignment should match open 
parenthesis
drivers/net/wireless/ath/ath10k/debug.c:2640: Alignment should match open 
parenthesis

I fixed those in the pending branch:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending=bd8c3bdce70adc201037b2eb7eda0a83911ef375

I'll look at this more closely later.

-- 
Kalle Valo

[PATCH] ath10k: add configurable debugging.

2017-05-10 Thread Adrian Chadd 
This adds a few configurable debugging options:

* driver debugging and tracing is now configurable per device
* driver debugging and tracing is now configurable at runtime
* the debugging / tracing is not run at all (besides a mask check)
  unless the specific debugging bitmap field is configured.

Signed-off-by: Adrian Chadd 
---
 drivers/net/wireless/ath/ath10k/core.c  |   2 +
 drivers/net/wireless/ath/ath10k/core.h  |   2 +
 drivers/net/wireless/ath/ath10k/debug.c | 101 
 drivers/net/wireless/ath/ath10k/debug.h |  44 +-
 4 files changed, 125 insertions(+), 24 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c 
b/drivers/net/wireless/ath/ath10k/core.c
index eea111d704c5..fcb068cb0248 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
struct device *dev,
ar->hw_rev = hw_rev;
ar->hif.ops = hif_ops;
ar->hif.bus = bus;
+   ar->debug_mask = ath10k_debug_mask;
+   ar->trace_debug_mask = ath10k_debug_mask;
 
switch (hw_rev) {
case ATH10K_HW_QCA988X:
diff --git a/drivers/net/wireless/ath/ath10k/core.h 
b/drivers/net/wireless/ath/ath10k/core.h
index 8fc08a5043db..07e392a377d0 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -762,6 +762,8 @@ struct ath10k {
struct device *dev;
u8 mac_addr[ETH_ALEN];
 
+   u32 debug_mask;
+   u32 trace_debug_mask;
enum ath10k_hw_rev hw_rev;
u16 dev_id;
u32 chip_id;
diff --git a/drivers/net/wireless/ath/ath10k/debug.c 
b/drivers/net/wireless/ath/ath10k/debug.c
index 389fcb7a9fd0..017360a26b40 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -2418,6 +2418,79 @@ int ath10k_debug_create(struct ath10k *ar)
return 0;
 }
 
+#ifdef CONFIG_ATH10K_DEBUGFS
+static ssize_t ath10k_write_debug_mask(struct file *file,
+  const char __user *ubuf,
+  size_t count, loff_t *ppos)
+{
+   struct ath10k *ar = file->private_data;
+   int ret;
+   u32 val;
+
+if (kstrtou32_from_user(ubuf, count, 0, ))
+return -EINVAL;
+
+   ar->debug_mask = val;
+   ret = count;
+
+   return ret;
+}
+
+static ssize_t ath10k_read_debug_mask(struct file *file, char __user *ubuf,
+ size_t count, loff_t *ppos)
+{
+   char buf[32];
+   struct ath10k *ar = file->private_data;
+   int len = 0;
+
+   len = scnprintf(buf, sizeof(buf) - len, "0x%x\n", ar->debug_mask);
+   return simple_read_from_buffer(ubuf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_debug_mask = {
+   .read = ath10k_read_debug_mask,
+   .write = ath10k_write_debug_mask,
+   .open = simple_open
+};
+
+static ssize_t ath10k_write_trace_debug_mask(struct file *file,
+const char __user *ubuf,
+size_t count, loff_t *ppos)
+{
+   struct ath10k *ar = file->private_data;
+   int ret;
+   u32 val;
+
+if (kstrtou32_from_user(ubuf, count, 0, ))
+return -EINVAL;
+
+   ar->trace_debug_mask = val;
+   ret = count;
+
+   return ret;
+}
+
+static ssize_t ath10k_read_trace_debug_mask(struct file *file,
+   char __user *ubuf,
+   size_t count, loff_t *ppos)
+{
+   char buf[32];
+   struct ath10k *ar = file->private_data;
+   int len = 0;
+
+   len = scnprintf(buf, sizeof(buf) - len, "0x%x\n",
+   ar->trace_debug_mask);
+   return simple_read_from_buffer(ubuf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_trace_debug_mask = {
+   .read = ath10k_read_trace_debug_mask,
+   .write = ath10k_write_trace_debug_mask,
+   .open = simple_open
+};
+#endif /* CONFIG_ATH10K_DEBUGFS */
+
+
 void ath10k_debug_destroy(struct ath10k *ar)
 {
vfree(ar->debug.fw_crash_data);
@@ -2448,6 +2521,13 @@ int ath10k_debug_register(struct ath10k *ar)
init_completion(>debug.tpc_complete);
init_completion(>debug.fw_stats_complete);
 
+#ifdef CONFIG_ATH10K_DEBUG
+   debugfs_create_file("debug", S_IRUSR, ar->debug.debugfs_phy, ar,
+   _debug_mask);
+   debugfs_create_file("trace_debug", S_IRUSR, ar->debug.debugfs_phy, ar,
+   _trace_debug_mask);
+#endif
+
debugfs_create_file("fw_stats", 0400, ar->debug.debugfs_phy, ar,
_fw_stats);
 
@@ -2536,7 +2616,7 @@ void ath10k_debug_unregister(struct ath10k *ar)
 #endif /* CONFIG_ATH10K_DEBUGFS */
 
 #ifdef CONFIG_ATH10K_DEBUG
-void ath10k_dbg(struct ath10k

Re: [PATCH] ath10k: add configurable debugging.

2017-05-10 Thread Adrian Chadd 
grr, no. lemme go re-add that and resubmit.

thanks!


-a


On 10 May 2017 at 09:44, Steve deRosier  wrote:
> Hi Adrian,
>
> On Wed, May 10, 2017 at 9:25 AM, Adrian Chadd  wrote:
>
>> diff --git a/drivers/net/wireless/ath/ath10k/debug.h 
>> b/drivers/net/wireless/ath/ath10k/debug.h
>> index 257d10985c6e..7bd461927029 100644
>> --- a/drivers/net/wireless/ath/ath10k/debug.h
>> +++ b/drivers/net/wireless/ath/ath10k/debug.h
>> @@ -200,27 +200,43 @@ void ath10k_sta_update_rx_duration(struct ath10k *ar,
>>  #endif /* CONFIG_MAC80211_DEBUGFS */
>>
>>  #ifdef CONFIG_ATH10K_DEBUG
>> -__printf(3, 4) void ath10k_dbg(struct ath10k *ar,
>> +static inline int
>> +_ath10k_do_dbg(struct ath10k *ar, enum ath10k_debug_mask mask)
>> +{
>> +   if (ar->trace_debug_mask & mask)
>> +   return (1);
>> +   if (ar->debug_mask & mask)
>> +   return (1);
>> +   return (0);
>> +}
>> +
>> +void _ath10k_dbg(struct ath10k *ar,
>>enum ath10k_debug_mask mask,
>>const char *fmt, ...);
>> -void ath10k_dbg_dump(struct ath10k *ar,
>> +
>> +void _ath10k_dbg_dump(struct ath10k *ar,
>>  enum ath10k_debug_mask mask,
>>  const char *msg, const char *prefix,
>>  const void *buf, size_t len);
>> +
>> +#defineath10k_dbg(ar, mask, ...)
>>\
>> +   do {\
>> +   if (_ath10k_do_dbg(ar, mask)) { \
>> +   _ath10k_dbg((ar), (mask), __VA_ARGS__); \
>> +   };  \
>> +   } while (0)
>> +
>
> Looks to me you dropped the "__printf(3, 4)" safety check. Was that 
> intentional?
>
> Thanks,
> - Steve

Re: [PATCH] ath10k: add configurable debugging.

2017-05-10 Thread Steve deRosier 
Hi Adrian,

On Wed, May 10, 2017 at 9:25 AM, Adrian Chadd  wrote:

> diff --git a/drivers/net/wireless/ath/ath10k/debug.h 
> b/drivers/net/wireless/ath/ath10k/debug.h
> index 257d10985c6e..7bd461927029 100644
> --- a/drivers/net/wireless/ath/ath10k/debug.h
> +++ b/drivers/net/wireless/ath/ath10k/debug.h
> @@ -200,27 +200,43 @@ void ath10k_sta_update_rx_duration(struct ath10k *ar,
>  #endif /* CONFIG_MAC80211_DEBUGFS */
>
>  #ifdef CONFIG_ATH10K_DEBUG
> -__printf(3, 4) void ath10k_dbg(struct ath10k *ar,
> +static inline int
> +_ath10k_do_dbg(struct ath10k *ar, enum ath10k_debug_mask mask)
> +{
> +   if (ar->trace_debug_mask & mask)
> +   return (1);
> +   if (ar->debug_mask & mask)
> +   return (1);
> +   return (0);
> +}
> +
> +void _ath10k_dbg(struct ath10k *ar,
>enum ath10k_debug_mask mask,
>const char *fmt, ...);
> -void ath10k_dbg_dump(struct ath10k *ar,
> +
> +void _ath10k_dbg_dump(struct ath10k *ar,
>  enum ath10k_debug_mask mask,
>  const char *msg, const char *prefix,
>  const void *buf, size_t len);
> +
> +#defineath10k_dbg(ar, mask, ...) 
>   \
> +   do {\
> +   if (_ath10k_do_dbg(ar, mask)) { \
> +   _ath10k_dbg((ar), (mask), __VA_ARGS__); \
> +   };  \
> +   } while (0)
> +

Looks to me you dropped the "__printf(3, 4)" safety check. Was that intentional?

Thanks,
- Steve

[PATCH] ath10k: add configurable debugging.

2017-05-10 Thread Adrian Chadd 
This adds a few configurable debugging options:

* driver debugging and tracing is now configurable per device
* driver debugging and tracing is now configurable at runtime
* the debugging / tracing is not run at all (besides a mask check)
  unless the specific debugging bitmap field is configured.

Signed-off-by: Adrian Chadd 
---
 drivers/net/wireless/ath/ath10k/core.c  |   2 +
 drivers/net/wireless/ath/ath10k/core.h  |   2 +
 drivers/net/wireless/ath/ath10k/debug.c | 101 
 drivers/net/wireless/ath/ath10k/debug.h |  44 +-
 4 files changed, 125 insertions(+), 24 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c 
b/drivers/net/wireless/ath/ath10k/core.c
index eea111d704c5..fcb068cb0248 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, 
struct device *dev,
ar->hw_rev = hw_rev;
ar->hif.ops = hif_ops;
ar->hif.bus = bus;
+   ar->debug_mask = ath10k_debug_mask;
+   ar->trace_debug_mask = ath10k_debug_mask;
 
switch (hw_rev) {
case ATH10K_HW_QCA988X:
diff --git a/drivers/net/wireless/ath/ath10k/core.h 
b/drivers/net/wireless/ath/ath10k/core.h
index 8fc08a5043db..07e392a377d0 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -762,6 +762,8 @@ struct ath10k {
struct device *dev;
u8 mac_addr[ETH_ALEN];
 
+   u32 debug_mask;
+   u32 trace_debug_mask;
enum ath10k_hw_rev hw_rev;
u16 dev_id;
u32 chip_id;
diff --git a/drivers/net/wireless/ath/ath10k/debug.c 
b/drivers/net/wireless/ath/ath10k/debug.c
index 389fcb7a9fd0..017360a26b40 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -2418,6 +2418,79 @@ int ath10k_debug_create(struct ath10k *ar)
return 0;
 }
 
+#ifdef CONFIG_ATH10K_DEBUGFS
+static ssize_t ath10k_write_debug_mask(struct file *file,
+  const char __user *ubuf,
+  size_t count, loff_t *ppos)
+{
+   struct ath10k *ar = file->private_data;
+   int ret;
+   u32 val;
+
+if (kstrtou32_from_user(ubuf, count, 0, ))
+return -EINVAL;
+
+   ar->debug_mask = val;
+   ret = count;
+
+   return ret;
+}
+
+static ssize_t ath10k_read_debug_mask(struct file *file, char __user *ubuf,
+ size_t count, loff_t *ppos)
+{
+   char buf[32];
+   struct ath10k *ar = file->private_data;
+   int len = 0;
+
+   len = scnprintf(buf, sizeof(buf) - len, "0x%x\n", ar->debug_mask);
+   return simple_read_from_buffer(ubuf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_debug_mask = {
+   .read = ath10k_read_debug_mask,
+   .write = ath10k_write_debug_mask,
+   .open = simple_open
+};
+
+static ssize_t ath10k_write_trace_debug_mask(struct file *file,
+const char __user *ubuf,
+size_t count, loff_t *ppos)
+{
+   struct ath10k *ar = file->private_data;
+   int ret;
+   u32 val;
+
+if (kstrtou32_from_user(ubuf, count, 0, ))
+return -EINVAL;
+
+   ar->trace_debug_mask = val;
+   ret = count;
+
+   return ret;
+}
+
+static ssize_t ath10k_read_trace_debug_mask(struct file *file,
+   char __user *ubuf,
+   size_t count, loff_t *ppos)
+{
+   char buf[32];
+   struct ath10k *ar = file->private_data;
+   int len = 0;
+
+   len = scnprintf(buf, sizeof(buf) - len, "0x%x\n",
+   ar->trace_debug_mask);
+   return simple_read_from_buffer(ubuf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_trace_debug_mask = {
+   .read = ath10k_read_trace_debug_mask,
+   .write = ath10k_write_trace_debug_mask,
+   .open = simple_open
+};
+#endif /* CONFIG_ATH10K_DEBUGFS */
+
+
 void ath10k_debug_destroy(struct ath10k *ar)
 {
vfree(ar->debug.fw_crash_data);
@@ -2448,6 +2521,13 @@ int ath10k_debug_register(struct ath10k *ar)
init_completion(>debug.tpc_complete);
init_completion(>debug.fw_stats_complete);
 
+#ifdef CONFIG_ATH10K_DEBUG
+   debugfs_create_file("debug", S_IRUSR, ar->debug.debugfs_phy, ar,
+   _debug_mask);
+   debugfs_create_file("trace_debug", S_IRUSR, ar->debug.debugfs_phy, ar,
+   _trace_debug_mask);
+#endif
+
debugfs_create_file("fw_stats", 0400, ar->debug.debugfs_phy, ar,
_fw_stats);
 
@@ -2536,7 +2616,7 @@ void ath10k_debug_unregister(struct ath10k *ar)
 #endif /* CONFIG_ATH10K_DEBUGFS */
 
 #ifdef CONFIG_ATH10K_DEBUG
-void ath10k_dbg(struct ath10k