Page MenuHomeFreeBSD
Differential D30944

pf: Reduce the data returned in DIOCGETSTATESNV
ClosedPublic
Actions

Authored by kp on Jun 29 2021, 7:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 8:26 AM
Unknown Object (File)
Tue, Feb 25, 1:05 AM
Unknown Object (File)
Feb 7 2025, 12:05 PM
Unknown Object (File)
Feb 1 2025, 12:03 AM
Unknown Object (File)
Jan 16 2025, 5:18 PM
Unknown Object (File)
Jan 16 2025, 5:01 PM
Unknown Object (File)
Jan 16 2025, 1:13 PM
Unknown Object (File)
Dec 28 2024, 3:20 AM
View All 59 Files
Subscribers
donner
farrokhi
imp
melifaro

Details

Reviewers
donner
Group Reviewers
network
pfsense
Commits
rG63a8dc255208: pf: Reduce the data returned in DIOCGETSTATESNV
rG9e5d987058fe: pf: Reduce the data returned in DIOCGETSTATESNV
rG34285eefddc9: pf: Reduce the data returned in DIOCGETSTATESNV
Summary

This call is particularly slow due to the large amount of data it
returns. Remove all fields pfctl does not use. There is no functional
impact to pfctl, but it somewhat speeds up the call.

It might affect other (i.e. non-FreeBSD) code that uses the new
interface, but this call is very new, so there's unlikely to be any. No
releases contained the previous version, so we choose to live with the
ABI modification.

MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
libpfctl/
12 lines
22 lines
sys/
netpfil/
pf/
34 lines

Diff 91664

View Options

lib/libpfctl/libpfctl.h

