May 2019 - Linux-stable-mirror

[PATCH BACKPORT 4.4] crypto: vmx - ghash: do nosimd fallback manually

by Daniel Axtens

VMX ghash was using a fallback that did not support interleaving simd and nosimd operations, leading to failures in the extended test suite. If I understood correctly, Eric's suggestion was to use the same data format that the generic code uses, allowing us to call into it with the same contexts. I wasn't able to get that to work - I think there's a very different key structure and data layout being used. So instead steal the arm64 approach and perform the fallback operations directly if required. Fixes: cc333cd68dfa ("crypto: vmx - Adding GHASH routines for VMX module") Cc: stable(a)vger.kernel.org # v4.1+ Reported-by: Eric Biggers <ebiggers(a)google.com> Signed-off-by: Daniel Axtens <dja(a)axtens.net> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Tested-by: Michael Ellerman <mpe(a)ellerman.id.au> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> (backported from commit 357d065a44cdd77ed5ff35155a989f2a763e96ef) Signed-off-by: Daniel Axtens <dja(a)axtens.net> --- drivers/crypto/vmx/ghash.c | 218 +++++++++++++++---------------------- 1 file changed, 89 insertions(+), 129 deletions(-) diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c index 84b9389bf1ed..d6b68cf7bba7 100644 --- a/drivers/crypto/vmx/ghash.c +++ b/drivers/crypto/vmx/ghash.c @@ -1,22 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 /** * GHASH routines supporting VMX instructions on the Power 8 * - * Copyright (C) 2015 International Business Machines Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 only. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Copyright (C) 2015, 2019 International Business Machines Inc. * * Author: Marcelo Henrique Cerri <mhcerri(a)br.ibm.com> + * + * Extended by Daniel Axtens <dja(a)axtens.net> to replace the fallback + * mechanism. The new approach is based on arm64 code, which is: + * Copyright (C) 2014 - 2018 Linaro Ltd. <ard.biesheuvel(a)linaro.org> */ #include <linux/types.h> @@ -39,71 +31,25 @@ void gcm_ghash_p8(u64 Xi[2], const u128 htable[16], const u8 *in, size_t len); struct p8_ghash_ctx { + /* key used by vector asm */ u128 htable[16]; - struct crypto_shash *fallback; + /* key used by software fallback */ + be128 key; }; struct p8_ghash_desc_ctx { u64 shash[2]; u8 buffer[GHASH_DIGEST_SIZE]; int bytes; - struct shash_desc fallback_desc; }; -static int p8_ghash_init_tfm(struct crypto_tfm *tfm) -{ - const char *alg = "ghash-generic"; - struct crypto_shash *fallback; - struct crypto_shash *shash_tfm = __crypto_shash_cast(tfm); - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm); - - fallback = crypto_alloc_shash(alg, 0, CRYPTO_ALG_NEED_FALLBACK); - if (IS_ERR(fallback)) { - printk(KERN_ERR - "Failed to allocate transformation for '%s': %ld\n", - alg, PTR_ERR(fallback)); - return PTR_ERR(fallback); - } - - crypto_shash_set_flags(fallback, - crypto_shash_get_flags((struct crypto_shash - *) tfm)); - - /* Check if the descsize defined in the algorithm is still enough. */ - if (shash_tfm->descsize < sizeof(struct p8_ghash_desc_ctx) - + crypto_shash_descsize(fallback)) { - printk(KERN_ERR - "Desc size of the fallback implementation (%s) does not match the expected value: %lu vs %u\n", - alg, - shash_tfm->descsize - sizeof(struct p8_ghash_desc_ctx), - crypto_shash_descsize(fallback)); - return -EINVAL; - } - ctx->fallback = fallback; - - return 0; -} - -static void p8_ghash_exit_tfm(struct crypto_tfm *tfm) -{ - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm); - - if (ctx->fallback) { - crypto_free_shash(ctx->fallback); - ctx->fallback = NULL; - } -} - static int p8_ghash_init(struct shash_desc *desc) { - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); dctx->bytes = 0; memset(dctx->shash, 0, GHASH_DIGEST_SIZE); - dctx->fallback_desc.tfm = ctx->fallback; - dctx->fallback_desc.flags = desc->flags; - return crypto_shash_init(&dctx->fallback_desc); + return 0; } static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key, @@ -122,7 +68,53 @@ static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key, gcm_init_p8(ctx->htable, (const u64 *) key); pagefault_enable(); preempt_enable(); - return crypto_shash_setkey(ctx->fallback, key, keylen); + + memcpy(&ctx->key, key, GHASH_BLOCK_SIZE); + + return 0; +} + +static inline void __ghash_block(struct p8_ghash_ctx *ctx, + struct p8_ghash_desc_ctx *dctx) +{ + if (!IN_INTERRUPT) { + preempt_disable(); + pagefault_disable(); + enable_kernel_altivec(); + enable_kernel_vsx(); + enable_kernel_fp(); + gcm_ghash_p8(dctx->shash, ctx->htable, + dctx->buffer, GHASH_DIGEST_SIZE); + pagefault_enable(); + preempt_enable(); + } else { + crypto_xor((u8 *)dctx->shash, dctx->buffer, GHASH_BLOCK_SIZE); + gf128mul_lle((be128 *)dctx->shash, &ctx->key); + } +} + +static inline void __ghash_blocks(struct p8_ghash_ctx *ctx, + struct p8_ghash_desc_ctx *dctx, + const u8 *src, unsigned int srclen) +{ + if (!IN_INTERRUPT) { + preempt_disable(); + pagefault_disable(); + enable_kernel_altivec(); + enable_kernel_vsx(); + enable_kernel_fp(); + gcm_ghash_p8(dctx->shash, ctx->htable, + src, srclen); + pagefault_enable(); + preempt_enable(); + } else { + while (srclen >= GHASH_BLOCK_SIZE) { + crypto_xor((u8 *)dctx->shash, src, GHASH_BLOCK_SIZE); + gf128mul_lle((be128 *)dctx->shash, &ctx->key); + srclen -= GHASH_BLOCK_SIZE; + src += GHASH_BLOCK_SIZE; + } + } } static int p8_ghash_update(struct shash_desc *desc, @@ -132,51 +124,33 @@ static int p8_ghash_update(struct shash_desc *desc, struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); - if (IN_INTERRUPT) { - return crypto_shash_update(&dctx->fallback_desc, src, - srclen); - } else { - if (dctx->bytes) { - if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) { - memcpy(dctx->buffer + dctx->bytes, src, - srclen); - dctx->bytes += srclen; - return 0; - } + if (dctx->bytes) { + if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) { memcpy(dctx->buffer + dctx->bytes, src, - GHASH_DIGEST_SIZE - dctx->bytes); - preempt_disable(); - pagefault_disable(); - enable_kernel_altivec(); - enable_kernel_vsx(); - enable_kernel_fp(); - gcm_ghash_p8(dctx->shash, ctx->htable, - dctx->buffer, GHASH_DIGEST_SIZE); - pagefault_enable(); - preempt_enable(); - src += GHASH_DIGEST_SIZE - dctx->bytes; - srclen -= GHASH_DIGEST_SIZE - dctx->bytes; - dctx->bytes = 0; - } - len = srclen & ~(GHASH_DIGEST_SIZE - 1); - if (len) { - preempt_disable(); - pagefault_disable(); - enable_kernel_altivec(); - enable_kernel_vsx(); - enable_kernel_fp(); - gcm_ghash_p8(dctx->shash, ctx->htable, src, len); - pagefault_enable(); - preempt_enable(); - src += len; - srclen -= len; - } - if (srclen) { - memcpy(dctx->buffer, src, srclen); - dctx->bytes = srclen; + srclen); + dctx->bytes += srclen; + return 0; } - return 0; + memcpy(dctx->buffer + dctx->bytes, src, + GHASH_DIGEST_SIZE - dctx->bytes); + + __ghash_block(ctx, dctx); + + src += GHASH_DIGEST_SIZE - dctx->bytes; + srclen -= GHASH_DIGEST_SIZE - dctx->bytes; + dctx->bytes = 0; + } + len = srclen & ~(GHASH_DIGEST_SIZE - 1); + if (len) { + __ghash_blocks(ctx, dctx, src, len); + src += len; + srclen -= len; } + if (srclen) { + memcpy(dctx->buffer, src, srclen); + dctx->bytes = srclen; + } + return 0; } static int p8_ghash_final(struct shash_desc *desc, u8 *out) @@ -185,26 +159,14 @@ static int p8_ghash_final(struct shash_desc *desc, u8 *out) struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); - if (IN_INTERRUPT) { - return crypto_shash_final(&dctx->fallback_desc, out); - } else { - if (dctx->bytes) { - for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++) - dctx->buffer[i] = 0; - preempt_disable(); - pagefault_disable(); - enable_kernel_altivec(); - enable_kernel_vsx(); - enable_kernel_fp(); - gcm_ghash_p8(dctx->shash, ctx->htable, - dctx->buffer, GHASH_DIGEST_SIZE); - pagefault_enable(); - preempt_enable(); - dctx->bytes = 0; - } - memcpy(out, dctx->shash, GHASH_DIGEST_SIZE); - return 0; + if (dctx->bytes) { + for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++) + dctx->buffer[i] = 0; + __ghash_block(ctx, dctx); + dctx->bytes = 0; } + memcpy(out, dctx->shash, GHASH_DIGEST_SIZE); + return 0; } struct shash_alg p8_ghash_alg = { @@ -219,11 +181,9 @@ struct shash_alg p8_ghash_alg = { .cra_name = "ghash", .cra_driver_name = "p8_ghash", .cra_priority = 1000, - .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK, + .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = GHASH_BLOCK_SIZE, .cra_ctxsize = sizeof(struct p8_ghash_ctx), .cra_module = THIS_MODULE, - .cra_init = p8_ghash_init_tfm, - .cra_exit = p8_ghash_exit_tfm, }, }; -- 2.19.1

5 years, 9 months

1
0
0 0

[PATCH BACKPORT 4.9, 4.14] crypto: vmx - ghash: do nosimd fallback manually

by Daniel Axtens

