From patchwork Mon Jun 20 00:42:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 12886908 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 52B97C43334 for ; Mon, 20 Jun 2022 00:43:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DED4B6B0080; Sun, 19 Jun 2022 20:43:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D75246B0081; Sun, 19 Jun 2022 20:43:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3D026B0085; Sun, 19 Jun 2022 20:43:14 -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 B53706B0080 for ; Sun, 19 Jun 2022 20:43:14 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 976CB60120 for ; Mon, 20 Jun 2022 00:43:14 +0000 (UTC) X-FDA: 79596765108.23.C32021F Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by imf03.hostedemail.com (Postfix) with ESMTP id 2D479200A9 for ; Mon, 20 Jun 2022 00:43:14 +0000 (UTC) Received: by mail-qv1-f52.google.com with SMTP id cu16so13426852qvb.7 for ; Sun, 19 Jun 2022 17:43:13 -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=zAaaB7BPzM5EIrGQgkWN70MkkmVNwbYet4dekg796sA=; b=MoZI9+GQspHo00TU3bi0nZhx+5j2QBc5KmRJtrnf6gLeKNidHTro+4EoEVgJQJBFWp lQ/bnhZe7nogMNTLRD4V3MHqOpCVve7WX7atjsPhA9BPyjIASo0B2Fgf5xzQLCSc6OJj heVAk+50nn9u47fdgRWUwTc+8kkiFW24+z4/61YnBxiW7BxqDeMLFUGu7EsrYlSpSxzY kpLNm1zEs4j5zGK4GOxaUg+ClQmx8nQxexM254kfG+WGP7R9hlor/zdG4AjfurOkWvxl ZU4kbXD5zOl5J2EirQTk6+XmlUnljt8HWEW1r37z3Wja+Wi8Fk4zGIIRR0KhphVFXZjN 7C1Q== 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=zAaaB7BPzM5EIrGQgkWN70MkkmVNwbYet4dekg796sA=; b=kZ3Ecq/tQYvuV2SvDvlXnYRnwi+I1tAzfMgQ/yBUUSzgwjV5VhFOIZPP2tUJmsmS2X YP9Kqa++DV3OY96vQ5HEkIE2dtx5Gy/f4XGo4uBL1tdiAozQXwMZTCrEl/7gwxeYKaEw pZCyGKs5XxxMyfzHcUSUZhB6/uFKPp6cB4KDeZzMDyF5sC3AX3TMKJCYaR1qKO5Qi1iZ 8UObUQBlb8EVhXVAOEgEaL+vS73XYqJDOibApR6NIRpc8F+AZz7x18xsJii2QF2qB0cC 0XxJzk1MlsBqIfEAy8IlS+QPUMUSA1dH2QblPPzx4a3oFLWNeCUR4zFC6d0TI7aBnZEx RyzA== X-Gm-Message-State: AJIora/18Uum/mNVJyRf1b9aGF3s84ouk9b1hw7+ux23wSa72sO1L4On 3fNMdEM0urqBIjL/0PAcjQ== X-Google-Smtp-Source: AGRyM1sjMbmVVjnL+wojUunsiX2UzDwVWpxKDcnMKNTZnQ/JsgUszLITOuijL19jbO916YwEf2WMHg== X-Received: by 2002:a05:6214:4016:b0:470:45d8:3be5 with SMTP id kd22-20020a056214401600b0047045d83be5mr1400880qvb.126.1655685793530; Sun, 19 Jun 2022 17:43:13 -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 s3-20020a05620a29c300b006a79aa0c8b1sm11393436qkp.113.2022.06.19.17.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 17:43:12 -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 17/34] vsprintf: Refactor ip_addr_string() Date: Sun, 19 Jun 2022 20:42:16 -0400 Message-Id: <20220620004233.3805-18-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-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MoZI9+GQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.219.52 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655685794; 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=zAaaB7BPzM5EIrGQgkWN70MkkmVNwbYet4dekg796sA=; b=c3eoKodIYAvt3a9/gDTrlzJi45vwrHlqyOjV7hugkn3iZFITcdBPJBG5poRUZXut//MC/F 8sCzn5zMfpVwvo0hPCfYYO3C6OrPMoboxJ9SaXB0Y9bk+jkvfa7uJ9ZqY6CDJzxsoyFKPC Whr3oxHxrbB2fJGc/ID8pDUzFMCITps= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655685794; a=rsa-sha256; cv=none; b=ZSdXen+iyt49JfTh6d2iiY8cmT+TVoIJc8QE/hEErqsaZIRIThNUTY/OaN7TzRAMGKmTsk P8wC4fWsNp2KcWJJxONlSEp6YPHg5eChDm0lxcFdTF7zKeLqT1qEwYzQFCWRTs42jIzZzS GmeX5KSY4iDeH4jP1Uo4F3fZ3VJ953M= X-Rspamd-Queue-Id: 2D479200A9 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MoZI9+GQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of kent.overstreet@gmail.com designates 209.85.219.52 as permitted sender) smtp.mailfrom=kent.overstreet@gmail.com X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: iix8oizn39ncyao15wtrshytiz9oyw4b X-HE-Tag: 1655685794-611406 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: - We're attempting to consolidate printf_spec and format string handling in the top level vpr_buf(), this changes ip_addr_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 | 114 ++++++++++++++++--------------------------------- 1 file changed, 37 insertions(+), 77 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 55a42ae055..5c9a529415 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1301,13 +1301,13 @@ void mac_address_string(struct printbuf *out, u8 *addr, } static noinline_for_stack -void ip4_string(struct printbuf *out, - const u8 *addr, const char *fmt) +void ip4_string(struct printbuf *out, const u8 *addr, const char *fmt) { - int i; - bool leading_zeros = (fmt[0] == 'i'); - int index; - int step; + struct printf_spec spec = default_dec_spec; + int i, index, step; + + if (fmt[0] == 'i') + spec.precision = 3; switch (fmt[2]) { case 'h': @@ -1331,19 +1331,9 @@ void ip4_string(struct printbuf *out, break; } for (i = 0; i < 4; i++) { - char temp[4] __aligned(2); /* hold each IP quad in reverse order */ - int digits = put_dec_trunc8(temp, addr[index]) - temp; - if (leading_zeros) { - if (digits < 3) - prt_char(out, '0'); - if (digits < 2) - prt_char(out, '0'); - } - /* reverse the digits in the quad */ - while (digits--) - prt_char(out, temp[digits]); - if (i < 3) + if (i) prt_char(out, '.'); + number(out, addr[index], spec); index += step; } } @@ -1426,8 +1416,6 @@ void ip6_compressed_string(struct printbuf *out, const char *addr) __prt_char(out, ':'); ip4_string(out, &in6.s6_addr[12], "I4"); } - - printbuf_nul_terminate(out); } static noinline_for_stack @@ -1445,41 +1433,20 @@ void ip6_string(struct printbuf *out, const char *addr, const char *fmt) static noinline_for_stack void ip6_addr_string(struct printbuf *out, const u8 *addr, - struct printf_spec spec, const char *fmt) + const char *fmt) { - char ip6_addr_buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")]; - struct printbuf ip6_addr = PRINTBUF_EXTERN(ip6_addr_buf, sizeof(ip6_addr_buf)); - if (fmt[0] == 'I' && fmt[2] == 'c') - ip6_compressed_string(&ip6_addr, addr); + ip6_compressed_string(out, addr); else - ip6_string(&ip6_addr, addr, fmt); - - string_nocheck(out, ip6_addr_buf, spec); -} - -static noinline_for_stack -void ip4_addr_string(struct printbuf *out, const u8 *addr, - struct printf_spec spec, const char *fmt) -{ - char ip4_addr_buf[sizeof("255.255.255.255")]; - struct printbuf ip4_addr = PRINTBUF_EXTERN(ip4_addr_buf, sizeof(ip4_addr_buf)); - - ip4_string(&ip4_addr, addr, fmt); - - string_nocheck(out, ip4_addr_buf, spec); + ip6_string(out, addr, fmt); } static noinline_for_stack void ip6_addr_string_sa(struct printbuf *out, const struct sockaddr_in6 *sa, - struct printf_spec spec, const char *fmt) + const char *fmt) { bool have_p = false, have_s = false, have_f = false, have_c = false; - char ip6_addr_buf[sizeof("[xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255]") + - sizeof(":12345") + sizeof("/123456789") + - sizeof("%1234567890")]; - struct printbuf ip6_addr = PRINTBUF_EXTERN(ip6_addr_buf, sizeof(ip6_addr_buf)); const u8 *addr = (const u8 *) &sa->sin6_addr; char fmt6[2] = { fmt[0], '6' }; @@ -1502,41 +1469,35 @@ void ip6_addr_string_sa(struct printbuf *out, } if (have_p || have_s || have_f) - prt_char(&ip6_addr, '['); + prt_char(out, '['); if (fmt6[0] == 'I' && have_c) - ip6_compressed_string(&ip6_addr, addr); + ip6_compressed_string(out, addr); else - ip6_string(&ip6_addr, addr, fmt6); + ip6_string(out, addr, fmt6); if (have_p || have_s || have_f) - prt_char(&ip6_addr, ']'); + prt_char(out, ']'); if (have_p) { - prt_char(&ip6_addr, ':'); - number(&ip6_addr, ntohs(sa->sin6_port), spec); + prt_char(out, ':'); + prt_u64(out, ntohs(sa->sin6_port)); } if (have_f) { - prt_char(&ip6_addr, '/'); - number(&ip6_addr, ntohl(sa->sin6_flowinfo & - IPV6_FLOWINFO_MASK), spec); + prt_char(out, '/'); + prt_u64(out, ntohl(sa->sin6_flowinfo & IPV6_FLOWINFO_MASK)); } if (have_s) { - prt_char(&ip6_addr, '%'); - number(&ip6_addr, sa->sin6_scope_id, spec); + prt_char(out, '%'); + prt_u64(out, sa->sin6_scope_id); } - - string_nocheck(out, ip6_addr_buf, spec); } static noinline_for_stack -void ip4_addr_string_sa(struct printbuf *out, - const struct sockaddr_in *sa, - struct printf_spec spec, const char *fmt) +void ip4_addr_string_sa(struct printbuf *out, const struct sockaddr_in *sa, + const char *fmt) { bool have_p = false; - char ip4_addr_buf[sizeof("255.255.255.255") + sizeof(":12345")]; - struct printbuf ip4_addr = PRINTBUF_EXTERN(ip4_addr_buf, sizeof(ip4_addr_buf)); const u8 *addr = (const u8 *) &sa->sin_addr.s_addr; char fmt4[3] = { fmt[0], '4', 0 }; @@ -1555,29 +1516,27 @@ void ip4_addr_string_sa(struct printbuf *out, } } - ip4_string(&ip4_addr, addr, fmt4); + ip4_string(out, addr, fmt4); if (have_p) { - prt_char(&ip4_addr, ':'); - number(&ip4_addr, ntohs(sa->sin_port), spec); + prt_char(out, ':'); + prt_u64(out, ntohs(sa->sin_port)); } - - string_nocheck(out, ip4_addr_buf, spec); } static noinline_for_stack void ip_addr_string(struct printbuf *out, const void *ptr, - struct printf_spec spec, const char *fmt) + const char *fmt) { char *err_fmt_msg; - if (check_pointer_spec(out, ptr, spec)) + if (check_pointer(out, ptr)) return; switch (fmt[1]) { case '6': - return ip6_addr_string(out, ptr, spec, fmt); + return ip6_addr_string(out, ptr, fmt); case '4': - return ip4_addr_string(out, ptr, spec, fmt); + return ip4_string(out, ptr, fmt); case 'S': { const union { struct sockaddr raw; @@ -1587,16 +1546,16 @@ void ip_addr_string(struct printbuf *out, const void *ptr, switch (sa->raw.sa_family) { case AF_INET: - return ip4_addr_string_sa(out, &sa->v4, spec, fmt); + return ip4_addr_string_sa(out, &sa->v4, fmt); case AF_INET6: - return ip6_addr_string_sa(out, &sa->v6, spec, fmt); + return ip6_addr_string_sa(out, &sa->v6, fmt); default: - return error_string_spec(out, "(einval)", spec); + return error_string(out, "(einval)"); }} } err_fmt_msg = fmt[0] == 'i' ? "(%pi?)" : "(%pI?)"; - return error_string_spec(out, err_fmt_msg, spec); + error_string(out, err_fmt_msg); } static noinline_for_stack @@ -2343,7 +2302,8 @@ void pointer(struct printbuf *out, const char *fmt, * 4: 001.002.003.004 * 6: 000102...0f */ - return ip_addr_string(out, ptr, spec, fmt); + ip_addr_string(out, ptr, fmt); + return do_width_precision(out, prev_pos, spec); case 'E': return escaped_string(out, ptr, spec, fmt); case 'U':