| Message ID | 20220419022206.36381-3-shenjian15@huawei.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: extend the type of netdev_features_t to bitmap | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next, async |
| netdev/apply | fail | Patch does not apply to net-next |
From: Jian Shen <shenjian15@huawei.com> Date: Tue, 19 Apr 2022 10:21:49 +0800 > There are many netdev_features bits group used in kernel. The definition > will be illegal when using feature bit more than 64. Replace these macroes > with global netdev_features variables, initialize them when netdev module > init. > > Signed-off-by: Jian Shen <shenjian15@huawei.com> > --- > drivers/net/wireguard/device.c | 10 +- > include/linux/netdev_features.h | 102 +++++++++----- > net/core/Makefile | 2 +- > net/core/dev.c | 87 ++++++++++++ > net/core/netdev_features.c | 241 ++++++++++++++++++++++++++++++++ > 5 files changed, 400 insertions(+), 42 deletions(-) > create mode 100644 net/core/netdev_features.c > --- 8< --- > diff --git a/net/core/dev.c b/net/core/dev.c > index 4d6b57752eee..85bb418e8ef1 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -146,6 +146,7 @@ > #include <linux/sctp.h> > #include <net/udp_tunnel.h> > #include <linux/net_namespace.h> > +#include <linux/netdev_features_helper.h> > #include <linux/indirect_call_wrapper.h> > #include <net/devlink.h> > #include <linux/pm_runtime.h> > @@ -11255,6 +11256,90 @@ static struct pernet_operations __net_initdata default_device_ops = { > .exit_batch = default_device_exit_batch, > }; > > +static void netdev_features_init(void) It is an initialization function, so it must be marked as __init. > +{ > + netdev_features_t features; > + > + netdev_features_set_array(&netif_f_never_change_feature_set, > + &netdev_never_change_features); > + > + netdev_features_set_array(&netif_f_gso_feature_set_mask, I'm not sure it does make sense to have an empty newline between each call. I'd leave newlines only between the "regular" blocks and the "multi-call" blocks, I mean, stuff like VLAN, GSO and @netdev_ethtool_features. > + &netdev_gso_features_mask); > + > + netdev_features_set_array(&netif_f_ip_csum_feature_set, > + &netdev_ip_csum_features); > + > + netdev_features_set_array(&netif_f_csum_feature_set_mask, > + &netdev_csum_features_mask); > + > + netdev_features_set_array(&netif_f_general_tso_feature_set, > + &netdev_general_tso_features); > + > + netdev_features_set_array(&netif_f_all_tso_feature_set, > + &netdev_all_tso_features); > + > + netdev_features_set_array(&netif_f_tso_ecn_feature_set, > + &netdev_tso_ecn_features); > + > + netdev_features_set_array(&netif_f_all_fcoe_feature_set, > + &netdev_all_fcoe_features); > + > + netdev_features_set_array(&netif_f_gso_soft_feature_set, > + &netdev_gso_software_features); > + > + netdev_features_set_array(&netif_f_one_for_all_feature_set, > + &netdev_one_for_all_features); > + > + netdev_features_set_array(&netif_f_all_for_all_feature_set, > + &netdev_all_for_all_features); > + > + netdev_features_set_array(&netif_f_upper_disables_feature_set, > + &netdev_upper_disable_features); > + > + netdev_features_set_array(&netif_f_soft_feature_set, > + &netdev_soft_features); > + > + netdev_features_set_array(&netif_f_soft_off_feature_set, > + &netdev_soft_off_features); > + > + netdev_features_set_array(&netif_f_rx_vlan_feature_set, > + &netdev_rx_vlan_features); > + > + netdev_features_set_array(&netif_f_tx_vlan_feature_set, > + &netdev_tx_vlan_features); > + > + netdev_features_set_array(&netif_f_vlan_filter_feature_set, > + &netdev_vlan_filter_features); > + > + netdev_all_vlan_features = netdev_rx_vlan_features; > + netdev_features_set(&netdev_all_vlan_features, netdev_tx_vlan_features); > + netdev_features_set(&netdev_all_vlan_features, > + netdev_vlan_filter_features); > + > + netdev_features_set_array(&netif_f_ctag_vlan_feature_set, > + &netdev_ctag_vlan_features); > + > + netdev_features_set_array(&netif_f_stag_vlan_feature_set, > + &netdev_stag_vlan_features); > + > + netdev_features_set_array(&netif_f_gso_encap_feature_set, > + &netdev_gso_encap_all_features); > + > + netdev_features_set_array(&netif_f_xfrm_feature_set, > + &netdev_xfrm_features); > + > + netdev_features_set_array(&netif_f_tls_feature_set, > + &netdev_tls_features); > + > + netdev_csum_gso_features_mask = > + netdev_features_or(netdev_gso_software_features, > + netdev_csum_features_mask); > + > + netdev_features_fill(&features); > + netdev_ethtool_features = > + netdev_features_andnot(features, netdev_never_change_features); > +} > + > /* > * Initialize the DEV module. At boot time this walks the device list and > * unhooks any devices that fail to initialise (normally hardware not --- 8< --- > -- > 2.33.0 Thanks, Al
在 2022/4/19 22:49, Alexander Lobakin 写道: > From: Jian Shen <shenjian15@huawei.com> > Date: Tue, 19 Apr 2022 10:21:49 +0800 > >> There are many netdev_features bits group used in kernel. The definition >> will be illegal when using feature bit more than 64. Replace these macroes >> with global netdev_features variables, initialize them when netdev module >> init. >> >> Signed-off-by: Jian Shen <shenjian15@huawei.com> >> --- >> drivers/net/wireguard/device.c | 10 +- >> include/linux/netdev_features.h | 102 +++++++++----- >> net/core/Makefile | 2 +- >> net/core/dev.c | 87 ++++++++++++ >> net/core/netdev_features.c | 241 ++++++++++++++++++++++++++++++++ >> 5 files changed, 400 insertions(+), 42 deletions(-) >> create mode 100644 net/core/netdev_features.c >> > --- 8< --- > >> diff --git a/net/core/dev.c b/net/core/dev.c >> index 4d6b57752eee..85bb418e8ef1 100644 >> --- a/net/core/dev.c >> +++ b/net/core/dev.c >> @@ -146,6 +146,7 @@ >> #include <linux/sctp.h> >> #include <net/udp_tunnel.h> >> #include <linux/net_namespace.h> >> +#include <linux/netdev_features_helper.h> >> #include <linux/indirect_call_wrapper.h> >> #include <net/devlink.h> >> #include <linux/pm_runtime.h> >> @@ -11255,6 +11256,90 @@ static struct pernet_operations __net_initdata default_device_ops = { >> .exit_batch = default_device_exit_batch, >> }; >> >> +static void netdev_features_init(void) > It is an initialization function, so it must be marked as __init. right, I will add it, thanks! >> +{ >> + netdev_features_t features; >> + >> + netdev_features_set_array(&netif_f_never_change_feature_set, >> + &netdev_never_change_features); >> + >> + netdev_features_set_array(&netif_f_gso_feature_set_mask, > I'm not sure it does make sense to have an empty newline between > each call. I'd leave newlines only between the "regular" blocks > and the "multi-call" blocks, I mean, stuff like VLAN, GSO and > @netdev_ethtool_features. At first, I added empty newline per call for the it used three lines. Now the new call just use two lines, I will remove some unnecessary blank lines. Thanks! >> + &netdev_gso_features_mask); >> + >> + netdev_features_set_array(&netif_f_ip_csum_feature_set, >> + &netdev_ip_csum_features); >> + >> + netdev_features_set_array(&netif_f_csum_feature_set_mask, >> + &netdev_csum_features_mask); >> + >> + netdev_features_set_array(&netif_f_general_tso_feature_set, >> + &netdev_general_tso_features); >> + >> + netdev_features_set_array(&netif_f_all_tso_feature_set, >> + &netdev_all_tso_features); >> + >> + netdev_features_set_array(&netif_f_tso_ecn_feature_set, >> + &netdev_tso_ecn_features); >> + >> + netdev_features_set_array(&netif_f_all_fcoe_feature_set, >> + &netdev_all_fcoe_features); >> + >> + netdev_features_set_array(&netif_f_gso_soft_feature_set, >> + &netdev_gso_software_features); >> + >> + netdev_features_set_array(&netif_f_one_for_all_feature_set, >> + &netdev_one_for_all_features); >> + >> + netdev_features_set_array(&netif_f_all_for_all_feature_set, >> + &netdev_all_for_all_features); >> + >> + netdev_features_set_array(&netif_f_upper_disables_feature_set, >> + &netdev_upper_disable_features); >> + >> + netdev_features_set_array(&netif_f_soft_feature_set, >> + &netdev_soft_features); >> + >> + netdev_features_set_array(&netif_f_soft_off_feature_set, >> + &netdev_soft_off_features); >> + >> + netdev_features_set_array(&netif_f_rx_vlan_feature_set, >> + &netdev_rx_vlan_features); >> + >> + netdev_features_set_array(&netif_f_tx_vlan_feature_set, >> + &netdev_tx_vlan_features); >> + >> + netdev_features_set_array(&netif_f_vlan_filter_feature_set, >> + &netdev_vlan_filter_features); >> + >> + netdev_all_vlan_features = netdev_rx_vlan_features; >> + netdev_features_set(&netdev_all_vlan_features, netdev_tx_vlan_features); >> + netdev_features_set(&netdev_all_vlan_features, >> + netdev_vlan_filter_features); >> + >> + netdev_features_set_array(&netif_f_ctag_vlan_feature_set, >> + &netdev_ctag_vlan_features); >> + >> + netdev_features_set_array(&netif_f_stag_vlan_feature_set, >> + &netdev_stag_vlan_features); >> + >> + netdev_features_set_array(&netif_f_gso_encap_feature_set, >> + &netdev_gso_encap_all_features); >> + >> + netdev_features_set_array(&netif_f_xfrm_feature_set, >> + &netdev_xfrm_features); >> + >> + netdev_features_set_array(&netif_f_tls_feature_set, >> + &netdev_tls_features); >> + >> + netdev_csum_gso_features_mask = >> + netdev_features_or(netdev_gso_software_features, >> + netdev_csum_features_mask); >> + >> + netdev_features_fill(&features); >> + netdev_ethtool_features = >> + netdev_features_andnot(features, netdev_never_change_features); >> +} >> + >> /* >> * Initialize the DEV module. At boot time this walks the device list and >> * unhooks any devices that fail to initialise (normally hardware not > --- 8< --- > >> -- >> 2.33.0 > Thanks, > Al > > . >
From: shenjian (K) <shenjian15@huawei.com> Date: Wed, 20 Apr 2022 17:54:13 +0800 > 在 2022/4/19 22:49, Alexander Lobakin 写道: > > From: Jian Shen <shenjian15@huawei.com> > > Date: Tue, 19 Apr 2022 10:21:49 +0800 > > > >> There are many netdev_features bits group used in kernel. The definition > >> will be illegal when using feature bit more than 64. Replace these macroes > >> with global netdev_features variables, initialize them when netdev module > >> init. > >> > >> Signed-off-by: Jian Shen <shenjian15@huawei.com> > >> --- > >> drivers/net/wireguard/device.c | 10 +- > >> include/linux/netdev_features.h | 102 +++++++++----- > >> net/core/Makefile | 2 +- > >> net/core/dev.c | 87 ++++++++++++ > >> net/core/netdev_features.c | 241 ++++++++++++++++++++++++++++++++ > >> 5 files changed, 400 insertions(+), 42 deletions(-) > >> create mode 100644 net/core/netdev_features.c > >> > > --- 8< --- > > > >> diff --git a/net/core/dev.c b/net/core/dev.c > >> index 4d6b57752eee..85bb418e8ef1 100644 > >> --- a/net/core/dev.c > >> +++ b/net/core/dev.c > >> @@ -146,6 +146,7 @@ > >> #include <linux/sctp.h> > >> #include <net/udp_tunnel.h> > >> #include <linux/net_namespace.h> > >> +#include <linux/netdev_features_helper.h> > >> #include <linux/indirect_call_wrapper.h> > >> #include <net/devlink.h> > >> #include <linux/pm_runtime.h> > >> @@ -11255,6 +11256,90 @@ static struct pernet_operations __net_initdata default_device_ops = { > >> .exit_batch = default_device_exit_batch, > >> }; > >> > >> +static void netdev_features_init(void) > > It is an initialization function, so it must be marked as __init. > right, I will add it, thanks! > > >> +{ > >> + netdev_features_t features; > >> + > >> + netdev_features_set_array(&netif_f_never_change_feature_set, > >> + &netdev_never_change_features); > >> + > >> + netdev_features_set_array(&netif_f_gso_feature_set_mask, > > I'm not sure it does make sense to have an empty newline between > > each call. I'd leave newlines only between the "regular" blocks > > and the "multi-call" blocks, I mean, stuff like VLAN, GSO and > > @netdev_ethtool_features. > At first, I added empty newline per call for the it used three lines. > Now the new call just use two lines, I will remove some unnecessary > blank lines. > > Thanks! (sorry for the triple mail, at first References got screwed, then encoding =\) I see no news regarding the conversion since the end of April, maybe I could pick it and finish if nobody objects? I'll preserve the original authorship for sure. > > >> + &netdev_gso_features_mask); > >> + > >> + netdev_features_set_array(&netif_f_ip_csum_feature_set, > >> + &netdev_ip_csum_features); > >> + > >> + netdev_features_set_array(&netif_f_csum_feature_set_mask, > >> + &netdev_csum_features_mask); > >> + > >> + netdev_features_set_array(&netif_f_general_tso_feature_set, > >> + &netdev_general_tso_features); > >> + > >> + netdev_features_set_array(&netif_f_all_tso_feature_set, > >> + &netdev_all_tso_features); > >> + > >> + netdev_features_set_array(&netif_f_tso_ecn_feature_set, > >> + &netdev_tso_ecn_features); > >> + > >> + netdev_features_set_array(&netif_f_all_fcoe_feature_set, > >> + &netdev_all_fcoe_features); > >> + > >> + netdev_features_set_array(&netif_f_gso_soft_feature_set, > >> + &netdev_gso_software_features); > >> + > >> + netdev_features_set_array(&netif_f_one_for_all_feature_set, > >> + &netdev_one_for_all_features); > >> + > >> + netdev_features_set_array(&netif_f_all_for_all_feature_set, > >> + &netdev_all_for_all_features); > >> + > >> + netdev_features_set_array(&netif_f_upper_disables_feature_set, > >> + &netdev_upper_disable_features); > >> + > >> + netdev_features_set_array(&netif_f_soft_feature_set, > >> + &netdev_soft_features); > >> + > >> + netdev_features_set_array(&netif_f_soft_off_feature_set, > >> + &netdev_soft_off_features); > >> + > >> + netdev_features_set_array(&netif_f_rx_vlan_feature_set, > >> + &netdev_rx_vlan_features); > >> + > >> + netdev_features_set_array(&netif_f_tx_vlan_feature_set, > >> + &netdev_tx_vlan_features); > >> + > >> + netdev_features_set_array(&netif_f_vlan_filter_feature_set, > >> + &netdev_vlan_filter_features); > >> + > >> + netdev_all_vlan_features = netdev_rx_vlan_features; > >> + netdev_features_set(&netdev_all_vlan_features, netdev_tx_vlan_features); > >> + netdev_features_set(&netdev_all_vlan_features, > >> + netdev_vlan_filter_features); > >> + > >> + netdev_features_set_array(&netif_f_ctag_vlan_feature_set, > >> + &netdev_ctag_vlan_features); > >> + > >> + netdev_features_set_array(&netif_f_stag_vlan_feature_set, > >> + &netdev_stag_vlan_features); > >> + > >> + netdev_features_set_array(&netif_f_gso_encap_feature_set, > >> + &netdev_gso_encap_all_features); > >> + > >> + netdev_features_set_array(&netif_f_xfrm_feature_set, > >> + &netdev_xfrm_features); > >> + > >> + netdev_features_set_array(&netif_f_tls_feature_set, > >> + &netdev_tls_features); > >> + > >> + netdev_csum_gso_features_mask = > >> + netdev_features_or(netdev_gso_software_features, > >> + netdev_csum_features_mask); > >> + > >> + netdev_features_fill(&features); > >> + netdev_ethtool_features = > >> + netdev_features_andnot(features, netdev_never_change_features); > >> +} > >> + > >> /* > >> * Initialize the DEV module. At boot time this walks the device list and > >> * unhooks any devices that fail to initialise (normally hardware not > > --- 8< --- > > > >> -- > >> 2.33.0 > > Thanks, > > Al > > > > . > > Thanks, Olek
在 2022/7/20 23:09, Alexander Lobakin 写道: > From: shenjian (K) <shenjian15@huawei.com> > Date: Wed, 20 Apr 2022 17:54:13 +0800 > >> 在 2022/4/19 22:49, Alexander Lobakin 写é“: >> > From: Jian Shen <shenjian15@huawei.com> >> > Date: Tue, 19 Apr 2022 10:21:49 +0800 >> > >> >> There are many netdev_features bits group used in kernel. The >> definition >> >> will be illegal when using feature bit more than 64. Replace these >> macroes >> >> with global netdev_features variables, initialize them when netdev >> module >> >> init. >> >> >> >> Signed-off-by: Jian Shen <shenjian15@huawei.com> >> >> --- >> >> drivers/net/wireguard/device.c | 10 +- >> >> include/linux/netdev_features.h | 102 +++++++++----- >> >> net/core/Makefile | 2 +- >> >> net/core/dev.c | 87 ++++++++++++ >> >> net/core/netdev_features.c | 241 >> ++++++++++++++++++++++++++++++++ >> >> 5 files changed, 400 insertions(+), 42 deletions(-) >> >> create mode 100644 net/core/netdev_features.c >> >> >> > --- 8< --- >> > >> >> diff --git a/net/core/dev.c b/net/core/dev.c >> >> index 4d6b57752eee..85bb418e8ef1 100644 >> >> --- a/net/core/dev.c >> >> +++ b/net/core/dev.c >> >> @@ -146,6 +146,7 @@ >> >> #include <linux/sctp.h> >> >> #include <net/udp_tunnel.h> >> >> #include <linux/net_namespace.h> >> >> +#include <linux/netdev_features_helper.h> >> >> #include <linux/indirect_call_wrapper.h> >> >> #include <net/devlink.h> >> >> #include <linux/pm_runtime.h> >> >> @@ -11255,6 +11256,90 @@ static struct pernet_operations >> __net_initdata default_device_ops = { >> >> .exit_batch = default_device_exit_batch, >> >> }; >> >> >> +static void netdev_features_init(void) >> > It is an initialization function, so it must be marked as __init. >> right, I will add it, thanks! >> >> >> +{ >> >> + netdev_features_t features; >> >> + >> >> + netdev_features_set_array(&netif_f_never_change_feature_set, >> >> + &netdev_never_change_features); >> >> + >> >> + netdev_features_set_array(&netif_f_gso_feature_set_mask, >> > I'm not sure it does make sense to have an empty newline between >> > each call. I'd leave newlines only between the "regular" blocks >> > and the "multi-call" blocks, I mean, stuff like VLAN, GSO and >> > @netdev_ethtool_features. >> At first, I added empty newline per call for the it used three lines. >> Now the new call just use two lines, I will remove some unnecessary >> blank lines. >> >> Thanks! > > I see no news regarding the conversion since the end of April, maybe > I could pick it and finish if nobody objects? I'll preserve the > original authorship for sure. > Hi， Alexander Sorry for late to finish the whole patchset with treewide changes, but I'm still working on it. And most of the convertsions have been completed. I will send to new patchset in two weeks. Jian >> >> >> + &netdev_gso_features_mask); >> >> + >> >> + netdev_features_set_array(&netif_f_ip_csum_feature_set, >> >> + &netdev_ip_csum_features); >> >> + >> >> + netdev_features_set_array(&netif_f_csum_feature_set_mask, >> >> + &netdev_csum_features_mask); >> >> + >> >> + netdev_features_set_array(&netif_f_general_tso_feature_set, >> >> + &netdev_general_tso_features); >> >> + >> >> + netdev_features_set_array(&netif_f_all_tso_feature_set, >> >> + &netdev_all_tso_features); >> >> + >> >> + netdev_features_set_array(&netif_f_tso_ecn_feature_set, >> >> + &netdev_tso_ecn_features); >> >> + >> >> + netdev_features_set_array(&netif_f_all_fcoe_feature_set, >> >> + &netdev_all_fcoe_features); >> >> + >> >> + netdev_features_set_array(&netif_f_gso_soft_feature_set, >> >> + &netdev_gso_software_features); >> >> + >> >> + netdev_features_set_array(&netif_f_one_for_all_feature_set, >> >> + &netdev_one_for_all_features); >> >> + >> >> + netdev_features_set_array(&netif_f_all_for_all_feature_set, >> >> + &netdev_all_for_all_features); >> >> + >> >> + netdev_features_set_array(&netif_f_upper_disables_feature_set, >> >> + &netdev_upper_disable_features); >> >> + >> >> + netdev_features_set_array(&netif_f_soft_feature_set, >> >> + &netdev_soft_features); >> >> + >> >> + netdev_features_set_array(&netif_f_soft_off_feature_set, >> >> + &netdev_soft_off_features); >> >> + >> >> + netdev_features_set_array(&netif_f_rx_vlan_feature_set, >> >> + &netdev_rx_vlan_features); >> >> + >> >> + netdev_features_set_array(&netif_f_tx_vlan_feature_set, >> >> + &netdev_tx_vlan_features); >> >> + >> >> + netdev_features_set_array(&netif_f_vlan_filter_feature_set, >> >> + &netdev_vlan_filter_features); >> >> + >> >> + netdev_all_vlan_features = netdev_rx_vlan_features; >> >> + netdev_features_set(&netdev_all_vlan_features, >> netdev_tx_vlan_features); >> >> + netdev_features_set(&netdev_all_vlan_features, >> >> + netdev_vlan_filter_features); >> >> + >> >> + netdev_features_set_array(&netif_f_ctag_vlan_feature_set, >> >> + &netdev_ctag_vlan_features); >> >> + >> >> + netdev_features_set_array(&netif_f_stag_vlan_feature_set, >> >> + &netdev_stag_vlan_features); >> >> + >> >> + netdev_features_set_array(&netif_f_gso_encap_feature_set, >> >> + &netdev_gso_encap_all_features); >> >> + >> >> + netdev_features_set_array(&netif_f_xfrm_feature_set, >> >> + &netdev_xfrm_features); >> >> + >> >> + netdev_features_set_array(&netif_f_tls_feature_set, >> >> + &netdev_tls_features); >> >> + >> >> + netdev_csum_gso_features_mask = >> >> + netdev_features_or(netdev_gso_software_features, >> >> + netdev_csum_features_mask); >> >> + >> >> + netdev_features_fill(&features); >> >> + netdev_ethtool_features = >> >> + netdev_features_andnot(features, >> netdev_never_change_features); >> >> +} >> >> + >> >> /* >> >> * Initialize the DEV module. At boot time this walks the >> device list and >> >> * unhooks any devices that fail to initialise (normally >> hardware not >> > --- 8< --- >> > >> >> -- >> 2.33.0 >> > Thanks, >> > Al >> > >> > . >> > > > Thanks, > Olek > > . >
From: shenjian (K) <shenjian15@huawei.com> Date: Thu, 21 Jul 2022 09:15:59 +0800 > 在 2022/7/20 23:09, Alexander Lobakin 写道: > > From: shenjian (K) <shenjian15@huawei.com> > > Date: Wed, 20 Apr 2022 17:54:13 +0800 > > > >> 在 2022/4/19 22:49, Alexander Lobakin 写道: > >> > From: Jian Shen <shenjian15@huawei.com> > >> > Date: Tue, 19 Apr 2022 10:21:49 +0800 > >> > > >> >> There are many netdev_features bits group used in kernel. The > >> definition > >> >> will be illegal when using feature bit more than 64. Replace these > >> macroes > >> >> with global netdev_features variables, initialize them when netdev > >> module > >> >> init. > >> >> > >> >> Signed-off-by: Jian Shen <shenjian15@huawei.com> > >> >> --- > >> >> drivers/net/wireguard/device.c | 10 +- > >> >> include/linux/netdev_features.h | 102 +++++++++----- > >> >> net/core/Makefile | 2 +- > >> >> net/core/dev.c | 87 ++++++++++++ > >> >> net/core/netdev_features.c | 241 > >> ++++++++++++++++++++++++++++++++ > >> >> 5 files changed, 400 insertions(+), 42 deletions(-) > >> >> create mode 100644 net/core/netdev_features.c > >> >> > >> > --- 8< --- > >> > > >> >> diff --git a/net/core/dev.c b/net/core/dev.c > >> >> index 4d6b57752eee..85bb418e8ef1 100644 > >> >> --- a/net/core/dev.c > >> >> +++ b/net/core/dev.c > >> >> @@ -146,6 +146,7 @@ > >> >> #include <linux/sctp.h> > >> >> #include <net/udp_tunnel.h> > >> >> #include <linux/net_namespace.h> > >> >> +#include <linux/netdev_features_helper.h> > >> >> #include <linux/indirect_call_wrapper.h> > >> >> #include <net/devlink.h> > >> >> #include <linux/pm_runtime.h> > >> >> @@ -11255,6 +11256,90 @@ static struct pernet_operations > >> __net_initdata default_device_ops = { > >> >> .exit_batch = default_device_exit_batch, > >> >> }; > >> >> >> +static void netdev_features_init(void) > >> > It is an initialization function, so it must be marked as __init. > >> right, I will add it, thanks! > >> > >> >> +{ > >> >> + netdev_features_t features; > >> >> + > >> >> + netdev_features_set_array(&netif_f_never_change_feature_set, > >> >> + &netdev_never_change_features); > >> >> + > >> >> + netdev_features_set_array(&netif_f_gso_feature_set_mask, > >> > I'm not sure it does make sense to have an empty newline between > >> > each call. I'd leave newlines only between the "regular" blocks > >> > and the "multi-call" blocks, I mean, stuff like VLAN, GSO and > >> > @netdev_ethtool_features. > >> At first, I added empty newline per call for the it used three lines. > >> Now the new call just use two lines, I will remove some unnecessary > >> blank lines. > >> > >> Thanks! > > > > I see no news regarding the conversion since the end of April, maybe > > I could pick it and finish if nobody objects? I'll preserve the > > original authorship for sure. > > > Hi， Alexander > > Sorry for late to finish the whole patchset with treewide changes, but > I'm still working on it. > And most of the convertsions have been completed. I will send to new > patchset in two weeks. Oh okay, I was only worried that it could be abandoned for some reason. Great to hear it's almost done, 120+ drivers is not something quick or exciting :) I'll start reviewing the series, at least its "core" part, as soon as it hits netdev ML. Thanks! > > Jian > > >> > >> >> + &netdev_gso_features_mask); [...] > > Thanks, > > Olek > > > > . > > > Olek
在 2022/7/21 22:57, Alexander Lobakin 写道: > From: shenjian (K) <shenjian15@huawei.com> > Date: Thu, 21 Jul 2022 09:15:59 +0800 > >> 在 2022/7/20 23:09, Alexander Lobakin 写道: >>> From: shenjian (K) <shenjian15@huawei.com> >>> Date: Wed, 20 Apr 2022 17:54:13 +0800 >>> >>>> 在 2022/4/19 22:49, Alexander Lobakin 写道: >>>>> From: Jian Shen <shenjian15@huawei.com> >>>>> Date: Tue, 19 Apr 2022 10:21:49 +0800 >>>>> >>>>>> There are many netdev_features bits group used in kernel. The >>>> definition >>>>>> will be illegal when using feature bit more than 64. Replace these >>>> macroes >>>>>> with global netdev_features variables, initialize them when netdev >>>> module >>>>>> init. >>>>>> >>>>>> Signed-off-by: Jian Shen <shenjian15@huawei.com> >>>>>> --- >>>>>> drivers/net/wireguard/device.c | 10 +- >>>>>> include/linux/netdev_features.h | 102 +++++++++----- >>>>>> net/core/Makefile | 2 +- >>>>>> net/core/dev.c | 87 ++++++++++++ >>>>>> net/core/netdev_features.c | 241 >>>> ++++++++++++++++++++++++++++++++ >>>>>> 5 files changed, 400 insertions(+), 42 deletions(-) >>>>>> create mode 100644 net/core/netdev_features.c >>>>>> >>>>> --- 8< --- >>>>> >>>>>> diff --git a/net/core/dev.c b/net/core/dev.c >>>>>> index 4d6b57752eee..85bb418e8ef1 100644 >>>>>> --- a/net/core/dev.c >>>>>> +++ b/net/core/dev.c >>>>>> @@ -146,6 +146,7 @@ >>>>>> #include <linux/sctp.h> >>>>>> #include <net/udp_tunnel.h> >>>>>> #include <linux/net_namespace.h> >>>>>> +#include <linux/netdev_features_helper.h> >>>>>> #include <linux/indirect_call_wrapper.h> >>>>>> #include <net/devlink.h> >>>>>> #include <linux/pm_runtime.h> >>>>>> @@ -11255,6 +11256,90 @@ static struct pernet_operations >>>> __net_initdata default_device_ops = { >>>>>> .exit_batch = default_device_exit_batch, >>>>>> }; >>>>>> >> +static void netdev_features_init(void) >>>>> It is an initialization function, so it must be marked as __init. >>>> right, I will add it, thanks! >>>> >>>>>> +{ >>>>>> + netdev_features_t features; >>>>>> + >>>>>> + netdev_features_set_array(&netif_f_never_change_feature_set, >>>>>> + &netdev_never_change_features); >>>>>> + >>>>>> + netdev_features_set_array(&netif_f_gso_feature_set_mask, >>>>> I'm not sure it does make sense to have an empty newline between >>>>> each call. I'd leave newlines only between the "regular" blocks >>>>> and the "multi-call" blocks, I mean, stuff like VLAN, GSO and >>>>> @netdev_ethtool_features. >>>> At first, I added empty newline per call for the it used three lines. >>>> Now the new call just use two lines, I will remove some unnecessary >>>> blank lines. >>>> >>>> Thanks! >>> I see no news regarding the conversion since the end of April, maybe >>> I could pick it and finish if nobody objects? I'll preserve the >>> original authorship for sure. >>> >> Hi， Alexander >> >> Sorry for late to finish the whole patchset with treewide changes, but >> I'm still working on it. >> And most of the convertsions have been completed. I will send to new >> patchset in two weeks. > Oh okay, I was only worried that it could be abandoned for some > reason. Great to hear it's almost done, 120+ drivers is not > something quick or exciting :) Thanks, I will speed up efforts. > I'll start reviewing the series, at least its "core" part, as soon > as it hits netdev ML. Thanks! Yes, It's need sufficient review, I want to get as many as possible advices for it. Thanks! >> Jian >> >>>>>> + &netdev_gso_features_mask); > [...] > >>> Thanks, >>> Olek >>> >>> . >>> > Olek > > . >
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index 0fad1331303c..bca987ed02c9 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -273,9 +273,9 @@ static const struct device_type device_type = { .name = KBUILD_MODNAME }; static void wg_setup(struct net_device *dev) { struct wg_device *wg = netdev_priv(dev); - enum { WG_NETDEV_FEATURES = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | + netdev_features_t wg_netdev_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO | - NETIF_F_GSO_SOFTWARE | NETIF_F_HIGHDMA }; + NETIF_F_GSO_SOFTWARE | NETIF_F_HIGHDMA; const int overhead = MESSAGE_MINIMUM_LENGTH + sizeof(struct udphdr) + max(sizeof(struct ipv6hdr), sizeof(struct iphdr)); @@ -289,9 +289,9 @@ static void wg_setup(struct net_device *dev) dev->flags = IFF_POINTOPOINT | IFF_NOARP; dev->priv_flags |= IFF_NO_QUEUE; dev->features |= NETIF_F_LLTX; - dev->features |= WG_NETDEV_FEATURES; - dev->hw_features |= WG_NETDEV_FEATURES; - dev->hw_enc_features |= WG_NETDEV_FEATURES; + dev->features |= wg_netdev_features; + dev->hw_features |= wg_netdev_features; + dev->hw_enc_features |= wg_netdev_features; dev->mtu = ETH_DATA_LEN - overhead; dev->max_mtu = round_down(INT_MAX, MESSAGE_PADDING_MULTIPLE) - overhead; diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index e2b66fa3d7d6..16b2313e1dec 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -7,6 +7,7 @@ #include <linux/types.h> #include <linux/bitops.h> +#include <linux/cache.h> #include <asm/byteorder.h> typedef u64 netdev_features_t; @@ -113,6 +114,55 @@ enum { /**/NETDEV_FEATURE_COUNT }; +extern netdev_features_t netdev_ethtool_features __ro_after_init; +extern netdev_features_t netdev_never_change_features __ro_after_init; +extern netdev_features_t netdev_gso_features_mask __ro_after_init; +extern netdev_features_t netdev_ip_csum_features __ro_after_init; +extern netdev_features_t netdev_csum_features_mask __ro_after_init; +extern netdev_features_t netdev_general_tso_features __ro_after_init; +extern netdev_features_t netdev_all_tso_features __ro_after_init; +extern netdev_features_t netdev_tso_ecn_features __ro_after_init; +extern netdev_features_t netdev_all_fcoe_features __ro_after_init; +extern netdev_features_t netdev_gso_software_features __ro_after_init; +extern netdev_features_t netdev_one_for_all_features __ro_after_init; +extern netdev_features_t netdev_all_for_all_features __ro_after_init; +extern netdev_features_t netdev_upper_disable_features __ro_after_init; +extern netdev_features_t netdev_soft_features __ro_after_init; +extern netdev_features_t netdev_soft_off_features __ro_after_init; +extern netdev_features_t netdev_all_vlan_features __ro_after_init; +extern netdev_features_t netdev_rx_vlan_features __ro_after_init; +extern netdev_features_t netdev_tx_vlan_features __ro_after_init; +extern netdev_features_t netdev_ctag_vlan_features __ro_after_init; +extern netdev_features_t netdev_stag_vlan_features __ro_after_init; +extern netdev_features_t netdev_vlan_filter_features __ro_after_init; +extern netdev_features_t netdev_gso_encap_all_features __ro_after_init; +extern netdev_features_t netdev_xfrm_features __ro_after_init; +extern netdev_features_t netdev_tls_features __ro_after_init; +extern netdev_features_t netdev_csum_gso_features_mask __ro_after_init; +extern struct netdev_feature_set netif_f_never_change_feature_set; +extern struct netdev_feature_set netif_f_gso_feature_set_mask; +extern struct netdev_feature_set netif_f_ip_csum_feature_set; +extern struct netdev_feature_set netif_f_csum_feature_set_mask; +extern struct netdev_feature_set netif_f_general_tso_feature_set; +extern struct netdev_feature_set netif_f_all_tso_feature_set; +extern struct netdev_feature_set netif_f_tso_ecn_feature_set; +extern struct netdev_feature_set netif_f_all_fcoe_feature_set; +extern struct netdev_feature_set netif_f_gso_soft_feature_set; +extern struct netdev_feature_set netif_f_one_for_all_feature_set; +extern struct netdev_feature_set netif_f_all_for_all_feature_set; +extern struct netdev_feature_set netif_f_upper_disables_feature_set; +extern struct netdev_feature_set netif_f_soft_feature_set; +extern struct netdev_feature_set netif_f_soft_off_feature_set; +extern struct netdev_feature_set netif_f_vlan_feature_set; +extern struct netdev_feature_set netif_f_tx_vlan_feature_set; +extern struct netdev_feature_set netif_f_rx_vlan_feature_set; +extern struct netdev_feature_set netif_f_vlan_filter_feature_set; +extern struct netdev_feature_set netif_f_ctag_vlan_feature_set; +extern struct netdev_feature_set netif_f_stag_vlan_feature_set; +extern struct netdev_feature_set netif_f_gso_encap_feature_set; +extern struct netdev_feature_set netif_f_xfrm_feature_set; +extern struct netdev_feature_set netif_f_tls_feature_set; + /* copy'n'paste compression ;) */ #define __NETIF_F_BIT(bit) ((netdev_features_t)1 << (bit)) #define __NETIF_F(name) __NETIF_F_BIT(NETIF_F_##name##_BIT) @@ -204,73 +254,53 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) /* Features valid for ethtool to change */ /* = all defined minus driver/device-class-related */ -#define NETIF_F_NEVER_CHANGE (NETIF_F_VLAN_CHALLENGED | \ - NETIF_F_LLTX | NETIF_F_NETNS_LOCAL) +#define NETIF_F_NEVER_CHANGE netdev_never_change_features /* remember that ((t)1 << t_BITS) is undefined in C99 */ -#define NETIF_F_ETHTOOL_BITS ((__NETIF_F_BIT(NETDEV_FEATURE_COUNT - 1) | \ - (__NETIF_F_BIT(NETDEV_FEATURE_COUNT - 1) - 1)) & \ - ~NETIF_F_NEVER_CHANGE) +#define NETIF_F_ETHTOOL_BITS netdev_ethtool_features /* Segmentation offload feature mask */ -#define NETIF_F_GSO_MASK (__NETIF_F_BIT(NETIF_F_GSO_LAST + 1) - \ - __NETIF_F_BIT(NETIF_F_GSO_SHIFT)) +#define NETIF_F_GSO_MASK netdev_gso_features_mask /* List of IP checksum features. Note that NETIF_F_HW_CSUM should not be * set in features when NETIF_F_IP_CSUM or NETIF_F_IPV6_CSUM are set-- * this would be contradictory */ -#define NETIF_F_CSUM_MASK (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ - NETIF_F_HW_CSUM) +#define NETIF_F_CSUM_MASK netdev_csum_features_mask -#define NETIF_F_ALL_TSO (NETIF_F_TSO | NETIF_F_TSO6 | \ - NETIF_F_TSO_ECN | NETIF_F_TSO_MANGLEID) +#define NETIF_F_ALL_TSO netdev_all_tso_features -#define NETIF_F_ALL_FCOE (NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \ - NETIF_F_FSO) +#define NETIF_F_ALL_FCOE netdev_all_fcoe_features /* List of features with software fallbacks. */ -#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP | \ - NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST) +#define NETIF_F_GSO_SOFTWARE netdev_gso_software_features /* * If one device supports one of these features, then enable them * for all in netdev_increment_features. */ -#define NETIF_F_ONE_FOR_ALL (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \ - NETIF_F_SG | NETIF_F_HIGHDMA | \ - NETIF_F_FRAGLIST | NETIF_F_VLAN_CHALLENGED) +#define NETIF_F_ONE_FOR_ALL netdev_one_for_all_features /* * If one device doesn't support one of these features, then disable it * for all in netdev_increment_features. */ -#define NETIF_F_ALL_FOR_ALL (NETIF_F_NOCACHE_COPY | NETIF_F_FSO) +#define NETIF_F_ALL_FOR_ALL netdev_all_for_all_features /* * If upper/master device has these features disabled, they must be disabled * on all lower/slave devices as well. */ -#define NETIF_F_UPPER_DISABLES NETIF_F_LRO +#define NETIF_F_UPPER_DISABLES netdev_upper_disable_features /* changeable features with no special hardware requirements */ -#define NETIF_F_SOFT_FEATURES (NETIF_F_GSO | NETIF_F_GRO) +#define NETIF_F_SOFT_FEATURES netdev_soft_features /* Changeable features with no special hardware requirements that defaults to off. */ -#define NETIF_F_SOFT_FEATURES_OFF (NETIF_F_GRO_FRAGLIST | NETIF_F_GRO_UDP_FWD) - -#define NETIF_F_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_FILTER | \ - NETIF_F_HW_VLAN_CTAG_RX | \ - NETIF_F_HW_VLAN_CTAG_TX | \ - NETIF_F_HW_VLAN_STAG_FILTER | \ - NETIF_F_HW_VLAN_STAG_RX | \ - NETIF_F_HW_VLAN_STAG_TX) - -#define NETIF_F_GSO_ENCAP_ALL (NETIF_F_GSO_GRE | \ - NETIF_F_GSO_GRE_CSUM | \ - NETIF_F_GSO_IPXIP4 | \ - NETIF_F_GSO_IPXIP6 | \ - NETIF_F_GSO_UDP_TUNNEL | \ - NETIF_F_GSO_UDP_TUNNEL_CSUM) +#define NETIF_F_SOFT_FEATURES_OFF netdev_soft_off_features + +#define NETIF_F_VLAN_FEATURES netdev_all_vlan_features + +#define NETIF_F_GSO_ENCAP_ALL netdev_gso_encap_all_features #endif /* _LINUX_NETDEV_FEATURES_H */ diff --git a/net/core/Makefile b/net/core/Makefile index a8e4f737692b..9d2127d25d72 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.o obj-y += dev.o dev_addr_lists.o dst.o netevent.o \ neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \ - fib_notifier.o xdp.o flow_offload.o gro.o + fib_notifier.o xdp.o flow_offload.o gro.o netdev_features.o obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o diff --git a/net/core/dev.c b/net/core/dev.c index 4d6b57752eee..85bb418e8ef1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -146,6 +146,7 @@ #include <linux/sctp.h> #include <net/udp_tunnel.h> #include <linux/net_namespace.h> +#include <linux/netdev_features_helper.h> #include <linux/indirect_call_wrapper.h> #include <net/devlink.h> #include <linux/pm_runtime.h> @@ -11255,6 +11256,90 @@ static struct pernet_operations __net_initdata default_device_ops = { .exit_batch = default_device_exit_batch, }; +static void netdev_features_init(void) +{ + netdev_features_t features; + + netdev_features_set_array(&netif_f_never_change_feature_set, + &netdev_never_change_features); + + netdev_features_set_array(&netif_f_gso_feature_set_mask, + &netdev_gso_features_mask); + + netdev_features_set_array(&netif_f_ip_csum_feature_set, + &netdev_ip_csum_features); + + netdev_features_set_array(&netif_f_csum_feature_set_mask, + &netdev_csum_features_mask); + + netdev_features_set_array(&netif_f_general_tso_feature_set, + &netdev_general_tso_features); + + netdev_features_set_array(&netif_f_all_tso_feature_set, + &netdev_all_tso_features); + + netdev_features_set_array(&netif_f_tso_ecn_feature_set, + &netdev_tso_ecn_features); + + netdev_features_set_array(&netif_f_all_fcoe_feature_set, + &netdev_all_fcoe_features); + + netdev_features_set_array(&netif_f_gso_soft_feature_set, + &netdev_gso_software_features); + + netdev_features_set_array(&netif_f_one_for_all_feature_set, + &netdev_one_for_all_features); + + netdev_features_set_array(&netif_f_all_for_all_feature_set, + &netdev_all_for_all_features); + + netdev_features_set_array(&netif_f_upper_disables_feature_set, + &netdev_upper_disable_features); + + netdev_features_set_array(&netif_f_soft_feature_set, + &netdev_soft_features); + + netdev_features_set_array(&netif_f_soft_off_feature_set, + &netdev_soft_off_features); + + netdev_features_set_array(&netif_f_rx_vlan_feature_set, + &netdev_rx_vlan_features); + + netdev_features_set_array(&netif_f_tx_vlan_feature_set, + &netdev_tx_vlan_features); + + netdev_features_set_array(&netif_f_vlan_filter_feature_set, + &netdev_vlan_filter_features); + + netdev_all_vlan_features = netdev_rx_vlan_features; + netdev_features_set(&netdev_all_vlan_features, netdev_tx_vlan_features); + netdev_features_set(&netdev_all_vlan_features, + netdev_vlan_filter_features); + + netdev_features_set_array(&netif_f_ctag_vlan_feature_set, + &netdev_ctag_vlan_features); + + netdev_features_set_array(&netif_f_stag_vlan_feature_set, + &netdev_stag_vlan_features); + + netdev_features_set_array(&netif_f_gso_encap_feature_set, + &netdev_gso_encap_all_features); + + netdev_features_set_array(&netif_f_xfrm_feature_set, + &netdev_xfrm_features); + + netdev_features_set_array(&netif_f_tls_feature_set, + &netdev_tls_features); + + netdev_csum_gso_features_mask = + netdev_features_or(netdev_gso_software_features, + netdev_csum_features_mask); + + netdev_features_fill(&features); + netdev_ethtool_features = + netdev_features_andnot(features, netdev_never_change_features); +} + /* * Initialize the DEV module. At boot time this walks the device list and * unhooks any devices that fail to initialise (normally hardware not @@ -11285,6 +11370,8 @@ static int __init net_dev_init(void) if (register_pernet_subsys(&netdev_net_ops)) goto out; + netdev_features_init(); + /* * Initialise the packet receive queues. */ diff --git a/net/core/netdev_features.c b/net/core/netdev_features.c new file mode 100644 index 000000000000..db870038213a --- /dev/null +++ b/net/core/netdev_features.c @@ -0,0 +1,241 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Network device features. + */ + +#include <linux/netdev_features.h> +#include <linux/netdev_features_helper.h> + +netdev_features_t netdev_ethtool_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_ethtool_features); + +netdev_features_t netdev_never_change_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_never_change_features); + +netdev_features_t netdev_gso_features_mask __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_gso_features_mask); + +netdev_features_t netdev_ip_csum_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_ip_csum_features); + +netdev_features_t netdev_csum_features_mask __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_csum_features_mask); + +netdev_features_t netdev_general_tso_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_general_tso_features); + +netdev_features_t netdev_all_tso_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_all_tso_features); + +netdev_features_t netdev_tso_ecn_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_tso_ecn_features); + +netdev_features_t netdev_all_fcoe_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_all_fcoe_features); + +netdev_features_t netdev_gso_software_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_gso_software_features); + +netdev_features_t netdev_one_for_all_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_one_for_all_features); + +netdev_features_t netdev_all_for_all_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_all_for_all_features); + +netdev_features_t netdev_upper_disable_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_upper_disable_features); + +netdev_features_t netdev_soft_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_soft_features); + +netdev_features_t netdev_soft_off_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_soft_off_features); + +netdev_features_t netdev_all_vlan_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_all_vlan_features); + +netdev_features_t netdev_vlan_filter_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_vlan_filter_features); + +netdev_features_t netdev_rx_vlan_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_rx_vlan_features); + +netdev_features_t netdev_tx_vlan_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_tx_vlan_features); + +netdev_features_t netdev_ctag_vlan_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_ctag_vlan_features); + +netdev_features_t netdev_stag_vlan_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_stag_vlan_features); + +netdev_features_t netdev_gso_encap_all_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_gso_encap_all_features); + +netdev_features_t netdev_xfrm_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_xfrm_features); + +netdev_features_t netdev_tls_features __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_tls_features); + +netdev_features_t netdev_csum_gso_features_mask __ro_after_init; +EXPORT_SYMBOL_GPL(netdev_csum_gso_features_mask); + +DECLARE_NETDEV_FEATURE_SET(netif_f_never_change_feature_set, + NETIF_F_VLAN_CHALLENGED_BIT, + NETIF_F_LLTX_BIT, + NETIF_F_NETNS_LOCAL_BIT); +EXPORT_SYMBOL_GPL(netif_f_never_change_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_gso_feature_set_mask, + NETIF_F_TSO_BIT, + NETIF_F_GSO_ROBUST_BIT, + NETIF_F_TSO_ECN_BIT, + NETIF_F_TSO_MANGLEID_BIT, + NETIF_F_TSO6_BIT, + NETIF_F_FSO_BIT, + NETIF_F_GSO_GRE_BIT, + NETIF_F_GSO_GRE_CSUM_BIT, + NETIF_F_GSO_IPXIP4_BIT, + NETIF_F_GSO_IPXIP6_BIT, + NETIF_F_GSO_UDP_TUNNEL_BIT, + NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT, + NETIF_F_GSO_PARTIAL_BIT, + NETIF_F_GSO_TUNNEL_REMCSUM_BIT, + NETIF_F_GSO_SCTP_BIT, + NETIF_F_GSO_ESP_BIT, + NETIF_F_GSO_UDP_BIT, + NETIF_F_GSO_UDP_L4_BIT, + NETIF_F_GSO_FRAGLIST_BIT); +EXPORT_SYMBOL_GPL(netif_f_gso_feature_set_mask); + +DECLARE_NETDEV_FEATURE_SET(netif_f_ip_csum_feature_set, + NETIF_F_IP_CSUM_BIT, + NETIF_F_IPV6_CSUM_BIT); +EXPORT_SYMBOL_GPL(netif_f_ip_csum_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_csum_feature_set_mask, + NETIF_F_IP_CSUM_BIT, + NETIF_F_IPV6_CSUM_BIT, + NETIF_F_HW_CSUM_BIT); +EXPORT_SYMBOL_GPL(netif_f_csum_feature_set_mask); + +DECLARE_NETDEV_FEATURE_SET(netif_f_general_tso_feature_set, + NETIF_F_TSO_BIT, + NETIF_F_TSO6_BIT); +EXPORT_SYMBOL_GPL(netif_f_general_tso_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_all_tso_feature_set, + NETIF_F_TSO_BIT, + NETIF_F_TSO6_BIT, + NETIF_F_TSO_ECN_BIT, + NETIF_F_TSO_MANGLEID_BIT); +EXPORT_SYMBOL_GPL(netif_f_all_tso_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_tso_ecn_feature_set, + NETIF_F_TSO_ECN_BIT); +EXPORT_SYMBOL_GPL(netif_f_tso_ecn_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_all_fcoe_feature_set, + NETIF_F_FCOE_CRC_BIT, + NETIF_F_FCOE_MTU_BIT, + NETIF_F_FSO_BIT); +EXPORT_SYMBOL_GPL(netif_f_all_fcoe_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_gso_soft_feature_set, + NETIF_F_TSO_BIT, + NETIF_F_TSO6_BIT, + NETIF_F_TSO_ECN_BIT, + NETIF_F_TSO_MANGLEID_BIT, + NETIF_F_GSO_SCTP_BIT, + NETIF_F_GSO_UDP_L4_BIT, + NETIF_F_GSO_FRAGLIST_BIT); +EXPORT_SYMBOL_GPL(netif_f_gso_soft_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_one_for_all_feature_set, + NETIF_F_TSO_BIT, + NETIF_F_TSO6_BIT, + NETIF_F_TSO_ECN_BIT, + NETIF_F_TSO_MANGLEID_BIT, + NETIF_F_GSO_SCTP_BIT, + NETIF_F_GSO_UDP_L4_BIT, + NETIF_F_GSO_FRAGLIST_BIT, + NETIF_F_GSO_ROBUST_BIT, + NETIF_F_SG_BIT, + NETIF_F_HIGHDMA_BIT, + NETIF_F_FRAGLIST_BIT, + NETIF_F_VLAN_CHALLENGED); +EXPORT_SYMBOL_GPL(netif_f_one_for_all_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_all_for_all_feature_set, + NETIF_F_NOCACHE_COPY_BIT, + NETIF_F_FSO_BIT); +EXPORT_SYMBOL_GPL(netif_f_all_for_all_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_upper_disables_feature_set, + NETIF_F_LRO_BIT); +EXPORT_SYMBOL_GPL(netif_f_upper_disables_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_soft_feature_set, + NETIF_F_GSO_BIT, + NETIF_F_GRO_BIT); +EXPORT_SYMBOL_GPL(netif_f_soft_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_soft_off_feature_set, + NETIF_F_GRO_FRAGLIST_BIT, + NETIF_F_GRO_UDP_FWD_BIT); +EXPORT_SYMBOL_GPL(netif_f_soft_off_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_vlan_feature_set, + NETIF_F_HW_VLAN_CTAG_FILTER_BIT, + NETIF_F_HW_VLAN_CTAG_RX_BIT, + NETIF_F_HW_VLAN_CTAG_TX_BIT, + NETIF_F_HW_VLAN_STAG_FILTER_BIT, + NETIF_F_HW_VLAN_STAG_RX_BIT, + NETIF_F_HW_VLAN_STAG_TX_BIT); +EXPORT_SYMBOL_GPL(netif_f_vlan_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_tx_vlan_feature_set, + NETIF_F_HW_VLAN_CTAG_TX_BIT, + NETIF_F_HW_VLAN_STAG_TX_BIT); +EXPORT_SYMBOL_GPL(netif_f_tx_vlan_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_rx_vlan_feature_set, + NETIF_F_HW_VLAN_CTAG_RX_BIT, + NETIF_F_HW_VLAN_STAG_RX_BIT); +EXPORT_SYMBOL_GPL(netif_f_rx_vlan_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_vlan_filter_feature_set, + NETIF_F_HW_VLAN_CTAG_FILTER_BIT, + NETIF_F_HW_VLAN_STAG_FILTER_BIT); +EXPORT_SYMBOL_GPL(netif_f_vlan_filter_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_ctag_vlan_feature_set, + NETIF_F_HW_VLAN_CTAG_TX_BIT, + NETIF_F_HW_VLAN_CTAG_RX_BIT); +EXPORT_SYMBOL_GPL(netif_f_ctag_vlan_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_stag_vlan_feature_set, + NETIF_F_HW_VLAN_STAG_TX_BIT, + NETIF_F_HW_VLAN_STAG_RX_BIT); +EXPORT_SYMBOL_GPL(netif_f_stag_vlan_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_gso_encap_feature_set, + NETIF_F_GSO_GRE_BIT, + NETIF_F_GSO_GRE_CSUM_BIT, + NETIF_F_GSO_IPXIP4_BIT, + NETIF_F_GSO_IPXIP6_BIT, + NETIF_F_GSO_UDP_TUNNEL_BIT, + NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT); +EXPORT_SYMBOL_GPL(netif_f_gso_encap_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_xfrm_feature_set, + NETIF_F_HW_ESP_BIT, + NETIF_F_HW_ESP_TX_CSUM_BIT, + NETIF_F_GSO_ESP_BIT); +EXPORT_SYMBOL_GPL(netif_f_xfrm_feature_set); + +DECLARE_NETDEV_FEATURE_SET(netif_f_tls_feature_set, + NETIF_F_HW_TLS_TX_BIT, + NETIF_F_HW_TLS_RX_BIT); +EXPORT_SYMBOL_GPL(netif_f_tls_feature_set);
There are many netdev_features bits group used in kernel. The definition will be illegal when using feature bit more than 64. Replace these macroes with global netdev_features variables, initialize them when netdev module init. Signed-off-by: Jian Shen <shenjian15@huawei.com> --- drivers/net/wireguard/device.c | 10 +- include/linux/netdev_features.h | 102 +++++++++----- net/core/Makefile | 2 +- net/core/dev.c | 87 ++++++++++++ net/core/netdev_features.c | 241 ++++++++++++++++++++++++++++++++ 5 files changed, 400 insertions(+), 42 deletions(-) create mode 100644 net/core/netdev_features.c