From patchwork Tue Sep 18 05:49:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10603745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 590FC15A6 for ; Tue, 18 Sep 2018 06:01:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 466112A2FF for ; Tue, 18 Sep 2018 06:01:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39ACC2A30A; Tue, 18 Sep 2018 06:01:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9710F2A2FF for ; Tue, 18 Sep 2018 06:01:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5855F21A07A82; Mon, 17 Sep 2018 23:01:05 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8CEA22194D387 for ; Mon, 17 Sep 2018 23:01:04 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2018 23:01:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,388,1531810800"; d="scan'208";a="75185703" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga006.jf.intel.com with ESMTP; 17 Sep 2018 23:01:03 -0700 Subject: [ndctl PATCH 1/3] ndctl: Introduce dirty-dimm command From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 17 Sep 2018 22:49:16 -0700 Message-ID: <153724975617.55312.7253687867673718680.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> References: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Some DIMMs provide a facility to track dirty-shutdown events. The counter only rolls forward after the OS sets a latch. This allows the agent tracking dirty shutdowns to ignore events that occur while the capacity has not been written. For these DIMMs dirty-dimm will trigger the counter to roll to the next state. The shutdown state can be retrieved with 'ndctl list -DH' Cc: Keith Busch Cc: Vishal Verma Signed-off-by: Dan Williams --- Documentation/ndctl/Makefile.am | 1 + Documentation/ndctl/ndctl-dirty-dimm.txt | 29 +++++++++++++++++++++++++++++ builtin.h | 1 + ndctl/dimm.c | 28 ++++++++++++++++++++++++++++ ndctl/ndctl.c | 1 + 5 files changed, 60 insertions(+) create mode 100644 Documentation/ndctl/ndctl-dirty-dimm.txt diff --git a/Documentation/ndctl/Makefile.am b/Documentation/ndctl/Makefile.am index a30b139ba3a3..1a826bb001be 100644 --- a/Documentation/ndctl/Makefile.am +++ b/Documentation/ndctl/Makefile.am @@ -38,6 +38,7 @@ man1_MANS = \ ndctl-disable-region.1 \ ndctl-enable-dimm.1 \ ndctl-disable-dimm.1 \ + ndctl-dirty-dimm.1 \ ndctl-enable-namespace.1 \ ndctl-disable-namespace.1 \ ndctl-create-namespace.1 \ diff --git a/Documentation/ndctl/ndctl-dirty-dimm.txt b/Documentation/ndctl/ndctl-dirty-dimm.txt new file mode 100644 index 000000000000..5c0b97f37ad6 --- /dev/null +++ b/Documentation/ndctl/ndctl-dirty-dimm.txt @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 + +ndctl-dirty-dimm(1) +===================== + +NAME +---- +ndctl-dirty-dimm - set dimm to record the next dirty shutdown event + +SYNOPSIS +-------- +[verse] +'ndctl dirty-dimm [..]' + +Some NVDIMMs have the capability to detect 'flush failed' events whereby +data that is pending in buffers at the time of system power loss fail to +be flushed out to media. Some DIMMs go further to count how many times +such fatal events occur, but only roll the count in response to a latch +being set. The 'dirty-dimm' command sets this latch on those devices and +is meant to be called in advance to any writes to media. + +OPTIONS +------- +:: +include::xable-dimm-options.txt[] + +SEE ALSO +-------- +http://pmem.io/documents/NVDIMM_DSM_Interface-V1.7.pdf[NVDIMM DSM Inteface] diff --git a/builtin.h b/builtin.h index 675a6ce79b9c..1157243cdf60 100644 --- a/builtin.h +++ b/builtin.h @@ -48,4 +48,5 @@ int cmd_bat(int argc, const char **argv, void *ctx); #endif int cmd_update_firmware(int argc, const char **argv, void *ctx); int cmd_inject_smart(int argc, const char **argv, void *ctx); +int cmd_dirty_dimm(int argc, const char **argv, void *ctx); #endif /* _NDCTL_BUILTIN_H_ */ diff --git a/ndctl/dimm.c b/ndctl/dimm.c index a4203f354000..595e4e4096a5 100644 --- a/ndctl/dimm.c +++ b/ndctl/dimm.c @@ -61,6 +61,19 @@ static int action_zero(struct ndctl_dimm *dimm, struct action_context *actx) return ndctl_dimm_zero_labels(dimm); } +static int action_dirty(struct ndctl_dimm *dimm, struct action_context *actx) +{ + struct ndctl_cmd *cmd; + + cmd = ndctl_dimm_cmd_new_ack_shutdown_count(dimm); + if (!cmd) + return -EOPNOTSUPP; + ndctl_cmd_submit(cmd); + ndctl_cmd_unref(cmd); + + return 0; +} + static struct json_object *dump_label_json(struct ndctl_dimm *dimm, struct ndctl_cmd *cmd_read, ssize_t size) { @@ -943,6 +956,11 @@ static const struct option update_options[] = { OPT_END(), }; +static const struct option dirty_options[] = { + BASE_OPTIONS(), + OPT_END(), +}; + static const struct option base_options[] = { BASE_OPTIONS(), OPT_END(), @@ -1181,3 +1199,13 @@ int cmd_update_firmware(int argc, const char **argv, void *ctx) count > 1 ? "s" : ""); return count >= 0 ? 0 : EXIT_FAILURE; } + +int cmd_dirty_dimm(int argc, const char **argv, void *ctx) +{ + int count = dimm_action(argc, argv, ctx, action_dirty, dirty_options, + "ndctl dirty-dimm [..] []"); + + fprintf(stderr, "dirtied %d nmem%s.\n", count >= 0 ? count : 0, + count > 1 ? "s" : ""); + return count >= 0 ? 0 : EXIT_FAILURE; +} diff --git a/ndctl/ndctl.c b/ndctl/ndctl.c index 73dabfac3908..93d0d88a274c 100644 --- a/ndctl/ndctl.c +++ b/ndctl/ndctl.c @@ -83,6 +83,7 @@ static struct cmd_struct commands[] = { { "write-labels", cmd_write_labels }, { "init-labels", cmd_init_labels }, { "check-labels", cmd_check_labels }, + { "dirty-dimm", cmd_dirty_dimm }, { "inject-error", cmd_inject_error }, { "update-firmware", cmd_update_firmware }, { "inject-smart", cmd_inject_smart }, From patchwork Tue Sep 18 05:49:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10603747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B9B35A4 for ; Tue, 18 Sep 2018 06:01:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED5522A2FF for ; Tue, 18 Sep 2018 06:01:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1DDA2A30A; Tue, 18 Sep 2018 06:01:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 887FF2A2FF for ; Tue, 18 Sep 2018 06:01:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 726F72113DA22; Mon, 17 Sep 2018 23:01:09 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C5C4B2113DA19 for ; Mon, 17 Sep 2018 23:01:08 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2018 23:01:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,388,1531810800"; d="scan'208";a="74109101" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga008.jf.intel.com with ESMTP; 17 Sep 2018 23:01:08 -0700 Subject: [ndctl PATCH 2/3] ndctl: Revert "ndctl, intel: Fallback to smart cached shutdown_count" From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 17 Sep 2018 22:49:21 -0700 Message-ID: <153724976126.55312.1677206589965006541.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> References: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Static device attribute data, if it needs to be cached and exported to unprivileged userspace, should live in sysfs. Cc: Keith Busch Cc: Vishal Verma Signed-off-by: Dan Williams --- ndctl/lib/intel.c | 41 ----------------------------------------- ndctl/lib/libndctl.c | 6 +----- ndctl/lib/private.h | 3 --- 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/ndctl/lib/intel.c b/ndctl/lib/intel.c index 15c5d1a60e34..0abea1e1f5ff 100644 --- a/ndctl/lib/intel.c +++ b/ndctl/lib/intel.c @@ -56,46 +56,6 @@ static struct ndctl_cmd *alloc_intel_cmd(struct ndctl_dimm *dimm, return cmd; } -/* - * If provided, read the cached shutdown count in case the user does not have - * access rights to run the smart command, and pretend the command was - * successful with only the shutdown_count valid. - */ -static int intel_smart_handle_error(struct ndctl_cmd *cmd) -{ - struct ndctl_dimm *dimm = cmd->dimm; - struct ndctl_bus *bus = cmd_to_bus(cmd); - struct ndctl_ctx *ctx = ndctl_bus_get_ctx(bus); - char *path = NULL, shutdown_count[16] = {}; - int fd, rc = cmd->status; - - if (!dimm) - goto out; - - if (asprintf(&path, DEF_TMPFS_DIR "/%s/usc", - ndctl_dimm_get_devname(dimm)) < 0) - goto out; - - fd = open(path, O_RDONLY); - if (fd < 0) - goto free_path; - - if (read(fd, shutdown_count, sizeof(shutdown_count)) < 0) - goto close; - - cmd->intel->smart.flags = ND_INTEL_SMART_SHUTDOWN_COUNT_VALID; - cmd->intel->smart.shutdown_count = strtoull(shutdown_count, NULL, 0); - rc = cmd->status = 0; - close: - close (fd); - free_path: - free(path); - out: - if (rc) - err(ctx, "failed: %s\n", strerror(errno)); - return rc; -} - static struct ndctl_cmd *intel_dimm_cmd_new_smart(struct ndctl_dimm *dimm) { struct ndctl_cmd *cmd; @@ -107,7 +67,6 @@ static struct ndctl_cmd *intel_dimm_cmd_new_smart(struct ndctl_dimm *dimm) if (!cmd) return NULL; cmd->firmware_status = &cmd->intel->smart.status; - cmd->handle_error = intel_smart_handle_error; return cmd; } diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 481b110d2a18..5bc97f25607c 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -2753,9 +2753,7 @@ NDCTL_EXPORT int ndctl_cmd_submit(struct ndctl_cmd *cmd) fd = open(path, O_RDWR); if (fd < 0) { - if (!cmd->handle_error) - err(ctx, "failed to open %s: %s\n", path, - strerror(errno)); + err(ctx, "failed to open %s: %s\n", path, strerror(errno)); rc = -errno; goto out; } @@ -2771,8 +2769,6 @@ NDCTL_EXPORT int ndctl_cmd_submit(struct ndctl_cmd *cmd) close(fd); out: cmd->status = rc; - if (rc && cmd->handle_error) - rc = cmd->handle_error(cmd); return rc; } diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h index b6e438aff8c7..5ddc682b7514 100644 --- a/ndctl/lib/private.h +++ b/ndctl/lib/private.h @@ -227,8 +227,6 @@ struct ndctl_namespace { * @firmware_status: NFIT command output status code * @iter: iterator for multi-xfer commands * @source: source cmd of an inherited iter.total_buf - * @handle_error: function pointer to handle a cmd error and override it to - * return alternative data (from a cache for example). * * For dynamically sized commands like 'get_config', 'set_config', or * 'vendor', @size encompasses the entire buffer for the command input @@ -257,7 +255,6 @@ struct ndctl_cmd { int dir; } iter; struct ndctl_cmd *source; - int (*handle_error)(struct ndctl_cmd *cmd); union { struct nd_cmd_ars_cap ars_cap[0]; struct nd_cmd_ars_start ars_start[0]; From patchwork Tue Sep 18 05:49:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10603749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B79135A4 for ; Tue, 18 Sep 2018 06:01:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4D472A2FF for ; Tue, 18 Sep 2018 06:01:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9714E2A30A; Tue, 18 Sep 2018 06:01:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 97E392A2FF for ; Tue, 18 Sep 2018 06:01:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8C07521A07A92; Mon, 17 Sep 2018 23:01:15 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id ED82F2113DA19 for ; Mon, 17 Sep 2018 23:01:13 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2018 23:01:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,388,1531810800"; d="scan'208";a="73866118" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga007.jf.intel.com with ESMTP; 17 Sep 2018 23:01:13 -0700 Subject: [ndctl PATCH 3/3] ndctl: Revert "ndctl: Create ndctl udev rules for dirty shutdown" From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 17 Sep 2018 22:49:26 -0700 Message-ID: <153724976637.55312.13961048174124075461.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> References: <153724975102.55312.9664009456306267501.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP With the introduction of the 'ndctl dirty-dimm' command, environments that choose to implement dirty-shutdown mitigation can use 'dirty-dimm nmemX' and 'list --dimm --health nmemX' to acknowledge and retrieve these details. However, it should be noted that this is not the default. If the platform advertises support for "Memory Controller Flush to NVDIMM Durability on Power Loss Capable" then the default Linux policy is to trust that designation. A platform owner can override the default Linux policy by delaying namespace activation until after 'dirty-dimm' has been completed on all DIMMs that contribute to a given interleave-set. Without coordinating the latch with writes the dirty-shutdown counter could fail to reflect the dirty-state relative to failed write-buffer flush. Cc: Keith Busch Cc: Vishal Verma Signed-off-by: Dan Williams --- .gitignore | 1 Makefile.am | 3 - configure.ac | 10 --- contrib/80-ndctl.rules | 3 - ndctl.spec.in | 3 - ndctl/Makefile.am | 5 -- ndctl/ndctl-udev.c | 150 ------------------------------------------------ 7 files changed, 175 deletions(-) delete mode 100644 contrib/80-ndctl.rules delete mode 100644 ndctl/ndctl-udev.c diff --git a/.gitignore b/.gitignore index f13a7ef5a608..0baace4b457e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ daxctl/lib/libdaxctl.pc *.a ndctl/lib/libndctl.pc ndctl/ndctl -ndctl/ndctl-udev rhel/ sles/ndctl.spec util/log.lo diff --git a/Makefile.am b/Makefile.am index 7880eef1c890..e0c463a3493a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,9 +42,6 @@ bashcompletiondir = $(BASH_COMPLETION_DIR) dist_bashcompletion_DATA = contrib/ndctl endif -udevrulesdir = $(UDEVDIR)/rules.d -dist_udevrules_DATA = contrib/80-ndctl.rules - noinst_LIBRARIES = libccan.a libccan_a_SOURCES = \ ccan/str/str.h \ diff --git a/configure.ac b/configure.ac index 9dc11da194d1..bb6b03324ea8 100644 --- a/configure.ac +++ b/configure.ac @@ -153,17 +153,8 @@ fi AC_SUBST([systemd_unitdir]) AM_CONDITIONAL([ENABLE_SYSTEMD_UNITS], [test "x$with_systemd" = "xyes"]) -AC_ARG_WITH([tmpfilesdir], - [AS_HELP_STRING([--with-tmpfilesdir=DIR], [Directory for temporary runtime files])], - [tmpfilesdir=$withval], - [tmpfilesdir="/run"]) - -UDEVDIR="$(pkg-config udev --variable=udevdir)" -AC_SUBST([UDEVDIR]) - my_CFLAGS="\ -D DEF_CONF_FILE='\"${sysconfdir}/ndctl/monitor.conf\"' \ --D DEF_TMPFS_DIR='\"${tmpfilesdir}/ndctl\"' \ -Wall \ -Wchar-subscripts \ -Wformat-security \ @@ -204,7 +195,6 @@ AC_MSG_RESULT([ sysconfdir: ${sysconfdir} libdir: ${libdir} includedir: ${includedir} - tmpfilesdir: ${tmpfilesdir} compiler: ${CC} cflags: ${CFLAGS} diff --git a/contrib/80-ndctl.rules b/contrib/80-ndctl.rules deleted file mode 100644 index 54788c40ea9d..000000000000 --- a/contrib/80-ndctl.rules +++ /dev/null @@ -1,3 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="add", KERNEL=="nmem*", RUN+="ndctl-udev $kernel" diff --git a/ndctl.spec.in b/ndctl.spec.in index 98394a924030..26396d4abad7 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -110,7 +110,6 @@ make check %postun -n DAX_LNAME -p /sbin/ldconfig %define bashcompdir %(pkg-config --variable=completionsdir bash-completion) -%define udevdir %(pkg-config --variable=udevdir udev) %files %defattr(-,root,root) @@ -120,8 +119,6 @@ make check %{bashcompdir}/ %{_sysconfdir}/ndctl/monitor.conf %{_unitdir}/ndctl-monitor.service -%{_udevrulesdir}/80-ndctl.rules -%{udevdir}/ndctl-udev %files -n daxctl %defattr(-,root,root) diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am index d6839e4a9fb6..8a5e5f87e6c5 100644 --- a/ndctl/Makefile.am +++ b/ndctl/Makefile.am @@ -51,8 +51,3 @@ EXTRA_DIST += $(monitor_config_file) if ENABLE_SYSTEMD_UNITS systemd_unit_DATA = ndctl-monitor.service endif - -ndctl_udevdir = $(UDEVDIR) -ndctl_udev_PROGRAMS = ndctl-udev -ndctl_udev_SOURCES = ndctl-udev.c -ndctl_udev_LDADD = lib/libndctl.la diff --git a/ndctl/ndctl-udev.c b/ndctl/ndctl-udev.c deleted file mode 100644 index 7b174b61d8cd..000000000000 --- a/ndctl/ndctl-udev.c +++ /dev/null @@ -1,150 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 2018 Intel Corporation. All rights reserved. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * mkdir_p - * - * Copied from util-linux lib/fileutils.c - */ -static int mkdir_p(const char *path, mode_t mode) -{ - char *p, *dir; - int rc = 0; - - if (!path || !*path) - return -EINVAL; - - dir = p = strdup(path); - if (!dir) - return -ENOMEM; - - if (*p == '/') - p++; - - while (p && *p) { - char *e = strchr(p, '/'); - if (e) - *e = '\0'; - if (*p) { - rc = mkdir(dir, mode); - if (rc && errno != EEXIST) - break; - rc = 0; - } - if (!e) - break; - *e = '/'; - p = e + 1; - } - - free(dir); - return rc; -} - -static struct ndctl_dimm *find_dimm(struct ndctl_ctx *ctx, const char *devname) -{ - struct ndctl_bus *bus; - struct ndctl_dimm *dimm; - - ndctl_bus_foreach(ctx, bus) { - ndctl_dimm_foreach(bus, dimm) { - if (strcmp(ndctl_dimm_get_devname(dimm), devname) == 0) - return dimm; - } - } - return NULL; -} - -static void ack_shutdown(struct ndctl_dimm *dimm) -{ - struct ndctl_cmd *cmd; - - cmd = ndctl_dimm_cmd_new_ack_shutdown_count(dimm); - if (!cmd) - return; - ndctl_cmd_submit(cmd); - ndctl_cmd_unref(cmd); -} - -static void save_unsafe_shutdown_count(struct ndctl_dimm *dimm, - const char *devname) -{ - char *path, *usc, count[16]; - unsigned int shutdown; - struct ndctl_cmd *cmd; - int fd; - - cmd = ndctl_dimm_cmd_new_smart(dimm); - if (!cmd) - return; - - if (ndctl_cmd_submit(cmd)) - goto unref_cmd; - - shutdown = ndctl_cmd_smart_get_shutdown_count(cmd); - if (shutdown == UINT_MAX) - goto unref_cmd; - - if (asprintf(&path, DEF_TMPFS_DIR "/%s", devname) < 0) - goto unref_cmd; - - if (mkdir_p(path, 0755)) - goto free_path; - - if (asprintf(&usc, "%s/usc", path) < 0) - goto free_path; - - fd = open(usc, O_WRONLY | O_CREAT, 0644); - if (fd < 0) - goto free_usc; - - if (snprintf(count, sizeof(count), "%u\n", shutdown) < 0) - goto close_fd; - - if (write(fd, count, strlen(count)) < 0) - goto close_fd; - - close_fd: - close(fd); - free_usc: - free(usc); - free_path: - free(path); - unref_cmd: - ndctl_cmd_unref(cmd); -} - -int main(int argc, char *argv[]) -{ - struct ndctl_ctx *ctx; - struct ndctl_dimm *dimm = NULL; - const char *devname; - - if (argc < 2) - return EINVAL; - - devname = argv[1]; - if (ndctl_new(&ctx)) - return ENOMEM; - - dimm = find_dimm(ctx, devname); - if (!dimm) - return ENODEV; - - ack_shutdown(dimm); - save_unsafe_shutdown_count(dimm, devname); - - ndctl_unref(ctx); - return 0; -}