From patchwork Mon Jun 20 00:42:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 12886919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E409C43334 for ; Mon, 20 Jun 2022 00:43:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E15F86B007D; Sun, 19 Jun 2022 20:43:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D76B96B0081; Sun, 19 Jun 2022 20:43:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7B486B0087; Sun, 19 Jun 2022 20:43:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A4C526B007D for ; Sun, 19 Jun 2022 20:43:35 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7F7CB34650 for ; Mon, 20 Jun 2022 00:43:35 +0000 (UTC) X-FDA: 79596765990.08.4CF8082 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by imf20.hostedemail.com (Postfix) with ESMTP id 2B2C21C009A for ; Mon, 20 Jun 2022 00:43:35 +0000 (UTC) Received: by mail-qk1-f180.google.com with SMTP id g15so6878165qke.4 for ; Sun, 19 Jun 2022 17:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c+8VrBQ9WReeZhxiPy4cLYIhVweEbjxzP+O3PD/upkI=; b=hG1zSXlqMLSt6C53e/b9Mbo0SIVK2m3R3jUS+uuyLNSYU7h0hemVP+PRCJbhYgLMX7 FyNfHr+aW+bfF+gBFHQVtjYmTqBlPCmff2HDumH0thLuIMmi+5xTZif5rFBJ+/Im7rAY 1iX2kT7GRCrIcIEadxyY1d1XK2xwI+VfWhMkRQQXdVqaQ1Fe0sWfvN1U4Bkz0s0EOCFP 8abRX4B1TCxLaNePhLqRU6tlIUx0JP4G+9qFcUhjmBSi/tOCHoHYoFp9xNjydTdju9/h wJokcyg3abuBPNvUSNp4Rqz/gHfQqlC/+laxZ12aplYKKmjtUIHJTaMhGSQZkwxGp0ta ffZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c+8VrBQ9WReeZhxiPy4cLYIhVweEbjxzP+O3PD/upkI=; b=KxpyZfbqhmG9vzZ8fqSWvvIby1w5mUXT+gmuqPwF6gDeMg7xjCpcDPi/wQREfh0pDq ixu0JzniWZIH/9YahJfkLjk42DwPddNewKhe8Fd48Htz2hWQnrTFIYGxp2o1Xi8HNV8y tSfiIo2Mips20sn7/jKAPtksySehqTqVGFLfsGZKerjPwy1Bs4z8Uiz4pI+43looheRt e1r/CCm5yU6J3C63WC3jWFmWebn7n3+lkftsFGsszp3+yKl4LvtlNDLPtSx/FPASHX7y UECJ4U8G0cDclVzl8Zr7t05nb+2/sKNqL3YQUV8cqZWipSpPJviO3881Dm7ku5YYmP5p gzVg== X-Gm-Message-State: AJIora/QdMOgqPqNiVRQTpz6HDK4aHxU2OaFOX6Tn8lhBdGu+mvwZCu0 yKu0UuPBcAkinrSoF3B8xA== X-Google-Smtp-Source: AGRyM1sebw4W5sjFrt3VW++8K/4IO2JYqZAC0xgWvLT2GDMfU7O1Du2uxp+uMD8HWJJW0TKREzVJcA== X-Received: by 2002:a05:620a:f05:b0:6a9:7122:edb1 with SMTP id v5-20020a05620a0f0500b006a97122edb1mr14790338qkl.82.1655685814618; Sun, 19 Jun 2022 17:43:34 -0700 (PDT) Received: from localhost (c-73-219-103-14.hsd1.vt.comcast.net. [73.219.103.14]) by smtp.gmail.com with ESMTPSA id y17-20020a37f611000000b006a69f6793c5sm9944488qkj.14.2022.06.19.17.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 17:43:33 -0700 (PDT) From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, pmladek@suse.com Cc: Kent Overstreet , rostedt@goodmis.org, enozhatsky@chromium.org, linux@rasmusvillemoes.dk, willy@infradead.org, Dan Williams , Dave Hansen , nvdimm@lists.linux.dev Subject: [PATCH v4 26/34] tools/testing/nvdimm: Convert to printbuf Date: Sun, 19 Jun 2022 20:42:25 -0400 Message-Id: <20220620004233.3805-27-kent.overstreet@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620004233.3805-1-kent.overstreet@gmail.com> References: <20220620004233.3805-1-kent.overstreet@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655685815; a=rsa-sha256; cv=none; b=DTsw9Cw9Fv+lotkhbCw5Ymrigkyu7weccKudWXqpr5C/xNBKE4fWCnI2lXVvrwsQB2aEwC mNddOcYV7HGlemdNzaRc3KajgkmiG9cZJE9C8B7zyl85DcYCucZRXR+JtpJVOC0m7DgBj/ mwPjB3livtgNpgDPuAbW17v+6WWwgK8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=hG1zSXlq; spf=pass (imf20.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.222.180 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655685815; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=c+8VrBQ9WReeZhxiPy4cLYIhVweEbjxzP+O3PD/upkI=; b=O1AriY01+uj0h6lOWsNtOpazX2+Q7D7tacaMqEuwKvrPiL8JdbGP+43wnmdz7nGZoE3sV5 iuZAfgb2kLp5JZ0ZUlrkN8rlRHSim8XcIuqTNv9fkqv670/GzLiZ1XmR3+5UivWWS1FIN3 JSN4gb4ivhMUPSpSprhhKA2/EUF/Reo= X-Stat-Signature: 1kjhupiietfpohf1dksay7a78sufucy8 X-Rspamd-Queue-Id: 2B2C21C009A Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=hG1zSXlq; spf=pass (imf20.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.222.180 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam07 X-Rspam-User: X-HE-Tag: 1655685815-190184 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This converts from seq_buf to printbuf. Here we're using printbuf with an external buffer, meaning it's a direct conversion. Signed-off-by: Kent Overstreet Cc: Dan Williams Cc: Dave Hansen Cc: nvdimm@lists.linux.dev Acked-by: Dan Williams Tested-By: Shivaprasad G Bhat --- tools/testing/nvdimm/test/ndtest.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c index 4d1a947367..a2097955da 100644 --- a/tools/testing/nvdimm/test/ndtest.c +++ b/tools/testing/nvdimm/test/ndtest.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "../watermark.h" #include "nfit_test.h" @@ -740,32 +740,30 @@ static ssize_t flags_show(struct device *dev, { struct nvdimm *nvdimm = to_nvdimm(dev); struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm); - struct seq_buf s; + struct printbuf s = PRINTBUF_EXTERN(buf, PAGE_SIZE); u64 flags; flags = dimm->flags; - seq_buf_init(&s, buf, PAGE_SIZE); if (flags & PAPR_PMEM_UNARMED_MASK) - seq_buf_printf(&s, "not_armed "); + prt_printf(&s, "not_armed "); if (flags & PAPR_PMEM_BAD_SHUTDOWN_MASK) - seq_buf_printf(&s, "flush_fail "); + prt_printf(&s, "flush_fail "); if (flags & PAPR_PMEM_BAD_RESTORE_MASK) - seq_buf_printf(&s, "restore_fail "); + prt_printf(&s, "restore_fail "); if (flags & PAPR_PMEM_SAVE_MASK) - seq_buf_printf(&s, "save_fail "); + prt_printf(&s, "save_fail "); if (flags & PAPR_PMEM_SMART_EVENT_MASK) - seq_buf_printf(&s, "smart_notify "); + prt_printf(&s, "smart_notify "); + if (printbuf_written(&s)) + prt_printf(&s, "\n"); - if (seq_buf_used(&s)) - seq_buf_printf(&s, "\n"); - - return seq_buf_used(&s); + return printbuf_written(&s); } static DEVICE_ATTR_RO(flags);