lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 125/196] nfit, address-range-scrub: fix scrub in-progress reporting
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Williams <dan.j.williams@intel.com>

    commit 78727137fdf49edf9f731bde79d7189067b4047a upstream.

    There is a small window whereby ARS scan requests can schedule work that
    userspace will miss when polling scrub_show. Hold the init_mutex lock
    over calls to report the status to close this potential escape. Also,
    make sure that requests to cancel the ARS workqueue are treated as an
    idle event.

    Cc: <stable@vger.kernel.org>
    Cc: Vishal Verma <vishal.l.verma@intel.com>
    Fixes: 37b137ff8c83 ("nfit, libnvdimm: allow an ARS scrub...")
    Reviewed-by: Dave Jiang <dave.jiang@intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/nfit/core.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/acpi/nfit/core.c
    +++ b/drivers/acpi/nfit/core.c
    @@ -1250,8 +1250,11 @@ static ssize_t scrub_show(struct device
    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,
    - (work_busy(&acpi_desc->work)) ? "+\n" : "\n");
    + work_busy(&acpi_desc->work)
    + && !acpi_desc->cancel ? "+\n" : "\n");
    + mutex_unlock(&acpi_desc->init_mutex);
    }
    device_unlock(dev);
    return rc;

    \
     
     \ /
      Last update: 2018-04-22 17:48    [W:4.021 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site