diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index b0c574aa..271b7a7d 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.27 Kernel Configuration +# Linux/x86_64 4.9.29 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -373,6 +373,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_IOSCHED_BFQ is not set CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set diff --git a/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.29.xz b/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.29.xz new file mode 100644 index 00000000..c0d3d748 Binary files /dev/null and b/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.29.xz differ diff --git a/kernel/tools/cpupowertools/files/patches/mageia/block-update-bfq-from-v8r10-to-v8r11.patch b/kernel/tools/cpupowertools/files/patches/mageia/block-update-bfq-from-v8r10-to-v8r11.patch new file mode 100644 index 00000000..8299447d --- /dev/null +++ b/kernel/tools/cpupowertools/files/patches/mageia/block-update-bfq-from-v8r10-to-v8r11.patch @@ -0,0 +1,69 @@ + block/bfq-iosched.c | 4 +++- + block/bfq-sched.c | 15 ++++++++++++--- + block/bfq.h | 2 +- + 3 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +index 96b79a0dae9f..158628392d92 100644 +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -4572,6 +4572,8 @@ static int bfq_set_request(struct request_queue *q, struct request *rq, + if (!bic) + goto queue_fail; + ++ bfq_check_ioprio_change(bic, bio); ++ + bfq_bic_update_cgroup(bic, bio); + + new_queue: +@@ -5268,7 +5270,7 @@ static struct blkcg_policy blkcg_policy_bfq = { + static int __init bfq_init(void) + { + int ret; +- char msg[60] = "BFQ I/O-scheduler: v8r10"; ++ char msg[60] = "BFQ I/O-scheduler: v8r11"; + + #ifdef CONFIG_BFQ_GROUP_IOSCHED + ret = blkcg_policy_register(&blkcg_policy_bfq); +diff --git a/block/bfq-sched.c b/block/bfq-sched.c +index 70aac56b02ef..8311bdbeceea 100644 +--- a/block/bfq-sched.c ++++ b/block/bfq-sched.c +@@ -1280,14 +1280,23 @@ static bool __bfq_deactivate_entity(struct bfq_entity *entity, + bool ins_into_idle_tree) + { + struct bfq_sched_data *sd = entity->sched_data; +- struct bfq_service_tree *st = bfq_entity_service_tree(entity); +- bool is_in_service = entity == sd->in_service_entity; ++ struct bfq_service_tree *st; ++ bool is_in_service; + + if (!entity->on_st) { /* entity never activated, or already inactive */ +- BUG_ON(entity == entity->sched_data->in_service_entity); ++ BUG_ON(sd && entity == sd->in_service_entity); + return false; + } + ++ /* ++ * If we get here, then entity is active, which implies that ++ * bfq_group_set_parent has already been invoked for the group ++ * represented by entity. Therefore, the field ++ * entity->sched_data has been set, and we can safely use it. ++ */ ++ st = bfq_entity_service_tree(entity); ++ is_in_service = entity == sd->in_service_entity; ++ + BUG_ON(is_in_service && entity->tree && entity->tree != &st->active); + + if (is_in_service) +diff --git a/block/bfq.h b/block/bfq.h +index e3855af1211b..a521ac40cac0 100644 +--- a/block/bfq.h ++++ b/block/bfq.h +@@ -1,5 +1,5 @@ + /* +- * BFQ v8r10 for 4.9.0: data structures and common functions prototypes. ++ * BFQ v8r11 for 4.9.0: data structures and common functions prototypes. + * + * Based on ideas and code from CFQ: + * Copyright (C) 2003 Jens Axboe diff --git a/kernel/tools/cpupowertools/files/patches/mageia/net-macsec-dynamically-allocate-space-for-sglist.patch b/kernel/tools/cpupowertools/files/patches/mageia/net-macsec-dynamically-allocate-space-for-sglist.patch deleted file mode 100644 index abbb40d6..00000000 --- a/kernel/tools/cpupowertools/files/patches/mageia/net-macsec-dynamically-allocate-space-for-sglist.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 5294b83086cc1c35b4efeca03644cf9d12282e5b Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Tue, 25 Apr 2017 19:08:18 +0200 -Subject: [PATCH] macsec: dynamically allocate space for sglist - -We call skb_cow_data, which is good anyway to ensure we can actually -modify the skb as such (another error from prior). Now that we have the -number of fragments required, we can safely allocate exactly that amount -of memory. - -Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") -Signed-off-by: Jason A. Donenfeld -Acked-by: Sabrina Dubroca -Signed-off-by: David S. Miller ---- - drivers/net/macsec.c | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c -index dbab05a..49ce4e9 100644 ---- a/drivers/net/macsec.c -+++ b/drivers/net/macsec.c -@@ -617,7 +617,8 @@ static void macsec_encrypt_done(struct crypto_async_request *base, int err) - - static struct aead_request *macsec_alloc_req(struct crypto_aead *tfm, - unsigned char **iv, -- struct scatterlist **sg) -+ struct scatterlist **sg, -+ int num_frags) - { - size_t size, iv_offset, sg_offset; - struct aead_request *req; -@@ -629,7 +630,7 @@ static struct aead_request *macsec_alloc_req(struct crypto_aead *tfm, - - size = ALIGN(size, __alignof__(struct scatterlist)); - sg_offset = size; -- size += sizeof(struct scatterlist) * (MAX_SKB_FRAGS + 1); -+ size += sizeof(struct scatterlist) * num_frags; - - tmp = kmalloc(size, GFP_ATOMIC); - if (!tmp) -@@ -649,6 +650,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, - { - int ret; - struct scatterlist *sg; -+ struct sk_buff *trailer; - unsigned char *iv; - struct ethhdr *eth; - struct macsec_eth_header *hh; -@@ -723,7 +725,14 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, - return ERR_PTR(-EINVAL); - } - -- req = macsec_alloc_req(tx_sa->key.tfm, &iv, &sg); -+ ret = skb_cow_data(skb, 0, &trailer); -+ if (unlikely(ret < 0)) { -+ macsec_txsa_put(tx_sa); -+ kfree_skb(skb); -+ return ERR_PTR(ret); -+ } -+ -+ req = macsec_alloc_req(tx_sa->key.tfm, &iv, &sg, ret); - if (!req) { - macsec_txsa_put(tx_sa); - kfree_skb(skb); -@@ -732,7 +741,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, - - macsec_fill_iv(iv, secy->sci, pn); - -- sg_init_table(sg, MAX_SKB_FRAGS + 1); -+ sg_init_table(sg, ret); - skb_to_sgvec(skb, sg, 0, skb->len); - - if (tx_sc->encrypt) { -@@ -917,6 +926,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, - { - int ret; - struct scatterlist *sg; -+ struct sk_buff *trailer; - unsigned char *iv; - struct aead_request *req; - struct macsec_eth_header *hdr; -@@ -927,7 +937,12 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, - if (!skb) - return ERR_PTR(-ENOMEM); - -- req = macsec_alloc_req(rx_sa->key.tfm, &iv, &sg); -+ ret = skb_cow_data(skb, 0, &trailer); -+ if (unlikely(ret < 0)) { -+ kfree_skb(skb); -+ return ERR_PTR(ret); -+ } -+ req = macsec_alloc_req(rx_sa->key.tfm, &iv, &sg, ret); - if (!req) { - kfree_skb(skb); - return ERR_PTR(-ENOMEM); -@@ -936,7 +951,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, - hdr = (struct macsec_eth_header *)skb->data; - macsec_fill_iv(iv, sci, ntohl(hdr->packet_number)); - -- sg_init_table(sg, MAX_SKB_FRAGS + 1); -+ sg_init_table(sg, ret); - skb_to_sgvec(skb, sg, 0, skb->len); - - if (hdr->tci_an & MACSEC_TCI_E) { -@@ -2716,7 +2731,7 @@ static netdev_tx_t macsec_start_xmit(struct sk_buff *skb, - } - - #define MACSEC_FEATURES \ -- (NETIF_F_SG | NETIF_F_HIGHDMA) -+ (NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST) - static struct lock_class_key macsec_netdev_addr_lock_key; - - static int macsec_dev_init(struct net_device *dev) --- -2.10.2 - diff --git a/kernel/tools/cpupowertools/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch b/kernel/tools/cpupowertools/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch deleted file mode 100644 index c996a702..00000000 --- a/kernel/tools/cpupowertools/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d8320d75b59ecdc1b8e60ac793d3a54d84333a18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= -Date: Mon, 10 Oct 2016 18:30:00 +0200 -Subject: [PATCH] iwlwifi: fix MODULE_FIRMWARE for 6030 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -IWL6000G2B_UCODE_API_MAX is not defined. ucode_api_max of -IWL_DEVICE_6030 uses IWL6000G2_UCODE_API_MAX. Use this also for -MODULE_FIRMWARE. - -Fixes: 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK") -Signed-off-by: Jürg Billeter -Signed-off-by: Luca Coelho ---- - drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c -index 0b9f6a7..39335b7 100644 ---- a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c -+++ b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c -@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = { - MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); - MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); - MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); --MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX)); -+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); --- -2.10.2 - diff --git a/kernel/tools/cpupowertools/files/patches/mageia/series b/kernel/tools/cpupowertools/files/patches/mageia/series index a5ce22a7..bacc9567 100644 --- a/kernel/tools/cpupowertools/files/patches/mageia/series +++ b/kernel/tools/cpupowertools/files/patches/mageia/series @@ -132,6 +132,7 @@ block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch block-Turn-into-BFQ-v8r7-for-4.9.0.patch block-update-bfq-from-v8r7-to-v8r10.patch +block-update-bfq-from-v8r10-to-v8r11.patch # new macbooks block-nvme-detect-NVMe-controller-in-recent-MacBooks.patch @@ -260,9 +261,6 @@ net-netfilter-psd-mdv.patch net-netfilter-psd-2.6.35-buildfix.patch net-netfilter-psd-fix-redefines.patch -# iwlwifi fixes -net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch - # rtlwifi fixes net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch @@ -273,9 +271,6 @@ net-wireless-realtek-rtl8xxxu-linux-4.11-rc.patch # WireGuard support net-wireguard.patch -# CVE-2017-7477 -net-macsec-dynamically-allocate-space-for-sglist.patch - ### ### Platform drivers ### diff --git a/kernel/tools/cpupowertools/pspec.xml b/kernel/tools/cpupowertools/pspec.xml index bd9fac28..4da45264 100644 --- a/kernel/tools/cpupowertools/pspec.xml +++ b/kernel/tools/cpupowertools/pspec.xml @@ -18,8 +18,8 @@ - patches/linux/patch-4.9.27.xz - + patches/linux/patch-4.9.29.xz + @@ -46,11 +46,13 @@ patches/mageia/block-floppy-disable-pnp-modalias.patch patches/mageia/ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch patches/mageia/block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch - + patches/mageia/block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch patches/mageia/block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch patches/mageia/block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch patches/mageia/block-Turn-into-BFQ-v8r7-for-4.9.0.patch - patches/mageia/block-update-bfq-from-v8r7-to-v8r10.patch<2--> + patches/mageia/block-update-bfq-from-v8r7-to-v8r10.patch + patches/mageia/block-update-bfq-from-v8r10-to-v8r11.patch patches/mageia/block-nvme-detect-NVMe-controller-in-recent-MacBooks.patch patches/mageia/char-tpm-tpm_crb-implement-tpm-crb-idle-state.patch patches/mageia/char-tmp-tpm_crb-fix-Intel-PTT-hw-bug-during-idle-state.patch @@ -100,12 +102,10 @@ patches/mageia/net-netfilter-psd-mdv.patch patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch patches/mageia/net-netfilter-psd-fix-redefines.patch - patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch patches/mageia/net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch patches/mageia/net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch patches/mageia/net-wireless-realtek-rtl8xxxu-linux-4.11-rc.patch patches/mageia/net-wireguard.patch - patches/mageia/net-macsec-dynamically-allocate-space-for-sglist.patch patches/mageia/platform-x86-add-shuttle-wmi-driver.patch patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch @@ -176,8 +176,8 @@ - 2017-05-10 - 4.9.27 + 2017-05-21 + 4.9.29 Release bump PisiLinux Community admin@pisilinux.org