From: Sasha Levin Date: Tue, 23 Apr 2019 15:45:11 +0000 (-0400) Subject: patches for 5.0 X-Git-Tag: v3.18.139~45^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89217399116df27f2daddac1abe918c70fafc6a3;p=thirdparty%2Fkernel%2Fstable-queue.git patches for 5.0 Signed-off-by: Sasha Levin --- diff --git a/queue-5.0/nfit-ars-allow-root-to-busy-poll-the-ars-state-machi.patch b/queue-5.0/nfit-ars-allow-root-to-busy-poll-the-ars-state-machi.patch new file mode 100644 index 00000000000..38bb316efd1 --- /dev/null +++ b/queue-5.0/nfit-ars-allow-root-to-busy-poll-the-ars-state-machi.patch @@ -0,0 +1,66 @@ +From 1c7ebd1cf9579c4fcfdd96b2d3bd68ae2936ae34 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 22 Apr 2019 16:08:21 -0700 +Subject: nfit/ars: Allow root to busy-poll the ARS state machine + +commit 5479b2757f26fe9908fc341d105b2097fe820b6f upstream. + +The ARS implementation implements exponential back-off on the poll +interval to prevent high-frequency access to the DIMM / platform +interface. Depending on when the ARS completes the poll interval may +exceed the completion event by minutes. Allow root to reset the timeout +each time it probes the status. A one-second timeout is still enforced, +but root can otherwise can control the poll interval. + +Fixes: bc6ba8085842 ("nfit, address-range-scrub: rework and simplify ARS...") +Cc: +Reported-by: Erwin Tsaur +Reviewed-by: Toshi Kani +Signed-off-by: Dan Williams +Signed-off-by: Sasha Levin +--- + drivers/acpi/nfit/core.c | 8 ++++++++ + drivers/acpi/nfit/nfit.h | 1 + + 2 files changed, 9 insertions(+) + +diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c +index 64308e669250..61d3fd65fbe9 100644 +--- a/drivers/acpi/nfit/core.c ++++ b/drivers/acpi/nfit/core.c +@@ -1335,6 +1335,13 @@ static ssize_t scrub_show(struct device *dev, + busy = test_bit(ARS_BUSY, &acpi_desc->scrub_flags) + && !test_bit(ARS_CANCEL, &acpi_desc->scrub_flags); + rc = sprintf(buf, "%d%s", acpi_desc->scrub_count, busy ? "+\n" : "\n"); ++ /* Allow an admin to poll the busy state at a higher rate */ ++ if (busy && capable(CAP_SYS_RAWIO) && !test_and_set_bit(ARS_POLL, ++ &acpi_desc->scrub_flags)) { ++ acpi_desc->scrub_tmo = 1; ++ mod_delayed_work(nfit_wq, &acpi_desc->dwork, HZ); ++ } ++ + mutex_unlock(&acpi_desc->init_mutex); + device_unlock(dev); + return rc; +@@ -3196,6 +3203,7 @@ static void acpi_nfit_scrub(struct work_struct *work) + else + notify_ars_done(acpi_desc); + memset(acpi_desc->ars_status, 0, acpi_desc->max_ars); ++ clear_bit(ARS_POLL, &acpi_desc->scrub_flags); + mutex_unlock(&acpi_desc->init_mutex); + } + +diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h +index 897ce10192a0..d14bad687fb8 100644 +--- a/drivers/acpi/nfit/nfit.h ++++ b/drivers/acpi/nfit/nfit.h +@@ -213,6 +213,7 @@ struct nfit_mem { + enum scrub_flags { + ARS_BUSY, + ARS_CANCEL, ++ ARS_POLL, + }; + + struct acpi_nfit_desc { +-- +2.19.1 + diff --git a/queue-5.0/nfit-ars-avoid-stale-ars-results.patch b/queue-5.0/nfit-ars-avoid-stale-ars-results.patch new file mode 100644 index 00000000000..ef1d6bc4346 --- /dev/null +++ b/queue-5.0/nfit-ars-avoid-stale-ars-results.patch @@ -0,0 +1,80 @@ +From ddaf917919fa4ff38a4e87397717069e75aee8f4 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 22 Apr 2019 16:08:26 -0700 +Subject: nfit/ars: Avoid stale ARS results + +commit 78153dd45e7e0596ba32b15d02bda08e1513111e upstream. + +Gate ARS result consumption on whether the OS issued start-ARS since the +previous consumption. The BIOS may only clear its result buffers after a +successful start-ARS. + +Fixes: 0caeef63e6d2 ("libnvdimm: Add a poison list and export badblocks") +Cc: +Reported-by: Krzysztof Rusocki +Reported-by: Vishal Verma +Reviewed-by: Toshi Kani +Signed-off-by: Dan Williams +Signed-off-by: Sasha Levin +--- + drivers/acpi/nfit/core.c | 17 ++++++++++++++++- + drivers/acpi/nfit/nfit.h | 1 + + 2 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c +index 61d3fd65fbe9..4be4dc3e8aa6 100644 +--- a/drivers/acpi/nfit/core.c ++++ b/drivers/acpi/nfit/core.c +@@ -2661,7 +2661,10 @@ static int ars_start(struct acpi_nfit_desc *acpi_desc, + + if (rc < 0) + return rc; +- return cmd_rc; ++ if (cmd_rc < 0) ++ return cmd_rc; ++ set_bit(ARS_VALID, &acpi_desc->scrub_flags); ++ return 0; + } + + static int ars_continue(struct acpi_nfit_desc *acpi_desc) +@@ -2754,6 +2757,17 @@ static int ars_status_process_records(struct acpi_nfit_desc *acpi_desc) + */ + if (ars_status->out_length < 44) + return 0; ++ ++ /* ++ * Ignore potentially stale results that are only refreshed ++ * after a start-ARS event. ++ */ ++ if (!test_and_clear_bit(ARS_VALID, &acpi_desc->scrub_flags)) { ++ dev_dbg(acpi_desc->dev, "skip %d stale records\n", ++ ars_status->num_records); ++ return 0; ++ } ++ + for (i = 0; i < ars_status->num_records; i++) { + /* only process full records */ + if (ars_status->out_length +@@ -3238,6 +3252,7 @@ static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc) + struct nfit_spa *nfit_spa; + int rc; + ++ set_bit(ARS_VALID, &acpi_desc->scrub_flags); + list_for_each_entry(nfit_spa, &acpi_desc->spas, list) { + switch (nfit_spa_type(nfit_spa->spa)) { + case NFIT_SPA_VOLATILE: +diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h +index d14bad687fb8..0cbe5009eb2c 100644 +--- a/drivers/acpi/nfit/nfit.h ++++ b/drivers/acpi/nfit/nfit.h +@@ -213,6 +213,7 @@ struct nfit_mem { + enum scrub_flags { + ARS_BUSY, + ARS_CANCEL, ++ ARS_VALID, + ARS_POLL, + }; + +-- +2.19.1 + diff --git a/queue-5.0/nfit-ars-introduce-scrub_flags.patch b/queue-5.0/nfit-ars-introduce-scrub_flags.patch new file mode 100644 index 00000000000..b0830cd10e5 --- /dev/null +++ b/queue-5.0/nfit-ars-introduce-scrub_flags.patch @@ -0,0 +1,130 @@ +From ee2bf629d0434d6bc7656ec80a9a7cb15468ced1 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 22 Apr 2019 16:08:16 -0700 +Subject: nfit/ars: Introduce scrub_flags + +commit e34b8252a3d2893ca55c82dbfcdaa302fa03d400 upstream. + +In preparation for introducing new flags to gate whether ARS results are +stale, or poll the completion state, convert the existing flags to an +unsigned long with enumerated values. This conversion allows the flags +to be atomically updated outside of ->init_mutex. + +Reviewed-by: Toshi Kani +Signed-off-by: Dan Williams +Signed-off-by: Sasha Levin +--- + drivers/acpi/nfit/core.c | 30 +++++++++++++++++------------- + drivers/acpi/nfit/nfit.h | 8 ++++++-- + 2 files changed, 23 insertions(+), 15 deletions(-) + +diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c +index 1a48c92eaed5..64308e669250 100644 +--- a/drivers/acpi/nfit/core.c ++++ b/drivers/acpi/nfit/core.c +@@ -1319,19 +1319,23 @@ static ssize_t scrub_show(struct device *dev, + struct device_attribute *attr, char *buf) + { + struct nvdimm_bus_descriptor *nd_desc; ++ struct acpi_nfit_desc *acpi_desc; + ssize_t rc = -ENXIO; ++ bool busy; + + device_lock(dev); + nd_desc = dev_get_drvdata(dev); +- if (nd_desc) { +- struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc); +- +- mutex_lock(&acpi_desc->init_mutex); +- rc = sprintf(buf, "%d%s", acpi_desc->scrub_count, +- acpi_desc->scrub_busy +- && !acpi_desc->cancel ? "+\n" : "\n"); +- mutex_unlock(&acpi_desc->init_mutex); ++ if (!nd_desc) { ++ device_unlock(dev); ++ return rc; + } ++ acpi_desc = to_acpi_desc(nd_desc); ++ ++ mutex_lock(&acpi_desc->init_mutex); ++ busy = test_bit(ARS_BUSY, &acpi_desc->scrub_flags) ++ && !test_bit(ARS_CANCEL, &acpi_desc->scrub_flags); ++ rc = sprintf(buf, "%d%s", acpi_desc->scrub_count, busy ? "+\n" : "\n"); ++ mutex_unlock(&acpi_desc->init_mutex); + device_unlock(dev); + return rc; + } +@@ -3081,7 +3085,7 @@ static unsigned int __acpi_nfit_scrub(struct acpi_nfit_desc *acpi_desc, + + lockdep_assert_held(&acpi_desc->init_mutex); + +- if (acpi_desc->cancel) ++ if (test_bit(ARS_CANCEL, &acpi_desc->scrub_flags)) + return 0; + + if (query_rc == -EBUSY) { +@@ -3155,7 +3159,7 @@ static void __sched_ars(struct acpi_nfit_desc *acpi_desc, unsigned int tmo) + { + lockdep_assert_held(&acpi_desc->init_mutex); + +- acpi_desc->scrub_busy = 1; ++ set_bit(ARS_BUSY, &acpi_desc->scrub_flags); + /* note this should only be set from within the workqueue */ + if (tmo) + acpi_desc->scrub_tmo = tmo; +@@ -3171,7 +3175,7 @@ static void notify_ars_done(struct acpi_nfit_desc *acpi_desc) + { + lockdep_assert_held(&acpi_desc->init_mutex); + +- acpi_desc->scrub_busy = 0; ++ clear_bit(ARS_BUSY, &acpi_desc->scrub_flags); + acpi_desc->scrub_count++; + if (acpi_desc->scrub_count_state) + sysfs_notify_dirent(acpi_desc->scrub_count_state); +@@ -3460,7 +3464,7 @@ int acpi_nfit_ars_rescan(struct acpi_nfit_desc *acpi_desc, + struct nfit_spa *nfit_spa; + + mutex_lock(&acpi_desc->init_mutex); +- if (acpi_desc->cancel) { ++ if (test_bit(ARS_CANCEL, &acpi_desc->scrub_flags)) { + mutex_unlock(&acpi_desc->init_mutex); + return 0; + } +@@ -3539,7 +3543,7 @@ void acpi_nfit_shutdown(void *data) + mutex_unlock(&acpi_desc_lock); + + mutex_lock(&acpi_desc->init_mutex); +- acpi_desc->cancel = 1; ++ set_bit(ARS_CANCEL, &acpi_desc->scrub_flags); + cancel_delayed_work_sync(&acpi_desc->dwork); + mutex_unlock(&acpi_desc->init_mutex); + +diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h +index 871fb3de3b30..897ce10192a0 100644 +--- a/drivers/acpi/nfit/nfit.h ++++ b/drivers/acpi/nfit/nfit.h +@@ -210,6 +210,11 @@ struct nfit_mem { + int family; + }; + ++enum scrub_flags { ++ ARS_BUSY, ++ ARS_CANCEL, ++}; ++ + struct acpi_nfit_desc { + struct nvdimm_bus_descriptor nd_desc; + struct acpi_table_header acpi_header; +@@ -231,8 +236,7 @@ struct acpi_nfit_desc { + unsigned int max_ars; + unsigned int scrub_count; + unsigned int scrub_mode; +- unsigned int scrub_busy:1; +- unsigned int cancel:1; ++ unsigned long scrub_flags; + unsigned long dimm_cmd_force_en; + unsigned long bus_cmd_force_en; + unsigned long bus_nfit_cmd_force_en; +-- +2.19.1 + diff --git a/queue-5.0/nfit-ars-remove-ars_start_flags.patch b/queue-5.0/nfit-ars-remove-ars_start_flags.patch new file mode 100644 index 00000000000..24fb0dd459b --- /dev/null +++ b/queue-5.0/nfit-ars-remove-ars_start_flags.patch @@ -0,0 +1,54 @@ +From b41a0eac96713f8e0f848d213af431f826865111 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 22 Apr 2019 16:08:10 -0700 +Subject: nfit/ars: Remove ars_start_flags + +commit 317a992ab9266b86b774b9f6b0f87eb4f59879a1 upstream. + +The ars_start_flags property of 'struct acpi_nfit_desc' is no longer +used since ARS_REQ_SHORT and ARS_REQ_LONG were added. + +Reviewed-by: Toshi Kani +Signed-off-by: Dan Williams +Signed-off-by: Sasha Levin +--- + drivers/acpi/nfit/core.c | 10 +++++----- + drivers/acpi/nfit/nfit.h | 1 - + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c +index f75f8f870ce3..1a48c92eaed5 100644 +--- a/drivers/acpi/nfit/core.c ++++ b/drivers/acpi/nfit/core.c +@@ -2660,11 +2660,11 @@ static int ars_continue(struct acpi_nfit_desc *acpi_desc) + struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc; + struct nd_cmd_ars_status *ars_status = acpi_desc->ars_status; + +- memset(&ars_start, 0, sizeof(ars_start)); +- ars_start.address = ars_status->restart_address; +- ars_start.length = ars_status->restart_length; +- ars_start.type = ars_status->type; +- ars_start.flags = acpi_desc->ars_start_flags; ++ ars_start = (struct nd_cmd_ars_start) { ++ .address = ars_status->restart_address, ++ .length = ars_status->restart_length, ++ .type = ars_status->type, ++ }; + rc = nd_desc->ndctl(nd_desc, NULL, ND_CMD_ARS_START, &ars_start, + sizeof(ars_start), &cmd_rc); + if (rc < 0) +diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h +index 33691aecfcee..871fb3de3b30 100644 +--- a/drivers/acpi/nfit/nfit.h ++++ b/drivers/acpi/nfit/nfit.h +@@ -223,7 +223,6 @@ struct acpi_nfit_desc { + struct list_head idts; + struct nvdimm_bus *nvdimm_bus; + struct device *dev; +- u8 ars_start_flags; + struct nd_cmd_ars_status *ars_status; + struct nfit_spa *scrub_spa; + struct delayed_work dwork; +-- +2.19.1 + diff --git a/queue-5.0/series b/queue-5.0/series index 14042580d74..7a5fce07633 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -41,3 +41,9 @@ sch_cake-make-sure-we-can-write-the-ip-header-before-changing-dscp-bits.patch nfc-nci-add-some-bounds-checking-in-nci_hci_cmd_received.patch nfc-nci-potential-off-by-one-in-pipes-array.patch sch_cake-simplify-logic-in-cake_select_tin.patch +nfit-ars-remove-ars_start_flags.patch +nfit-ars-introduce-scrub_flags.patch +nfit-ars-allow-root-to-busy-poll-the-ars-state-machi.patch +nfit-ars-avoid-stale-ars-results.patch +tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch +tpm-fix-the-type-of-the-return-value-in-calc_tpm2_ev.patch diff --git a/queue-5.0/tpm-fix-the-type-of-the-return-value-in-calc_tpm2_ev.patch b/queue-5.0/tpm-fix-the-type-of-the-return-value-in-calc_tpm2_ev.patch new file mode 100644 index 00000000000..1f7c2c26756 --- /dev/null +++ b/queue-5.0/tpm-fix-the-type-of-the-return-value-in-calc_tpm2_ev.patch @@ -0,0 +1,41 @@ +From edda1b60405845fb6528ee212587890e76ab54c9 Mon Sep 17 00:00:00 2001 +From: Yue Haibing +Date: Tue, 23 Apr 2019 16:05:18 +0300 +Subject: tpm: Fix the type of the return value in calc_tpm2_event_size() + +commit b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a upstream + +calc_tpm2_event_size() has an invalid signature because +it returns a 'size_t' where as its signature says that +it returns 'int'. + +Cc: +Fixes: 4d23cc323cdb ("tpm: add securityfs support for TPM 2.0 firmware event log") +Suggested-by: Jarkko Sakkinen +Signed-off-by: Yue Haibing +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: James Morris +Signed-off-by: Sasha Levin +--- + drivers/char/tpm/eventlog/tpm2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c +index 1b8fa9de2cac..41b9f6c92da7 100644 +--- a/drivers/char/tpm/eventlog/tpm2.c ++++ b/drivers/char/tpm/eventlog/tpm2.c +@@ -37,8 +37,8 @@ + * + * Returns size of the event. If it is an invalid event, returns 0. + */ +-static int calc_tpm2_event_size(struct tcg_pcr_event2 *event, +- struct tcg_pcr_event *event_header) ++static size_t calc_tpm2_event_size(struct tcg_pcr_event2 *event, ++ struct tcg_pcr_event *event_header) + { + struct tcg_efi_specid_event *efispecid; + struct tcg_event_field *event_field; +-- +2.19.1 + diff --git a/queue-5.0/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch b/queue-5.0/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch new file mode 100644 index 00000000000..f4d2dae6bd6 --- /dev/null +++ b/queue-5.0/tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-.patch @@ -0,0 +1,38 @@ +From 847d809885d3e57cfce98000be1e4716cab0b43a Mon Sep 17 00:00:00 2001 +From: Jarkko Sakkinen +Date: Fri, 8 Feb 2019 18:30:59 +0200 +Subject: tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete + +[ Upstream commit 442601e87a4769a8daba4976ec3afa5222ca211d ] + +Return -E2BIG when the transfer is incomplete. The upper layer does +not retry, so not doing that is incorrect behaviour. + +Cc: stable@vger.kernel.org +Fixes: a2871c62e186 ("tpm: Add support for Atmel I2C TPMs") +Signed-off-by: Jarkko Sakkinen +Reviewed-by: Stefan Berger +Reviewed-by: Jerry Snitselaar +Signed-off-by: Sasha Levin +--- + drivers/char/tpm/tpm_i2c_atmel.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c +index 32a8e27c5382..cc4e642d3180 100644 +--- a/drivers/char/tpm/tpm_i2c_atmel.c ++++ b/drivers/char/tpm/tpm_i2c_atmel.c +@@ -69,6 +69,10 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len) + if (status < 0) + return status; + ++ /* The upper layer does not support incomplete sends. */ ++ if (status != len) ++ return -E2BIG; ++ + return 0; + } + +-- +2.19.1 +