[PATCH net-next 1/2] codel: remove unnecessary sock.h include

[PATCH net-next 1/2] codel: remove unnecessary sock.h include

[Jakub Kicinski]

Since sock.h is modified relatively often (60 times in the last
12 months) it seems worthwhile to decrease the incremental build
work.

CoDel's header includes net/inet_ecn.h which in turn includes net/sock.h.
codel.h is itself included by mac80211 which is included by much of
the WiFi stack and drivers. Removing the net/inet_ecn.h include from
CoDel breaks the dependecy between WiFi and sock.h.

Commit d068ca2ae2e6 ("codel: split into multiple files") moved all
the code which actually needs ECN helpers out to net/codel_impl.h,
the include can be moved there as well.

This decreases the incremental build size after touching sock.h
from 4999 objects to 4051 objects.

Fix unmasked missing includes in WiFi drivers.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: kvalo@kernel.org
CC: pkshih@realtek.com
CC: ath11k@lists.infradead.org
CC: linux-wireless@vger.kernel.org
---
 drivers/net/wireless/ath/ath11k/debugfs.c  | 2 ++
 drivers/net/wireless/realtek/rtw89/core.c  | 2 ++
 drivers/net/wireless/realtek/rtw89/debug.c | 2 ++
 include/net/codel.h                        | 1 -
 include/net/codel_impl.h                   | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index dba055d085be..eb8b4f20c95e 100644
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
  */
 
+#include <linux/vmalloc.h>
+
 #include "debugfs.h"
 
 #include "core.h"
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index cf05baf88640..a0737eea9f81 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /* Copyright(c) 2019-2020  Realtek Corporation
  */
+#include <linux/ip.h>
+#include <linux/udp.h>
 
 #include "coex.h"
 #include "core.h"
diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
index 9756d75ef24e..22bd1d03e722 100644
--- a/drivers/net/wireless/realtek/rtw89/debug.c
+++ b/drivers/net/wireless/realtek/rtw89/debug.c
@@ -2,6 +2,8 @@
 /* Copyright(c) 2019-2020  Realtek Corporation
  */
 
+#include <linux/vmalloc.h>
+
 #include "coex.h"
 #include "debug.h"
 #include "fw.h"
diff --git a/include/net/codel.h b/include/net/codel.h
index a6c9e34e62b8..d74dd8fda54e 100644
--- a/include/net/codel.h
+++ b/include/net/codel.h
@@ -45,7 +45,6 @@
 #include <linux/ktime.h>
 #include <linux/skbuff.h>
 #include <net/pkt_sched.h>
-#include <net/inet_ecn.h>
 
 /* Controlling Queue Delay (CoDel) algorithm
  * =========================================
diff --git a/include/net/codel_impl.h b/include/net/codel_impl.h
index 137d40d8cbeb..78a27ac73070 100644
--- a/include/net/codel_impl.h
+++ b/include/net/codel_impl.h
@@ -49,6 +49,8 @@
  * Implemented on linux by Dave Taht and Eric Dumazet
  */
 
