Revert r327828, r327949, r327953, r328016-r328026, r328041:

Uses of mallocarray(9).

The use of mallocarray(9) has rocketed the required swap to build FreeBSD.
This is likely caused by the allocation size attributes which put extra pressure
on the compiler.

Given that most of these checks are superfluous we have to choose better
where to use mallocarray(9). We still have more uses of mallocarray(9) but
hopefully this is enough to bring swap usage to a reasonable level.

Reported by:	wosch
PR:		225197

1 files changed, 11 insertions, 11 deletions

diff --git a/sys/dev/mpr/mpr_mapping.c b/sys/dev/mpr/mpr_mapping.c
index 532a69114b13..6d90c79efca8 100644
--- a/sys/dev/mpr/mpr_mapping.c
+++ b/sys/dev/mpr/mpr_mapping.c
@@ -2141,27 +2141,27 @@ mpr_mapping_allocate_memory(struct mpr_softc *sc)
 {
 	uint32_t dpm_pg0_sz;
 
-	sc->mapping_table = mallocarray(sc->max_devices,
-	    sizeof(struct dev_mapping_table), M_MPR, M_ZERO|M_NOWAIT);
+	sc->mapping_table = malloc((sizeof(struct dev_mapping_table) *
+	    sc->max_devices), M_MPR, M_ZERO|M_NOWAIT);
 	if (!sc->mapping_table)
 		goto free_resources;
 
-	sc->removal_table = mallocarray(sc->max_devices,
-	    sizeof(struct map_removal_table), M_MPR, M_ZERO|M_NOWAIT);
+	sc->removal_table = malloc((sizeof(struct map_removal_table) *
+	    sc->max_devices), M_MPR, M_ZERO|M_NOWAIT);
 	if (!sc->removal_table)
 		goto free_resources;
 
-	sc->enclosure_table = mallocarray(sc->max_enclosures,
-	     sizeof(struct enc_mapping_table), M_MPR, M_ZERO|M_NOWAIT);
+	sc->enclosure_table = malloc((sizeof(struct enc_mapping_table) *
+	    sc->max_enclosures), M_MPR, M_ZERO|M_NOWAIT);
 	if (!sc->enclosure_table)
 		goto free_resources;
 
-	sc->dpm_entry_used = mallocarray(sc->max_dpm_entries, sizeof(u8),
+	sc->dpm_entry_used = malloc((sizeof(u8) * sc->max_dpm_entries),
 	    M_MPR, M_ZERO|M_NOWAIT);
 	if (!sc->dpm_entry_used)
 		goto free_resources;
 
-	sc->dpm_flush_entry = mallocarray(sc->max_dpm_entries, sizeof(u8),
+	sc->dpm_flush_entry = malloc((sizeof(u8) * sc->max_dpm_entries),
 	    M_MPR, M_ZERO|M_NOWAIT);
 	if (!sc->dpm_flush_entry)
 		goto free_resources;
@@ -2912,7 +2912,7 @@ mpr_mapping_topology_change_event(struct mpr_softc *sc,
 
 	if (!num_entries)
 		goto out;
-	phy_change = mallocarray(num_entries, sizeof(struct _map_phy_change),
+	phy_change = malloc(sizeof(struct _map_phy_change) * num_entries,
 	    M_MPR, M_NOWAIT|M_ZERO);
 	topo_change.phy_details = phy_change;
 	if (!phy_change)
@@ -2963,7 +2963,7 @@ mpr_mapping_pcie_topology_change_event(struct mpr_softc *sc,
 
 	if (!num_entries)
 		goto out;
-	port_change = mallocarray(num_entries, sizeof(struct _map_port_change),
+	port_change = malloc(sizeof(struct _map_port_change) * num_entries,
 	    M_MPR, M_NOWAIT|M_ZERO);
 	topo_change.port_details = port_change;
 	if (!port_change)
@@ -3003,7 +3003,7 @@ mpr_mapping_ir_config_change_event(struct mpr_softc *sc,
 	struct dev_mapping_table *mt_entry;
 	u16 element_flags;
 
-	wwid_table = mallocarray(event_data->NumElements, sizeof(u64), M_MPR,
+	wwid_table = malloc(sizeof(u64) * event_data->NumElements, M_MPR,
 	    M_NOWAIT | M_ZERO);
 	if (!wwid_table)
 		goto out;