hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-25 10:01:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ice(4): Stop checking for failures from malloc(M_WAITOK)

Browse Source 
As a consequence now ice_alloc_vsi_qmap() does not fail. Remove unneeded
error checks.

MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D45852
This commit is contained in:
Zhenlei Huang 2024-09-03 18:25:29 +08:00
parent 92b0370ec6
commit 5f97656fa3
3 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/ice/ice_lib.c
View File

@ -426,31 +426,21 @@ ice_setup_pf_vsi(struct ice_softc *sc)
* all queues for this VSI are not yet assigned an index and thus, * all queues for this VSI are not yet assigned an index and thus,
* not ready for use. * not ready for use.
* *
* Returns an error code on failure.
*/ */
int void
ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
const int max_rx_queues) const int max_rx_queues)
{ {
struct ice_softc *sc = vsi->sc;
int i; int i;
MPASS(max_tx_queues > 0); MPASS(max_tx_queues > 0);
MPASS(max_rx_queues > 0); MPASS(max_rx_queues > 0);
/* Allocate Tx queue mapping memory */ /* Allocate Tx queue mapping memory */
if (!(vsi->tx_qmap = vsi->tx_qmap = malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK);
(u16 *) malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK))) {
device_printf(sc->dev, "Unable to allocate Tx qmap memory\n");
return (ENOMEM);
}
/* Allocate Rx queue mapping memory */ /* Allocate Rx queue mapping memory */
if (!(vsi->rx_qmap = vsi->rx_qmap = malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK);
(u16 *) malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK))) {
device_printf(sc->dev, "Unable to allocate Rx qmap memory\n");
goto free_tx_qmap;
}
/* Mark every queue map as invalid to start with */ /* Mark every queue map as invalid to start with */
for (i = 0; i < max_tx_queues; i++) { for (i = 0; i < max_tx_queues; i++) {
@ -459,14 +449,6 @@ ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
for (i = 0; i < max_rx_queues; i++) { for (i = 0; i < max_rx_queues; i++) {
vsi->rx_qmap[i] = ICE_INVALID_RES_IDX; vsi->rx_qmap[i] = ICE_INVALID_RES_IDX;
} }
return 0;
free_tx_qmap:
free(vsi->tx_qmap, M_ICE);
vsi->tx_qmap = NULL;
return (ENOMEM);
} }
/** /**

2
sys/dev/ice/ice_lib.h
View File

@ -830,7 +830,7 @@ void ice_free_bar(device_t dev, struct ice_bar_info *bar);
void ice_set_ctrlq_len(struct ice_hw *hw); void ice_set_ctrlq_len(struct ice_hw *hw);
void ice_release_vsi(struct ice_vsi *vsi); void ice_release_vsi(struct ice_vsi *vsi);
struct ice_vsi *ice_alloc_vsi(struct ice_softc *sc, enum ice_vsi_type type); struct ice_vsi *ice_alloc_vsi(struct ice_softc *sc, enum ice_vsi_type type);
int ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
const int max_rx_queues); const int max_rx_queues);
void ice_free_vsi_qmaps(struct ice_vsi *vsi); void ice_free_vsi_qmaps(struct ice_vsi *vsi);
int ice_initialize_vsi(struct ice_vsi *vsi); int ice_initialize_vsi(struct ice_vsi *vsi);

13
sys/dev/ice/if_ice_iflib.c
View File

@ -631,12 +631,8 @@ reinit_hw:
*/ */
ice_setup_pf_vsi(sc); ice_setup_pf_vsi(sc);
err = ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max, ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max,
scctx->isc_nrxqsets_max); scctx->isc_nrxqsets_max);
if (err) {
device_printf(dev, "Unable to allocate VSI Queue maps\n");
goto free_main_vsi;
}
/* Allocate MSI-X vectors (due to isc_flags IFLIB_SKIP_MSIX) */ /* Allocate MSI-X vectors (due to isc_flags IFLIB_SKIP_MSIX) */
err = ice_allocate_msix(sc); err = ice_allocate_msix(sc);
@ -3518,12 +3514,7 @@ ice_setup_mirror_vsi(struct ice_mirr_if *mif)
mif->vsi = vsi; mif->vsi = vsi;
/* Reserve VSI queue allocation from PF queues */ /* Reserve VSI queue allocation from PF queues */
ret = ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES); ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES);
if (ret) {
device_printf(dev, "%s: Unable to allocate mirror VSI queue maps (%d queues): %s\n",
__func__, ICE_DEFAULT_VF_QUEUES, ice_err_str(ret));
goto release_vsi;
}
vsi->num_tx_queues = vsi->num_rx_queues = ICE_DEFAULT_VF_QUEUES; vsi->num_tx_queues = vsi->num_rx_queues = ICE_DEFAULT_VF_QUEUES;
/* Assign Tx queues from PF space */ /* Assign Tx queues from PF space */