VMX ghash was using a fallback that did not support interleaving simd and nosimd operations, leading to failures in the extended test suite. If I understood correctly, Eric's suggestion was to use the same data format that the generic code uses, allowing us to call into it with the same contexts. I wasn't able to get that to work - I think there's a very different key structure and data layout being used. So instead steal the arm64 approach and perform the fallback operations directly if required. Fixes: cc333cd68dfa ("crypto: vmx - Adding GHASH routines for VMX module") Cc: stable(a)vger.kernel.org # v4.1+ Reported-by: Eric Biggers <ebiggers(a)google.com> Signed-off-by: Daniel Axtens <dja(a)axtens.net> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Tested-by: Michael Ellerman <mpe(a)ellerman.id.au> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> (backported from commit 357d065a44cdd77ed5ff35155a989f2a763e96ef) Signed-off-by: Daniel Axtens <dja(a)axtens.net> --- drivers/crypto/vmx/ghash.c | 213 +++++++++++++++---------------------- 1 file changed, 87 insertions(+), 126 deletions(-) diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c index 1c4b5b889fba..1bfe867c0b7b 100644 --- a/drivers/crypto/vmx/ghash.c +++ b/drivers/crypto/vmx/ghash.c @@ -1,22 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 /** * GHASH routines supporting VMX instructions on the Power 8 * - * Copyright (C) 2015 International Business Machines Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 only. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Copyright (C) 2015, 2019 International Business Machines Inc. * * Author: Marcelo Henrique Cerri <mhcerri(a)br.ibm.com> + * + * Extended by Daniel Axtens <dja(a)axtens.net> to replace the fallback + * mechanism. The new approach is based on arm64 code, which is: + * Copyright (C) 2014 - 2018 Linaro Ltd. <ard.biesheuvel(a)linaro.org> */ #include <linux/types.h> @@ -39,71 +31,25 @@ void gcm_ghash_p8(u64 Xi[2], const u128 htable[16], const u8 *in, size_t len); struct p8_ghash_ctx { + /* key used by vector asm */ u128 htable[16]; - struct crypto_shash *fallback; + /* key used by software fallback */ + be128 key; }; struct p8_ghash_desc_ctx { u64 shash[2]; u8 buffer[GHASH_DIGEST_SIZE]; int bytes; - struct shash_desc fallback_desc; }; -static int p8_ghash_init_tfm(struct crypto_tfm *tfm) -{ - const char *alg = "ghash-generic"; - struct crypto_shash *fallback; - struct crypto_shash *shash_tfm = __crypto_shash_cast(tfm); - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm); - - fallback = crypto_alloc_shash(alg, 0, CRYPTO_ALG_NEED_FALLBACK); - if (IS_ERR(fallback)) { - printk(KERN_ERR - "Failed to allocate transformation for '%s': %ld\n", - alg, PTR_ERR(fallback)); - return PTR_ERR(fallback); - } - - crypto_shash_set_flags(fallback, - crypto_shash_get_flags((struct crypto_shash - *) tfm)); - - /* Check if the descsize defined in the algorithm is still enough. */ - if (shash_tfm->descsize < sizeof(struct p8_ghash_desc_ctx) - + crypto_shash_descsize(fallback)) { - printk(KERN_ERR - "Desc size of the fallback implementation (%s) does not match the expected value: %lu vs %u\n", - alg, - shash_tfm->descsize - sizeof(struct p8_ghash_desc_ctx), - crypto_shash_descsize(fallback)); - return -EINVAL; - } - ctx->fallback = fallback; - - return 0; -} - -static void p8_ghash_exit_tfm(struct crypto_tfm *tfm) -{ - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm); - - if (ctx->fallback) { - crypto_free_shash(ctx->fallback); - ctx->fallback = NULL; - } -} - static int p8_ghash_init(struct shash_desc *desc) { - struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); dctx->bytes = 0; memset(dctx->shash, 0, GHASH_DIGEST_SIZE); - dctx->fallback_desc.tfm = ctx->fallback; - dctx->fallback_desc.flags = desc->flags; - return crypto_shash_init(&dctx->fallback_desc); + return 0; } static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key, @@ -121,7 +67,51 @@ static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key, disable_kernel_vsx(); pagefault_enable(); preempt_enable(); - return crypto_shash_setkey(ctx->fallback, key, keylen); + + memcpy(&ctx->key, key, GHASH_BLOCK_SIZE); + + return 0; +} + +static inline void __ghash_block(struct p8_ghash_ctx *ctx, + struct p8_ghash_desc_ctx *dctx) +{ + if (!IN_INTERRUPT) { + preempt_disable(); + pagefault_disable(); + enable_kernel_vsx(); + gcm_ghash_p8(dctx->shash, ctx->htable, + dctx->buffer, GHASH_DIGEST_SIZE); + disable_kernel_vsx(); + pagefault_enable(); + preempt_enable(); + } else { + crypto_xor((u8 *)dctx->shash, dctx->buffer, GHASH_BLOCK_SIZE); + gf128mul_lle((be128 *)dctx->shash, &ctx->key); + } +} + +static inline void __ghash_blocks(struct p8_ghash_ctx *ctx, + struct p8_ghash_desc_ctx *dctx, + const u8 *src, unsigned int srclen) +{ + if (!IN_INTERRUPT) { + preempt_disable(); + pagefault_disable(); + enable_kernel_vsx(); + gcm_ghash_p8(dctx->shash, ctx->htable, + src, srclen); + disable_kernel_vsx(); + pagefault_enable(); + preempt_enable(); + } else { + while (srclen >= GHASH_BLOCK_SIZE) { + crypto_xor((u8 *)dctx->shash, src, GHASH_BLOCK_SIZE); + gf128mul_lle((be128 *)dctx->shash, &ctx->key); + srclen -= GHASH_BLOCK_SIZE; + src += GHASH_BLOCK_SIZE; + } + } } static int p8_ghash_update(struct shash_desc *desc, @@ -131,49 +121,33 @@ static int p8_ghash_update(struct shash_desc *desc, struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); - if (IN_INTERRUPT) { - return crypto_shash_update(&dctx->fallback_desc, src, - srclen); - } else { - if (dctx->bytes) { - if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) { - memcpy(dctx->buffer + dctx->bytes, src, - srclen); - dctx->bytes += srclen; - return 0; - } + if (dctx->bytes) { + if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) { memcpy(dctx->buffer + dctx->bytes, src, - GHASH_DIGEST_SIZE - dctx->bytes); - preempt_disable(); - pagefault_disable(); - enable_kernel_vsx(); - gcm_ghash_p8(dctx->shash, ctx->htable, - dctx->buffer, GHASH_DIGEST_SIZE); - disable_kernel_vsx(); - pagefault_enable(); - preempt_enable(); - src += GHASH_DIGEST_SIZE - dctx->bytes; - srclen -= GHASH_DIGEST_SIZE - dctx->bytes; - dctx->bytes = 0; - } - len = srclen & ~(GHASH_DIGEST_SIZE - 1); - if (len) { - preempt_disable(); - pagefault_disable(); - enable_kernel_vsx(); - gcm_ghash_p8(dctx->shash, ctx->htable, src, len); - disable_kernel_vsx(); - pagefault_enable(); - preempt_enable(); - src += len; - srclen -= len; - } - if (srclen) { - memcpy(dctx->buffer, src, srclen); - dctx->bytes = srclen; + srclen); + dctx->bytes += srclen; + return 0; } - return 0; + memcpy(dctx->buffer + dctx->bytes, src, + GHASH_DIGEST_SIZE - dctx->bytes); + + __ghash_block(ctx, dctx); + + src += GHASH_DIGEST_SIZE - dctx->bytes; + srclen -= GHASH_DIGEST_SIZE - dctx->bytes; + dctx->bytes = 0; + } + len = srclen & ~(GHASH_DIGEST_SIZE - 1); + if (len) { + __ghash_blocks(ctx, dctx, src, len); + src += len; + srclen -= len; } + if (srclen) { + memcpy(dctx->buffer, src, srclen); + dctx->bytes = srclen; + } + return 0; } static int p8_ghash_final(struct shash_desc *desc, u8 *out) @@ -182,25 +156,14 @@ static int p8_ghash_final(struct shash_desc *desc, u8 *out) struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm)); struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc); - if (IN_INTERRUPT) { - return crypto_shash_final(&dctx->fallback_desc, out); - } else { - if (dctx->bytes) { - for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++) - dctx->buffer[i] = 0; - preempt_disable(); - pagefault_disable(); - enable_kernel_vsx(); - gcm_ghash_p8(dctx->shash, ctx->htable, - dctx->buffer, GHASH_DIGEST_SIZE); - disable_kernel_vsx(); - pagefault_enable(); - preempt_enable(); - dctx->bytes = 0; - } - memcpy(out, dctx->shash, GHASH_DIGEST_SIZE); - return 0; + if (dctx->bytes) { + for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++) + dctx->buffer[i] = 0; + __ghash_block(ctx, dctx); + dctx->bytes = 0; } + memcpy(out, dctx->shash, GHASH_DIGEST_SIZE); + return 0; } struct shash_alg p8_ghash_alg = { @@ -215,11 +178,9 @@ struct shash_alg p8_ghash_alg = { .cra_name = "ghash", .cra_driver_name = "p8_ghash", .cra_priority = 1000, - .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK, + .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = GHASH_BLOCK_SIZE, .cra_ctxsize = sizeof(struct p8_ghash_ctx), .cra_module = THIS_MODULE, - .cra_init = p8_ghash_init_tfm, - .cra_exit = p8_ghash_exit_tfm, }, }; -- 2.19.1

5 years, 9 months

1
0
0 0

[PATCH] drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled

