[PATCH 0/7] Fixes for Fedora Rawhide

[PATCH 0/7] Fixes for Fedora Rawhide

[David Marchand]

Similary to https://git.dpdk.org/dpdk/commit/?id=f4ef899bb3ae, we have
many strstr/str*chr calls on const char * stored to non const pointers.

This breaks build in Fedora Rawhide as a change in its glibc now
triggers build warnings.

Probably too late for 25.11, but sending in any case...

-- 
David Marchand

David Marchand (7):
  bus/ifpga: fix const pointer in device name parsing
  bus/uacce: fix const pointer in device matching
  drivers: fix some const pointers in qat drivers
  crypto/caam_jr: fix const pointer in UIO filename parsing
  net/enetfec: fix const pointer in UIO filename parsing
  net/memif: fix const pointer in socket check
  app/procinfo: fix const pointer in collectd format

 app/proc-info/main.c                 |  2 +-
 drivers/bus/ifpga/ifpga_bus.c        |  4 ++--
 drivers/bus/uacce/uacce.c            |  2 +-
 drivers/common/qat/qat_device.c      |  7 ++++---
 drivers/common/qat/qat_device.h      |  2 +-
 drivers/compress/qat/qat_comp_pmd.c  |  2 +-
 drivers/crypto/caam_jr/caam_jr_uio.c | 12 ++----------
 drivers/crypto/qat/qat_asym.c        |  2 +-
 drivers/crypto/qat/qat_sym.c         |  2 +-
 drivers/net/enetfec/enet_uio.c       |  8 +-------
 drivers/net/memif/rte_eth_memif.c    |  3 ++-
 11 files changed, 17 insertions(+), 29 deletions(-)

-- 
2.51.1

[PATCH 1/7] bus/ifpga: fix const pointer in device name parsing

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/bus/ifpga/ifpga_bus.c: In function 'ifpga_parse':
../drivers/bus/ifpga/ifpga_bus.c:479:12: warning: assignment discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  479 |         c1 = strchr(name, '|');
      |            ^

Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/bus/ifpga/ifpga_bus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index ca9e49f548..fdce1f6b1f 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -468,8 +468,8 @@ ifpga_parse(const char *name, void *addr)
 	int *out = addr;
 	struct rte_rawdev *rawdev = NULL;
 	char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN];
-	char *c1 = NULL;
-	char *c2 = NULL;
+	const char *c1 = NULL;
+	const char *c2 = NULL;
 	int port = IFPGA_BUS_DEV_PORT_MAX;
 	char str_port[8];
 	int str_port_len = 0;
-- 
2.51.1

[PATCH 2/7] bus/uacce: fix const pointer in device matching

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/bus/uacce/uacce.c: In function 'uacce_match':
../drivers/bus/uacce/uacce.c:346:21: warning: assignment discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  346 |                 map = strstr(dev->algs, id_table->dev_alg);
      |                     ^

Fixes: 62b906cf06ba ("bus/uacce: introduce UACCE bus")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/bus/uacce/uacce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/uacce/uacce.c b/drivers/bus/uacce/uacce.c
index 87e68b3dbf..79f990c54c 100644
--- a/drivers/bus/uacce/uacce.c
+++ b/drivers/bus/uacce/uacce.c
@@ -328,8 +328,8 @@ static bool
 uacce_match(const struct rte_uacce_driver *dr, const struct rte_uacce_device *dev)
 {
 	const struct rte_uacce_id *id_table;
+	const char *map;
 	uint32_t len;
-	char *map;
 
 	for (id_table = dr->id_table; id_table->dev_api != NULL; id_table++) {
 		if (strcmp(id_table->dev_api, dev->api) != 0)
-- 
2.51.1

[PATCH 3/7] drivers: fix some const pointers in qat drivers

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/common/qat/qat_device.c: In function 'qat_dev_cmdline_get_val':
../drivers/common/qat/qat_device.c:183:43: warning: return discards 'const'
	qualifier from pointer target type [-Wdiscarded-qualifiers]
  183 |         return key ? strchr(key, '=') + 1 : NULL;
      |                                           ^
../drivers/common/qat/qat_device.c: In function 'cmdline_validate':
../drivers/common/qat/qat_device.c:189:25: warning: initialization discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  189 |         char *eq_sign = strchr(arg, '=');
      |                         ^~~~~~

Fixes: 99ab2806687b ("common/qat: isolate parser arguments configuration")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/common/qat/qat_device.c     | 7 ++++---
 drivers/common/qat/qat_device.h     | 2 +-
 drivers/compress/qat/qat_comp_pmd.c | 2 +-
 drivers/crypto/qat/qat_asym.c       | 2 +-
 drivers/crypto/qat/qat_sym.c        | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c
index b582e3bf8b..07a8b19583 100644
--- a/drivers/common/qat/qat_device.c
+++ b/drivers/common/qat/qat_device.c
@@ -173,7 +173,7 @@ wireless_slice_support(uint16_t pci_dev_id)
  * other than the equals sign is ignored. It will not work with other conversion
  * functions like strt*.
  */
-char *qat_dev_cmdline_get_val(struct qat_pci_device *qat_dev,
+const char *qat_dev_cmdline_get_val(struct qat_pci_device *qat_dev,
 	const char *key)
 {
 	if (qat_dev->command_line == NULL)
@@ -185,8 +185,9 @@ char *qat_dev_cmdline_get_val(struct qat_pci_device *qat_dev,
 
 static int cmdline_validate(const char *arg)
 {
+	const char *eq_sign = strchr(arg, '=');
 	int i, len;
-	char *eq_sign = strchr(arg, '=');
+
 	/* Check for the equal sign */
 	if (eq_sign == NULL) {
 		QAT_LOG(ERR, "malformed string, no equals sign, %s", arg);
@@ -263,7 +264,7 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev)
 	struct rte_mem_resource *mem_resource;
 	const struct rte_memzone *qat_dev_mz;
 	int qat_dev_size, extra_size;
-	char *cmdline = NULL;
+	const char *cmdline = NULL;
 
 	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
 	snprintf(name+strlen(name), QAT_DEV_NAME_MAX_LEN-strlen(name), "_qat");
diff --git a/drivers/common/qat/qat_device.h b/drivers/common/qat/qat_device.h
index f5ba1592c3..34937e963e 100644
--- a/drivers/common/qat/qat_device.h
+++ b/drivers/common/qat/qat_device.h
@@ -42,7 +42,7 @@ typedef int (*qat_dev_get_extra_size_t)(void);
 typedef int (*qat_dev_get_slice_map_t)(uint32_t *map,
 		const struct rte_pci_device *pci_dev);
 
-char *qat_dev_cmdline_get_val(struct qat_pci_device *qat_dev, const char *key);
+const char *qat_dev_cmdline_get_val(struct qat_pci_device *qat_dev, const char *key);
 
 struct qat_dev_hw_spec_funcs {
 	qat_dev_reset_ring_pairs_t	qat_dev_reset_ring_pairs;
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 55e510c91f..92dac79423 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -690,7 +690,7 @@ qat_comp_dev_create(struct qat_pci_device *qat_pci_dev)
 			&qat_comp_gen_dev_ops[qat_pci_dev->qat_dev_gen];
 	uint64_t capa_size;
 	uint16_t sub_id = qat_dev_instance->pci_dev->id.subsystem_device_id;
-	char *cmdline = NULL;
+	const char *cmdline = NULL;
 
 	snprintf(name, RTE_COMPRESSDEV_NAME_MAX_LEN, "%s_%s",
 			qat_pci_dev->name, "comp");
diff --git a/drivers/crypto/qat/qat_asym.c b/drivers/crypto/qat/qat_asym.c
index 8808337551..06f037cc14 100644
--- a/drivers/crypto/qat/qat_asym.c
+++ b/drivers/crypto/qat/qat_asym.c
@@ -1697,7 +1697,7 @@ qat_asym_dev_create(struct qat_pci_device *qat_pci_dev)
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
 	char capa_memz_name[RTE_CRYPTODEV_NAME_MAX_LEN];
 	uint16_t sub_id = qat_dev_instance->pci_dev->id.subsystem_device_id;
-	char *cmdline = NULL;
+	const char *cmdline = NULL;
 
 	snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
 			qat_pci_dev->name, "asym");
diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index d979ae6489..83f1084030 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -217,7 +217,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
 	const struct qat_crypto_gen_dev_ops *gen_dev_ops =
 		&qat_sym_gen_dev_ops[qat_pci_dev->qat_dev_gen];
 	uint16_t sub_id = qat_dev_instance->pci_dev->id.subsystem_device_id;
-	char *cmdline = NULL;
+	const char *cmdline = NULL;
 
 	snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
 			qat_pci_dev->name, "sym");
-- 
2.51.1

[PATCH 4/7] crypto/caam_jr: fix const pointer in UIO filename parsing

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/crypto/caam_jr/caam_jr_uio.c: In function
	'file_name_match_extract':
../drivers/crypto/caam_jr/caam_jr_uio.c:111:16: warning: assignment
	discards 'const' qualifier from pointer target type
	[-Wdiscarded-qualifiers]
  111 |         substr = strstr(filename, match);
      |                ^

Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/crypto/caam_jr/caam_jr_uio.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index 8956f7750d..43357091e1 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -106,19 +106,11 @@ static int g_uio_jr_num;
 static bool
 file_name_match_extract(const char filename[], const char match[], int *number)
 {
-	char *substr = NULL;
-
-	substr = strstr(filename, match);
-	if (substr == NULL)
-		return false;
-
 	/* substring <match> was found in <filename>
 	 * read number following <match> substring in <filename>
 	 */
-	if (sscanf(filename + strlen(match), "%d", number) <= 0)
-		return false;
-
-	return true;
+	return strstr(filename, match) != NULL &&
+		sscanf(filename + strlen(match), "%d", number) > 0;
 }
 
 /** @brief Reads first line from a file.
-- 
2.51.1

RE: [PATCH 4/7] crypto/caam_jr: fix const pointer in UIO filename parsing

[Hemant Agrawal]

Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

[PATCH 5/7] net/enetfec: fix const pointer in UIO filename parsing

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/net/enetfec/enet_uio.c: In function 'file_name_match_extract':
../drivers/net/enetfec/enet_uio.c:37:16: warning: assignment discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   37 |         substr = strstr(filename, match);
      |                ^

Fixes: b84fdd39638b ("net/enetfec: support UIO")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/enetfec/enet_uio.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/enetfec/enet_uio.c b/drivers/net/enetfec/enet_uio.c
index f32d5e1b1e..c3917cd9df 100644
--- a/drivers/net/enetfec/enet_uio.c
+++ b/drivers/net/enetfec/enet_uio.c
@@ -32,13 +32,7 @@ static int enetfec_count;
 static bool
 file_name_match_extract(const char filename[], const char match[])
 {
-	char *substr = NULL;
-
-	substr = strstr(filename, match);
-	if (substr == NULL)
-		return false;
-
-	return true;
+	return strstr(filename, match) != NULL;
 }
 
 /*
-- 
2.51.1

RE: [PATCH 5/7] net/enetfec: fix const pointer in UIO filename parsing

[Hemant Agrawal]

Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

[PATCH 6/7] net/memif: fix const pointer in socket check

[David Marchand]

With latest glibc (Fedora Rawhide):
../drivers/net/memif/rte_eth_memif.c: In function
	'memif_check_socket_filename':
../drivers/net/memif/rte_eth_memif.c:1848:13: warning: assignment discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
 1848 |         tmp = strrchr(filename, '/');
      |             ^

Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/memif/rte_eth_memif.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c
index 9de6f97cd9..8d7060cd7c 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1836,7 +1836,8 @@ memif_set_rs(const char *key __rte_unused, const char *value, void *extra_args)
 static int
 memif_check_socket_filename(const char *filename)
 {
-	char *dir = NULL, *tmp;
+	char *dir = NULL;
+	const char *tmp;
 	uint32_t idx;
 	int ret = 0;
 
-- 
2.51.1

[PATCH 7/7] app/procinfo: fix const pointer in collectd format

[David Marchand]

With latest glibc (Fedora Rawhide):
../app/proc-info/main.c: In function 'collectd_resolve_cnt_type':
../app/proc-info/main.c:689:26: warning: initialization discards
	'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  689 |         char *type_end = strrchr(cnt_name, '_');
      |                          ^~~~~~~

Fixes: 2deb6b5246d7 ("app/procinfo: add collectd format and host id")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 app/proc-info/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index b09c03ab35..5925bbb765 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -686,7 +686,7 @@ nic_stats_clear(uint16_t port_id)
 
 static void collectd_resolve_cnt_type(char *cnt_type, size_t cnt_type_len,
 				      const char *cnt_name) {
-	char *type_end = strrchr(cnt_name, '_');
+	const char *type_end = strrchr(cnt_name, '_');
 
 	if ((type_end != NULL) &&
 	    (strncmp(cnt_name, "rx_", strlen("rx_")) == 0)) {
-- 
2.51.1