[{eoan, disco, xenial}:linux-gcp][PATCH 0/2] LP: #1851538 - Fix the annotations file for linux-gcp

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[{eoan, disco, xenial}:linux-gcp][PATCH 0/2] LP: #1851538 - Fix the annotations file for linux-gcp

Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1851538

The annotation file has a typo that is basically causing the checks to
be ignored. Fix the annotations file and update the necessary config
back to their intended values.

For 5.0+ a patch used to fix a raid6 algorithm was silently dropped
(probably due to the annotations typo), also re-introduce this commit.

Marcelo Henrique Cerri (2):
  UBUNTU: SAUCE: raid6: Add option for default PQ algorithm
  UBUNTU: [Config] Fix annotations file

 debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules |  1 -
 debian.gcp/config/annotations                 | 42 +++++++++----------
 debian.gcp/config/config.common.ubuntu        |  4 +-
 lib/Kconfig                                   | 17 ++++++++
 lib/raid6/algos.c                             | 26 ++++++++++++
 5 files changed, 67 insertions(+), 23 deletions(-)

--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[eoan:linux-gcp][PATCH 1/2] UBUNTU: SAUCE: raid6: Add option for default PQ algorithm

Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1812728
BugLink: https://bugs.launchpad.net/bugs/1851538

Add a new config ("CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL") to enable
specifying a default gen() algorithm for RAID_PQ via the kernel
"raid6_pq_default_alg" cmdline option. When a default algorithm is
given, the raid6_pq module will skip the performance round of tests.

The config CONFIG_RAID6_PQ_DEFAULT_ALG can be used to define a default
value for the kernel option.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 lib/Kconfig       | 17 +++++++++++++++++
 lib/raid6/algos.c | 26 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/lib/Kconfig b/lib/Kconfig
index 4e6b1c3e4c98..dae35c80dfda 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,23 @@ config RAID6_PQ_BENCHMARK
   Benchmark all available RAID6 PQ functions on init and choose the
   fastest one.
 
+config RAID6_PQ_DEFAULT_ALG_BOOL
+ bool "Default RAID6 PQ algorithm"
+ default n
+ depends on RAID6_PQ
+ help
+  Allow for specifying a default algorithm via the kernel
+  parameter "raid6_pq_default_alg", which forces the performance
+  tests to be skipped. This can save between 500ms to 2s
+  during boot.
+
+config RAID6_PQ_DEFAULT_ALG
+ string "Default RAID6 PQ algorithm name"
+ default ""
+ depends on RAID6_PQ_DEFAULT_ALG_BOOL
+ help
+  The default algorithm name to be used by default.
+
 config PACKING
  bool "Generic bitfield packing and unpacking"
  default n
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 608b648261bd..67af502eada3 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -25,6 +25,12 @@ EXPORT_SYMBOL(raid6_empty_zero_page);
 #endif
 #endif
 
+#ifdef CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL
+static char raid6_pq_default_alg[32] = CONFIG_RAID6_PQ_DEFAULT_ALG;
+module_param_string(raid6_pq_default_alg, raid6_pq_default_alg, sizeof(raid6_pq_default_alg), 0444);
+MODULE_PARM_DESC(raid6_pq_default_alg, "Default gen/xor() algorithm");
+#endif
+
 struct raid6_calls raid6_call;
 EXPORT_SYMBOL_GPL(raid6_call);
 