by Jian-Hong Pan

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> commit 905801fe72377b4dc53c6e13eea1a91c6a4aa0c4 upstream. CDCLK has to be at least twice the BLCK regardless of audio. Audio driver has to probe using this hook and increase the clock even in absence of any display. v2: Use atomic refcount for get_power, put_power so that we can call each once(Abhay). v3: Reset power well 2 to avoid any transaction on iDisp link during cdclk change(Abhay). v4: Remove Power well 2 reset workaround(Ville). v5: Remove unwanted Power well 2 register defined in v4(Abhay). v6: - Use a dedicated flag instead of state->modeset for min CDCLK changes - Make get/put audio power domain symmetric - Rebased on top of intel_wakeref tracking changes. Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Abhay Kumar <abhay.kumar(a)intel.com> Tested-by: Abhay Kumar <abhay.kumar(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Clint Taylor <Clinton.A.Taylor(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190320135439.12201-1-imre.d… Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=203623 Cc: <stable(a)vger.kernel.org> # 5.1.x: d31c85fc8642 snd/hda, drm/i915: Track the display_power_status using a cookie Cc: <stable(a)vger.kernel.org> # 5.1.x Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> --- drivers/gpu/drm/i915/i915_drv.h | 3 ++ drivers/gpu/drm/i915/intel_audio.c | 64 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_cdclk.c | 30 +++++-------- drivers/gpu/drm/i915/intel_display.c | 9 +++- drivers/gpu/drm/i915/intel_drv.h | 3 ++ 5 files changed, 86 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a67a63b5aa84..5c9bb1b2d1f3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1622,6 +1622,8 @@ struct drm_i915_private { struct intel_cdclk_state actual; /* The current hardware cdclk state */ struct intel_cdclk_state hw; + + int force_min_cdclk; } cdclk; /** @@ -1741,6 +1743,7 @@ struct drm_i915_private { * */ struct mutex av_mutex; + int audio_power_refcount; struct { struct mutex mutex; diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 502b57ce72ab..20324b0d34c7 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -741,18 +741,78 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv) } } +static void glk_force_audio_cdclk(struct drm_i915_private *dev_priv, + bool enable) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_atomic_state *state; + int ret; + + drm_modeset_acquire_init(&ctx, 0); + state = drm_atomic_state_alloc(&dev_priv->drm); + if (WARN_ON(!state)) + return; + + state->acquire_ctx = &ctx; + +retry: + to_intel_atomic_state(state)->cdclk.force_min_cdclk_changed = true; + to_intel_atomic_state(state)->cdclk.force_min_cdclk = + enable ? 2 * 96000 : 0; + + /* + * Protects dev_priv->cdclk.force_min_cdclk + * Need to lock this here in case we have no active pipes + * and thus wouldn't lock it during the commit otherwise. + */ + ret = drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex, + &ctx); + if (!ret) + ret = drm_atomic_commit(state); + + if (ret == -EDEADLK) { + drm_atomic_state_clear(state); + drm_modeset_backoff(&ctx); + goto retry; + } + + WARN_ON(ret); + + drm_atomic_state_put(state); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + static unsigned long i915_audio_component_get_power(struct device *kdev) { + struct drm_i915_private *dev_priv = kdev_to_i915(kdev); + intel_wakeref_t ret; + /* Catch potential impedance mismatches before they occur! */ BUILD_BUG_ON(sizeof(intel_wakeref_t) > sizeof(unsigned long)); - return intel_display_power_get(kdev_to_i915(kdev), POWER_DOMAIN_AUDIO); + ret = intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); + + /* Force CDCLK to 2*BCLK as long as we need audio to be powered. */ + if (dev_priv->audio_power_refcount++ == 0) + if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) + glk_force_audio_cdclk(dev_priv, true); + + return ret; } static void i915_audio_component_put_power(struct device *kdev, unsigned long cookie) { - intel_display_power_put(kdev_to_i915(kdev), POWER_DOMAIN_AUDIO, cookie); + struct drm_i915_private *dev_priv = kdev_to_i915(kdev); + + /* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */ + if (--dev_priv->audio_power_refcount == 0) + if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) + glk_force_audio_cdclk(dev_priv, false); + + intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie); } static void i915_audio_component_codec_wake_override(struct device *kdev, diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c index 15ba950dee00..553f57ff60f4 100644 --- a/drivers/gpu/drm/i915/intel_cdclk.c +++ b/drivers/gpu/drm/i915/intel_cdclk.c @@ -2187,19 +2187,8 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state) /* * According to BSpec, "The CD clock frequency must be at least twice * the frequency of the Azalia BCLK." and BCLK is 96 MHz by default. - * - * FIXME: Check the actual, not default, BCLK being used. - * - * FIXME: This does not depend on ->has_audio because the higher CDCLK - * is required for audio probe, also when there are no audio capable - * displays connected at probe time. This leads to unnecessarily high - * CDCLK when audio is not required. - * - * FIXME: This limit is only applied when there are displays connected - * at probe time. If we probe without displays, we'll still end up using - * the platform minimum CDCLK, failing audio probe. */ - if (INTEL_GEN(dev_priv) >= 9) + if (crtc_state->has_audio && INTEL_GEN(dev_priv) >= 9) min_cdclk = max(2 * 96000, min_cdclk); /* @@ -2239,7 +2228,7 @@ static int intel_compute_min_cdclk(struct drm_atomic_state *state) intel_state->min_cdclk[i] = min_cdclk; } - min_cdclk = 0; + min_cdclk = intel_state->cdclk.force_min_cdclk; for_each_pipe(dev_priv, pipe) min_cdclk = max(intel_state->min_cdclk[pipe], min_cdclk); @@ -2300,7 +2289,8 @@ static int vlv_modeset_calc_cdclk(struct drm_atomic_state *state) vlv_calc_voltage_level(dev_priv, cdclk); if (!intel_state->active_crtcs) { - cdclk = vlv_calc_cdclk(dev_priv, 0); + cdclk = vlv_calc_cdclk(dev_priv, + intel_state->cdclk.force_min_cdclk); intel_state->cdclk.actual.cdclk = cdclk; intel_state->cdclk.actual.voltage_level = @@ -2333,7 +2323,7 @@ static int bdw_modeset_calc_cdclk(struct drm_atomic_state *state) bdw_calc_voltage_level(cdclk); if (!intel_state->active_crtcs) { - cdclk = bdw_calc_cdclk(0); + cdclk = bdw_calc_cdclk(intel_state->cdclk.force_min_cdclk); intel_state->cdclk.actual.cdclk = cdclk; intel_state->cdclk.actual.voltage_level = @@ -2405,7 +2395,7 @@ static int skl_modeset_calc_cdclk(struct drm_atomic_state *state) skl_calc_voltage_level(cdclk); if (!intel_state->active_crtcs) { - cdclk = skl_calc_cdclk(0, vco); + cdclk = skl_calc_cdclk(intel_state->cdclk.force_min_cdclk, vco); intel_state->cdclk.actual.vco = vco; intel_state->cdclk.actual.cdclk = cdclk; @@ -2444,10 +2434,10 @@ static int bxt_modeset_calc_cdclk(struct drm_atomic_state *state) if (!intel_state->active_crtcs) { if (IS_GEMINILAKE(dev_priv)) { - cdclk = glk_calc_cdclk(0); + cdclk = glk_calc_cdclk(intel_state->cdclk.force_min_cdclk); vco = glk_de_pll_vco(dev_priv, cdclk); } else { - cdclk = bxt_calc_cdclk(0); + cdclk = bxt_calc_cdclk(intel_state->cdclk.force_min_cdclk); vco = bxt_de_pll_vco(dev_priv, cdclk); } @@ -2483,7 +2473,7 @@ static int cnl_modeset_calc_cdclk(struct drm_atomic_state *state) cnl_compute_min_voltage_level(intel_state)); if (!intel_state->active_crtcs) { - cdclk = cnl_calc_cdclk(0); + cdclk = cnl_calc_cdclk(intel_state->cdclk.force_min_cdclk); vco = cnl_cdclk_pll_vco(dev_priv, cdclk); intel_state->cdclk.actual.vco = vco; @@ -2519,7 +2509,7 @@ static int icl_modeset_calc_cdclk(struct drm_atomic_state *state) cnl_compute_min_voltage_level(intel_state)); if (!intel_state->active_crtcs) { - cdclk = icl_calc_cdclk(0, ref); + cdclk = icl_calc_cdclk(intel_state->cdclk.force_min_cdclk, ref); vco = icl_calc_cdclk_pll_vco(dev_priv, cdclk); intel_state->cdclk.actual.vco = vco; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 421aac80a838..ebbac873b8f4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12769,6 +12769,11 @@ static int intel_modeset_checks(struct drm_atomic_state *state) return -EINVAL; } + /* keep the current setting */ + if (!intel_state->cdclk.force_min_cdclk_changed) + intel_state->cdclk.force_min_cdclk = + dev_priv->cdclk.force_min_cdclk; + intel_state->modeset = true; intel_state->active_crtcs = dev_priv->active_crtcs; intel_state->cdclk.logical = dev_priv->cdclk.logical; @@ -12864,7 +12869,7 @@ static int intel_atomic_check(struct drm_device *dev, struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state, *crtc_state; int ret, i; - bool any_ms = false; + bool any_ms = intel_state->cdclk.force_min_cdclk_changed; /* Catch I915_MODE_FLAG_INHERITED */ for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, @@ -13456,6 +13461,8 @@ static int intel_atomic_commit(struct drm_device *dev, dev_priv->active_crtcs = intel_state->active_crtcs; dev_priv->cdclk.logical = intel_state->cdclk.logical; dev_priv->cdclk.actual = intel_state->cdclk.actual; + dev_priv->cdclk.force_min_cdclk = + intel_state->cdclk.force_min_cdclk; } drm_atomic_state_get(state); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d5660ac1b0d6..539caca05da4 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -480,6 +480,9 @@ struct intel_atomic_state { * state only when all crtc's are DPMS off. */ struct intel_cdclk_state actual; + + int force_min_cdclk; + bool force_min_cdclk_changed; } cdclk; bool dpll_set, modeset; -- 2.21.0

5 years, 9 months

1
1
0 0

[PATCH 4.14 000/193] 4.14.123-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.123 release. There are 193 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat 01 Jun 2019 03:02:04 AM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.123-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.123-rc1 Benjamin Coddington <bcodding(a)redhat.com> NFS: Fix a double unlock from nfs_match,get_client Farhan Ali <alifm(a)linux.ibm.com> vfio-ccw: Prevent quiesce function going into an infinite loop Chris Wilson <chris(a)chris-wilson.co.uk> drm: Wake up next in drm_read() chain if we are forced to putback the event Noralf Trønnes <noralf(a)tronnes.org> drm/drv: Hold ref on parent device during drm_device lifetime Arnd Bergmann <arnd(a)arndb.de> ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM Chris Lesiak <chris.lesiak(a)licor.com> spi: Fix zero length xfer bug Geert Uytterhoeven <geert+renesas(a)glider.be> spi: rspi: Fix sequencer reset during initialization Aditya Pakki <pakki001(a)umn.edu> spi : spi-topcliff-pch: Fix to handle empty DMA buffers James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices Arnd Bergmann <arnd(a)arndb.de> media: saa7146: avoid high stack usage with clang James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix fc4type information for FDMI James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix FDMI manufacturer attribute value Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vimc: zero the media_device on probe Arnd Bergmann <arnd(a)arndb.de> media: go7007: avoid clang frame overflow warning with KASAN Helen Fornazier <helen.koike(a)collabora.com> media: vimc: stream: fix thread state before sleep James Hutchinson <jahutchinson99(a)googlemail.com> media: m88ds3103: serialize reset messages in m88ds3103_set_frontend Aditya Pakki <pakki001(a)umn.edu> thunderbolt: Fix to check for kmemdup failure Rouven Czerwinski <r.czerwinski(a)pengutronix.de> hwrng: omap - Set default quality Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-adma: use devm_clk_*() helpers Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: allow updating DAT entry timeouts on incoming ARP Replies Arnd Bergmann <arnd(a)arndb.de> scsi: qla4xxx: avoid freeing unallocated dma memory Tony Lindgren <tony(a)atomide.com> usb: core: Add PM runtime calls to usb_hcd_platform_shutdown Paul E. McKenney <paulmck(a)linux.ibm.com> rcuperf: Fix cleanup path for invalid perf_type strings Paul E. McKenney <paulmck(a)linux.ibm.com> rcutorture: Fix cleanup path for invalid torture_type strings Tony Luck <tony.luck(a)intel.com> x86/mce: Fix machine_check_poll() tests for error types Kangjie Lu <kjlu(a)umn.edu> tty: ipwireless: fix missing checks for ioremap Pankaj Gupta <pagupta(a)redhat.com> virtio_console: initialize vtermno value for ports Chad Dupuis <cdupuis(a)marvell.com> scsi: qedf: Add missing return in qedf_post_io_req() in the fcport offload check Dan Carpenter <dan.carpenter(a)oracle.com> media: wl128x: prevent two potential buffer overflows Kangjie Lu <kjlu(a)umn.edu> media: video-mux: fix null pointer dereferences Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> kobject: Don't trigger kobject_uevent(KOBJ_REMOVE) twice. Sowjanya Komatineni <skomatineni(a)nvidia.com> spi: tegra114: reset controller on probe Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent Gustavo A. R. Silva <gustavo(a)embeddedor.com> cxgb3/l2t: Fix undefined behaviour Wen Yang <wen.yang99(a)zte.com.cn> ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put Wen Yang <wen.yang99(a)zte.com.cn> ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> HID: core: move Usage Page concatenation to Main item Leon Romanovsky <leonro(a)mellanox.com> RDMA/hns: Fix bad endianess of port_pd variable Chengguang Xu <cgxu519(a)gmx.com> chardev: add additional check for minor range overlap Peter Zijlstra <peterz(a)infradead.org> x86/ia32: Fix ia32_restore_sigcontext() AC leak Peter Zijlstra <peterz(a)infradead.org> x86/uaccess, signal: Fix AC=1 bloat Peter Zijlstra <peterz(a)infradead.org> x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP Wen Yang <wen.yang99(a)zte.com.cn> arm64: cpu_ops: fix a leaked reference by adding missing of_node_put Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Avoid configuring regulator with undefined voltage range Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Fix regulator load and icc-level configuration Ping-Ke Shih <pkshih(a)realtek.com> rtlwifi: fix potential NULL pointer dereference Alexandre Belloni <alexandre.belloni(a)bootlin.com> rtc: xgene: fix possible race condition Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix Oops when bringing up interface during USB disconnect Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix race during disconnect when USB completion is in progress Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix WARNING during USB disconnect in case of unempty psq Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: convert dev_init_lock mutex to completion Arnd Bergmann <arnd(a)arndb.de> b43: shut up clang -Wuninitialized variable warning Kangjie Lu <kjlu(a)umn.edu> brcmfmac: fix missing checks for kmemdup YueHaibing <yuehaibing(a)huawei.com> mwifiex: Fix mem leak in mwifiex_tm_cmd Kangjie Lu <kjlu(a)umn.edu> rtlwifi: fix a potential NULL pointer dereference Nathan Chancellor <natechancellor(a)gmail.com> iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data Kangjie Lu <kjlu(a)umn.edu> iio: hmc5843: fix potential NULL pointer dereferences Lars-Peter Clausen <lars(a)metafoo.de> iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion Kees Cook <keescook(a)chromium.org> x86/build: Keep local relocations with ld.lld David Kozub <zub(a)linux.fjfi.cvut.cz> block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: kirkwood: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: pmac32: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq/pasemi: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: ppc_cbe: fix possible object reference leak Arnd Bergmann <arnd(a)arndb.de> s390: cio: fix cio_irb declaration Borislav Petkov <bp(a)suse.de> x86/microcode: Fix the ancient deprecated microcode loading method Arnd Bergmann <arnd(a)arndb.de> s390: zcrypt: initialize variables before_use Douglas Anderson <dianders(a)chromium.org> clk: rockchip: Make rkpwm a critical clock on rk3288 Charles Keepax <ckeepax(a)opensource.cirrus.com> extcon: arizona: Disable mic detect if running when driver is removed Douglas Anderson <dianders(a)chromium.org> clk: rockchip: Fix video codec clocks on rk3288 Ulf Hansson <ulf.hansson(a)linaro.org> PM / core: Propagate dev->power.wakeup_path when no callbacks Christian König <christian.koenig(a)amd.com> drm/amdgpu: fix old fence check in amdgpu_fence_emit Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum A-009204 support Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC5 support Kangjie Lu <kjlu(a)umn.edu> mmc_spi: add a status check for spi_sync_locked Andrea Merello <andrea.merello(a)gmail.com> mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers John Garry <john.garry(a)huawei.com> scsi: libsas: Do discovery on empty PHY to update PHY info Guenter Roeck <linux(a)roeck-us.net> hwmon: (f71805f) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (pc87427) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (vt1211) Use request_muxed_region for Super-IO accesses Colin Ian King <colin.king(a)canonical.com> RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: vdso: Fix clock_getres() for CLOCK_REALTIME Nicholas Nunley <nicholas.d.nunley(a)intel.com> i40e: don't allow changes to HW VLAN stripping on active port VLANs Adam Ludkiewicz <adam.ludkiewicz(a)intel.com> i40e: Able to add up to 16 MAC filters on an untrusted VF Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode Thomas Gleixner <tglx(a)linutronix.de> x86/irq/64: Limit IST stack overflow check to #DB stack Alan Stern <stern(a)rowland.harvard.edu> USB: core: Don't unbind interfaces following device reset failure Wen Yang <wen.yang99(a)zte.com.cn> drm/msm: a5xx: fix possible object reference leak Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Handle overflow in cpu_shares_write_u64 Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/rt: Check integer overflow at usec to nsec conversion Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Check quota and period overflow at usec to nsec conversion Roman Gushchin <guro(a)fb.com> cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> random: add a spinlock_t to struct batched_entropy Russell Currey <ruscur(a)russell.cc> powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/numa: improve control of topology updates Dan Carpenter <dan.carpenter(a)oracle.com> media: pvrusb2: Prevent a buffer overflow Shuah Khan <shuah(a)kernel.org> media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable() Hugues Fruchet <hugues.fruchet(a)st.com> media: stm32-dcmi: fix crash when subdev do not expose any formats Wenwen Wang <wang6495(a)umn.edu> audit: fix a memory leak bug Akinobu Mita <akinobu.mita(a)gmail.com> media: ov2659: make S_FMT succeed even if requested format doesn't match Hans Verkuil <hverkuil(a)xs4all.nl> media: au0828: stop video streaming only when last user stops Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper Philipp Zabel <p.zabel(a)pengutronix.de> media: coda: clear error return value before picture run Nicolas Ferre <nicolas.ferre(a)microchip.com> dmaengine: at_xdmac: remove BUG_ON macro in tasklet Douglas Anderson <dianders(a)chromium.org> clk: rockchip: undo several noc and special clocks as critical on rk3288 Wen Yang <wen.yang99(a)zte.com.cn> pinctrl: samsung: fix leaked of_node references Wen Yang <wen.yang99(a)zte.com.cn> pinctrl: pistachio: fix leaked of_node references Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: use RAP instead of FAP to get the protocol version Peter Zijlstra <peterz(a)infradead.org> mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions Jiri Kosina <jkosina(a)suse.cz> x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> smpboot: Place the __percpu annotation correctly Kees Cook <keescook(a)chromium.org> x86/build: Move _etext to actual end of .text Farhan Ali <alifm(a)linux.ibm.com> vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev Farhan Ali <alifm(a)linux.ibm.com> vfio-ccw: Do not call flush_workqueue while holding the spinlock Arnd Bergmann <arnd(a)arndb.de> bcache: avoid clang -Wunintialized warning Coly Li <colyli(a)suse.de> bcache: add failure check to run_cache_set() for journal replay Tang Junhui <tang.junhui.linux(a)gmail.com> bcache: fix failure in journal relplay Coly Li <colyli(a)suse.de> bcache: return error immediately in bch_journal_replay() Corentin Labbe <clabbe.montjoie(a)gmail.com> crypto: sun4i-ss - Fix invalid calculation of hash end Kangjie Lu <kjlu(a)umn.edu> net: cw1200: fix a NULL pointer dereference Dan Carpenter <dan.carpenter(a)oracle.com> mwifiex: prevent an array overflow Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: fsl_sai: Update is_slave_mode with correct value Daniel T. Lee <danieltimlee(a)gmail.com> libbpf: fix samples/bpf build failure due to undefined UINT32_MAX Sergey Matyukevich <sergey.matyukevich.os(a)quantenna.com> mac80211/cfg80211: update bss channel on channel switch Sugar Zhang <sugar.zhang(a)rock-chips.com> dmaengine: pl330: _stop: clear interrupt status Mariusz Bialonczyk <manio(a)skyboo.net> w1: fix the resume command API Manish Rangankar <mrangankar(a)marvell.com> scsi: qedi: Abort ep termination if offload not scheduled Sven Van Asbroeck <thesven73(a)gmail.com> rtc: 88pm860x: prevent use-after-free on device remove Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: don't crash on invalid RX interrupt Qu Wenruo <wqu(a)suse.com> btrfs: Don't panic when we can't find a root key Josef Bacik <josef(a)toxicpanda.com> btrfs: fix panic during relocation after ENOSPC before writeback happens Robbie Ko <robbieko(a)synology.com> Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session() Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending() Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Viresh Kumar <viresh.kumar(a)linaro.org> sched/cpufreq: Fix kobject memleak Qian Cai <cai(a)lca.pw> arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable Marc Zyngier <marc.zyngier(a)arm.com> ARM: vdso: Remove dependency with the arch_timer driver internals Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ACPI / property: fix handling of data_nodes in acpi_get_next_subnode() Dan Carpenter <dan.carpenter(a)oracle.com> brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() Flavio Suligoi <f.suligoi(a)asem.it> spi: pxa2xx: fix SCR (divisor) calculation Arnd Bergmann <arnd(a)arndb.de> ASoC: imx: fix fiq dependencies Bo YU <tsu.yubo(a)gmail.com> powerpc/boot: Fix missing check of lseek() return value Anju T Sudhakar <anju(a)linux.vnet.ibm.com> powerpc/perf: Return accordingly on invalid chip-id in Jerome Brunet <jbrunet(a)baylibre.com> ASoC: hdmi-codec: unlock the device on startup errors Wen Yang <wen.yang99(a)zte.com.cn> pinctrl: zte: fix leaked of_node references Sameeh Jubran <sameehj(a)amazon.com> net: ena: gcc 8: fix compilation warning Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-dma: free dma controller in remove() Vineet Gupta <Vineet.Gupta1(a)synopsys.com> tools/bpf: fix perf build error with uClibc (seen on ARC) Raul E Rangel <rrangel(a)chromium.org> mmc: core: Verify SD bus width Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix occasional glock use-after-free Mike Marciniszyn <mike.marciniszyn(a)intel.com> IB/hfi1: Fix WQ_MEM_RECLAIM warning Roberto Bergantinos Corpas <rbergant(a)redhat.com> NFS: make nfs_match_client killable YueHaibing <yuehaibing(a)huawei.com> cxgb4: Fix error path in cxgb4_init_module Ross Lagerwall <ross.lagerwall(a)citrix.com> gfs2: Fix lru_count going negative David Sterba <dsterba(a)suse.com> Revert "btrfs: Honour FITRIM range constraints during free space trim" William Tu <u9012063(a)gmail.com> net: erspan: fix use-after-free YueHaibing <yuehaibing(a)huawei.com> at76c50x-usb: Don't register led_trigger if usb_register_driver failed Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast: fix multicast tt/tvlv worker locking Eric Dumazet <edumazet(a)google.com> bpf: devmap: fix use-after-free Read in __dev_map_entry_free YueHaibing <yuehaibing(a)huawei.com> ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit Alexander Potapenko <glider(a)google.com> media: vivid: use vfree() instead of kfree() for dev->bitmap_cap YueHaibing <yuehaibing(a)huawei.com> media: serial_ir: Fix use-after-free in serial_ir_init_module YueHaibing <yuehaibing(a)huawei.com> media: cpia2: Fix use-after-free in cpia2_exit Jiufei Xue <jiufei.xue(a)linux.alibaba.com> fbdev: fix WARNING in __alloc_pages_nodemask bug Josef Bacik <josef(a)toxicpanda.com> btrfs: honor path->skip_locking in backref code Arend van Spriel <arend.vanspriel(a)broadcom.com> brcmfmac: add subtype check for event handling in data path Arend van Spriel <arend.vanspriel(a)broadcom.com> brcmfmac: assure SSID length from firmware is limited Mike Kravetz <mike.kravetz(a)oracle.com> hugetlb: use same fault hash key for shared and private mappings Shile Zhang <shile.zhang(a)linux.alibaba.com> fbdev: fix divide error in fb_var_to_videomode Tobin C. Harding <tobin(a)kernel.org> btrfs: sysfs: don't leak memory when failing add fsid Tobin C. Harding <tobin(a)kernel.org> btrfs: sysfs: Fix error path kobject memory leak Filipe Manana <fdmanana(a)suse.com> Btrfs: fix race between ranged fsync and writeback of adjacent ranges Filipe Manana <fdmanana(a)suse.com> Btrfs: avoid fallback to transaction commit during fsync of files with holes Filipe Manana <fdmanana(a)suse.com> Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix sign extension bug in gfs2_update_stats Christoph Hellwig <hch(a)lst.de> arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix label tracking error Dan Williams <dan.j.williams(a)intel.com> libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead Suthikulpanit, Suravee <Suravee.Suthikulpanit(a)amd.com> kvm: svm/avic: fix off-by-one in checking host APIC ID Trac Hoang <trac.hoang(a)broadcom.com> mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem Trac Hoang <trac.hoang(a)broadcom.com> mmc: sdhci-iproc: cygnus: Set NO_HISPD bit to fix HS50 data hold time problem Daniel Axtens <dja(a)axtens.net> crypto: vmx - CTR: always increment IV as quadword Martin K. Petersen <martin.petersen(a)oracle.com> Revert "scsi: sd: Keep disk read-only when re-reading partition" Andrea Parri <andrea.parri(a)amarulasolutions.com> sbitmap: fix improper use of smp_mb__before_atomic() Andrea Parri <andrea.parri(a)amarulasolutions.com> bio: fix improper use of smp_mb__before_atomic() Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: fix return value for reserved EFER Damien Le Moal <damien.lemoal(a)wdc.com> f2fs: Fix use of number of devices Jan Kara <jack(a)suse.cz> ext4: do not delete unlinked inode from orphan list on failed truncate Steven Rostedt (VMware) <rostedt(a)goodmis.org> x86: Hide the int3_emulate_call/jmp functions from UML ------------- Diffstat: Makefile | 4 +- arch/arm/include/asm/cp15.h | 2 + arch/arm/vdso/vgettimeofday.c | 5 ++- arch/arm64/include/asm/pgtable.h | 3 +- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpu_ops.c | 1 + arch/arm64/kernel/vdso.c | 3 ++ arch/arm64/kernel/vdso/gettimeofday.S | 7 ++- arch/arm64/mm/dma-mapping.c | 10 +++++ arch/powerpc/boot/addnote.c | 6 ++- arch/powerpc/kernel/head_64.S | 4 +- arch/powerpc/mm/numa.c | 18 +++++--- arch/powerpc/perf/imc-pmu.c | 5 +++ arch/x86/Makefile | 2 +- arch/x86/ia32/ia32_signal.c | 29 +++++++----- arch/x86/include/asm/text-patching.h | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 44 +++++++++++++++--- arch/x86/kernel/cpu/microcode/core.c | 3 +- arch/x86/kernel/irq_64.c | 19 +++++--- arch/x86/kernel/signal.c | 29 +++++++----- arch/x86/kernel/vmlinux.lds.S | 6 +-- arch/x86/kvm/svm.c | 6 ++- arch/x86/kvm/x86.c | 2 +- arch/x86/mm/fault.c | 2 - block/sed-opal.c | 9 ++-- drivers/acpi/property.c | 8 ++++ drivers/base/power/main.c | 4 ++ drivers/char/hw_random/omap-rng.c | 1 + drivers/char/random.c | 52 +++++++++++----------- drivers/char/virtio_console.c | 3 +- drivers/clk/rockchip/clk-rk3288.c | 21 ++++----- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 + drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++---- drivers/cpufreq/pasemi-cpufreq.c | 1 + drivers/cpufreq/pmac32-cpufreq.c | 2 + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- drivers/dma/at_xdmac.c | 6 ++- drivers/dma/pl330.c | 10 +++-- drivers/dma/tegra210-adma.c | 28 ++++++------ drivers/extcon/extcon-arizona.c | 10 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 +++++++--- drivers/gpu/drm/drm_drv.c | 5 ++- drivers/gpu/drm/drm_file.c | 1 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 +++-- drivers/hid/hid-core.c | 36 ++++++++++----- drivers/hid/hid-logitech-hidpp.c | 23 +++++++--- drivers/hwmon/f71805f.c | 15 +++++-- drivers/hwmon/pc87427.c | 14 +++++- drivers/hwmon/smsc47b397.c | 13 +++++- drivers/hwmon/smsc47m1.c | 28 ++++++++---- drivers/hwmon/vt1211.c | 15 +++++-- drivers/iio/adc/ad_sigma_delta.c | 16 ++++--- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 ++- drivers/iio/magnetometer/hmc5843_spi.c | 7 ++- drivers/infiniband/hw/cxgb4/cm.c | 2 + drivers/infiniband/hw/hfi1/init.c | 3 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +- drivers/md/bcache/alloc.c | 5 ++- drivers/md/bcache/journal.c | 26 +++++++++-- drivers/md/bcache/super.c | 17 ++++--- drivers/media/dvb-frontends/m88ds3103.c | 9 ++-- drivers/media/i2c/ov2659.c | 6 ++- drivers/media/i2c/ov6650.c | 25 ++++++----- drivers/media/pci/saa7146/hexium_gemini.c | 5 +-- drivers/media/pci/saa7146/hexium_orion.c | 5 +-- drivers/media/platform/coda/coda-bit.c | 3 ++ drivers/media/platform/stm32/stm32-dcmi.c | 6 +++ drivers/media/platform/video-mux.c | 5 +++ drivers/media/platform/vimc/vimc-core.c | 2 + drivers/media/platform/vimc/vimc-streamer.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 7 ++- drivers/media/rc/serial_ir.c | 9 +--- drivers/media/usb/au0828/au0828-video.c | 16 ++++--- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- drivers/media/usb/go7007/go7007-fw.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++-------- drivers/mmc/core/sd.c | 8 ++++ drivers/mmc/host/mmc_spi.c | 4 ++ drivers/mmc/host/sdhci-iproc.c | 6 ++- drivers/mmc/host/sdhci-of-esdhc.c | 8 ++++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 ++- drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +++ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 15 ++++--- .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 16 +++++-- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 42 +++++++++-------- .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 +- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 27 ++++++----- .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 ++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 ++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 ++ drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 ++ drivers/net/wireless/st/cw1200/main.c | 5 +++ drivers/nvdimm/label.c | 29 ++++++------ drivers/nvdimm/namespace_devs.c | 15 +++++++ drivers/nvdimm/nd.h | 4 ++ drivers/nvdimm/pmem.c | 8 +++- drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++ drivers/pinctrl/pinctrl-pistachio.c | 2 + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + drivers/pinctrl/zte/pinctrl-zx.c | 1 + drivers/rtc/rtc-88pm860x.c | 2 +- drivers/rtc/rtc-xgene.c | 18 +++++--- drivers/s390/cio/cio.h | 2 +- drivers/s390/cio/vfio_ccw_drv.c | 32 +++++++------ drivers/s390/cio/vfio_ccw_ops.c | 11 ++++- drivers/s390/crypto/zcrypt_api.c | 4 ++ drivers/scsi/libsas/sas_expander.c | 5 +++ drivers/scsi/lpfc/lpfc_ct.c | 20 ++++++--- drivers/scsi/lpfc/lpfc_hbadisc.c | 11 ++++- drivers/scsi/qedf/qedf_io.c | 1 + drivers/scsi/qedi/qedi_iscsi.c | 3 ++ drivers/scsi/qla2xxx/qla_isr.c | 6 ++- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 5 ++- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/sd.c | 3 +- drivers/scsi/ufs/ufshcd.c | 28 ++++++++---- drivers/spi/spi-pxa2xx.c | 8 +++- drivers/spi/spi-rspi.c | 9 ++-- drivers/spi/spi-tegra114.c | 32 +++++++------ drivers/spi/spi-topcliff-pch.c | 15 ++++++- drivers/spi/spi.c | 2 + drivers/ssb/bridge_pcmcia_80211.c | 9 +++- drivers/thunderbolt/switch.c | 22 ++++++--- drivers/tty/ipwireless/main.c | 8 ++++ drivers/usb/core/hcd.c | 3 ++ drivers/usb/core/hub.c | 5 ++- drivers/video/fbdev/core/fbcmap.c | 2 + drivers/video/fbdev/core/modedb.c | 3 ++ drivers/w1/w1_io.c | 3 +- fs/btrfs/backref.c | 17 ++++--- fs/btrfs/extent-tree.c | 28 +++--------- fs/btrfs/file.c | 15 ++++++- fs/btrfs/relocation.c | 31 ++++++++----- fs/btrfs/root-tree.c | 17 +++---- fs/btrfs/sysfs.c | 7 ++- fs/btrfs/tree-log.c | 1 + fs/char_dev.c | 6 +++ fs/ext4/inode.c | 2 +- fs/f2fs/data.c | 17 ++++--- fs/f2fs/f2fs.h | 11 +++++ fs/f2fs/file.c | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/segment.c | 6 +-- fs/gfs2/glock.c | 23 ++++++---- fs/gfs2/lock_dlm.c | 9 ++-- fs/gfs2/log.c | 3 +- fs/gfs2/lops.c | 6 ++- fs/hugetlbfs/inode.c | 8 +--- fs/nfs/client.c | 7 ++- include/linux/bio.h | 2 +- include/linux/cgroup-defs.h | 5 +++ include/linux/hid.h | 1 + include/linux/hugetlb.h | 4 +- include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/smpboot.h | 2 +- kernel/auditfilter.c | 12 ++--- kernel/bpf/devmap.c | 3 ++ kernel/cgroup/cgroup.c | 6 +++ kernel/rcu/rcuperf.c | 5 +++ kernel/rcu/rcutorture.c | 5 +++ kernel/sched/core.c | 9 +++- kernel/sched/rt.c | 5 +++ kernel/trace/trace_branch.c | 4 ++ lib/kobject_uevent.c | 11 +++-- lib/sbitmap.c | 2 +- lib/strncpy_from_user.c | 5 ++- lib/strnlen_user.c | 4 +- mm/hugetlb.c | 23 +++------- mm/userfaultfd.c | 3 +- net/batman-adv/distributed-arp-table.c | 4 +- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 ++--- net/batman-adv/types.h | 2 + net/ipv4/ip_gre.c | 2 +- net/mac80211/mlme.c | 3 -- net/wireless/nl80211.c | 5 +++ sound/soc/codecs/hdmi-codec.c | 6 ++- sound/soc/davinci/davinci-mcasp.c | 2 + sound/soc/fsl/Kconfig | 9 ++-- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl_sai.c | 2 + sound/soc/fsl/fsl_utils.c | 1 + tools/lib/bpf/bpf.c | 2 + tools/lib/bpf/bpf.h | 1 + 205 files changed, 1216 insertions(+), 552 deletions(-)

5 years, 9 months

6
198
0 0

答复: Re: [tip:x86/urgent] x86/mce: Ensure offline CPUs don' t participate in rendezvous process

by Tony W Wang-oc

On Thu, May 30, 2019, Tony W Wang-oc wrote: > Hi Ashok, > I have two questions about this patch, could you help to check: > > 1, for broadcast #MC exceptions, this patch seems require #MC exception > errors > set MCG_STATUS_RIPV = 1. > But for Intel CPU, some #MC exception errors set MCG_STATUS_RIPV = 0 > (like "Recoverable-not-continuable SRAR Type" Errors), for these errors > the patch doesn't seem to work, is that okay? > > 2, for LMCE exceptions, this patch seems require #MC exception errors > set MCG_STATUS_RIPV = 0 to make sure LMCE be handled normally even > on offline CPU. > For LMCE errors set MCG_STAUS_RIPV = 1, the patch prevents offline CPU > handle these LMCE errors, is that okay? > More specifically, this patch seems require #MC exceptions meet the condition "MCG_STATUS_RIPV ^ MCG_STATUS_LMCES == 1"; But on a Xeon X5650 machine (SMP), "Data CACHE Level-2 Generic Error" does not meet this condition. I got below message from: https://www.centos.org/forums/viewtopic.php?p=292742 Hardware event. This is not a software error. MCE 0 CPU 4 BANK 6 TSC b7065eeaa18b0 TIME 1545643603 Mon Dec 24 10:26:43 2018 MCG status:MCIP MCi status: Uncorrected error Error enabled Processor context corrupt MCA: Data CACHE Level-2 Generic Error STATUS b200000080000106 MCGSTATUS 4 MCGCAP 1c09 APICID 4 SOCKETID 0 CPUID Vendor Intel Family 6 Model 44 > Thanks > Tony W Wang-oc

5 years, 9 months

3
3
0 0

[PATCH] Subject:alignment:fetch pc-instr before irq_enable

by xiaoqian

When the instruction code under PC address is read through _probe_kernel_read in do_alignment,if the pte page corresponding to the code segment of PC address is reclaimed exactly at this time, the address mapping cannot be reconstructed because page fault_disable() is executed in _probe_kernel_read function,and the failure to obtain the instruction code of PC finally results in the unsuccessful repair operation. Thus we can modify the implementation of reading user-mode PC instruction before local_irq_enable to avoid the above risk. At the same time, adjust the sequence of code processing and optimize the process. Signed-off-by: xiaoqian <xiaoqian9(a)huawei.com> Cc: stable(a)vger.kernel.org --- arch/arm/mm/alignment.c | 81 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index e376883ab35b..4124b9ce3c70 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -76,6 +76,11 @@ #define IS_T32(hi16) \ (((hi16) & 0xe000) == 0xe000 && ((hi16) & 0x1800)) +#define INVALID_INSTR_MODE 0 +#define ARM_INSTR_MODE 1 +#define THUMB_INSTR_MODE 2 +#define THUMB2_INSTR_MODE 3 + static unsigned long ai_user; static unsigned long ai_sys; static void *ai_sys_last_pc; @@ -705,6 +710,48 @@ thumb2arm(u16 tinstr) } } +static unsigned int +fetch_usr_pc_instr(struct pt_regs *regs, unsigned long *pc_instrptr) +{ + unsigned int fault; + unsigned long instrptr; + unsigned long instr_mode = INVALID_INSTR_MODE; + + instrptr = instruction_pointer(regs); + + if (thumb_mode(regs)) { + u16 tinstr = 0; + u16 *ptr = (u16 *)(instrptr & ~1); + + fault = probe_kernel_address(ptr, tinstr); + if (!fault) { + tinstr = __mem_to_opcode_thumb16(tinstr); + if (cpu_architecture() >= CPU_ARCH_ARMv7 && + IS_T32(tinstr)) { + /* Thumb-2 32-bit */ + u16 tinstr2 = 0; + + fault = probe_kernel_address(ptr + 1, tinstr2); + if (!fault) { + tinstr2 = __mem_to_opcode_thumb16(tinstr2); + *pc_instrptr = __opcode_thumb32_compose(tinstr, tinstr2); + instr_mode = THUMB2_INSTR_MODE; + } + } else { + *pc_instrptr = thumb2arm(tinstr); + instr_mode = THUMB_INSTR_MODE; + } + } + } else { + fault = probe_kernel_address((void *)instrptr, *pc_instrptr); + if (!fault) { + *pc_instrptr = __mem_to_opcode_arm(*pc_instrptr); + instr_mode = ARM_INSTR_MODE; + } + } + return instr_mode; +} + /* * Convert Thumb-2 32 bit LDM, STM, LDRD, STRD to equivalent instruction * handlable by ARM alignment handler, also find the corresponding handler, @@ -775,42 +822,24 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) unsigned long instr = 0, instrptr; int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); unsigned int type; - unsigned int fault; u16 tinstr = 0; int isize = 4; int thumb2_32b = 0; + unsigned long pc_instr_mode; + + pc_instr_mode = fetch_usr_pc_instr(regs, &instr); if (interrupts_enabled(regs)) local_irq_enable(); instrptr = instruction_pointer(regs); - - if (thumb_mode(regs)) { - u16 *ptr = (u16 *)(instrptr & ~1); - fault = probe_kernel_address(ptr, tinstr); - tinstr = __mem_to_opcode_thumb16(tinstr); - if (!fault) { - if (cpu_architecture() >= CPU_ARCH_ARMv7 && - IS_T32(tinstr)) { - /* Thumb-2 32-bit */ - u16 tinst2 = 0; - fault = probe_kernel_address(ptr + 1, tinst2); - tinst2 = __mem_to_opcode_thumb16(tinst2); - instr = __opcode_thumb32_compose(tinstr, tinst2); - thumb2_32b = 1; - } else { - isize = 2; - instr = thumb2arm(tinstr); - } - } - } else { - fault = probe_kernel_address((void *)instrptr, instr); - instr = __mem_to_opcode_arm(instr); - } - - if (fault) { + if (pc_instr_mode == INVALID_INSTR_MODE) { type = TYPE_FAULT; goto bad_or_fault; + } else if (pc_instr_mode == THUMB_INSTR_MODE) { + isize = 2; + } else if (pc_instr_mode == THUMB2_INSTR_MODE) { + thumb2_32b = 1; } if (user_mode(regs)) -- 2.12.3

5 years, 9 months

1
0
0 0

[stable] bpf: add bpf_jit_limit knob to restrict unpriv allocations

by Ben Hutchings

Please consider backporting this commit to 4.19-stable: commit ede95a63b5e84ddeea6b0c473b36ab8bfd8c6ce3 Author: Daniel Borkmann <daniel(a)iogearbox.net> Date: Tue Oct 23 01:11:04 2018 +0200 bpf: add bpf_jit_limit knob to restrict unpriv allocations No other stable branches are affected by the issue. Ben. -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom

5 years, 9 months

2
4
0 0

[PATCH 4.9 000/128] 4.9.180-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.180 release. There are 128 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat 01 Jun 2019 03:02:06 AM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.180-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.180-rc1 Chris Wilson <chris(a)chris-wilson.co.uk> drm: Wake up next in drm_read() chain if we are forced to putback the event Arnd Bergmann <arnd(a)arndb.de> ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM Chris Lesiak <chris.lesiak(a)licor.com> spi: Fix zero length xfer bug Geert Uytterhoeven <geert+renesas(a)glider.be> spi: rspi: Fix sequencer reset during initialization Aditya Pakki <pakki001(a)umn.edu> spi : spi-topcliff-pch: Fix to handle empty DMA buffers James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices Arnd Bergmann <arnd(a)arndb.de> media: saa7146: avoid high stack usage with clang James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix FDMI manufacturer attribute value Arnd Bergmann <arnd(a)arndb.de> media: go7007: avoid clang frame overflow warning with KASAN James Hutchinson <jahutchinson99(a)googlemail.com> media: m88ds3103: serialize reset messages in m88ds3103_set_frontend Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-adma: use devm_clk_*() helpers Arnd Bergmann <arnd(a)arndb.de> scsi: qla4xxx: avoid freeing unallocated dma memory Tony Lindgren <tony(a)atomide.com> usb: core: Add PM runtime calls to usb_hcd_platform_shutdown Paul E. McKenney <paulmck(a)linux.ibm.com> rcuperf: Fix cleanup path for invalid perf_type strings Paul E. McKenney <paulmck(a)linux.ibm.com> rcutorture: Fix cleanup path for invalid torture_type strings Tony Luck <tony.luck(a)intel.com> x86/mce: Fix machine_check_poll() tests for error types Kangjie Lu <kjlu(a)umn.edu> tty: ipwireless: fix missing checks for ioremap Pankaj Gupta <pagupta(a)redhat.com> virtio_console: initialize vtermno value for ports Dan Carpenter <dan.carpenter(a)oracle.com> media: wl128x: prevent two potential buffer overflows Sowjanya Komatineni <skomatineni(a)nvidia.com> spi: tegra114: reset controller on probe Gustavo A. R. Silva <gustavo(a)embeddedor.com> cxgb3/l2t: Fix undefined behaviour Wen Yang <wen.yang99(a)zte.com.cn> ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put Wen Yang <wen.yang99(a)zte.com.cn> ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> HID: core: move Usage Page concatenation to Main item Chengguang Xu <cgxu519(a)gmx.com> chardev: add additional check for minor range overlap Peter Zijlstra <peterz(a)infradead.org> x86/ia32: Fix ia32_restore_sigcontext() AC leak Peter Zijlstra <peterz(a)infradead.org> x86/uaccess, signal: Fix AC=1 bloat Wen Yang <wen.yang99(a)zte.com.cn> arm64: cpu_ops: fix a leaked reference by adding missing of_node_put Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Avoid configuring regulator with undefined voltage range Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Fix regulator load and icc-level configuration Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix Oops when bringing up interface during USB disconnect Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: fix race during disconnect when USB completion is in progress Piotr Figiel <p.figiel(a)camlintechnologies.com> brcmfmac: convert dev_init_lock mutex to completion Arnd Bergmann <arnd(a)arndb.de> b43: shut up clang -Wuninitialized variable warning Kangjie Lu <kjlu(a)umn.edu> brcmfmac: fix missing checks for kmemdup YueHaibing <yuehaibing(a)huawei.com> mwifiex: Fix mem leak in mwifiex_tm_cmd Kangjie Lu <kjlu(a)umn.edu> rtlwifi: fix a potential NULL pointer dereference Nathan Chancellor <natechancellor(a)gmail.com> iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data Kangjie Lu <kjlu(a)umn.edu> iio: hmc5843: fix potential NULL pointer dereferences Lars-Peter Clausen <lars(a)metafoo.de> iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion Kees Cook <keescook(a)chromium.org> x86/build: Keep local relocations with ld.lld Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: pmac32: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq/pasemi: fix possible object reference leak Wen Yang <wen.yang99(a)zte.com.cn> cpufreq: ppc_cbe: fix possible object reference leak Arnd Bergmann <arnd(a)arndb.de> s390: cio: fix cio_irb declaration Charles Keepax <ckeepax(a)opensource.cirrus.com> extcon: arizona: Disable mic detect if running when driver is removed Ulf Hansson <ulf.hansson(a)linaro.org> PM / core: Propagate dev->power.wakeup_path when no callbacks Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support Yinbo Zhu <yinbo.zhu(a)nxp.com> mmc: sdhci-of-esdhc: add erratum eSDHC5 support Kangjie Lu <kjlu(a)umn.edu> mmc_spi: add a status check for spi_sync_locked Andrea Merello <andrea.merello(a)gmail.com> mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers John Garry <john.garry(a)huawei.com> scsi: libsas: Do discovery on empty PHY to update PHY info Guenter Roeck <linux(a)roeck-us.net> hwmon: (f71805f) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (pc87427) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses Guenter Roeck <linux(a)roeck-us.net> hwmon: (vt1211) Use request_muxed_region for Super-IO accesses Colin Ian King <colin.king(a)canonical.com> RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: vdso: Fix clock_getres() for CLOCK_REALTIME Nicholas Nunley <nicholas.d.nunley(a)intel.com> i40e: don't allow changes to HW VLAN stripping on active port VLANs Thomas Gleixner <tglx(a)linutronix.de> x86/irq/64: Limit IST stack overflow check to #DB stack Alan Stern <stern(a)rowland.harvard.edu> USB: core: Don't unbind interfaces following device reset failure Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Handle overflow in cpu_shares_write_u64 Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> sched/core: Check quota and period overflow at usec to nsec conversion Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/numa: improve control of topology updates Dan Carpenter <dan.carpenter(a)oracle.com> media: pvrusb2: Prevent a buffer overflow Shuah Khan <shuah(a)kernel.org> media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable() Wenwen Wang <wang6495(a)umn.edu> audit: fix a memory leak bug Akinobu Mita <akinobu.mita(a)gmail.com> media: ov2659: make S_FMT succeed even if requested format doesn't match Hans Verkuil <hverkuil(a)xs4all.nl> media: au0828: stop video streaming only when last user stops Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper Philipp Zabel <p.zabel(a)pengutronix.de> media: coda: clear error return value before picture run Nicolas Ferre <nicolas.ferre(a)microchip.com> dmaengine: at_xdmac: remove BUG_ON macro in tasklet Wen Yang <wen.yang99(a)zte.com.cn> pinctrl: pistachio: fix leaked of_node references Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: use RAP instead of FAP to get the protocol version Peter Zijlstra <peterz(a)infradead.org> mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions Jiri Kosina <jkosina(a)suse.cz> x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> smpboot: Place the __percpu annotation correctly Kees Cook <keescook(a)chromium.org> x86/build: Move _etext to actual end of .text Arnd Bergmann <arnd(a)arndb.de> bcache: avoid clang -Wunintialized warning Coly Li <colyli(a)suse.de> bcache: add failure check to run_cache_set() for journal replay Tang Junhui <tang.junhui.linux(a)gmail.com> bcache: fix failure in journal relplay Coly Li <colyli(a)suse.de> bcache: return error immediately in bch_journal_replay() Corentin Labbe <clabbe.montjoie(a)gmail.com> crypto: sun4i-ss - Fix invalid calculation of hash end Kangjie Lu <kjlu(a)umn.edu> net: cw1200: fix a NULL pointer dereference Dan Carpenter <dan.carpenter(a)oracle.com> mwifiex: prevent an array overflow Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: fsl_sai: Update is_slave_mode with correct value Sergey Matyukevich <sergey.matyukevich.os(a)quantenna.com> mac80211/cfg80211: update bss channel on channel switch Sugar Zhang <sugar.zhang(a)rock-chips.com> dmaengine: pl330: _stop: clear interrupt status Mariusz Bialonczyk <manio(a)skyboo.net> w1: fix the resume command API Sven Van Asbroeck <thesven73(a)gmail.com> rtc: 88pm860x: prevent use-after-free on device remove Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: don't crash on invalid RX interrupt Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Viresh Kumar <viresh.kumar(a)linaro.org> sched/cpufreq: Fix kobject memleak Qian Cai <cai(a)lca.pw> arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable Marc Zyngier <marc.zyngier(a)arm.com> ARM: vdso: Remove dependency with the arch_timer driver internals Dan Carpenter <dan.carpenter(a)oracle.com> brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() Flavio Suligoi <f.suligoi(a)asem.it> spi: pxa2xx: fix SCR (divisor) calculation Arnd Bergmann <arnd(a)arndb.de> ASoC: imx: fix fiq dependencies Bo YU <tsu.yubo(a)gmail.com> powerpc/boot: Fix missing check of lseek() return value Jerome Brunet <jbrunet(a)baylibre.com> ASoC: hdmi-codec: unlock the device on startup errors Sameeh Jubran <sameehj(a)amazon.com> net: ena: gcc 8: fix compilation warning Sameer Pujar <spujar(a)nvidia.com> dmaengine: tegra210-dma: free dma controller in remove() Raul E Rangel <rrangel(a)chromium.org> mmc: core: Verify SD bus width YueHaibing <yuehaibing(a)huawei.com> cxgb4: Fix error path in cxgb4_init_module Ross Lagerwall <ross.lagerwall(a)citrix.com> gfs2: Fix lru_count going negative David Sterba <dsterba(a)suse.com> Revert "btrfs: Honour FITRIM range constraints during free space trim" Arnaldo Carvalho de Melo <acme(a)redhat.com> tools include: Adopt linux/bits.h Arnaldo Carvalho de Melo <acme(a)redhat.com> perf tools: No need to include bitops.h in util.h YueHaibing <yuehaibing(a)huawei.com> at76c50x-usb: Don't register led_trigger if usb_register_driver failed YueHaibing <yuehaibing(a)huawei.com> ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit Alexander Potapenko <glider(a)google.com> media: vivid: use vfree() instead of kfree() for dev->bitmap_cap YueHaibing <yuehaibing(a)huawei.com> media: cpia2: Fix use-after-free in cpia2_exit Jiufei Xue <jiufei.xue(a)linux.alibaba.com> fbdev: fix WARNING in __alloc_pages_nodemask bug Mike Kravetz <mike.kravetz(a)oracle.com> hugetlb: use same fault hash key for shared and private mappings Shile Zhang <shile.zhang(a)linux.alibaba.com> fbdev: fix divide error in fb_var_to_videomode Tobin C. Harding <tobin(a)kernel.org> btrfs: sysfs: don't leak memory when failing add fsid Filipe Manana <fdmanana(a)suse.com> Btrfs: fix race between ranged fsync and writeback of adjacent ranges Filipe Manana <fdmanana(a)suse.com> Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix sign extension bug in gfs2_update_stats Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> arm64: Save and restore OSDLR_EL1 across suspend/resume Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix label tracking error Suthikulpanit, Suravee <Suravee.Suthikulpanit(a)amd.com> kvm: svm/avic: fix off-by-one in checking host APIC ID Daniel Axtens <dja(a)axtens.net> crypto: vmx - CTR: always increment IV as quadword Martin K. Petersen <martin.petersen(a)oracle.com> Revert "scsi: sd: Keep disk read-only when re-reading partition" Andrea Parri <andrea.parri(a)amarulasolutions.com> bio: fix improper use of smp_mb__before_atomic() Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: fix return value for reserved EFER Jan Kara <jack(a)suse.cz> ext4: do not delete unlinked inode from orphan list on failed truncate ------------- Diffstat: Makefile | 4 +- arch/arm/include/asm/cp15.h | 2 + arch/arm/vdso/vgettimeofday.c | 5 ++- arch/arm64/include/asm/pgtable.h | 3 +- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpu_ops.c | 1 + arch/arm64/kernel/vdso.c | 3 ++ arch/arm64/kernel/vdso/gettimeofday.S | 7 ++-- arch/arm64/mm/proc.S | 26 +++++++------ arch/powerpc/boot/addnote.c | 6 ++- arch/powerpc/mm/numa.c | 18 ++++++--- arch/x86/Makefile | 2 +- arch/x86/ia32/ia32_signal.c | 29 ++++++++------ arch/x86/kernel/cpu/mcheck/mce.c | 44 ++++++++++++++++++---- arch/x86/kernel/irq_64.c | 19 +++++++--- arch/x86/kernel/signal.c | 29 ++++++++------ arch/x86/kernel/vmlinux.lds.S | 6 +-- arch/x86/kvm/svm.c | 6 ++- arch/x86/kvm/x86.c | 2 +- arch/x86/mm/fault.c | 2 - drivers/base/power/main.c | 4 ++ drivers/char/virtio_console.c | 3 +- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 + drivers/cpufreq/pasemi-cpufreq.c | 1 + drivers/cpufreq/pmac32-cpufreq.c | 2 + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- drivers/dma/at_xdmac.c | 6 ++- drivers/dma/pl330.c | 10 +++-- drivers/dma/tegra210-adma.c | 28 +++++++------- drivers/extcon/extcon-arizona.c | 10 +++++ drivers/gpu/drm/drm_fops.c | 1 + drivers/hid/hid-core.c | 36 ++++++++++++------ drivers/hid/hid-logitech-hidpp.c | 17 +++++++-- drivers/hwmon/f71805f.c | 15 ++++++-- drivers/hwmon/pc87427.c | 14 ++++++- drivers/hwmon/smsc47b397.c | 13 ++++++- drivers/hwmon/smsc47m1.c | 28 +++++++++----- drivers/hwmon/vt1211.c | 15 ++++++-- drivers/iio/adc/ad_sigma_delta.c | 16 +++++--- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 +++- drivers/iio/magnetometer/hmc5843_spi.c | 7 +++- drivers/infiniband/hw/cxgb4/cm.c | 2 + drivers/md/bcache/alloc.c | 5 ++- drivers/md/bcache/journal.c | 26 +++++++++++-- drivers/md/bcache/super.c | 17 ++++++--- drivers/media/dvb-frontends/m88ds3103.c | 9 ++--- drivers/media/i2c/ov2659.c | 6 ++- drivers/media/i2c/soc_camera/ov6650.c | 25 ++++++------ drivers/media/pci/saa7146/hexium_gemini.c | 5 +-- drivers/media/pci/saa7146/hexium_orion.c | 5 +-- drivers/media/platform/coda/coda-bit.c | 3 ++ drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 7 +++- drivers/media/usb/au0828/au0828-video.c | 16 +++++--- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- drivers/media/usb/go7007/go7007-fw.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++++--------- drivers/mmc/core/sd.c | 8 ++++ drivers/mmc/host/mmc_spi.c | 4 ++ drivers/mmc/host/sdhci-of-esdhc.c | 5 +++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 ++++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++ drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 10 +++-- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 27 +++++++------ .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 ++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 +++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 ++ drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++ drivers/net/wireless/st/cw1200/main.c | 5 +++ drivers/nvdimm/label.c | 29 +++++++------- drivers/nvdimm/namespace_devs.c | 15 ++++++++ drivers/nvdimm/nd.h | 4 ++ drivers/pinctrl/pinctrl-pistachio.c | 2 + drivers/rtc/rtc-88pm860x.c | 2 +- drivers/s390/cio/cio.h | 2 +- drivers/scsi/libsas/sas_expander.c | 5 +++ drivers/scsi/lpfc/lpfc_ct.c | 3 ++ drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +++++- drivers/scsi/qla2xxx/qla_isr.c | 6 ++- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/sd.c | 3 +- drivers/scsi/ufs/ufshcd.c | 28 ++++++++++---- drivers/spi/spi-pxa2xx.c | 8 +++- drivers/spi/spi-rspi.c | 9 +++-- drivers/spi/spi-tegra114.c | 32 +++++++++------- drivers/spi/spi-topcliff-pch.c | 15 +++++++- drivers/spi/spi.c | 2 + drivers/ssb/bridge_pcmcia_80211.c | 9 ++++- drivers/tty/ipwireless/main.c | 8 ++++ drivers/usb/core/hcd.c | 3 ++ drivers/usb/core/hub.c | 5 ++- drivers/video/fbdev/core/fbcmap.c | 2 + drivers/video/fbdev/core/modedb.c | 3 ++ drivers/w1/w1_io.c | 3 +- fs/btrfs/extent-tree.c | 25 +++--------- fs/btrfs/file.c | 12 ++++++ fs/btrfs/root-tree.c | 4 +- fs/btrfs/sysfs.c | 7 +++- fs/char_dev.c | 6 +++ fs/ext4/inode.c | 2 +- fs/gfs2/glock.c | 22 ++++++----- fs/gfs2/lock_dlm.c | 9 +++-- fs/hugetlbfs/inode.c | 8 +--- include/linux/bio.h | 2 +- include/linux/hid.h | 1 + include/linux/hugetlb.h | 4 +- include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/smpboot.h | 2 +- kernel/auditfilter.c | 12 +++--- kernel/rcu/rcuperf.c | 5 +++ kernel/rcu/rcutorture.c | 5 +++ kernel/sched/core.c | 9 ++++- lib/strncpy_from_user.c | 5 ++- lib/strnlen_user.c | 4 +- mm/hugetlb.c | 19 +++------- net/mac80211/mlme.c | 3 -- net/wireless/nl80211.c | 5 +++ sound/soc/codecs/hdmi-codec.c | 6 ++- sound/soc/davinci/davinci-mcasp.c | 2 + sound/soc/fsl/Kconfig | 9 +++-- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl_sai.c | 2 + sound/soc/fsl/fsl_utils.c | 1 + tools/include/linux/bitops.h | 7 +--- tools/include/linux/bits.h | 26 +++++++++++++ tools/perf/check-headers.sh | 1 + tools/perf/util/util.h | 1 - 140 files changed, 836 insertions(+), 371 deletions(-)

5 years, 9 months

6
133
0 0

[PATCH v2] PCI: qcom: Ensure that PERST is asserted for at least 100 ms

by Niklas Cassel

Currently, there is only a 1 ms sleep after asserting PERST. Reading the datasheets for different endpoints, some require PERST to be asserted for 10 ms in order for the endpoint to perform a reset, others require it to be asserted for 50 ms. Several SoCs using this driver uses PCIe Mini Card, where we don't know what endpoint will be plugged in. The PCI Express Card Electromechanical Specification specifies: "On power up, the deassertion of PERST# is delayed 100 ms (TPVPERL) from the power rails achieving specified operating limits." Add a sleep of 100 ms before deasserting PERST, in order to ensure that we are compliant with the spec. Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Niklas Cassel <niklas.cassel(a)linaro.org> Acked-by: Stanimir Varbanov <svarbanov(a)mm-sol.com> Cc: stable(a)vger.kernel.org # 4.5+ --- Changes since v1: Move the sleep into qcom_ep_reset_deassert() drivers/pci/controller/dwc/pcie-qcom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0ed235d560e3..5d1713069d14 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -178,6 +178,8 @@ static void qcom_ep_reset_assert(struct qcom_pcie *pcie) static void qcom_ep_reset_deassert(struct qcom_pcie *pcie) { + /* Ensure that PERST has been asserted for at least 100 ms */ + msleep(100); gpiod_set_value_cansleep(pcie->reset, 0); usleep_range(PERST_DELAY_US, PERST_DELAY_US + 500); } -- 2.21.0

5 years, 9 months

3
3
0 0

❎ FAIL: Test report for kernel 4.19.47-rc1-011862f.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: 9c8c1a222a6b - Linux 4.19.47-rc1 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: OK Tests: FAILED One or more kernel tests failed: aarch64: ❎ Boot test We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-9c8c… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-9c8c… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-9c8c… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-9c8c… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-9c8c1a22… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-9c8c1a22… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-9c8c1a… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-9c8c1a… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ❎ Boot test [0] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] ppc64le: Host 1: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [2] Host 2: ✅ Boot test [0] ✅ kdump: sysrq-c [27] Host 3: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [28] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] x86_64: Host 1: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [28] 🚧 ✅ Networking route: pmtu [19] 🚧 ✅ Networking route_func: local [20] 🚧 ✅ Networking route_func: forward [20] 🚧 ✅ Networking TCP: keepalive test [21] 🚧 ✅ Networking UDP: socket [22] 🚧 ✅ Networking tunnel: vxlan basic [23] 🚧 ✅ Networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] Host 2: ✅ Boot test [0] ✅ kdump: sysrq-c [27] Host 3: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] Host 4: ✅ Boot test [0] ✅ kdump: sysrq-c - megaraid_sas [27] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/lvm/… [16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s… [19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t… [22]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/u… [23]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [24]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [25]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [26]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/blk [27]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/kdump/kdump… [28]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 9 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2019