+#include <net/inet_ecn.h>
+
 static void codel_params_init(struct codel_params *params)
 {
 	params->interval = MS2TIME(100);
-- 
2.31.1

[PATCH net-next 2/2] codel: remove unnecessary pkt_sched.h include

[Jakub Kicinski]

Commit d068ca2ae2e6 ("codel: split into multiple files") moved all
Qdisc-related code to codel_qdisc.h, move the include of pkt_sched.h
as well.

This is similar to the previous commit, although we don't care as
much about incremental builds after pkt_sched.h was touched itself
it is included by net/sch_generic.h which is modified ~20 times
a year.

This decreases the incremental build size after touching pkt_sched.h
from 1592 to 617 objects.

Fix unmasked missing includes in WiFi drivers.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: kvalo@kernel.org
CC: luciano.coelho@intel.com
CC: nbd@nbd.name
CC: lorenzo.bianconi83@gmail.com
CC: ryder.lee@mediatek.com
CC: shayne.chen@mediatek.com
CC: sean.wang@mediatek.com
CC: johannes.berg@intel.com
CC: emmanuel.grumbach@intel.com
CC: ath11k@lists.infradead.org
CC: linux-wireless@vger.kernel.org
---
 drivers/net/wireless/ath/ath11k/reg.c               | 2 ++
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c        | 1 +
 drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 1 +
 drivers/net/wireless/mediatek/mt76/testmode.h       | 2 ++
 include/net/codel.h                                 | 1 -
 include/net/codel_qdisc.h                           | 2 ++
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 1f8a81987187..d6575feca5a2 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -2,6 +2,8 @@
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
  */
+#include <linux/rtnetlink.h>
+
 #include "core.h"
 #include "debug.h"
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index f12e571d3581..a3324c30af90 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
 #include <linux/module.h>
+#include <linux/rtnetlink.h>
 #include <linux/vmalloc.h>
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
index f702ad85e609..78450366312b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
@@ -4,6 +4,7 @@
  */
 #include "mvm.h"
 #include <linux/nl80211-vnd-intel.h>
+#include <net/netlink.h>
 
 static const struct nla_policy
 iwl_mvm_vendor_attr_policy[NUM_IWL_MVM_VENDOR_ATTR] = {
diff --git a/drivers/net/wireless/mediatek/mt76/testmode.h b/drivers/net/wireless/mediatek/mt76/testmode.h
index d1f9c036dd1f..725973f1ca58 100644
--- a/drivers/net/wireless/mediatek/mt76/testmode.h
+++ b/drivers/net/wireless/mediatek/mt76/testmode.h
@@ -7,6 +7,8 @@
 
 #define MT76_TM_TIMEOUT	10
 
+#include <net/netlink.h>
+
 /**
  * enum mt76_testmode_attr - testmode attributes inside NL80211_ATTR_TESTDATA
  *
diff --git a/include/net/codel.h b/include/net/codel.h
index d74dd8fda54e..5fed2f16cb8d 100644
--- a/include/net/codel.h
+++ b/include/net/codel.h
@@ -44,7 +44,6 @@
 #include <linux/types.h>
 #include <linux/ktime.h>
 #include <linux/skbuff.h>
-#include <net/pkt_sched.h>
 
 /* Controlling Queue Delay (CoDel) algorithm
  * =========================================
diff --git a/include/net/codel_qdisc.h b/include/net/codel_qdisc.h
index 098630f83a55..58b6d0ebea10 100644
--- a/include/net/codel_qdisc.h
+++ b/include/net/codel_qdisc.h
@@ -49,6 +49,8 @@
  * Implemented on linux by Dave Taht and Eric Dumazet
  */
 
+#include <net/pkt_sched.h>
+
 /* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */
 struct codel_skb_cb {
 	codel_time_t enqueue_time;
-- 
2.31.1

Re: [PATCH net-next 2/2] codel: remove unnecessary pkt_sched.h include

[Kalle Valo]

Jakub Kicinski <kuba@kernel.org> writes:

> Commit d068ca2ae2e6 ("codel: split into multiple files") moved all
> Qdisc-related code to codel_qdisc.h, move the include of pkt_sched.h
> as well.
>
> This is similar to the previous commit, although we don't care as
> much about incremental builds after pkt_sched.h was touched itself
> it is included by net/sch_generic.h which is modified ~20 times
> a year.
>
> This decreases the incremental build size after touching pkt_sched.h
> from 1592 to 617 objects.
>
> Fix unmasked missing includes in WiFi drivers.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: kvalo@kernel.org
> CC: luciano.coelho@intel.com
> CC: nbd@nbd.name
> CC: lorenzo.bianconi83@gmail.com
> CC: ryder.lee@mediatek.com
> CC: shayne.chen@mediatek.com
> CC: sean.wang@mediatek.com
> CC: johannes.berg@intel.com
> CC: emmanuel.grumbach@intel.com
> CC: ath11k@lists.infradead.org
> CC: linux-wireless@vger.kernel.org
> ---
>  drivers/net/wireless/ath/ath11k/reg.c               | 2 ++
>  drivers/net/wireless/intel/iwlwifi/mvm/ops.c        | 1 +
>  drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 1 +
>  drivers/net/wireless/mediatek/mt76/testmode.h       | 2 ++

Acked-by: Kalle Valo <kvalo@kernel.org>

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

Re: [PATCH net-next 1/2] codel: remove unnecessary sock.h include

[Kalle Valo]

Jakub Kicinski <kuba@kernel.org> writes:

> Since sock.h is modified relatively often (60 times in the last
> 12 months) it seems worthwhile to decrease the incremental build
> work.
>
> CoDel's header includes net/inet_ecn.h which in turn includes net/sock.h.
> codel.h is itself included by mac80211 which is included by much of
> the WiFi stack and drivers. Removing the net/inet_ecn.h include from
> CoDel breaks the dependecy between WiFi and sock.h.
>
> Commit d068ca2ae2e6 ("codel: split into multiple files") moved all
> the code which actually needs ECN helpers out to net/codel_impl.h,
> the include can be moved there as well.
>
> This decreases the incremental build size after touching sock.h
> from 4999 objects to 4051 objects.
>
> Fix unmasked missing includes in WiFi drivers.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: kvalo@kernel.org
> CC: pkshih@realtek.com
> CC: ath11k@lists.infradead.org
> CC: linux-wireless@vger.kernel.org
> ---
>  drivers/net/wireless/ath/ath11k/debugfs.c  | 2 ++
>  drivers/net/wireless/realtek/rtw89/core.c  | 2 ++
>  drivers/net/wireless/realtek/rtw89/debug.c | 2 ++

Acked-by: Kalle Valo <kvalo@kernel.org>

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

Re: [PATCH net-next 1/2] codel: remove unnecessary sock.h include

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 21 Dec 2021 11:39:40 -0800 you wrote:
> Since sock.h is modified relatively often (60 times in the last
> 12 months) it seems worthwhile to decrease the incremental build
> work.
> 
> CoDel's header includes net/inet_ecn.h which in turn includes net/sock.h.
> codel.h is itself included by mac80211 which is included by much of
> the WiFi stack and drivers. Removing the net/inet_ecn.h include from
> CoDel breaks the dependecy between WiFi and sock.h.
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] codel: remove unnecessary sock.h include
    https://git.kernel.org/netdev/net-next/c/15fcb1031178
  - [net-next,2/2] codel: remove unnecessary pkt_sched.h include
    https://git.kernel.org/netdev/net-next/c/e6e590445581

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html