From patchwork Fri Jan 12 18:58:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Vagin X-Patchwork-Id: 10161567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2188F602D8 for ; Fri, 12 Jan 2018 18:58:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1297928871 for ; Fri, 12 Jan 2018 18:58:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0712B28949; Fri, 12 Jan 2018 18:58:19 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 015F028871 for ; Fri, 12 Jan 2018 18:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965115AbeALS6Q (ORCPT ); Fri, 12 Jan 2018 13:58:16 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:38209 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965031AbeALS6P (ORCPT ); Fri, 12 Jan 2018 13:58:15 -0500 Received: by mail-pf0-f193.google.com with SMTP id k19so5050592pfj.5 for ; Fri, 12 Jan 2018 10:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=wdK3NTpntWvARgYQk9T66lXSmKKzMD4YK+Z6ba31nKI=; b=Z2P1J4h+7jbNClbY34x1PnA4TJL1uU5XQk/ras/LaEV/Zd59zwIP3odreIeVCFlbC7 igFhxZjr6eFobrpbG5X8/TjNw5CyytpyxpvToR4f3yoafNaUDhAGJHhXQP6dQnd+ILVi Kh8I2KHgWzahyBP5e34po9wrupwbA5KF4w8ff/ZxTX7N2yD59NUWhG+dK93rv7NYmI9u 9Tw/cDfY/+AFcakAwy19TmP6uFZCdF2k7KFavtVIuky0QCvLaumOkmjNuNGPvRcuTMJ4 SjZO7DSPLrG0DHaGkg3y88+wse2OzvXqW4iCnsM5TIp1S0ZdzLTKUUoRc/7Sq6PMh3wG f82w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=wdK3NTpntWvARgYQk9T66lXSmKKzMD4YK+Z6ba31nKI=; b=W2lvSIDfBh5K2DVCGdiiDI3SmMMT5X82QsSBT9M8Ssepn5R8Rkc8y2MnYTbvfyeb+a 8xYm+a4nczpL/CVpeLypPrKswX2mjHsvpF+eJpAhdCex3ItNPGI/JlxDXbJLX7dRFjFV J+gu5fEgDjClxNzChV2iqRfBeZ64qtQVL9imx0/tsZUg0zlEjfwILt0Q9+HZW9vlKMVV 2Ysp1Q1ERDEWKGdQC3DVvOPN9pZRuNAyt7GLRadmLsIF9RPXcIsAt4nOU+3nRzV2Q0H5 Xvgr5yPOFTSRbpG9v5VIUjkO0lBF1tO39LPdGx2bacGUZYrhaqbjQ4dKVjldPHBdIxdn auRQ== X-Gm-Message-State: AKGB3mJ8vp91VdaiCtfigmQBNYpXtIynXs3rNm8hxc4AI6qnovtXvQ/y Hr5Gs3oTDt5eiLkdYV7JDMJ6cXrm X-Google-Smtp-Source: ACJfBot3HUisnvEEYuiBVKO3miUZ0fXlpuZLfzA0OgSaVGTOJQwuJoN8L2eLUoLp/8q3OqlWW8wI6Q== X-Received: by 10.98.17.193 with SMTP id 62mr19693285pfr.126.1515783494813; Fri, 12 Jan 2018 10:58:14 -0800 (PST) Received: from localhost.localdomain (c-73-140-212-29.hsd1.wa.comcast.net. [73.140.212.29]) by smtp.gmail.com with ESMTPSA id 6sm37411271pgf.54.2018.01.12.10.58.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Jan 2018 10:58:14 -0800 (PST) From: Andrei Vagin To: linux-fsdevel@vger.kernel.org Cc: Andrew Morton , Andrei Vagin , Alexey Dobriyan , KAMEZAWA Hiroyuki Subject: [PATCH 1/2] procfs: add seq_put_hex_ll to speed up /proc/pid/maps Date: Fri, 12 Jan 2018 10:58:11 -0800 Message-Id: <20180112185812.7710-1-avagin@openvz.org> X-Mailer: git-send-email 2.13.6 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP seq_put_hex_ll() prints a number in hexadecimal notation and works faster than seq_printf(). == test.py num = 0 with open("/proc/1/maps") as f: while num < 10000 : data = f.read() f.seek(0, 0) num = num + 1 == == Before patch == $ time python test.py real 0m1.561s user 0m0.257s sys 0m1.302s == After patch == $ time python test.py real 0m0.986s user 0m0.279s sys 0m0.707s $ perf -g record python test.py: == Before patch == - 67.42% 2.82% python [kernel.kallsyms] [k] show_map_vma.isra.22 - 64.60% show_map_vma.isra.22 - 44.98% seq_printf - seq_vprintf - vsnprintf + 14.85% number + 12.22% format_decode 5.56% memcpy_erms + 15.06% seq_path + 4.42% seq_pad + 2.45% __GI___libc_read == After patch == - 47.35% 3.38% python [kernel.kallsyms] [k] show_map_vma.isra.23 - 43.97% show_map_vma.isra.23 + 20.84% seq_path - 15.73% show_vma_header_prefix 10.55% seq_put_hex_ll + 2.65% seq_put_decimal_ull 0.95% seq_putc + 6.96% seq_pad + 2.94% __GI___libc_read Cc: Alexey Dobriyan Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrei Vagin --- fs/proc/task_mmu.c | 21 ++++++++------ fs/seq_file.c | 74 ++++++++++++++++++++++++++++++++++++++++-------- include/linux/seq_file.h | 3 ++ 3 files changed, 77 insertions(+), 21 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 339e4c1c044d..3a08685ef27c 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -282,15 +282,18 @@ static void show_vma_header_prefix(struct seq_file *m, dev_t dev, unsigned long ino) { seq_setwidth(m, 25 + sizeof(void *) * 6 - 1); - seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ", - start, - end, - flags & VM_READ ? 'r' : '-', - flags & VM_WRITE ? 'w' : '-', - flags & VM_EXEC ? 'x' : '-', - flags & VM_MAYSHARE ? 's' : 'p', - pgoff, - MAJOR(dev), MINOR(dev), ino); + seq_put_hex_ll(m, NULL, start, 8); + seq_put_hex_ll(m, "-", end, 8); + seq_putc(m, ' '); + seq_putc(m, flags & VM_READ ? 'r' : '-'); + seq_putc(m, flags & VM_WRITE ? 'w' : '-'); + seq_putc(m, flags & VM_EXEC ? 'x' : '-'); + seq_putc(m, flags & VM_MAYSHARE ? 's' : 'p'); + seq_put_hex_ll(m, " ", pgoff, 8); + seq_put_hex_ll(m, " ", MAJOR(dev), 2); + seq_put_hex_ll(m, ":", MINOR(dev), 2); + seq_put_decimal_ull(m, " ", ino); + seq_putc(m, ' '); } static void diff --git a/fs/seq_file.c b/fs/seq_file.c index 4be761c1a03d..fb37ec42fae2 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -670,6 +670,26 @@ void seq_puts(struct seq_file *m, const char *s) } EXPORT_SYMBOL(seq_puts); +static inline void seq_put_delimeter(struct seq_file *m, const char *delimiter) +{ + int len; + + if (!delimiter || !delimiter[0]) + return; + + if (delimiter[1] == 0) + return seq_putc(m, delimiter[0]); + + len = strlen(delimiter); + if (m->count + len >= m->size) { + seq_set_overflow(m); + return; + } + + memcpy(m->buf + m->count, delimiter, len); + m->count += len; +} + /* * A helper routine for putting decimal numbers without rich format of printf(). * only 'unsigned long long' is supported. @@ -685,12 +705,7 @@ void seq_put_decimal_ull(struct seq_file *m, const char *delimiter, if (m->count + 2 >= m->size) /* we'll write 2 bytes at least */ goto overflow; - len = strlen(delimiter); - if (m->count + len >= m->size) - goto overflow; - - memcpy(m->buf + m->count, delimiter, len); - m->count += len; + seq_put_delimeter(m, delimiter); if (m->count + 1 >= m->size) goto overflow; @@ -712,6 +727,46 @@ void seq_put_decimal_ull(struct seq_file *m, const char *delimiter, } EXPORT_SYMBOL(seq_put_decimal_ull); +/** + * seq_put_hex_ll - put a number in hexadecimal notation + * @m: seq_file identifying the buffer to which data should be written + * @delimiter: a string which is printed before the number + * @v: the number + * @width: a minimum field width + * + * seq_put_hex_ll(m, "", v, 8) is equal to seq_printf(m, "0x08llx", v) + * + * This routine is very quick when you show lots of numbers. + * In usual cases, it will be better to use seq_printf(). It's easier to read. + */ +void seq_put_hex_ll(struct seq_file *m, const char *delimiter, + unsigned long long v, int width) +{ + int i, len; + + seq_put_delimeter(m, delimiter); + + len = (sizeof(v) * 8 - __builtin_clzll(v) + 3) / 4; + + if (unlikely(len == 0)) + len = 1; + + if (len < width) + len = width; + + if (m->count + len > m->size) + goto overflow; + + for (i = len - 1; i >= 0; i--) { + m->buf[m->count + i] = hex_asc[0xf & v]; + v = v >> 4; + } + m->count += len; + return; +overflow: + seq_set_overflow(m); +} + void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num) { int len; @@ -719,12 +774,7 @@ void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num if (m->count + 3 >= m->size) /* we'll write 2 bytes at least */ goto overflow; - len = strlen(delimiter); - if (m->count + len >= m->size) - goto overflow; - - memcpy(m->buf + m->count, delimiter, len); - m->count += len; + seq_put_delimeter(m, delimiter); if (m->count + 2 >= m->size) goto overflow; diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index 09c6e28746f9..53f238934d7f 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h @@ -121,6 +121,9 @@ void seq_puts(struct seq_file *m, const char *s); void seq_put_decimal_ull(struct seq_file *m, const char *delimiter, unsigned long long num); void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num); +void seq_put_hex_ll(struct seq_file *m, const char *delimiter, + unsigned long long v, int width); + void seq_escape(struct seq_file *m, const char *s, const char *esc); void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,