From patchwork Mon Jun 20 00:42:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 12886906 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 1359FC433EF for ; Mon, 20 Jun 2022 00:43:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A43256B007E; Sun, 19 Jun 2022 20:43:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F3526B0080; Sun, 19 Jun 2022 20:43:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BC456B0081; Sun, 19 Jun 2022 20:43:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7DC266B007E for ; Sun, 19 Jun 2022 20:43:09 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 57DF260267 for ; Mon, 20 Jun 2022 00:43:09 +0000 (UTC) X-FDA: 79596764898.19.62CD453 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by imf07.hostedemail.com (Postfix) with ESMTP id 0196D40092 for ; Mon, 20 Jun 2022 00:43:08 +0000 (UTC) Received: by mail-qv1-f42.google.com with SMTP id g18so6506988qvn.2 for ; Sun, 19 Jun 2022 17:43:08 -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=VCq6AKFAlUXGqF4DA0HsDCSO8h2xYDtnNCe5ZdhSdK4=; b=Oe5cJFCnVbXEmZUpE7rqgrX5IjJnEG7SbQFZ95e/WKbGj1Hl2J7mTiwwDWsyD6Z3YS /a/iW28zNI9mTxABs6ipe4wRhdybAdBIcl4ZM4Wg/CYV3PGvElUmDIPPmg0IUZMSOixi zvfjYtdqjzx+H+inYmA3agMXfKKOgSGja8sRQO+i+mXan3sQJza85N4S5a5u9QmNpv25 KeJtv0wR/K+QCTorLCHhZCESxOluSs0Hk21DZbqOSMEvCyr5fz2IuXUpRIOn4k2Ol25r grRxL+L0ufPcKnYfY8ch9ncR5CDqJbnR/z1vhd68AwnhmBbssvIvYXSenZLuA2HxKfZc L5Dg== 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=VCq6AKFAlUXGqF4DA0HsDCSO8h2xYDtnNCe5ZdhSdK4=; b=wVrOIRutKijZV3w7qtsP1si4/ISHzEkFpABVj1mDjim0c8uPKFEvebTX2s0Advoa5a 4WUUlwbKGXjmPNmVxgwrtJOTE/atuRfkOCYpi9wX7NqI0xTsKOYa8Xs5T/2IRICJ/WVJ 7JplHAs/O5XTUjaqYdCFoPYXkyuxJRAjRkIcqdcPOf+8BsP5wjo/XyPM/zd0OKmZzMG+ v0JilSe6jBoYur1maiLcsa6uNDwo7SMAK+27q+M+pXHQdv2dinRNrmVot27bNFgZoT+k Y/TTGfXssRyhA1+u5+l14vsxfaz0sUxZUvz+LCNdv4YcIMvHKy7jcCpVJ8LIFY7KveD7 bQIQ== X-Gm-Message-State: AJIora/rrBWRveMZXbqFEEs9b848SbN6rRQF/c6CSiwE7fGPmJUtCqye v8FDRq4xslqGTshNK9zNHw== X-Google-Smtp-Source: AGRyM1sMsY6x0wzYYG8F8zSOj+RzNa5QMB0waNv1G3LpplIDOxZ1RPdMTxyR3MGURfWs8xYml8DWAQ== X-Received: by 2002:ad4:584c:0:b0:464:5904:998d with SMTP id de12-20020ad4584c000000b004645904998dmr16937211qvb.33.1655685788313; Sun, 19 Jun 2022 17:43:08 -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 d8-20020a05620a240800b006a6b564e9b8sm11073547qkn.4.2022.06.19.17.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 17:43:07 -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 Subject: [PATCH v4 15/34] vsprintf: Refactor resource_string() Date: Sun, 19 Jun 2022 20:42:14 -0400 Message-Id: <20220620004233.3805-16-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=1655685789; a=rsa-sha256; cv=none; b=4T0QFF9ewiaVpo01da4jQckK8wr6bDAsyCQD0ZQwKHzXDqNgLr+wloC8L0dYgooFoilBS6 YewWA+Q1KBkvT7ZgBn+OFGA7VM1C7zQYug01XocDx8VihpQkUxGPnrgdpKlNg7r5iJs6+M FmAOwL4RjQX8NOatl3HkV6OxNyPvK+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655685789; 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=VCq6AKFAlUXGqF4DA0HsDCSO8h2xYDtnNCe5ZdhSdK4=; b=mY3Ipzjp+Q7ZGwPlm1+Kf7j9DK2ge2x5a8ZRKTphAqedybOVSnt1PjcQwsAOk0ZG+u6StI +SHrQ3lW4LndH8XrnJYSJAkxOh7f5Ai9pPdGUkYTUQwfGeFDBUnNpZyCiGTksJZOTXAeEO iQXiLNh7gdda7xbP+MFA1x2gOlbEoog= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Oe5cJFCn; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Oe5cJFCn; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0196D40092 X-Stat-Signature: xriddbz6ezig88gd56jmrnjirit3ezhf X-HE-Tag: 1655685788-436202 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: Two changes: - We're attempting to consolidate printf_spec and format string handling in the top level vpr_buf(), this changes resource_string to not take printf_spec - With the new printbuf helpers there's no need to use a separate stack allocated buffer, so this patch deletes it. Signed-off-by: Kent Overstreet --- lib/vsprintf.c | 51 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index feaca085cd..5e96ab24f5 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1057,7 +1057,7 @@ static const struct printf_spec default_dec_spec = { static noinline_for_stack void resource_string(struct printbuf *out, struct resource *res, - struct printf_spec spec, const char *fmt) + int decode) { #ifndef IO_RSRC_PRINTK_SIZE #define IO_RSRC_PRINTK_SIZE 6 @@ -1096,62 +1096,58 @@ void resource_string(struct printbuf *out, struct resource *res, #define FLAG_BUF_SIZE (2 * sizeof(res->flags)) #define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]") #define RAW_BUF_SIZE sizeof("[mem - flags 0x]") - char sym_buf[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE, - 2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)]; - struct printbuf sym = PRINTBUF_EXTERN(sym_buf, sizeof(sym_buf)); - int decode = (fmt[0] == 'R') ? 1 : 0; const struct printf_spec *specp; - if (check_pointer_spec(out, res, spec)) + if (check_pointer(out, res)) return; - prt_char(&sym, '['); + prt_char(out, '['); if (res->flags & IORESOURCE_IO) { - string_nocheck(&sym, "io ", str_spec); + string_nocheck(out, "io ", str_spec); specp = &io_spec; } else if (res->flags & IORESOURCE_MEM) { - string_nocheck(&sym, "mem ", str_spec); + string_nocheck(out, "mem ", str_spec); specp = &mem_spec; } else if (res->flags & IORESOURCE_IRQ) { - string_nocheck(&sym, "irq ", str_spec); + string_nocheck(out, "irq ", str_spec); specp = &default_dec_spec; } else if (res->flags & IORESOURCE_DMA) { - string_nocheck(&sym, "dma ", str_spec); + string_nocheck(out, "dma ", str_spec); specp = &default_dec_spec; } else if (res->flags & IORESOURCE_BUS) { - string_nocheck(&sym, "bus ", str_spec); + string_nocheck(out, "bus ", str_spec); specp = &bus_spec; } else { - string_nocheck(&sym, "??? ", str_spec); + string_nocheck(out, "??? ", str_spec); specp = &mem_spec; decode = 0; } if (decode && res->flags & IORESOURCE_UNSET) { - string_nocheck(&sym, "size ", str_spec); - number(&sym, resource_size(res), *specp); + string_nocheck(out, "size ", str_spec); + number(out, resource_size(res), *specp); } else { - number(&sym, res->start, *specp); + number(out, res->start, *specp); if (res->start != res->end) { - prt_char(&sym, '-'); - number(&sym, res->end, *specp); + prt_char(out, '-'); + number(out, res->end, *specp); } } if (decode) { if (res->flags & IORESOURCE_MEM_64) - string_nocheck(&sym, " 64bit", str_spec); + string_nocheck(out, " 64bit", str_spec); if (res->flags & IORESOURCE_PREFETCH) - string_nocheck(&sym, " pref", str_spec); + string_nocheck(out, " pref", str_spec); if (res->flags & IORESOURCE_WINDOW) - string_nocheck(&sym, " window", str_spec); + string_nocheck(out, " window", str_spec); if (res->flags & IORESOURCE_DISABLED) - string_nocheck(&sym, " disabled", str_spec); + string_nocheck(out, " disabled", str_spec); } else { - string_nocheck(&sym, " flags ", str_spec); - number(&sym, res->flags, default_flag_spec); + string_nocheck(out, " flags ", str_spec); + number(out, res->flags, default_flag_spec); } - prt_char(&sym, ']'); + prt_char(out, ']'); - string_nocheck(out, sym_buf, spec); + printbuf_nul_terminate(out); } static noinline_for_stack @@ -2326,7 +2322,8 @@ void pointer(struct printbuf *out, const char *fmt, return do_width_precision(out, prev_pos, spec); case 'R': case 'r': - return resource_string(out, ptr, spec, fmt); + resource_string(out, ptr, fmt[0] == 'R'); + return do_width_precision(out, prev_pos, spec); case 'h': return hex_string(out, ptr, spec, fmt); case 'b':