From patchwork Wed Feb 20 05:10:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dexuan Cui X-Patchwork-Id: 10821179 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 43BE46C2 for ; Wed, 20 Feb 2019 05:11:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25A102DEBE for ; Wed, 20 Feb 2019 05:11:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 180392DEC4; Wed, 20 Feb 2019 05:11:00 +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.7 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_INVALID,DKIM_SIGNED,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 13B002DEBE for ; Wed, 20 Feb 2019 05:10:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EE7A2208D613B; Tue, 19 Feb 2019 21:10:58 -0800 (PST) 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=40.107.132.119; helo=apc01-pu1-obe.outbound.protection.outlook.com; envelope-from=decui@microsoft.com; receiver=linux-nvdimm@lists.01.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-eopbgr1320119.outbound.protection.outlook.com [40.107.132.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D6166208AE2C4 for ; Tue, 19 Feb 2019 21:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U0Vry1ANwK8gxXAlBPwegI47tTUEM9mEHQId4Furuqw=; b=NhKA7kD5hac/Ny1cHxF7vuKWdXnlq+BFup3r4oprZ3FM+AxSJZg9MyOlnMcmnuPryKStQU7HSzvoNzXvfENr2NxOY0JQsJoFq+IChZgSY3m1u5xdsk15DC/5O7uh8tSLzfYHPiuSbmaut9Tit5BXNEzHalmPL6Bu7a78as7QLqc= Received: from PU1P153MB0169.APCP153.PROD.OUTLOOK.COM (10.170.189.13) by PU1P153MB0105.APCP153.PROD.OUTLOOK.COM (10.170.188.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.0; Wed, 20 Feb 2019 05:10:54 +0000 Received: from PU1P153MB0169.APCP153.PROD.OUTLOOK.COM ([fe80::7822:a20:e63c:de2f]) by PU1P153MB0169.APCP153.PROD.OUTLOOK.COM ([fe80::7822:a20:e63c:de2f%9]) with mapi id 15.20.1665.002; Wed, 20 Feb 2019 05:10:54 +0000 From: Dexuan Cui To: Dave Jiang , Vishal Verma , Dan Williams , "linux-nvdimm@lists.01.org" , Michael Kelley , "qi.fuli@fujitsu.com" , Johannes Thumshirn Subject: [ndctl PATCH v2 2/4] libndctl: NVDIMM_FAMILY_HYPERV: add .smart_get_shutdown_count (Function 2) Thread-Topic: [ndctl PATCH v2 2/4] libndctl: NVDIMM_FAMILY_HYPERV: add .smart_get_shutdown_count (Function 2) Thread-Index: AdTI2qVNGDL7Aro+TdSJZnmU7IeV2Q== Date: Wed, 20 Feb 2019 05:10:54 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Owner=decui@microsoft.com; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2019-02-20T05:10:52.0084362Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=General; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application=Microsoft Azure Information Protection; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=4c1cf349-2158-40be-a317-b30c38bbbdf5; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method=Automatic x-originating-ip: [2001:4898:80e8:9:e09f:1351:8c90:7b8c] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 31599aec-d839-4858-49a3-08d696f1ca54 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600126)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:PU1P153MB0105; x-ms-traffictypediagnostic: PU1P153MB0105: x-microsoft-exchange-diagnostics: =?us-ascii?Q?1; PU1P153MB0105; 23:eRNMM+Z3HCoVq2f7oM7e37qC63bxxI49bcQr3OseG?= updwny09yxkKlf7Rwo9QqIVYQi69M620b+Z79WWmTBP+sp6d1ezRvhJDKpmrkAPAzCNwMXWpsk3JbZizGFa/jJxZLPmc6O9X4xjkBuxCQr2gIsKGbDy0HbKIfmYBRPCK4boVohPQxoyV0bHG8NLRjy4S5joWdXZ+7gSN0cHTc9YawYcrMgOeIks+ZN0Xjwq+ngcfVcG8hofqxxVRJIpYquHIRJW45CJbHrrngeE2QVy5GK+wgbFcz+lfEYOp0LBWrBuid4Q51c5Evadb4uOYBMO1aAyQ/UY22SgbDWN5aDlgNr4qMYT/Vah61+CpJsoKnWz5bEEJl8IKDT1oB6mdiHD7PH5Ass6iYL8rqmvMXopngv7pUqCPgCnhIfgBpNVWr+npMZgLQK2wEtoHwE4J5a5YUvY8PBBmYN444paZczTF8klCxHKouafdmL2M9D4OCmwbeqv3YzrVjLwMEQdoeq+RStv66hlOpqSAQdvdZcjb9vO5PVDJvM7jpA2BL6vHpxR/GtgVoluu1ZaZwAyxTHYU2GOsNlm7oByzGkAF3/dUa0QTUi+F0jyJZB+LtClxCyCujYGYkbtsfEbeXgi1RPnB25oXAAk5lXIdYRtoboqhpKTARc3+7sqlVvUtnmNxTRrGescuSN6I9Cg+SQxGe7XcmaLE2d1UP0/C6nrMetQbCJ1H9neE/e0OFy1oCgto7Dt3MWUEHUXmzUGTxJ8D4/fuWSYk/+AuIBVTmgbcWqg89Ye6MaFNHiYgK7HetrX3Rx5N80dhj53WbpRrbNX+eoYBIdOPun7cWFc9mrpd/eK/Ngrfc5k3ZQ3WNLLQSvsHVrDWlSQkAZFAWekPh8j8z1ZEs1ezr2KsxfZ9X/5ljXAfwvdKW1mhv0ufd9ST32Gl3tRbfU4opFjdqLl1MhHzz5MngJlvz+ZsNYvpqjS4KktX/zXrczsDnAO1fepc62oFpTJCzH02w3nprkm2kwUhzFQWH9tBohEnyUB2zz66Ttkb7IKgxgzzVebKNHmID92ANeSNrRmkDbst4K5ijxh1pe1fvu5x4DWrfWE/7iL7HtjnsG6La6lukqQHV2jIOhaqf1bKqozCQfDSEaUlDU1ClUK0bAXIrMQ/n1K919+mLeZGibNQpUxX7eMaO2rOYzmjcuUDRNkgaFOojNDFH+k+lladwBbEUL/NJ1s6Q8gimrk7A== x-microsoft-antispam-prvs: x-forefront-prvs: 0954EE4910 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(346002)(376002)(136003)(396003)(189003)(199004)(33656002)(478600001)(110136005)(316002)(14454004)(22452003)(106356001)(2906002)(46003)(8990500004)(6506007)(476003)(486006)(71200400001)(71190400001)(256004)(186003)(6116002)(105586002)(10290500003)(68736007)(1511001)(97736004)(10090500001)(6346003)(102836004)(9686003)(6436002)(8676002)(55016002)(5660300002)(81156014)(7736002)(305945005)(7696005)(86612001)(25786009)(53936002)(2501003)(74316002)(99286004)(86362001)(8936002)(81166006)(142923001); DIR:OUT; SFP:1102; SCL:1; SRVR:PU1P153MB0105; H:PU1P153MB0169.APCP153.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=decui@microsoft.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6dlLNhBqZC6dxvrQ8PWXaA5Huukw8Kiyn0sy84WZjdKq0suFDh2IkDYVX74voJpec5fK9hhi55r5ATDczDbmELMokiGxrOgZ2lI4+HzVJZdzd4l+FCIdNf9fUETg4qpcSvRA9yibNXh6J0fyUnm7TINT4pjsIZcQoYcFPfUZtnJW1KyXmvjx8SwMcTAo76qJCIQBvwKNIHQusFDupDfTDnDlgFtc3AmQgKOmZqpfqt+Hb8wL18WKMdbB7haJnswXkvz59sNR8Z0U5uFPOxPcXGRJF1b5Zv5rUR0Dx/3zF7P+q+bDaI8IkSyqEymT6XtJSG1Pp8Zs+A/5E43mmTcEtjZ+lSKvmgknmOjo/yxRs5IFEtUKJWlBYWRL7BGuzwXU/5jYRBG1cNzFp4q6MapKBtvgypel+qNGpLV2WUjQ41g= MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31599aec-d839-4858-49a3-08d696f1ca54 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2019 05:10:54.0652 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1P153MB0105 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 patch, "ndctl list --dimms --health --idle" can show "shutdown_count" now, e.g. { "dev":"nmem0", "id":"04d5-01-1701-00000000", "handle":0, "phys_id":0, "health":{ "health_state":"ok", "shutdown_count":2 } } The patch has to directly call ndctl_cmd_submit() in hyperv_cmd_smart_get_flags() and hyperv_cmd_smart_get_shutdown_count() to get the needed info, because util_dimm_health_to_json() only submits *one* command, and unluckily for Hyper-V Virtual NVDIMM we need to call both Function 1 and 2 to get the needed info. My feeling is that it's not very good to directly call ndctl_cmd_submit(), but by doing this we don't need to make any change to the common code, and I'm unsure if it's good to change the common code just for Hyper-V. Signed-off-by: Dexuan Cui --- ndctl/lib/hyperv.c | 62 ++++++++++++++++++++++++++++++++++++++++------ ndctl/lib/hyperv.h | 7 ++++++ 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/ndctl/lib/hyperv.c b/ndctl/lib/hyperv.c index b303d50..e8ec142 100644 --- a/ndctl/lib/hyperv.c +++ b/ndctl/lib/hyperv.c @@ -22,7 +22,8 @@ #define CMD_HYPERV_STATUS(_c) (CMD_HYPERV(_c)->u.status) #define CMD_HYPERV_SMART_DATA(_c) (CMD_HYPERV(_c)->u.smart.data) -static struct ndctl_cmd *hyperv_dimm_cmd_new_smart(struct ndctl_dimm *dimm) +static struct ndctl_cmd *hyperv_dimm_cmd_new_cmd(struct ndctl_dimm *dimm, + unsigned int command) { struct ndctl_bus *bus = ndctl_dimm_get_bus(dimm); struct ndctl_ctx *ctx = ndctl_bus_get_ctx(bus); @@ -35,8 +36,7 @@ static struct ndctl_cmd *hyperv_dimm_cmd_new_smart(struct ndctl_dimm *dimm) return NULL; } - if (test_dimm_dsm(dimm, ND_HYPERV_CMD_GET_HEALTH_INFO) == - DIMM_DSM_UNSUPPORTED) { + if (test_dimm_dsm(dimm, command) == DIMM_DSM_UNSUPPORTED) { dbg(ctx, "unsupported function\n"); return NULL; } @@ -54,7 +54,7 @@ static struct ndctl_cmd *hyperv_dimm_cmd_new_smart(struct ndctl_dimm *dimm) hyperv = CMD_HYPERV(cmd); hyperv->gen.nd_family = NVDIMM_FAMILY_HYPERV; - hyperv->gen.nd_command = ND_HYPERV_CMD_GET_HEALTH_INFO; + hyperv->gen.nd_command = command; hyperv->gen.nd_fw_size = 0; hyperv->gen.nd_size_in = offsetof(struct nd_hyperv_smart, status); hyperv->gen.nd_size_out = sizeof(hyperv->u.smart); @@ -65,34 +65,74 @@ static struct ndctl_cmd *hyperv_dimm_cmd_new_smart(struct ndctl_dimm *dimm) return cmd; } -static int hyperv_smart_valid(struct ndctl_cmd *cmd) +static struct ndctl_cmd *hyperv_dimm_cmd_new_smart(struct ndctl_dimm *dimm) +{ + return hyperv_dimm_cmd_new_cmd(dimm, ND_HYPERV_CMD_GET_HEALTH_INFO); +} + +static int hyperv_cmd_valid(struct ndctl_cmd *cmd, unsigned int command) { if (cmd->type != ND_CMD_CALL || cmd->size != sizeof(*cmd) + sizeof(struct nd_pkg_hyperv) || CMD_HYPERV(cmd)->gen.nd_family != NVDIMM_FAMILY_HYPERV || - CMD_HYPERV(cmd)->gen.nd_command != ND_HYPERV_CMD_GET_HEALTH_INFO || + CMD_HYPERV(cmd)->gen.nd_command != command || cmd->status != 0 || CMD_HYPERV_STATUS(cmd) != 0) return cmd->status < 0 ? cmd->status : -EINVAL; return 0; } +static int hyperv_smart_valid(struct ndctl_cmd *cmd) +{ + return hyperv_cmd_valid(cmd, ND_HYPERV_CMD_GET_HEALTH_INFO); +} + static int hyperv_cmd_xlat_firmware_status(struct ndctl_cmd *cmd) { return CMD_HYPERV_STATUS(cmd) == 0 ? 0 : -EINVAL; } +static int hyperv_get_shutdown_count(struct ndctl_cmd *cmd, + unsigned int *count) +{ + unsigned int command = ND_HYPERV_CMD_GET_SHUTDOWN_INFO; + struct ndctl_cmd *cmd_get_shutdown_info; + int rc; + + cmd_get_shutdown_info = hyperv_dimm_cmd_new_cmd(cmd->dimm, command); + if (!cmd_get_shutdown_info) + return -EINVAL; + + if (ndctl_cmd_submit(cmd_get_shutdown_info) < 0 || + hyperv_cmd_valid(cmd_get_shutdown_info, command) < 0) { + rc = -EINVAL; + goto out; + } + + *count = CMD_HYPERV(cmd_get_shutdown_info)->u.shutdown_info.count; + rc = 0; +out: + ndctl_cmd_unref(cmd_get_shutdown_info); + return rc; +} + static unsigned int hyperv_cmd_smart_get_flags(struct ndctl_cmd *cmd) { int rc; + unsigned int count; + unsigned int flags = 0; rc = hyperv_smart_valid(cmd); if (rc < 0) { errno = -rc; return 0; } + flags |= ND_SMART_HEALTH_VALID; - return ND_SMART_HEALTH_VALID; + if (hyperv_get_shutdown_count(cmd, &count) == 0) + flags |= ND_SMART_SHUTDOWN_COUNT_VALID; + + return flags; } static unsigned int hyperv_cmd_smart_get_health(struct ndctl_cmd *cmd) @@ -121,9 +161,17 @@ static unsigned int hyperv_cmd_smart_get_health(struct ndctl_cmd *cmd) return health; } +static unsigned int hyperv_cmd_smart_get_shutdown_count(struct ndctl_cmd *cmd) +{ + unsigned int count; + + return hyperv_get_shutdown_count(cmd, &count) == 0 ? count : UINT_MAX; +} + struct ndctl_dimm_ops * const hyperv_dimm_ops = &(struct ndctl_dimm_ops) { .new_smart = hyperv_dimm_cmd_new_smart, .smart_get_flags = hyperv_cmd_smart_get_flags, .smart_get_health = hyperv_cmd_smart_get_health, + .smart_get_shutdown_count = hyperv_cmd_smart_get_shutdown_count, .xlat_firmware_status = hyperv_cmd_xlat_firmware_status, }; diff --git a/ndctl/lib/hyperv.h b/ndctl/lib/hyperv.h index 8e55a97..5232d60 100644 --- a/ndctl/lib/hyperv.h +++ b/ndctl/lib/hyperv.h @@ -19,6 +19,7 @@ enum { /* non-root commands */ ND_HYPERV_CMD_GET_HEALTH_INFO = 1, + ND_HYPERV_CMD_GET_SHUTDOWN_INFO = 2, }; /* @@ -38,9 +39,15 @@ struct nd_hyperv_smart { }; } __attribute__((packed)); +struct nd_hyperv_shutdown_info { + __u32 status; + __u32 count; +} __attribute__((packed)); + union nd_hyperv_cmd { __u32 status; struct nd_hyperv_smart smart; + struct nd_hyperv_shutdown_info shutdown_info; } __attribute__((packed)); struct nd_pkg_hyperv {