@@ -153,6 +159,26 @@ static inline const struct raid6_calls *raid6_choose_gen(
  const struct raid6_calls *const *algo;
  const struct raid6_calls *best;
 
+#ifdef CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL
+ if (strlen(raid6_pq_default_alg)) {
+ for (algo = raid6_algos; *algo; algo++) {
+ if (!strncmp(raid6_pq_default_alg, (*algo)->name, sizeof(raid6_pq_default_alg))) {
+ if ((*algo)->valid && !(*algo)->valid()) {
+ pr_info("raid6: default alg \"%s\" is invalid.\n",
+ raid6_pq_default_alg);
+ continue;
+ }
+ pr_info("raid6: using default algorithm %s gen() without performace tests.\n",
+ (*algo)->name);
+ raid6_call = **algo;
+ return *algo;
+ }
+ }
+ pr_info("raid6: default alg \"%s\" not found. Choosing the best alg as fallback...\n",
+ raid6_pq_default_alg);
+ }
+#endif
+
  for (bestgenperf = 0, bestxorperf = 0, best = NULL, algo = raid6_algos; *algo; algo++) {
  if (!best || (*algo)->prefer >= best->prefer) {
  /* 2 ^ (RAID6_TIME_JIFFIES_LG2 - 0.5) */
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[eoan:linux-gcp][PATCH 2/2] UBUNTU: [Config] Fix annotations file

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1851538

Replace ENFORCE with ENFORCED to ensure the config options checks are
not being ignored. Also update the corresponding config options back
to the desirable value.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules |  1 -
 debian.gcp/config/annotations                 | 42 +++++++++----------
 debian.gcp/config/config.common.ubuntu        |  4 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules b/debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules
index 44d8f4cd0650..c3d5eeae9e86 100644
--- a/debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules
+++ b/debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules
@@ -1005,7 +1005,6 @@ dmm32at
 dmx3191d
 dn_rtmsg
 dnet
-dp83640
 dp83822
 dp83848
 dp83867
diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 9eeda849d8da..441de7cad8a5 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -7,79 +7,79 @@ include "../../debian.master/config/annotations"
 # Menu: Device Drivers >> Block devices
 CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
 #
-CONFIG_BLK_DEV_FD                               flag<ENFORCE> note<LP:1729673>
+CONFIG_BLK_DEV_FD                               flag<ENFORCED> note<LP:1729673>
 
 # Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support
 CONFIG_I2C_AMD_MP2 policy<{'amd64': 'n'}>
 #
-CONFIG_I2C_AMD_MP2 flag<ENFORCE> note<not relevant for gcp>
+CONFIG_I2C_AMD_MP2 flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices
 CONFIG_WCN36XX_SNAPDRAGON_HACKS policy<{'amd64': 'n'}>
 #
-CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCE> note<not relevant for gcp>
+CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> PTP clock support >> PTP clock support
 CONFIG_DP83640_PHY                              policy<{'amd64': 'n'}>
 #
-CONFIG_DP83640_PHY                              mark<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_DP83640_PHY                              mark<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers
 CONFIG_SCSI_VIRTIO                              policy<{'amd64': 'y'}>
 #
-CONFIG_SCSI_VIRTIO                              flag<ENFORCE> note<LP:1669657> note<tech preview of new feature>
+CONFIG_SCSI_VIRTIO                              flag<ENFORCED> note<LP:1669657> note<tech preview of new feature>
 
 # Menu: Device Drivers >> X86 Platform Specific Device Drivers
 CONFIG_DELL_UART_BACKLIGHT policy<{'amd64': 'n'}>
 CONFIG_DELL_SMBIOS_SMM policy<{'amd64': 'n'}>
 #
-CONFIG_DELL_UART_BACKLIGHT flag<ENFORCE> note<not relevant for gcp>
-CONFIG_DELL_SMBIOS_SMM flag<ENFORCE> note<not relevant for gcp>
+CONFIG_DELL_UART_BACKLIGHT flag<ENFORCED> note<not relevant for gcp>
+CONFIG_DELL_SMBIOS_SMM flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Kernel hacking
 CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
 #
-CONFIG_PANIC_ON_OOPS   flag<ENFORCE> note<initial packaging> note<keep working if at all possible>
+CONFIG_PANIC_ON_OOPS   flag<ENFORCED> note<initial packaging> note<keep working if at all possible>
 
 # Menu: Kernel hacking >> Debug Lockups and Hangs
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               policy<{'amd64': 'y'}>
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               policy<{'amd64': 'y'}>
 #
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
 
 # Menu: Library routines
-CONFIG_RAID6_PQ_DEFAULT_ALG policy<'amd64': 'avx2x4'>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<'amd64': 'y'>
+CONFIG_RAID6_PQ_DEFAULT_ALG policy<{'amd64': '"avx2x4"'}>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<{'amd64': 'y'}>
 #
-CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCE> note<LP:1812728>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCE> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCED> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCED> note<LP:1812728>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
 CONFIG_BT_QCOMSMD_HACK policy<{'amd64': 'n'}>
 #
-CONFIG_BT_QCOMSMD_HACK flag<ENFORCE> note<not relevant for gcp>
+CONFIG_BT_QCOMSMD_HACK flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options
 CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'n'}>
 #
-CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration
 CONFIG_NETFILTER_NETLINK_QUEUE                  policy<{'amd64': 'y'}>
 CONFIG_NETFILTER_NETLINK_LOG                    policy<{'amd64': 'y'}>
 #
-CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCE> note<initial packaging>
-CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCE> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCED> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCED> note<initial packaging>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support
 CONFIG_NF_CONNTRACK                             policy<{'amd64': 'y'}>
 CONFIG_NF_CONNTRACK_PROCFS                      policy<{'amd64': 'y'}>
 CONFIG_NF_CT_NETLINK                            policy<{'amd64': 'y'}>
 #
-CONFIG_NF_CONNTRACK                             flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CT_NETLINK                            flag<ENFORCE> note<initial packaging>
+CONFIG_NF_CONNTRACK                             flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CT_NETLINK                            flag<ENFORCED> note<initial packaging>
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
 
 #
diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu
index 587e7a311d76..38add6a055fa 100644
--- a/debian.gcp/config/config.common.ubuntu
+++ b/debian.gcp/config/config.common.ubuntu
@@ -1689,7 +1689,7 @@ CONFIG_DNET=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DOUBLEFAULT=y
-CONFIG_DP83640_PHY=m
+# CONFIG_DP83640_PHY is not set
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
@@ -5555,6 +5555,8 @@ CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_RAID6_PQ_DEFAULT_ALG="avx2x4"
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL=y
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_RANDOMIZE_BASE=y
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[disco:linux-gcp][PATCH 1/2] UBUNTU: SAUCE: raid6: Add option for default PQ algorithm

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1812728
BugLink: https://bugs.launchpad.net/bugs/1851538

Add a new config ("CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL") to enable
specifying a default gen() algorithm for RAID_PQ via the kernel
"raid6_pq_default_alg" cmdline option. When a default algorithm is
given, the raid6_pq module will skip the performance round of tests.

The config CONFIG_RAID6_PQ_DEFAULT_ALG can be used to define a default
value for the kernel option.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 lib/Kconfig       | 17 +++++++++++++++++
 lib/raid6/algos.c | 26 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/lib/Kconfig b/lib/Kconfig
index a9e56539bd11..94635255a996 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -18,6 +18,23 @@ config RAID6_PQ_BENCHMARK
   Benchmark all available RAID6 PQ functions on init and choose the
   fastest one.
 
+config RAID6_PQ_DEFAULT_ALG_BOOL
+ bool "Default RAID6 PQ algorithm"
+ default n
+ depends on RAID6_PQ
+ help
+  Allow for specifying a default algorithm via the kernel
+  parameter "raid6_pq_default_alg", which forces the performance
+  tests to be skipped. This can save between 500ms to 2s
+  during boot.
+
+config RAID6_PQ_DEFAULT_ALG
+ string "Default RAID6 PQ algorithm name"
+ default ""
+ depends on RAID6_PQ_DEFAULT_ALG_BOOL
+ help
+  The default algorithm name to be used by default.
+
 config BITREVERSE
  tristate
 
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 7ff2cc789f8a..7e27d1d044d7 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -30,6 +30,12 @@ EXPORT_SYMBOL(raid6_empty_zero_page);
 #endif
 #endif
 
+#ifdef CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL
+static char raid6_pq_default_alg[32] = CONFIG_RAID6_PQ_DEFAULT_ALG;
+module_param_string(raid6_pq_default_alg, raid6_pq_default_alg, sizeof(raid6_pq_default_alg), 0444);
+MODULE_PARM_DESC(raid6_pq_default_alg, "Default gen/xor() algorithm");
+#endif
+
 struct raid6_calls raid6_call;
 EXPORT_SYMBOL_GPL(raid6_call);
 
@@ -158,6 +164,26 @@ static inline const struct raid6_calls *raid6_choose_gen(
  const struct raid6_calls *const *algo;
  const struct raid6_calls *best;
 
+#ifdef CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL
+ if (strlen(raid6_pq_default_alg)) {
+ for (algo = raid6_algos; *algo; algo++) {
+ if (!strncmp(raid6_pq_default_alg, (*algo)->name, sizeof(raid6_pq_default_alg))) {
+ if ((*algo)->valid && !(*algo)->valid()) {
+ pr_info("raid6: default alg \"%s\" is invalid.\n",
+ raid6_pq_default_alg);
+ continue;
+ }
+ pr_info("raid6: using default algorithm %s gen() without performace tests.\n",
+ (*algo)->name);
+ raid6_call = **algo;
+ return *algo;
+ }
+ }
+ pr_info("raid6: default alg \"%s\" not found. Choosing the best alg as fallback...\n",
+ raid6_pq_default_alg);
+ }
+#endif
+
  for (bestgenperf = 0, bestxorperf = 0, best = NULL, algo = raid6_algos; *algo; algo++) {
  if (!best || (*algo)->prefer >= best->prefer) {
  /* 2 ^ (RAID6_TIME_JIFFIES_LG2 - 0.5) */
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[disco:linux-gcp][PATCH 2/2] UBUNTU: [Config] Fix annotations file

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1851538

Replace ENFORCE with ENFORCED to ensure the config options checks are
not being ignored. Also update the corresponding config options back
to the desirable value.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 .../abi/5.0.0-1021.21/amd64/gcp.modules       |  1 -
 debian.gcp/config/annotations                 | 42 +++++++++----------
 debian.gcp/config/config.common.ubuntu        |  4 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
index 97e6f14f9aa5..a6ea236301f1 100644
--- a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
+++ b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
@@ -1013,7 +1013,6 @@ dmm32at
 dmx3191d
 dn_rtmsg
 dnet
-dp83640
 dp83822
 dp83848
 dp83867
diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 7ec8b56a13e3..3f83e75ce50b 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -7,78 +7,78 @@ include "../../debian.master/config/annotations"
 # Menu: Device Drivers >> Block devices
 CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
 #
-CONFIG_BLK_DEV_FD                               flag<ENFORCE> note<LP:1729673>
+CONFIG_BLK_DEV_FD                               flag<ENFORCED> note<LP:1729673>
 
 # Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support
 CONFIG_I2C_AMD_MP2 policy<{'amd64': 'n'}>
 #
-CONFIG_I2C_AMD_MP2 flag<ENFORCE> note<not relevant for gcp>
+CONFIG_I2C_AMD_MP2 flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices
 CONFIG_WCN36XX_SNAPDRAGON_HACKS policy<{'amd64': 'n'}>
 #
-CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCE> note<not relevant for gcp>
+CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> PTP clock support >> PTP clock support
 CONFIG_DP83640_PHY                              policy<{'amd64': 'n'}>
 #
-CONFIG_DP83640_PHY                              mark<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_DP83640_PHY                              mark<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers
 CONFIG_SCSI_VIRTIO                              policy<{'amd64': 'y'}>
 #
-CONFIG_SCSI_VIRTIO                              flag<ENFORCE> note<LP:1669657> note<tech preview of new feature>
+CONFIG_SCSI_VIRTIO                              flag<ENFORCED> note<LP:1669657> note<tech preview of new feature>
 
 # Menu: Device Drivers >> X86 Platform Specific Device Drivers
 CONFIG_DELL_UART_BACKLIGHT policy<{'amd64': 'n'}>
 CONFIG_DELL_SMBIOS_SMM policy<{'amd64': 'n'}>
 #
-CONFIG_DELL_UART_BACKLIGHT flag<ENFORCE> note<not relevant for gcp>
-CONFIG_DELL_SMBIOS_SMM flag<ENFORCE> note<not relevant for gcp>
+CONFIG_DELL_UART_BACKLIGHT flag<ENFORCED> note<not relevant for gcp>
+CONFIG_DELL_SMBIOS_SMM flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Kernel hacking
 CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
 #
-CONFIG_PANIC_ON_OOPS   flag<ENFORCE> note<initial packaging> note<keep working if at all possible>
+CONFIG_PANIC_ON_OOPS   flag<ENFORCED> note<initial packaging> note<keep working if at all possible>
 
 # Menu: Kernel hacking >> Debug Lockups and Hangs
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               policy<{'amd64': 'y'}>
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               policy<{'amd64': 'y'}>
 #
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
 
 # Menu: Library routines
-CONFIG_RAID6_PQ_DEFAULT_ALG policy<'amd64': 'avx2x4'>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<'amd64': 'y'>
+CONFIG_RAID6_PQ_DEFAULT_ALG policy<{'amd64': '"avx2x4"'}>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<{'amd64': 'y'}>
 #
-CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCE> note<LP:1812728>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCE> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCED> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCED> note<LP:1812728>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
 CONFIG_BT_QCOMSMD_HACK policy<{'amd64': 'n'}>
 #
-CONFIG_BT_QCOMSMD_HACK flag<ENFORCE> note<not relevant for gcp>
+CONFIG_BT_QCOMSMD_HACK flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options
 CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'n'}>
 #
-CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration
 CONFIG_NETFILTER_NETLINK_QUEUE                  policy<{'amd64': 'y'}>
 CONFIG_NETFILTER_NETLINK_LOG                    policy<{'amd64': 'y'}>
 #
-CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCE> note<initial packaging>
-CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCE> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCED> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCED> note<initial packaging>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support
 CONFIG_NF_CONNTRACK                             policy<{'amd64': 'y'}>
 CONFIG_NF_CONNTRACK_PROCFS                      policy<{'amd64': 'y'}>
 CONFIG_NF_CT_NETLINK                            policy<{'amd64': 'y'}>
 #
-CONFIG_NF_CONNTRACK                             flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CT_NETLINK                            flag<ENFORCE> note<initial packaging>
+CONFIG_NF_CONNTRACK                             flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CT_NETLINK                            flag<ENFORCED> note<initial packaging>
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
 
diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu
index 28e8aac81525..02b8d3366910 100644
--- a/debian.gcp/config/config.common.ubuntu
+++ b/debian.gcp/config/config.common.ubuntu
@@ -1671,7 +1671,7 @@ CONFIG_DNET=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DOUBLEFAULT=y
-CONFIG_DP83640_PHY=m
+# CONFIG_DP83640_PHY is not set
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
@@ -5591,6 +5591,8 @@ CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_RAID6_PQ_DEFAULT_ALG="avx2x4"
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL=y
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_RANDOMIZE_BASE=y
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[xenial:linux-gcp][PATCH 1/1] UBUNTU: [Config] Fix annotations file

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
BugLink: https://bugs.launchpad.net/bugs/1851538

Replace ENFORCE with ENFORCED to ensure the config options checks are
not being ignored. Also update the corresponding config options back
to the desirable value.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian.gcp/config/annotations | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 7ec8b56a13e3..29244a1bb66d 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -7,78 +7,78 @@ include "../../debian.master/config/annotations"
 # Menu: Device Drivers >> Block devices
 CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
 #
-CONFIG_BLK_DEV_FD                               flag<ENFORCE> note<LP:1729673>
+CONFIG_BLK_DEV_FD                               flag<ENFORCED> note<LP:1729673>
 
 # Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support
 CONFIG_I2C_AMD_MP2 policy<{'amd64': 'n'}>
 #
-CONFIG_I2C_AMD_MP2 flag<ENFORCE> note<not relevant for gcp>
+CONFIG_I2C_AMD_MP2 flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices
 CONFIG_WCN36XX_SNAPDRAGON_HACKS policy<{'amd64': 'n'}>
 #
-CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCE> note<not relevant for gcp>
+CONFIG_WCN36XX_SNAPDRAGON_HACKS flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> PTP clock support >> PTP clock support
-CONFIG_DP83640_PHY                              policy<{'amd64': 'n'}>
+CONFIG_DP83640_PHY                              policy<{'amd64': '-'}>
 #
-CONFIG_DP83640_PHY                              mark<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_DP83640_PHY                              mark<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers
 CONFIG_SCSI_VIRTIO                              policy<{'amd64': 'y'}>
 #
-CONFIG_SCSI_VIRTIO                              flag<ENFORCE> note<LP:1669657> note<tech preview of new feature>
+CONFIG_SCSI_VIRTIO                              flag<ENFORCED> note<LP:1669657> note<tech preview of new feature>
 
 # Menu: Device Drivers >> X86 Platform Specific Device Drivers
 CONFIG_DELL_UART_BACKLIGHT policy<{'amd64': 'n'}>
 CONFIG_DELL_SMBIOS_SMM policy<{'amd64': 'n'}>
 #
-CONFIG_DELL_UART_BACKLIGHT flag<ENFORCE> note<not relevant for gcp>
-CONFIG_DELL_SMBIOS_SMM flag<ENFORCE> note<not relevant for gcp>
+CONFIG_DELL_UART_BACKLIGHT flag<ENFORCED> note<not relevant for gcp>
+CONFIG_DELL_SMBIOS_SMM flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Kernel hacking
 CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
 #
-CONFIG_PANIC_ON_OOPS   flag<ENFORCE> note<initial packaging> note<keep working if at all possible>
+CONFIG_PANIC_ON_OOPS   flag<ENFORCED> note<initial packaging> note<keep working if at all possible>
 
 # Menu: Kernel hacking >> Debug Lockups and Hangs
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               policy<{'amd64': 'y'}>
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               policy<{'amd64': 'y'}>
 #
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
 
 # Menu: Library routines
-CONFIG_RAID6_PQ_DEFAULT_ALG policy<'amd64': 'avx2x4'>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<'amd64': 'y'>
+CONFIG_RAID6_PQ_DEFAULT_ALG policy<{'amd64': '"avx2x4"'}>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<{'amd64': 'y'}>
 #
-CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCE> note<LP:1812728>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCE> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG mark<ENFORCED> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark<ENFORCED> note<LP:1812728>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
 CONFIG_BT_QCOMSMD_HACK policy<{'amd64': 'n'}>
 #
-CONFIG_BT_QCOMSMD_HACK flag<ENFORCE> note<not relevant for gcp>
+CONFIG_BT_QCOMSMD_HACK flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options
 CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'n'}>
 #
-CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_NETWORK_PHY_TIMESTAMPING flag<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration
 CONFIG_NETFILTER_NETLINK_QUEUE                  policy<{'amd64': 'y'}>
 CONFIG_NETFILTER_NETLINK_LOG                    policy<{'amd64': 'y'}>
 #
-CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCE> note<initial packaging>
-CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCE> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCED> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCED> note<initial packaging>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support
 CONFIG_NF_CONNTRACK                             policy<{'amd64': 'y'}>
 CONFIG_NF_CONNTRACK_PROCFS                      policy<{'amd64': 'y'}>
 CONFIG_NF_CT_NETLINK                            policy<{'amd64': 'y'}>
 #
-CONFIG_NF_CONNTRACK                             flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CT_NETLINK                            flag<ENFORCE> note<initial packaging>
+CONFIG_NF_CONNTRACK                             flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CT_NETLINK                            flag<ENFORCED> note<initial packaging>
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
 
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Cmnt: [eoan:linux-gcp][PATCH 1/2] UBUNTU: SAUCE: raid6: Add option for default PQ algorithm

Sultan Alsawaf
In reply to this post by Marcelo Henrique Cerri
On Wed, Nov 06, 2019 at 03:57:38PM -0300, Marcelo Henrique Cerri wrote:
> + if (strlen(raid6_pq_default_alg)) {

The strlen() can be replaced with raid6_pq_default_alg[0].

> + for (algo = raid6_algos; *algo; algo++) {
> + if (!strncmp(raid6_pq_default_alg, (*algo)->name, sizeof(raid6_pq_default_alg))) {

(*algo)->name is a statically initialized kernel string, which is terminated.
The module parameter string set function also ensures that raid6_pq_default_alg
will be terminated. You can safely use strcmp() here instead of strncmp().

> + if ((*algo)->valid && !(*algo)->valid()) {
> + pr_info("raid6: default alg \"%s\" is invalid.\n",
> + raid6_pq_default_alg);
> + continue;
> + }

Why continue if the default algorithm is invalid?

> + pr_info("raid6: using default algorithm %s gen() without performace tests.\n",
> + (*algo)->name);

Misspelling: s/performace/performance/
Also, as per the kernel coding style guide, kernel messages do not need to be
terminated with a period.

Other than those nits, this seems fine.

Sultan

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

NACK: [{eoan, disco, xenial}:linux-gcp][PATCH 0/2] LP: #1851538 - Fix the annotations file for linux-gcp

Stefan Bader-2
In reply to this post by Marcelo Henrique Cerri
On 06.11.19 19:57, Marcelo Henrique Cerri wrote:

> BugLink: https://bugs.launchpad.net/bugs/1851538
>
> The annotation file has a typo that is basically causing the checks to
> be ignored. Fix the annotations file and update the necessary config
> back to their intended values.
>
> For 5.0+ a patch used to fix a raid6 algorithm was silently dropped
> (probably due to the annotations typo), also re-introduce this commit.
>
> Marcelo Henrique Cerri (2):
>   UBUNTU: SAUCE: raid6: Add option for default PQ algorithm
>   UBUNTU: [Config] Fix annotations file
>
>  debian.gcp/abi/5.3.0-1006.6/amd64/gcp.modules |  1 -
>  debian.gcp/config/annotations                 | 42 +++++++++----------
>  debian.gcp/config/config.common.ubuntu        |  4 +-
>  lib/Kconfig                                   | 17 ++++++++
>  lib/raid6/algos.c                             | 26 ++++++++++++
>  5 files changed, 67 insertions(+), 23 deletions(-)
>
Fixing the annotations and re-introducing that config option are two completely
unrelated issues and should be fixed independently.

-Stefan


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment