xen/events: don't bind non-percpu VIRQs with percpu chip

[firefly-linux-kernel-4.4.55.git] / lib / string_helpers.c

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 9c48ddad0f0d5a5a03eb2914fdd9ecebfa1b5f9e..c98ae818eb4eed802119133ca9d1c809d6b9f155 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -4,6 +4,7 @@
  * Copyright 31 August 2008 James Bottomley
  * Copyright (C) 2013, Intel Corporation
  */
+#include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/export.h>
@@ -14,7 +15,8 @@
 
 /**
  * string_get_size - get the size in the specified units
- * @size:      The size to be converted
+ * @size:      The size to be converted in blocks
+ * @blk_size:  Size of the block (use 1 for size in bytes)
  * @units:     units to use (powers of 1000 or 1024)
  * @buf:       buffer to format to
  * @len:       length of buffer
@@ -24,14 +26,14 @@
  * at least 9 bytes and will always be zero terminated.
  *
  */
-void string_get_size(u64 size, const enum string_size_units units,
+void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
                     char *buf, int len)
 {
        static const char *const units_10[] = {
-               "B", "kB", "MB", "GB", "TB", "PB", "EB"
+               "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"
        };
        static const char *const units_2[] = {
-               "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"
+               "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"
        };
        static const char *const *const units_str[] = {
                [STRING_UNITS_10] = units_10,
@@ -42,31 +44,57 @@ void string_get_size(u64 size, const enum string_size_units units,
                [STRING_UNITS_2] = 1024,
        };
        int i, j;
-       u32 remainder = 0, sf_cap;
+       u32 remainder = 0, sf_cap, exp;
        char tmp[8];
+       const char *unit;
 
        tmp[0] = '\0';
        i = 0;
-       if (size >= divisor[units]) {
-               while (size >= divisor[units]) {
-                       remainder = do_div(size, divisor[units]);
-                       i++;
-               }
+       if (!size)
+               goto out;
 
-               sf_cap = size;
-               for (j = 0; sf_cap*10 < 1000; j++)
-                       sf_cap *= 10;
+       while (blk_size >= divisor[units]) {
+               remainder = do_div(blk_size, divisor[units]);
+               i++;
+       }
 
-               if (j) {
-                       remainder *= 1000;
-                       remainder /= divisor[units];
-                       snprintf(tmp, sizeof(tmp), ".%03u", remainder);
-                       tmp[j+1] = '\0';
-               }
+       exp = divisor[units] / (u32)blk_size;
+       if (size >= exp) {
+               remainder = do_div(size, divisor[units]);
+               remainder *= blk_size;
+               i++;
+       } else {
+               remainder *= size;
+       }
+
+       size *= blk_size;
+       size += remainder / divisor[units];
+       remainder %= divisor[units];
+
+       while (size >= divisor[units]) {
+               remainder = do_div(size, divisor[units]);
+               i++;
        }
 
+       sf_cap = size;
+       for (j = 0; sf_cap*10 < 1000; j++)
+               sf_cap *= 10;
+
+       if (j) {
+               remainder *= 1000;
+               remainder /= divisor[units];
+               snprintf(tmp, sizeof(tmp), ".%03u", remainder);
+               tmp[j+1] = '\0';
+       }
+
+ out:
+       if (i >= ARRAY_SIZE(units_2))
+               unit = "UNK";
+       else
+               unit = units_str[units][i];
+
        snprintf(buf, len, "%u%s %s", (u32)size,
-                tmp, units_str[units][i]);
+                tmp, unit);
 }
 EXPORT_SYMBOL(string_get_size);
 
@@ -274,11 +302,6 @@ static bool escape_space(unsigned char c, char **dst, char *end)
                return false;
        }
 
-       if (out + 2 > end) {
-               *dst = out + 2;
-               return true;
-       }
-
        if (out < end)
                *out = '\\';
        ++out;
@@ -309,11 +332,6 @@ static bool escape_special(unsigned char c, char **dst, char *end)
                return false;
        }
 
-       if (out + 2 > end) {
-               *dst = out + 2;
-               return true;
-       }
-
        if (out < end)
                *out = '\\';
        ++out;
@@ -332,11 +350,6 @@ static bool escape_null(unsigned char c, char **dst, char *end)
        if (c)
                return false;
 
-       if (out + 2 > end) {
-               *dst = out + 2;
-               return true;
-       }
-
        if (out < end)
                *out = '\\';
        ++out;
@@ -352,11 +365,6 @@ static bool escape_octal(unsigned char c, char **dst, char *end)
 {
        char *out = *dst;
 
-       if (out + 4 > end) {
-               *dst = out + 4;
-               return true;
-       }
-
        if (out < end)
                *out = '\\';
        ++out;
@@ -378,11 +386,6 @@ static bool escape_hex(unsigned char c, char **dst, char *end)
 {
        char *out = *dst;
 
-       if (out + 4 > end) {
-               *dst = out + 4;
-               return true;
-       }
-
        if (out < end)
                *out = '\\';
        ++out;
@@ -449,20 +452,17 @@ static bool escape_hex(unsigned char c, char **dst, char *end)
  * it if needs.
  *
  * Return:
- * The amount of the characters processed to the destination buffer, or
- * %-ENOMEM if the size of buffer is not enough to put an escaped character is
- * returned.
- *
- * Even in the case of error @dst pointer will be updated to point to the byte
- * after the last processed character.
+ * The total size of the escaped output that would be generated for
+ * the given input and flags. To check whether the output was
+ * truncated, compare the return value to osz. There is room left in
+ * dst for a '\0' terminator if and only if ret < osz.
  */
-int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
+int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
                      unsigned int flags, const char *esc)
 {
-       char *p = *dst;
+       char *p = dst;
        char *end = p + osz;
        bool is_dict = esc && *esc;
-       int ret;
 
        while (isz--) {
                unsigned char c = *src++;
@@ -502,13 +502,6 @@ int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
                escape_passthrough(c, &p, end);
        }
 
-       if (p > end) {
-               *dst = end;
-               return -ENOMEM;
-       }
-
-       ret = p - *dst;
-       *dst = p;
-       return ret;
+       return p - dst;
 }
 EXPORT_SYMBOL(string_escape_mem);