From patchwork Tue Jan 22 22:05:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elliott, Robert (Servers)" X-Patchwork-Id: 10776359 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 06B2F1390 for ; Tue, 22 Jan 2019 22:14:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0CB82000A for ; Tue, 22 Jan 2019 22:14:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D523F28420; Tue, 22 Jan 2019 22:14:40 +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 4FEC52000A for ; Tue, 22 Jan 2019 22:14:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C11E1211B6C0F; Tue, 22 Jan 2019 14:14:39 -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=148.163.147.86; helo=mx0a-002e3701.pphosted.com; envelope-from=elliott@hpe.com; receiver=linux-nvdimm@lists.01.org Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) (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 1FE0621959CB2 for ; Tue, 22 Jan 2019 14:14:37 -0800 (PST) Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0MMBX0o006434 for ; Tue, 22 Jan 2019 22:14:36 GMT Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 2q68ay1hut-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Jan 2019 22:14:36 +0000 Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3426.houston.hpe.com (Postfix) with ESMTP id A0DC14F for ; Tue, 22 Jan 2019 22:14:35 +0000 (UTC) Received: from linux-639c.americas.hpqcorp.net (linux-639c.americas.hpqcorp.net [16.102.109.115]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 7AE3A45; Tue, 22 Jan 2019 22:14:35 +0000 (UTC) From: Robert Elliott To: linux-nvdimm@lists.01.org Subject: [PATCH] libnvdimm: normalize dev_debug failed and succeeded wording Date: Tue, 22 Jan 2019 16:05:25 -0600 Message-Id: <20190122220525.5211-1-elliott@hpe.com> X-Mailer: git-send-email 2.16.3 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-01-22_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=592 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901220166 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: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Make dev_dbg prints use consistent wording for failed and succeeded, and include the return code when reporting something failed. Signed-off-by: Robert Elliott --- drivers/nvdimm/dimm.c | 2 +- drivers/nvdimm/label.c | 7 ++++--- drivers/nvdimm/security.c | 53 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c index 0cf58cabc9ed..3ff104f7ccaa 100644 --- a/drivers/nvdimm/dimm.c +++ b/drivers/nvdimm/dimm.c @@ -62,7 +62,7 @@ static int nvdimm_probe(struct device *dev) */ rc = nvdimm_security_unlock(dev); if (rc < 0) - dev_dbg(dev, "failed to unlock dimm: %d\n", rc); + dev_dbg(dev, "unlock failed: %d\n", rc); /* diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index a11bf4e6b451..235833a4881b 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -149,7 +149,7 @@ static int __nd_label_validate(struct nvdimm_drvdata *ndd) labelsize = 128; if (labelsize != sizeof_namespace_label(ndd)) { - dev_dbg(dev, "nsindex%d labelsize %d invalid\n", + dev_dbg(dev, "nsindex%d labelsize: %d invalid\n", i, nsindex[i]->labelsize); continue; } @@ -373,7 +373,8 @@ static bool slot_valid(struct nvdimm_drvdata *ndd, sum = nd_fletcher64(nd_label, sizeof_namespace_label(ndd), 1); nd_label->checksum = __cpu_to_le64(sum_save); if (sum != sum_save) { - dev_dbg(ndd->dev, "fail checksum. slot: %d expect: %#llx\n", + dev_dbg(ndd->dev, + "checksum failed. slot: %d expected: %#llx\n", slot, sum); return false; } @@ -535,7 +536,7 @@ int nd_label_data_init(struct nvdimm_drvdata *ndd) read_size += label_read_size; } - dev_dbg(ndd->dev, "len: %zu rc: %d\n", offset, rc); + dev_dbg(ndd->dev, "init config data area len: %zu succeeded\n", offset); out_err: return rc; } diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c index f8bb746a549f..b7f86846015a 100644 --- a/drivers/nvdimm/security.c +++ b/drivers/nvdimm/security.c @@ -58,7 +58,8 @@ static struct key *nvdimm_request_key(struct nvdimm *nvdimm) if (PTR_ERR(key) == -ENOKEY) dev_dbg(dev, "request_key() found no key\n"); else - dev_dbg(dev, "request_key() upcall failed\n"); + dev_dbg(dev, "request_key() upcall failed: %ld\n", + PTR_ERR(key)); key = NULL; } else { struct encrypted_key_payload *epayload; @@ -107,6 +108,7 @@ static struct key *nvdimm_lookup_user_key(struct nvdimm *nvdimm, static struct key *nvdimm_key_revalidate(struct nvdimm *nvdimm) { + struct device *dev = &nvdimm->dev; struct key *key; int rc; @@ -126,7 +128,11 @@ static struct key *nvdimm_key_revalidate(struct nvdimm *nvdimm) if (rc < 0) { nvdimm_put_key(key); key = NULL; - } + dev_dbg(dev, "key: %d revalidation failed: %d\n", + key_serial(key), rc); + } else + dev_dbg(dev, "key: %d revalidation succeeded\n", + key_serial(key)); return key; } @@ -170,8 +176,11 @@ static int __nvdimm_security_unlock(struct nvdimm *nvdimm) return -ENOKEY; rc = nvdimm->sec.ops->unlock(nvdimm, key_data(key)); - dev_dbg(dev, "key: %d unlock: %s\n", key_serial(key), - rc == 0 ? "success" : "fail"); + if (rc) + dev_dbg(dev, "key: %d unlock failed: %d\n", + key_serial(key), rc); + else + dev_dbg(dev, "key: %d unlock succeeded\n", key_serial(key)); nvdimm_put_key(key); nvdimm->sec.state = nvdimm_security_state(nvdimm, NVDIMM_USER); @@ -219,8 +228,11 @@ int nvdimm_security_disable(struct nvdimm *nvdimm, unsigned int keyid) return -ENOKEY; rc = nvdimm->sec.ops->disable(nvdimm, key_data(key)); - dev_dbg(dev, "key: %d disable: %s\n", key_serial(key), - rc == 0 ? "success" : "fail"); + if (rc) + dev_dbg(dev, "key: %d disable failed: %d\n", + key_serial(key), rc); + else + dev_dbg(dev, "key: %d disable succeeded\n", key_serial(key)); nvdimm_put_key(key); nvdimm->sec.state = nvdimm_security_state(nvdimm, NVDIMM_USER); @@ -265,10 +277,15 @@ int nvdimm_security_update(struct nvdimm *nvdimm, unsigned int keyid, rc = nvdimm->sec.ops->change_key(nvdimm, key ? key_data(key) : NULL, key_data(newkey), pass_type); - dev_dbg(dev, "key: %d %d update%s: %s\n", + if (rc) + dev_dbg(dev, "key: %d %d update%s failed: %d\n", key_serial(key), key_serial(newkey), pass_type == NVDIMM_MASTER ? "(master)" : "(user)", - rc == 0 ? "success" : "fail"); + rc); + else + dev_dbg(dev, "key: %d %d update%s succeeded\n", + key_serial(key), key_serial(newkey), + pass_type == NVDIMM_MASTER ? "(master)" : "(user)"); nvdimm_put_key(newkey); nvdimm_put_key(key); @@ -324,9 +341,13 @@ int nvdimm_security_erase(struct nvdimm *nvdimm, unsigned int keyid, return -ENOKEY; rc = nvdimm->sec.ops->erase(nvdimm, key_data(key), pass_type); - dev_dbg(dev, "key: %d erase%s: %s\n", key_serial(key), + if (rc) + dev_dbg(dev, "key: %d erase%s failed: %d\n", key_serial(key), pass_type == NVDIMM_MASTER ? "(master)" : "(user)", - rc == 0 ? "success" : "fail"); + rc); + else + dev_dbg(dev, "key: %d erase%s succeeded\n", key_serial(key), + pass_type == NVDIMM_MASTER ? "(master)" : "(user)"); nvdimm_put_key(key); nvdimm->sec.state = nvdimm_security_state(nvdimm, NVDIMM_USER); @@ -377,8 +398,12 @@ int nvdimm_security_overwrite(struct nvdimm *nvdimm, unsigned int keyid) } rc = nvdimm->sec.ops->overwrite(nvdimm, key ? key_data(key) : NULL); - dev_dbg(dev, "key: %d overwrite submission: %s\n", key_serial(key), - rc == 0 ? "success" : "fail"); + if (rc) + dev_dbg(dev, "key: %d overwrite submission failed: %d\n", + key_serial(key), rc); + else + dev_dbg(dev, "key: %d overwrite submission succeeded\n", + key_serial(key)); nvdimm_put_key(key); if (rc == 0) { @@ -429,9 +454,9 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm) } if (rc < 0) - dev_dbg(&nvdimm->dev, "overwrite failed\n"); + dev_dbg(&nvdimm->dev, "overwrite completion failed: %d\n", rc); else - dev_dbg(&nvdimm->dev, "overwrite completed\n"); + dev_dbg(&nvdimm->dev, "overwrite completion succeeded\n"); if (nvdimm->sec.overwrite_state) sysfs_notify_dirent(nvdimm->sec.overwrite_state);