7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
98 lines
3.5 KiB
Diff
98 lines
3.5 KiB
Diff
From df367f0febc7e5ea999f119f420d30a953268503 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Richardson <bruce.richardson@intel.com>
|
|
Date: Fri, 21 Oct 2022 15:37:01 +0800
|
|
Subject: [PATCH 185/189] telemetry: add escaping of strings in arrays
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When strings are added to an array variable, we need to properly escape
|
|
the invalid json characters in the strings.
|
|
|
|
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
|
|
Acked-by: Ciara Power <ciara.power@intel.com>
|
|
Acked-by: Morten Brørup <mb@smartsharesystems.com>
|
|
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
---
|
|
lib/telemetry/telemetry_json.h | 28 +++++++++++++++++++---------
|
|
1 file changed, 19 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/lib/telemetry/telemetry_json.h b/lib/telemetry/telemetry_json.h
|
|
index 13df5d07e3..c4442a0bf0 100644
|
|
--- a/lib/telemetry/telemetry_json.h
|
|
+++ b/lib/telemetry/telemetry_json.h
|
|
@@ -52,17 +52,22 @@ static const char control_chars[0x20] = {
|
|
|
|
/**
|
|
* @internal
|
|
- * Does the same as __json_snprintf(buf, len, "\"%s\"", str)
|
|
- * except that it does proper escaping as necessary.
|
|
+ * This function acts the same as __json_snprintf(buf, len, "%s%s%s", prefix, str, suffix)
|
|
+ * except that it does proper escaping of "str" as necessary. Prefix and suffix should be compile-
|
|
+ * time constants not needing escaping.
|
|
* Drops any invalid characters we don't support
|
|
*/
|
|
static inline int
|
|
-__json_format_str(char *buf, const int len, const char *str)
|
|
+__json_format_str(char *buf, const int len, const char *prefix, const char *str, const char *suffix)
|
|
{
|
|
char tmp[len];
|
|
int tmpidx = 0;
|
|
|
|
- tmp[tmpidx++] = '"';
|
|
+ while (*prefix != '\0' && tmpidx < len)
|
|
+ tmp[tmpidx++] = *prefix++;
|
|
+ if (tmpidx >= len)
|
|
+ return 0;
|
|
+
|
|
while (*str != '\0') {
|
|
if (*str < (int)RTE_DIM(control_chars)) {
|
|
int idx = *str; /* compilers don't like char type as index */
|
|
@@ -75,7 +80,7 @@ __json_format_str(char *buf, const int len, const char *str)
|
|
tmp[tmpidx++] = *str;
|
|
} else
|
|
tmp[tmpidx++] = *str;
|
|
- /* we always need space for closing quote and null character.
|
|
+ /* we always need space for (at minimum) closing quote and null character.
|
|
* Ensuring at least two free characters also means we can always take an
|
|
* escaped character like "\n" without overflowing
|
|
*/
|
|
@@ -83,7 +88,12 @@ __json_format_str(char *buf, const int len, const char *str)
|
|
return 0;
|
|
str++;
|
|
}
|
|
- tmp[tmpidx++] = '"';
|
|
+
|
|
+ while (*suffix != '\0' && tmpidx < len)
|
|
+ tmp[tmpidx++] = *suffix++;
|
|
+ if (tmpidx >= len)
|
|
+ return 0;
|
|
+
|
|
tmp[tmpidx] = '\0';
|
|
|
|
strcpy(buf, tmp);
|
|
@@ -108,7 +118,7 @@ rte_tel_json_empty_obj(char *buf, const int len, const int used)
|
|
static inline int
|
|
rte_tel_json_str(char *buf, const int len, const int used, const char *str)
|
|
{
|
|
- return used + __json_format_str(buf + used, len - used, str);
|
|
+ return used + __json_format_str(buf + used, len - used, "\"", str, "\"");
|
|
}
|
|
|
|
/* Appends a string into the JSON array in the provided buffer. */
|
|
@@ -118,9 +128,9 @@ rte_tel_json_add_array_string(char *buf, const int len, const int used,
|
|
{
|
|
int ret, end = used - 1; /* strip off final delimiter */
|
|
if (used <= 2) /* assume empty, since minimum is '[]' */
|
|
- return __json_snprintf(buf, len, "[\"%s\"]", str);
|
|
+ return __json_format_str(buf, len, "[\"", str, "\"]");
|
|
|
|
- ret = __json_snprintf(buf + end, len - end, ",\"%s\"]", str);
|
|
+ ret = __json_format_str(buf + end, len - end, ",\"", str, "\"]");
|
|
return ret == 0 ? used : end + ret;
|
|
}
|
|
|
|
--
|
|
2.23.0
|
|
|