From patchwork Tue Apr 7 15:51:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185247 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp5015011ilr; Tue, 7 Apr 2020 08:55:18 -0700 (PDT) X-Google-Smtp-Source: APiQypKSDRdQ6XpRLCL5OZ8MglynA4/qq214i6b7SOyAfPyri6sheHPxO1GXeuNcnr0RVc6GkIQs X-Received: by 2002:a37:aa15:: with SMTP id t21mr2922951qke.460.1586274917528; Tue, 07 Apr 2020 08:55:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586274917; cv=none; d=google.com; s=arc-20160816; b=vYgS5r2Ej+4nMfWmKYywbzfSNDmrnCOD9VsrpSqSgFd1xkLL+dSd3fQEtevwFbWth+ Yq6PjdgzEznRScXPQxDNdFv9pqN7ze+QJ5lAfOBBkV8Ld2igxNbHKRcxLfvANmO2JCDX rUQ5Idq48g98OlQtGIBqMpOkEIgJXw1MBM6DwvKLExcIxDJy78b6X/P8PKDNTY0OBVdB VUPB211NG6NAa1FeknqyAPc6hmn9GEVtbPkKlWEeSUKGAteTJGDek1odzXiK9KDlS85b 8i3zLDvIkJXt8Zie/jzEeHDSMsZdOr+z+lH0friBsSEllNd/C/MKXYJZQ0fQ7cIVgEpW GLQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=D8BK29LzMjfBeG1Gt0CmPdKAbN7O2k2vjO3bs9Akqc4=; b=tTEMu5/KqyQ6PUANbQfqSGODsfk9o2URPdCNT2IklpN3UtRKSU2scxbNMVQo5ygu2n U7VOeepPlqilgIaHK1TVCUEzvnrX070GTyMTWaXCQ9r9NSL9L/lDp7evJQxBVvqr3CqS J7EoCm4YZ5d7r/JGXonRPw1lQrekqr0JZhdizQWabGDYk2955lUsrj7AESj17lIxGRRT S9yllAJe6+EA0mkGuFILWp+SlP2MsK445DpWd5bFqidKPIsyd7xRlUOiW9hrNfCEtBiQ 8b1YxXAtqfGz+y8c2vPkISfhhy12JwoEAPNLFCmmEg551Dtfzc2X7bQphvSYArBdTmcP R0Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KLYCntdY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f137si2107572qke.171.2020.04.07.08.55.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Apr 2020 08:55:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KLYCntdY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLqZJ-0001g5-2W for patch@linaro.org; Tue, 07 Apr 2020 11:55:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43718) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLqVi-0003da-CC for qemu-devel@nongnu.org; Tue, 07 Apr 2020 11:51:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLqVh-0004PD-9D for qemu-devel@nongnu.org; Tue, 07 Apr 2020 11:51:34 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:38488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLqVh-0004Ob-3D for qemu-devel@nongnu.org; Tue, 07 Apr 2020 11:51:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id f20so2364532wmh.3 for ; Tue, 07 Apr 2020 08:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D8BK29LzMjfBeG1Gt0CmPdKAbN7O2k2vjO3bs9Akqc4=; b=KLYCntdYS8lGIH4zoDHxDdbiGfUzjbKpOXcTQgZMZXxbSYn+5NTyVuTiQ4qJHZiZZY GEzz4pGB+eFcaLkTnAIgn4QCmRLDY7NlKMWDhvf2D2YJUgw49yrjLWpxS82/h12YPY8u pe+OtxvA/DJnn4TjXuKw6QzzedoLQCzbas7RNI0dJBlaAPhEAigaYbbGX4q0XFNEdaTQ wdFh+hR7a8ZN8zg5HqHmHJ2x9fl0SzxesrkTTKAcXFLnWGEh0IVumDOeBkbGxRa4ZH6y 13E/W9FkPnaYjReWXM2NvH35VX2LzzuhE4sE+IgQHIM8G1ftj0IVvqtqKU0qF1d2DKlq nrpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D8BK29LzMjfBeG1Gt0CmPdKAbN7O2k2vjO3bs9Akqc4=; b=EPUq0bsjnKhJDyRa2UopPyiORdOGVeIvm/8ypZNp32ExeJe7K5a/jQFr/J0hBfkrOs CemOiN0s2Zxqt975w7KNoA+IdqRcq+XzMmuFm+k4716r1rGaJXj57TKO5JlSuxR5yI2p puqEz62gIYMxgmGLYV4y+RwZJkv3ijgI3r9EF0//5mfaqDoKeefp4ygsm4infkphae3k 7YSdDoacHBe2y+yS8LHuCA0qCa22FkWyQ13Eq5Y3Joyg8zHDGpgfuIOej9BPVmRgC0S1 vbPpC+BAyg0NJbnMRzoV5H9M5RaItGsOt5LmNwNnYnC+pD6y1EQh+6XhZmyFuXg5Mo/j ACkA== X-Gm-Message-State: AGi0PuYTtZRY4vSkoFEF8OygjWgLDQBaalCDC7eDBCDvz/UQKEsRpCrK OvwcdK9k+uMC4rQEfAgcDGU4lg== X-Received: by 2002:a05:600c:a:: with SMTP id g10mr3043304wmc.153.1586274692008; Tue, 07 Apr 2020 08:51:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j6sm32369851wrb.4.2020.04.07.08.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 08:51:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2BCA01FF99; Tue, 7 Apr 2020 16:51:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/13] linux-user: clean-up padding on /proc/self/maps Date: Tue, 7 Apr 2020 16:51:15 +0100 Message-Id: <20200407155118.20139-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407155118.20139-1-alex.bennee@linaro.org> References: <20200407155118.20139-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Don't use magic spaces, calculate the justification for the file field like the kernel does with seq_pad. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200403191150.863-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5f117872947..6495ddc4cda 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7235,6 +7235,7 @@ static int open_self_maps(void *cpu_env, int fd) TaskState *ts = cpu->opaque; GSList *map_info = read_self_maps(); GSList *s; + int count; for (s = map_info; s; s = g_slist_next(s)) { MapInfo *e = (MapInfo *) s->data; @@ -7253,20 +7254,24 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g(min) == ts->info->stack_limit) { - path = " [stack]"; + path = "[stack]"; } else { path = e->path; } - dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr - " %c%c%c%c %08" PRIx64 " %s %"PRId64" %s%s\n", - h2g(min), h2g(max - 1) + 1, - e->is_read ? 'r' : '-', - e->is_write ? 'w' : '-', - e->is_exec ? 'x' : '-', - e->is_priv ? 'p' : '-', - (uint64_t) e->offset, e->dev, e->inode, - path ? " " : "", path ? path : ""); + count = dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr + " %c%c%c%c %08" PRIx64 " %s %"PRId64, + h2g(min), h2g(max - 1) + 1, + e->is_read ? 'r' : '-', + e->is_write ? 'w' : '-', + e->is_exec ? 'x' : '-', + e->is_priv ? 'p' : '-', + (uint64_t) e->offset, e->dev, e->inode); + if (path) { + dprintf(fd, "%*s%s\n", 73 - count, "", path); + } else { + dprintf(fd, "\n"); + } } } @@ -7277,9 +7282,10 @@ static int open_self_maps(void *cpu_env, int fd) * We only support execution from the vsyscall page. * This is as if CONFIG_LEGACY_VSYSCALL_XONLY=y from v5.3. */ - dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx - " --xp 00000000 00:00 0 [vsyscall]\n", - TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE); + count = dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx + " --xp 00000000 00:00 0", + TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE); + dprintf(fd, "%*s%s\n", 73 - count, "", "[vsyscall]"); #endif return 0;