e2fsck: avoid mallinfo() if over 2GB allocated

Don't use mallinfo() for determining the amount of memory used if it
is over 2GB.  Otherwise, the signed ints used by this interface can
can overflow and return garbage values.  This makes the actual amount
of memory used by e2fsck misleading and hard to determine.

Instead, use brk() to get the total amount of memory allocated, and print
this if the more detailed mallinfo() information is not suitable for use.

There does not appear to be a mallinfo64() variant of this function.
There does appear to be an abomination named malloc_info() that writes
XML-formatted malloc stats to a FILE stream that would need to be read
and parsed in order to get these stats, but that doesn't seem worthwhile.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Shilong Wang <wshilong@ddn.com>
Lustre-bug-id: https://jira.whamcloud.com/browse/LU-13197
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c
index 6131141003eef1e8e6d17e13cf840f60855917ab..ed3595f86ebb30a1471da66811ab823f67f24cb0 100644 (file)
--- a/e2fsck/scantest.c
+++ b/e2fsck/scantest.c
@@ -76,8 +76,8 @@ static void print_resource_track(struct resource_track *track)
        gettimeofday(&time_end, 0);
        getrusage(RUSAGE_SELF, &r);
 
-       printf(_("Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"),
-              (int) (((char *) sbrk(0)) - ((char *) track->brk_start)),
+       printf(_("Memory used: %lu, elapsed time: %6.3f/%6.3f/%6.3f\n"),
+              (unsigned long)((char *)sbrk(0) - (char *)track->brk_start),
               timeval_subtract(&time_end, &track->time_start),
               timeval_subtract(&r.ru_utime, &track->user_start),
               timeval_subtract(&r.ru_stime, &track->system_start));

diff --git a/e2fsck/util.c b/e2fsck/util.c
index 6ac56dad6f67a1e93132cf47ecde22f4bd7133b9..d98b8e47be66ed5516fb2f1cae2dc427edb23d57 100644 (file)
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -420,9 +420,6 @@ void print_resource_track(e2fsck_t ctx, const char *desc,
 {
 #ifdef HAVE_GETRUSAGE
        struct rusage r;
-#endif
-#ifdef HAVE_MALLINFO
-       struct mallinfo malloc_info;
 #endif
        struct timeval time_end;
 
@@ -436,18 +433,21 @@ void print_resource_track(e2fsck_t ctx, const char *desc,
        if (desc)
                log_out(ctx, "%s: ", desc);
 
+#define kbytes(x)      (((unsigned long long)(x) + 1023) / 1024)
 #ifdef HAVE_MALLINFO
-#define kbytes(x)      (((unsigned long)(x) + 1023) / 1024)
-
-       malloc_info = mallinfo();
-       log_out(ctx, _("Memory used: %luk/%luk (%luk/%luk), "),
-               kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd),
-               kbytes(malloc_info.uordblks), kbytes(malloc_info.fordblks));
-#else
-       log_out(ctx, _("Memory used: %lu, "),
-               (unsigned long) (((char *) sbrk(0)) -
-                                ((char *) track->brk_start)));
+       /* don't use mallinfo() if over 2GB used, since it returns "int" */
+       if ((char *)sbrk(0) - (char *)track->brk_start < 2ULL << 30) {
+               struct mallinfo malloc_info = mallinfo();
+
+               log_out(ctx, _("Memory used: %lluk/%lluk (%lluk/%lluk), "),
+                       kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd),
+                       kbytes(malloc_info.uordblks),
+                       kbytes(malloc_info.fordblks));
+       } else
 #endif
+       log_out(ctx, _("Memory used: %lluk, "),
+               kbytes(((char *)sbrk(0)) - ((char *)track->brk_start)));
+
 #ifdef HAVE_GETRUSAGE
        getrusage(RUSAGE_SELF, &r);