Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp253835imj; Fri, 15 Feb 2019 23:07:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IacCZqnB476QGxhQtESxKbGecuiaF15iirPqz/duXEx5NcUwOF4Bs3orxYYWv86vzcQRdK7 X-Received: by 2002:a17:902:a7:: with SMTP id a36mr14166910pla.295.1550300834763; Fri, 15 Feb 2019 23:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550300834; cv=none; d=google.com; s=arc-20160816; b=0QAiJd+OJn4lyqinfj11ZHjNPq8AFIq3NMei930yWRv9RNC0ITOQnsJmoJZHWEdEj+ ot5VQ6rRzvSgc3bwgq6XJNS33R9U2IB4p+jtz8RFE56IgoU7KFDm/qvxpSMRPPuxz89I IwHj0Xob4HaNokj34c4Rp+pzQsjPSPxs6SPEKVgnGEIi/opBY6PqxEegzUH87TeQPY55 uBLLeiFi7d0129piIRHF7x/lyKXgraBxiA3kPqTE4JyyFnRHktYBc+6UiUZ5bVBCsIbN 3dc2jLAcxsO7POnfXUAU0LxxE8NiKNL9UaDB8V5S/g9KLep0kKZfiPqccdNoMEZNc1Q5 S6FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=b89d2TRE+IDNCNHp88oVyjHbOU0qk0++78JCKmAcc3I=; b=0HWG11oF0hzRXA2Vx+Z1GCYT9A0HAsNU+LjjhY3kvE30PVVApiBwVsx6L5WZ6M8hSB g6zBr+3KYcNTkXbJHeRm3Cn1RhezEhqbUEEUesZBLbEXKMNsjoLo6IPNU33OM/MHFtuG oEQw2/A64Tz1X2enNcBLdxdHiCbrEU+Hv4cyyLo9En91Ez7GlFUNZyDtpHBQUHD/4WKI w8jAiws0PX5GQ1boiJtAmKgE7koZ3ZetVdsuCZptZnwtNMy0PHixnJ80jC2WhWHR1M/y QjmY0uCh/eCrrAKDF9AM6K11YFiwJ2ngnC4nZ1dswsA/w8hUdBzorzPvPkExD/ziVhoQ m2Dw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w31si7808738pla.308.2019.02.15.23.06.59; Fri, 15 Feb 2019 23:07:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388000AbfBOT4w (ORCPT + 99 others); Fri, 15 Feb 2019 14:56:52 -0500 Received: from mga01.intel.com ([192.55.52.88]:61804 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbfBOT4v (ORCPT ); Fri, 15 Feb 2019 14:56:51 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2019 11:56:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,373,1544515200"; d="scan'208";a="143852650" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2019 11:56:51 -0800 Subject: [PATCH v2 5/6] nfit/ars: Allow root to busy-poll the ARS state machine From: Dan Williams To: linux-nvdimm@lists.01.org Cc: Erwin Tsaur , vishal.l.verma@intel.com, linux-kernel@vger.kernel.org Date: Fri, 15 Feb 2019 11:44:13 -0800 Message-ID: <155025985341.1043225.5482732552253707094.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <155025982726.1043225.15436410616433285475.stgit@dwillia2-desk3.amr.corp.intel.com> References: <155025982726.1043225.15436410616433285475.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Reported-by: Erwin Tsaur Signed-off-by: Dan Williams --- 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 90312892093e..629cf91649d2 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -1333,6 +1333,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; @@ -3187,6 +3194,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 {