With CONFIG_IWLWIFI_DEVICE_TRACING=y, these functions are rather large,
too big for inlining.
With this .config: http://busybox.net/~vda/kernel_config,
after uninlining these functions have sizes and callsite counts
as follows:
iwl_read32 475 bytes, 51 callsites
iwl_write32 477 bytes, 90 callsites
iwl_write8 493 bytes, 3 callsites
Reduction in size is about 74,000 bytes:
text data bss dec hex filename
90758147 17226024 36659200 144643371 89f152b vmlinux0
90687995 17221928 36659200 144569123 89df323 vmlinux.after
Signed-off-by: Denys Vlasenko <[email protected]>
CC: Johannes Berg <[email protected]>
CC: Emmanuel Grumbach <[email protected]>
Cc: "John W. Linville" <[email protected]>
Cc: Intel Linux Wireless <[email protected]>
Cc: [email protected]
Cc: [email protected]
CC: [email protected]
---
drivers/net/wireless/iwlwifi/iwl-io.c | 7 +++++++
drivers/net/wireless/iwlwifi/iwl-io.h | 39 +++++++++++++++++++++--------------
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 27c66e4..aed121e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -38,6 +38,13 @@
#define IWL_POLL_INTERVAL 10 /* microseconds */
+#if defined(CONFIG_IWLWIFI_DEVICE_TRACING)
+IWL_READ_WRITE( /*not inlined*/ )
+IWL_EXPORT_SYMBOL(iwl_write8);
+IWL_EXPORT_SYMBOL(iwl_write32);
+IWL_EXPORT_SYMBOL(iwl_read32);
+#endif
+
int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
u32 bits, u32 mask, int timeout)
{
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index 705d12c..3c9d2a8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -32,24 +32,31 @@
#include "iwl-devtrace.h"
#include "iwl-trans.h"
-static inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)
-{
- trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val);
- iwl_trans_write8(trans, ofs, val);
-}
-
-static inline void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val)
-{
- trace_iwlwifi_dev_iowrite32(trans->dev, ofs, val);
- iwl_trans_write32(trans, ofs, val);
+#define IWL_READ_WRITE(static_inline) \
+static_inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) \
+{ \
+ trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val); \
+ iwl_trans_write8(trans, ofs, val); \
+} \
+static_inline void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val) \
+{ \
+ trace_iwlwifi_dev_iowrite32(trans->dev, ofs, val); \
+ iwl_trans_write32(trans, ofs, val); \
+} \
+static_inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs) \
+{ \
+ u32 val = iwl_trans_read32(trans, ofs); \
+ trace_iwlwifi_dev_ioread32(trans->dev, ofs, val); \
+ return val; \
}
-static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs)
-{
- u32 val = iwl_trans_read32(trans, ofs);
- trace_iwlwifi_dev_ioread32(trans->dev, ofs, val);
- return val;
-}
+#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
+IWL_READ_WRITE(static inline)
+#else
+void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val);
+void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val);
+u32 iwl_read32(struct iwl_trans *trans, u32 ofs);
+#endif
static inline void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
{
--
1.8.1.4
Hello.
On 7/14/2015 3:22 PM, Denys Vlasenko wrote:
> With CONFIG_IWLWIFI_DEVICE_TRACING=y, these functions are rather large,
> too big for inlining.
> With this .config: http://busybox.net/~vda/kernel_config,
> after uninlining these functions have sizes and callsite counts
> as follows:
> iwl_read32 475 bytes, 51 callsites
> iwl_write32 477 bytes, 90 callsites
> iwl_write8 493 bytes, 3 callsites
> Reduction in size is about 74,000 bytes:
> text data bss dec hex filename
> 90758147 17226024 36659200 144643371 89f152b vmlinux0
> 90687995 17221928 36659200 144569123 89df323 vmlinux.after
> Signed-off-by: Denys Vlasenko <[email protected]>
> CC: Johannes Berg <[email protected]>
> CC: Emmanuel Grumbach <[email protected]>
> Cc: "John W. Linville" <[email protected]>
> Cc: Intel Linux Wireless <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> CC: [email protected]
> ---
> drivers/net/wireless/iwlwifi/iwl-io.c | 7 +++++++
> drivers/net/wireless/iwlwifi/iwl-io.h | 39 +++++++++++++++++++++--------------
> 2 files changed, 30 insertions(+), 16 deletions(-)
[...]
> diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
> index 705d12c..3c9d2a8 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-io.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-io.h
> @@ -32,24 +32,31 @@
> #include "iwl-devtrace.h"
> #include "iwl-trans.h"
>
[...]
> +#define IWL_READ_WRITE(static_inline) \
> +static_inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) \
> +{ \
> + trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val); \
> + iwl_trans_write8(trans, ofs, val); \
> +} \
> +static_inline void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val) \
> +{ \
> + trace_iwlwifi_dev_iowrite32(trans->dev, ofs, val); \
> + iwl_trans_write32(trans, ofs, val); \
> +} \
> +static_inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs) \
> +{ \
> + u32 val = iwl_trans_read32(trans, ofs); \
> + trace_iwlwifi_dev_ioread32(trans->dev, ofs, val); \
> + return val; \
> }
[...]
> +#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
> +IWL_READ_WRITE(static inline)
Not static_inline?
> +#else
> +void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val);
> +void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val);
> +u32 iwl_read32(struct iwl_trans *trans, u32 ofs);
> +#endif
MBR, Sergei
On Tue, Jul 14, 2015 at 3:41 PM, Denys Vlasenko
<[email protected]> wrote:
> On Tue, Jul 14, 2015 at 2:38 PM, Sergei Shtylyov
> <[email protected]> wrote:
>>> +#define IWL_READ_WRITE(static_inline) \
>>> +static_inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) \
>>> +{ \
>>> + trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val); \
>>> + iwl_trans_write8(trans, ofs, val); \
>>> +} \
>> [...]
>>>
>>> +#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
>>> +IWL_READ_WRITE(static inline)
>>
>> Not static_inline?
>
> Yes. Here we are putting two words, "static inline", in front of every
> function definition.
> --
I'll try to come up with a patch that is easier for me to read, but I
am really busy right now. Ping me in a week if you have heard from me
earlier.
On Tue, Jul 14, 2015 at 2:38 PM, Sergei Shtylyov
<[email protected]> wrote:
>> +#define IWL_READ_WRITE(static_inline) \
>> +static_inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) \
>> +{ \
>> + trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val); \
>> + iwl_trans_write8(trans, ofs, val); \
>> +} \
> [...]
>>
>> +#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
>> +IWL_READ_WRITE(static inline)
>
> Not static_inline?
Yes. Here we are putting two words, "static inline", in front of every
function definition.
> >
> > I'll try to come up with a patch that is easier for me to read, but I
> > am really busy right now. Ping me in a week if you have heard from me
> > earlier.
>
> So how it is going with this patch?
>
> In hindsight, I would use a different name for the macro parameter here:
>
> #define IWL_READ_WRITE(static_inline) \
> +static_inline void iwl_write8(...)
>
> "static_inline" proved to be confusing.
> Maybe perform s/static_inline/func_qualifier/ on the patch...
>
In the end, I un-inlined these functions unconditionally.
It won't make it for 4.3 though.
On 07/15/2015 07:49 PM, Emmanuel Grumbach wrote:
> On Tue, Jul 14, 2015 at 3:41 PM, Denys Vlasenko
> <[email protected]> wrote:
>> On Tue, Jul 14, 2015 at 2:38 PM, Sergei Shtylyov
>> <[email protected]> wrote:
>>>> +#define IWL_READ_WRITE(static_inline) \
>>>> +static_inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) \
>>>> +{ \
>>>> + trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val); \
>>>> + iwl_trans_write8(trans, ofs, val); \
>>>> +} \
>>> [...]
>>>>
>>>> +#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
>>>> +IWL_READ_WRITE(static inline)
>>>
>>> Not static_inline?
>>
>> Yes. Here we are putting two words, "static inline", in front of every
>> function definition.
>> --
>
> I'll try to come up with a patch that is easier for me to read, but I
> am really busy right now. Ping me in a week if you have heard from me
> earlier.
So how it is going with this patch?
In hindsight, I would use a different name for the macro parameter here:
#define IWL_READ_WRITE(static_inline) \
+static_inline void iwl_write8(...)
"static_inline" proved to be confusing.
Maybe perform s/static_inline/func_qualifier/ on the patch...