Context not available.
iflib_dma_free(&softc->rx_stats[i]); iflib_dma_free(&softc->rx_stats[i]);
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
iflib_dma_free(&softc->hw_tx_port_stats_ext);
iflib_dma_free(&softc->hw_rx_port_stats_ext);
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
free(softc->ag_rings, M_DEVBUF); free(softc->ag_rings, M_DEVBUF);
free(softc->rx_rings, M_DEVBUF); free(softc->rx_rings, M_DEVBUF);
Context not available.
bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag, bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag,
softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD); softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING, rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING,
&softc->hw_tx_port_stats, 0); &softc->hw_tx_port_stats, 0);
if (rc) if (rc)
goto hw_port_tx_stats_alloc_fail; goto hw_port_tx_stats_alloc_fail;
Context not available.
softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr; softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr;
softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr; softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr;
rc = iflib_dma_alloc(ctx, sizeof(struct rx_port_stats_ext),
&softc->hw_rx_port_stats_ext, 0);
if (rc)
goto hw_port_rx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_rx_port_stats_ext.idi_tag,
softc->hw_rx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats_ext),
&softc->hw_tx_port_stats_ext, 0);
if (rc)
goto hw_port_tx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_tx_port_stats_ext.idi_tag,
softc->hw_tx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
softc->rx_port_stats_ext = (void *) softc->hw_rx_port_stats_ext.idi_vaddr;
softc->tx_port_stats_ext = (void *) softc->hw_tx_port_stats_ext.idi_vaddr;
for (i = 0; i < nrxqsets; i++) { for (i = 0; i < nrxqsets; i++) {
/* Allocation the completion ring */ /* Allocation the completion ring */
softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE; softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE;
Context not available.
* HWRM every sec with which firmware timeouts can happen * HWRM every sec with which firmware timeouts can happen
*/ */
if (BNXT_PF(softc)) if (BNXT_PF(softc))
bnxt_create_port_stats_sysctls(softc); bnxt_create_port_stats_sysctls(softc);
/* And finally, the VNIC */ /* And finally, the VNIC */
softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE; softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE;
Context not available.
iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl); iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl);
rss_hash_alloc_fail: rss_hash_alloc_fail:
iflib_dma_free(&softc->vnic_info.mc_list); iflib_dma_free(&softc->vnic_info.mc_list);
tpa_alloc_fail:
mc_list_alloc_fail: mc_list_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i = i - 1; i >= 0; i--) {
free(softc->rx_rings[i].tpa_start, M_DEVBUF); if (softc->rx_rings[i].tpa_start)
free(softc->rx_rings[i].tpa_start, M_DEVBUF);
}
tpa_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats_ext);
hw_port_tx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats_ext);
hw_port_rx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
hw_port_tx_stats_alloc_fail: hw_port_tx_stats_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
hw_port_rx_stats_alloc_fail: hw_port_rx_stats_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i=0; i < nrxqsets; i++) {
iflib_dma_free(&softc->rx_stats[i]); if (softc->rx_stats[i].idi_vaddr)
iflib_dma_free(&softc->rx_stats[i]);
}
hw_stats_alloc_fail: hw_stats_alloc_fail:
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
grp_alloc_fail: grp_alloc_fail:
Context not available.
bnxt_hwrm_port_qstats(softc); bnxt_hwrm_port_qstats(softc);
if (BNXT_CHIP_P5(softc) &&
(softc->flags & BNXT_FLAG_FW_CAP_EXT_STATS))
bnxt_hwrm_port_qstats_ext(softc);
if (BNXT_CHIP_P5(softc)) { if (BNXT_CHIP_P5(softc)) {
struct ifmediareq ifmr; struct ifmediareq ifmr;
Context not available.
View Options

lib/libpfctl/libpfctl.c

Context not available.
iflib_dma_free(&softc->rx_stats[i]); iflib_dma_free(&softc->rx_stats[i]);
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
iflib_dma_free(&softc->hw_tx_port_stats_ext);
iflib_dma_free(&softc->hw_rx_port_stats_ext);
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
free(softc->ag_rings, M_DEVBUF); free(softc->ag_rings, M_DEVBUF);
free(softc->rx_rings, M_DEVBUF); free(softc->rx_rings, M_DEVBUF);
Context not available.
bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag, bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag,
softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD); softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING, rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING,
&softc->hw_tx_port_stats, 0); &softc->hw_tx_port_stats, 0);
if (rc) if (rc)
goto hw_port_tx_stats_alloc_fail; goto hw_port_tx_stats_alloc_fail;
Context not available.
softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr; softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr;
softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr; softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr;
rc = iflib_dma_alloc(ctx, sizeof(struct rx_port_stats_ext),
&softc->hw_rx_port_stats_ext, 0);
if (rc)
goto hw_port_rx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_rx_port_stats_ext.idi_tag,
softc->hw_rx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats_ext),
&softc->hw_tx_port_stats_ext, 0);
if (rc)
goto hw_port_tx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_tx_port_stats_ext.idi_tag,
softc->hw_tx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
softc->rx_port_stats_ext = (void *) softc->hw_rx_port_stats_ext.idi_vaddr;
softc->tx_port_stats_ext = (void *) softc->hw_tx_port_stats_ext.idi_vaddr;
for (i = 0; i < nrxqsets; i++) { for (i = 0; i < nrxqsets; i++) {
/* Allocation the completion ring */ /* Allocation the completion ring */
softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE; softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE;
Context not available.
* HWRM every sec with which firmware timeouts can happen * HWRM every sec with which firmware timeouts can happen
*/ */
if (BNXT_PF(softc)) if (BNXT_PF(softc))
bnxt_create_port_stats_sysctls(softc); bnxt_create_port_stats_sysctls(softc);
/* And finally, the VNIC */ /* And finally, the VNIC */
softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE; softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE;
Context not available.
iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl); iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl);
rss_hash_alloc_fail: rss_hash_alloc_fail:
iflib_dma_free(&softc->vnic_info.mc_list); iflib_dma_free(&softc->vnic_info.mc_list);
tpa_alloc_fail:
mc_list_alloc_fail: mc_list_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i = i - 1; i >= 0; i--) {
free(softc->rx_rings[i].tpa_start, M_DEVBUF); if (softc->rx_rings[i].tpa_start)
free(softc->rx_rings[i].tpa_start, M_DEVBUF);
}
tpa_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats_ext);
hw_port_tx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats_ext);
hw_port_rx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
hw_port_tx_stats_alloc_fail: hw_port_tx_stats_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
hw_port_rx_stats_alloc_fail: hw_port_rx_stats_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i=0; i < nrxqsets; i++) {
iflib_dma_free(&softc->rx_stats[i]); if (softc->rx_stats[i].idi_vaddr)
iflib_dma_free(&softc->rx_stats[i]);
}
hw_stats_alloc_fail: hw_stats_alloc_fail:
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
grp_alloc_fail: grp_alloc_fail:
Context not available.
bnxt_hwrm_port_qstats(softc); bnxt_hwrm_port_qstats(softc);
if (BNXT_CHIP_P5(softc) &&
(softc->flags & BNXT_FLAG_FW_CAP_EXT_STATS))
bnxt_hwrm_port_qstats_ext(softc);
if (BNXT_CHIP_P5(softc)) { if (BNXT_CHIP_P5(softc)) {
struct ifmediareq ifmr; struct ifmediareq ifmr;
Context not available.
View Options

sys/netpfil/pf/pf_nv.c

Context not available.
iflib_dma_free(&softc->rx_stats[i]); iflib_dma_free(&softc->rx_stats[i]);
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
iflib_dma_free(&softc->hw_tx_port_stats_ext);
iflib_dma_free(&softc->hw_rx_port_stats_ext);
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
free(softc->ag_rings, M_DEVBUF); free(softc->ag_rings, M_DEVBUF);
free(softc->rx_rings, M_DEVBUF); free(softc->rx_rings, M_DEVBUF);
Context not available.
bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag, bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag,
softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD); softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING, rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING,
&softc->hw_tx_port_stats, 0); &softc->hw_tx_port_stats, 0);
if (rc) if (rc)
goto hw_port_tx_stats_alloc_fail; goto hw_port_tx_stats_alloc_fail;
Context not available.
softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr; softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr;
softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr; softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr;
rc = iflib_dma_alloc(ctx, sizeof(struct rx_port_stats_ext),
&softc->hw_rx_port_stats_ext, 0);
if (rc)
goto hw_port_rx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_rx_port_stats_ext.idi_tag,
softc->hw_rx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats_ext),
&softc->hw_tx_port_stats_ext, 0);
if (rc)
goto hw_port_tx_stats_ext_alloc_fail;
bus_dmamap_sync(softc->hw_tx_port_stats_ext.idi_tag,
softc->hw_tx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD);
softc->rx_port_stats_ext = (void *) softc->hw_rx_port_stats_ext.idi_vaddr;
softc->tx_port_stats_ext = (void *) softc->hw_tx_port_stats_ext.idi_vaddr;
for (i = 0; i < nrxqsets; i++) { for (i = 0; i < nrxqsets; i++) {
/* Allocation the completion ring */ /* Allocation the completion ring */
softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE; softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE;
Context not available.
* HWRM every sec with which firmware timeouts can happen * HWRM every sec with which firmware timeouts can happen
*/ */
if (BNXT_PF(softc)) if (BNXT_PF(softc))
bnxt_create_port_stats_sysctls(softc); bnxt_create_port_stats_sysctls(softc);
/* And finally, the VNIC */ /* And finally, the VNIC */
softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE; softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE;
Context not available.
iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl); iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl);
rss_hash_alloc_fail: rss_hash_alloc_fail:
iflib_dma_free(&softc->vnic_info.mc_list); iflib_dma_free(&softc->vnic_info.mc_list);
tpa_alloc_fail:
mc_list_alloc_fail: mc_list_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i = i - 1; i >= 0; i--) {
free(softc->rx_rings[i].tpa_start, M_DEVBUF); if (softc->rx_rings[i].tpa_start)
free(softc->rx_rings[i].tpa_start, M_DEVBUF);
}
tpa_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats_ext);
hw_port_tx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats_ext);
hw_port_rx_stats_ext_alloc_fail:
iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_tx_port_stats);
hw_port_tx_stats_alloc_fail: hw_port_tx_stats_alloc_fail:
iflib_dma_free(&softc->hw_rx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats);
hw_port_rx_stats_alloc_fail: hw_port_rx_stats_alloc_fail:
for (i = i - 1; i >= 0; i--) for (i=0; i < nrxqsets; i++) {
iflib_dma_free(&softc->rx_stats[i]); if (softc->rx_stats[i].idi_vaddr)
iflib_dma_free(&softc->rx_stats[i]);
}
hw_stats_alloc_fail: hw_stats_alloc_fail:
free(softc->grp_info, M_DEVBUF); free(softc->grp_info, M_DEVBUF);
grp_alloc_fail: grp_alloc_fail:
Context not available.
bnxt_hwrm_port_qstats(softc); bnxt_hwrm_port_qstats(softc);
if (BNXT_CHIP_P5(softc) &&
(softc->flags & BNXT_FLAG_FW_CAP_EXT_STATS))
bnxt_hwrm_port_qstats_ext(softc);
if (BNXT_CHIP_P5(softc)) { if (BNXT_CHIP_P5(softc)) {
struct ifmediareq ifmr; struct ifmediareq ifmr;
Context not available.