Date: Mon, 28 Jul 2025 12:14:05 -1000 From: Warner Losh <imp@bsdimp.com> To: Kevin Bowling <kevin.bowling@kev009.com> Cc: Kristof Provost <kp@freebsd.org>, Krzysztof Galazka <kgalazka@freebsd.org>, Warner Losh <imp@freebsd.org>, Eric Joyner <eric.joyner@intel.com>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 430f1acc451c - main - ice(4): Add MAC filter and VLAN resource limits to VFs Message-ID: <CANCZdfqrzboT_jGqe47jYO1%2BpymFfO4Dnf62fZ2av3m7GAQSNw@mail.gmail.com> In-Reply-To: <CAK7dMtC9BD9txMJGGomg7oobtDce2QLaRt5duG5QU16u2_7kEQ@mail.gmail.com> References: <202507181916.56IJGLMK001122@gitrepo.freebsd.org> <A6ABB965-BD49-492D-B3AA-0EA973C344D6@FreeBSD.org> <CANCZdfqMQ5pktZp_o8sAUEcLH=8WKaqmofmYx6EZpMNJcc=2Rg@mail.gmail.com> <F0A45EE7-B379-4CED-A8E9-089ECC14A302@FreeBSD.org> <CAK7dMtC9BD9txMJGGomg7oobtDce2QLaRt5duG5QU16u2_7kEQ@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Mon, Jul 28, 2025, 9:42 AM Kevin Bowling <kevin.bowling@kev009.com>
wrote:
> One gentle reminder in all this, kgalazka@ is under mentorship and
> should be included in especially ixl and ice work and follow ups so we
> can release him to make all these mistakes and fixes :)
>
This was my mistake for pushing the pull request without enough interaction
or testing.
Warner
Regards,
> Kevin
>
>
> On Mon, Jul 28, 2025 at 12:01 PM Kristof Provost <kp@freebsd.org> wrote:
> >
> > That’s confirmed, that has indeed fixed the arm64 LINT build errors.
> > Thanks des.
> >
> > We’re still failing riscv and i386, but those are different errors.
> >
> > The riscv one is new (or I haven’t seen it before, anyway):
> >
> > --- all_subdir_usr.bin ---
> > ld: error: undefined symbol: llvm::DisableABIBreakingChecks
> > >>> referenced by ClangScanDeps.cpp
> > >>>
> ClangScanDeps.pieo:(llvm::VerifyDisableABIBreakingChecks)
> > c++: error: linker command failed with exit code 1 (use -v to see
> invocation)
> >
> > i386 has been failing for a while:
> >
> > --- all_subdir_sbin/recoverdisk ---
> > /usr/src/sbin/recoverdisk/recoverdisk.c:830:38: error: comparison of
> integers of different signs: 'unsigned int' and 'time_t' (aka 'int')
> [-Werror,-Wsign-compare]
> > --- all_subdir_usr.bin ---
> > --- uuencode.o ---
> > cc -target i386-unknown-freebsd15.0
> --sysroot=/usr/obj/usr/src/i386.i386/tmp
> -B/usr/obj/usr/src/i386.i386/tmp/usr/bin -O2 -pipe -fno-common -g
> -gz=zlib -MD -MF.depend.uuencode.o -MTuu
> > encode.o -std=gnu17 -Wno-format-zero-length -fstack-protector-strong
> -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
> -Wstrict-prototypes -Wmissing-prototypes -Wpoi
> > nter-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow
> -Wunused-parameter -Wcast-align -Wchar-subscripts -Wnested-externs
> -Wold-style-definition -Wno-pointer-sign -Wdate-t
> > ime -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body
> -Wno-string-plus-int -Wno-unused-const-variable
> -Wno-error=unused-but-set-parameter -Wno-error=cast-function-type-misma
> > tch -Qunused-arguments -c /usr/src/usr.bin/bintrans/uuencode.c -o
> uuencode.o
> > --- all_subdir_sbin ---
> > 830 | if (unsaved && (t_save + snapshot) < t_now) {
> > | ~~~~~~~~~~~~~~~~~ ^ ~~~~~
> > 1 error generated.
> > *** [recoverdisk.o] Error code 1
> >
> > —
> > Kristof
> >
> > On 28 Jul 2025, at 19:45, Warner Losh wrote:
> >
> > I think DES may have just fixed this. Can you confirm?
> >
> > Warner
> >
> > On Mon, Jul 28, 2025 at 3:23 AM Kristof Provost kp@freebsd.org wrote:
> >
> > I’m not sure if it’s this specific commit or another one in the recent
> dev/ice updates, but the arm64 LINT-FDT, LINT-ACPI and LINT builds all fail.
> >
> > This is from arm64-LINT:
> >
> > ld: error: undefined symbol: ice_iov_attach
> > >>> referenced by if_ice_iflib.c:859
> (/usr/src/sys/dev/ice/if_ice_iflib.c:859)
> > >>> if_ice_iflib.o:(ice_if_attach_post)
> >
> > ld: error: undefined symbol: ice_iov_detach
> > >>> referenced by if_ice_iflib.c:989
> (/usr/src/sys/dev/ice/if_ice_iflib.c:989)
> > >>> if_ice_iflib.o:(ice_if_detach)
> > >>> referenced by if_ice_iflib.c:2323
> (/usr/src/sys/dev/ice/if_ice_iflib.c:2323)
> > >>> if_ice_iflib.o:(ice_if_update_admin_status)
> > >>> referenced by if_ice_iflib.c:2376
> (/usr/src/sys/dev/ice/if_ice_iflib.c:2376)
> > >>> if_ice_iflib.o:(ice_transition_safe_mode)
> >
> > ld: error: undefined symbol: ice_iov_add_vf
> > >>> referenced by if_ice_iflib.c:3464
> (/usr/src/sys/dev/ice/if_ice_iflib.c:3464)
> > >>> if_ice_iflib.o:(ice_if_iov_vf_add)
> >
> > ld: error: undefined symbol: ice_iov_init
> > >>> referenced by if_ice_iflib.c:3429
> (/usr/src/sys/dev/ice/if_ice_iflib.c:3429)
> > >>> if_ice_iflib.o:(ice_if_iov_init)
> >
> > ld: error: undefined symbol: ice_iov_uninit
> > >>> referenced by if_ice_iflib.c:3445
> (/usr/src/sys/dev/ice/if_ice_iflib.c:3445)
> > >>> if_ice_iflib.o:(ice_if_iov_uninit)
> >
> > ld: error: undefined symbol: ice_iov_handle_vflr
> > >>> referenced by if_ice_iflib.c:3480
> (/usr/src/sys/dev/ice/if_ice_iflib.c:3480)
> > >>> if_ice_iflib.o:(ice_if_vflr_handle)
> >
> > ld: error: undefined symbol: ice_vc_notify_all_vfs_link_state
> > >>> referenced by if_ice_iflib.c:757
> (/usr/src/sys/dev/ice/if_ice_iflib.c:757)
> > >>> if_ice_iflib.o:(ice_update_link_status)
> >
> > ld: error: undefined symbol: ice_vc_handle_vf_msg
> > >>> referenced by ice_lib.c:2285
> (/usr/src/sys/dev/ice/ice_lib.c:2285)
> > >>> ice_lib.o:(ice_process_ctrlq)
> > *** [kernel.full] Error code 1
> >
> > —
> > Kristof
> >
> > On 18 Jul 2025, at 21:16, Warner Losh wrote:
> >
> > The branch main has been updated by imp:
> >
> > URL:
> https://cgit.FreeBSD.org/src/commit/?id=430f1acc451c7084d1d5aa7df7e7ecccea1a8b51
> >
> > commit 430f1acc451c7084d1d5aa7df7e7ecccea1a8b51
> > Author: Eric Joyner eric.joyner@intel.com
> > AuthorDate: 2024-10-17 22:19:09 +0000
> > Commit: Warner Losh imp@FreeBSD.org
> > CommitDate: 2025-07-18 19:16:17 +0000
> >
> > ice(4): Add MAC filter and VLAN resource limits to VFs
> >
> > Adds two new parameters to iovctl config for VLAN filter limits and MAC
> > filter limits and gives them defaults of 64 and 16, respectively.
> >
> > These are intended to limit the number of resources that a VF can
> > consume so that any one VF cannot starve an other VFs or the PF of
> > filters.
> >
> > Signed-off-by: Eric Joyner <eric.joyner@intel.com>
> > Signed-off-by: Krzysztof Galazka <krzysztof.galazka@intel.com>
> > Reviewed by: imp
> > Pull Request: https://github.com/freebsd/freebsd-src/pull/1573
> >
> > ________________________________
> >
> > sys/dev/ice/ice_iov.c | 45 ++++++++++++++++++++++++++++++++++++++++++---
> > sys/dev/ice/ice_iov.h | 8 ++++++++
> > 2 files changed, 50 insertions(+), 3 deletions(-)
> >
> > diff --git a/sys/dev/ice/ice_iov.c b/sys/dev/ice/ice_iov.c
> > index fc37a0e7679c..e06c7eb56f7a 100644
> > --- a/sys/dev/ice/ice_iov.c
> > +++ b/sys/dev/ice/ice_iov.c
> > @@ -117,6 +117,10 @@ ice_iov_attach(struct ice_softc *sc)
> > IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_QUEUES);
> > pci_iov_schema_add_uint16(vf_schema, "mirror-src-vsi",
> > IOV_SCHEMA_HASDEFAULT, ICE_INVALID_MIRROR_VSI);
> >
> > pci_iov_schema_add_uint16(vf_schema, "max-vlan-allowed",
> >
> > IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_VLAN_LIMIT);
> >
> > pci_iov_schema_add_uint16(vf_schema, "max-mac-filters",
> >
> > IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_FILTER_LIMIT);
> >
> > error = pci_iov_attach(dev, pf_schema, vf_schema);
> > if (error != 0) {
> >
> > @@ -360,6 +364,9 @@ ice_iov_add_vf(struct ice_softc *sc, uint16_t vfnum,
> const nvlist_t *params)
> >
> > vsi->mirror_src_vsi = nvlist_get_number(params, "mirror-src-vsi");
> >
> > vf->vlan_limit = nvlist_get_number(params, "max-vlan-allowed");
> >
> > vf->mac_filter_limit = nvlist_get_number(params, "max-mac-filters");
> >
> > vf->vf_flags |= VF_FLAG_VLAN_CAP;
> >
> > /* Create and setup VSI in HW */
> >
> > @@ -735,10 +742,17 @@ ice_vc_add_eth_addr_msg(struct ice_softc *sc,
> struct ice_vf *vf, u8 *msg_buf)
> > enum virtchnl_status_code v_status = VIRTCHNL_STATUS_SUCCESS;
> > struct virtchnl_ether_addr_list *addr_list;
> > struct ice_hw *hw = &sc->hw;
> >
> > u16 added_addr_cnt = 0;
> > int error = 0;
> >
> > addr_list = (struct virtchnl_ether_addr_list *)msg_buf;
> >
> > if (addr_list->num_elements >
> >
> > (vf->mac_filter_limit - vf->mac_filter_cnt)) {
> >
> > v_status = VIRTCHNL_STATUS_ERR_NO_MEMORY;
> >
> > goto done;
> >
> > }
> >
> > for (int i = 0; i < addr_list->num_elements; i++) {
> > u8 *addr = addr_list->list[i].addr;
> >
> > @@ -767,10 +781,15 @@ ice_vc_add_eth_addr_msg(struct ice_softc *sc,
> struct ice_vf *vf, u8 *msg_buf)
> > "%s: VF-%d: Error adding MAC addr for VSI %d\n",
> > func, vf->vf_num, vf->vsi->idx);
> > v_status = VIRTCHNL_STATUS_ERR_PARAM;
> >
> > goto done;
> >
> > continue;
> > }
> >
> > /* Don't count VF's MAC against its MAC filter limit */
> >
> > if (memcmp(addr, vf->mac, ETHER_ADDR_LEN))
> >
> > added_addr_cnt++;
> > }
> >
> > vf->mac_filter_cnt += added_addr_cnt;
> >
> > done:
> > ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_ADD_ETH_ADDR,
> > v_status, NULL, 0, NULL);
> > @@ -791,6 +810,7 @@ ice_vc_del_eth_addr_msg(struct ice_softc *sc, struct
> ice_vf *vf, u8 *msg_buf)
> > enum virtchnl_status_code v_status = VIRTCHNL_STATUS_SUCCESS;
> > struct virtchnl_ether_addr_list *addr_list;
> > struct ice_hw *hw = &sc->hw;
> >
> > u16 deleted_addr_cnt = 0;
> > int error = 0;
> >
> > addr_list = (struct virtchnl_ether_addr_list *)msg_buf;
> >
> > @@ -802,11 +822,18 @@ ice_vc_del_eth_addr_msg(struct ice_softc *sc,
> struct ice_vf *vf, u8 *msg_buf)
> > "%s: VF-%d: Error removing MAC addr for VSI %d\n",
> > func, vf->vf_num, vf->vsi->idx);
> > v_status = VIRTCHNL_STATUS_ERR_PARAM;
> >
> > goto done;
> >
> > continue;
> > }
> >
> > /* Don't count VF's MAC against its MAC filter limit */
> >
> > if (memcmp(addr_list->list[i].addr, vf->mac, ETHER_ADDR_LEN))
> >
> > deleted_addr_cnt++;
> > }
> >
> > -done:
> >
> > if (deleted_addr_cnt >= vf->mac_filter_cnt)
> >
> > vf->mac_filter_cnt = 0;
> >
> > else
> >
> > vf->mac_filter_cnt -= deleted_addr_cnt;
> >
> > ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_DEL_ETH_ADDR,
> > v_status, NULL, 0, NULL);
> >
> > }
> > @@ -838,6 +865,11 @@ ice_vc_add_vlan_msg(struct ice_softc *sc, struct
> ice_vf *vf, u8 *msg_buf)
> > goto done;
> > }
> >
> > if (vlan_list->num_elements > (vf->vlan_limit - vf->vlan_cnt)) {
> >
> > v_status = VIRTCHNL_STATUS_ERR_NO_MEMORY;
> >
> > goto done;
> >
> > }
> >
> > status = ice_add_vlan_hw_filters(vsi, vlan_list->vlan_id,
> > vlan_list->num_elements);
> > if (status) {
> >
> > @@ -849,6 +881,8 @@ ice_vc_add_vlan_msg(struct ice_softc *sc, struct
> ice_vf *vf, u8 *msg_buf)
> > goto done;
> > }
> >
> > vf->vlan_cnt += vlan_list->num_elements;
> >
> > done:
> > ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_ADD_VLAN,
> > v_status, NULL, 0, NULL);
> > @@ -892,6 +926,11 @@ ice_vc_del_vlan_msg(struct ice_softc *sc, struct
> ice_vf *vf, u8 *msg_buf)
> > goto done;
> > }
> >
> > if (vlan_list->num_elements >= vf->vlan_cnt)
> >
> > vf->vlan_cnt = 0;
> >
> > else
> >
> > vf->vlan_cnt -= vlan_list->num_elements;
> >
> > done:
> > ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_DEL_VLAN,
> > v_status, NULL, 0, NULL);
> > diff --git a/sys/dev/ice/ice_iov.h b/sys/dev/ice/ice_iov.h
> > index c2ac5fcd5c94..c4fb3e932e3f 100644
> > --- a/sys/dev/ice/ice_iov.h
> > +++ b/sys/dev/ice/ice_iov.h
> > @@ -85,6 +85,11 @@ struct ice_vf {
> > u16 vf_num;
> > struct virtchnl_version_info version;
> >
> > u16 mac_filter_limit;
> >
> > u16 mac_filter_cnt;
> >
> > u16 vlan_limit;
> >
> > u16 vlan_cnt;
> >
> > u16 num_irq_vectors;
> > u16 *vf_imap;
> > struct ice_irq_vector *tx_irqvs;
> >
> > @@ -101,6 +106,9 @@ struct ice_vf {
> > #define ICE_VIRTCHNL_VALID_PROMISC_FLAGS (FLAG_VF_UNICAST_PROMISC |
> > FLAG_VF_MULTICAST_PROMISC)
> >
> > +#define ICE_DEFAULT_VF_VLAN_LIMIT 64
> > +#define ICE_DEFAULT_VF_FILTER_LIMIT 16
> > +
> > int ice_iov_attach(struct ice_softc *sc);
> > int ice_iov_detach(struct ice_softc *sc);
>
[-- Attachment #2 --]
<div dir="auto"><div><br><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Mon, Jul 28, 2025, 9:42 AM Kevin Bowling <<a href="mailto:kevin.bowling@kev009.com">kevin.bowling@kev009.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">One gentle reminder in all this, kgalazka@ is under mentorship and<br>
should be included in especially ixl and ice work and follow ups so we<br>
can release him to make all these mistakes and fixes :)<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">This was my mistake for pushing the pull request without enough interaction or testing.</div><div dir="auto"><br></div><div dir="auto">Warner</div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote gmail_quote_container"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Regards,<br>
Kevin<br>
<br>
<br>
On Mon, Jul 28, 2025 at 12:01 PM Kristof Provost <<a href="mailto:kp@freebsd.org" target="_blank" rel="noreferrer">kp@freebsd.org</a>> wrote:<br>
><br>
> That’s confirmed, that has indeed fixed the arm64 LINT build errors.<br>
> Thanks des.<br>
><br>
> We’re still failing riscv and i386, but those are different errors.<br>
><br>
> The riscv one is new (or I haven’t seen it before, anyway):<br>
><br>
> --- all_subdir_usr.bin ---<br>
> ld: error: undefined symbol: llvm::DisableABIBreakingChecks<br>
> >>> referenced by ClangScanDeps.cpp<br>
> >>> ClangScanDeps.pieo:(llvm::VerifyDisableABIBreakingChecks)<br>
> c++: error: linker command failed with exit code 1 (use -v to see invocation)<br>
><br>
> i386 has been failing for a while:<br>
><br>
> --- all_subdir_sbin/recoverdisk ---<br>
> /usr/src/sbin/recoverdisk/recoverdisk.c:830:38: error: comparison of integers of different signs: 'unsigned int' and 'time_t' (aka 'int') [-Werror,-Wsign-compare]<br>
> --- all_subdir_usr.bin ---<br>
> --- uuencode.o ---<br>
> cc -target i386-unknown-freebsd15.0 --sysroot=/usr/obj/usr/src/i386.i386/tmp -B/usr/obj/usr/src/i386.i386/tmp/usr/bin -O2 -pipe -fno-common -g -gz=zlib -MD -MF.depend.uuencode.o -MTuu<br>
> encode.o -std=gnu17 -Wno-format-zero-length -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpoi<br>
> nter-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Wnested-externs -Wold-style-definition -Wno-pointer-sign -Wdate-t<br>
> ime -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-parameter -Wno-error=cast-function-type-misma<br>
> tch -Qunused-arguments -c /usr/src/usr.bin/bintrans/uuencode.c -o uuencode.o<br>
> --- all_subdir_sbin ---<br>
> 830 | if (unsaved && (t_save + snapshot) < t_now) {<br>
> | ~~~~~~~~~~~~~~~~~ ^ ~~~~~<br>
> 1 error generated.<br>
> *** [recoverdisk.o] Error code 1<br>
><br>
> —<br>
> Kristof<br>
><br>
> On 28 Jul 2025, at 19:45, Warner Losh wrote:<br>
><br>
> I think DES may have just fixed this. Can you confirm?<br>
><br>
> Warner<br>
><br>
> On Mon, Jul 28, 2025 at 3:23 AM Kristof Provost <a href="mailto:kp@freebsd.org" target="_blank" rel="noreferrer">kp@freebsd.org</a> wrote:<br>
><br>
> I’m not sure if it’s this specific commit or another one in the recent dev/ice updates, but the arm64 LINT-FDT, LINT-ACPI and LINT builds all fail.<br>
><br>
> This is from arm64-LINT:<br>
><br>
> ld: error: undefined symbol: ice_iov_attach<br>
> >>> referenced by if_ice_iflib.c:859 (/usr/src/sys/dev/ice/if_ice_iflib.c:859)<br>
> >>> if_ice_iflib.o:(ice_if_attach_post)<br>
><br>
> ld: error: undefined symbol: ice_iov_detach<br>
> >>> referenced by if_ice_iflib.c:989 (/usr/src/sys/dev/ice/if_ice_iflib.c:989)<br>
> >>> if_ice_iflib.o:(ice_if_detach)<br>
> >>> referenced by if_ice_iflib.c:2323 (/usr/src/sys/dev/ice/if_ice_iflib.c:2323)<br>
> >>> if_ice_iflib.o:(ice_if_update_admin_status)<br>
> >>> referenced by if_ice_iflib.c:2376 (/usr/src/sys/dev/ice/if_ice_iflib.c:2376)<br>
> >>> if_ice_iflib.o:(ice_transition_safe_mode)<br>
><br>
> ld: error: undefined symbol: ice_iov_add_vf<br>
> >>> referenced by if_ice_iflib.c:3464 (/usr/src/sys/dev/ice/if_ice_iflib.c:3464)<br>
> >>> if_ice_iflib.o:(ice_if_iov_vf_add)<br>
><br>
> ld: error: undefined symbol: ice_iov_init<br>
> >>> referenced by if_ice_iflib.c:3429 (/usr/src/sys/dev/ice/if_ice_iflib.c:3429)<br>
> >>> if_ice_iflib.o:(ice_if_iov_init)<br>
><br>
> ld: error: undefined symbol: ice_iov_uninit<br>
> >>> referenced by if_ice_iflib.c:3445 (/usr/src/sys/dev/ice/if_ice_iflib.c:3445)<br>
> >>> if_ice_iflib.o:(ice_if_iov_uninit)<br>
><br>
> ld: error: undefined symbol: ice_iov_handle_vflr<br>
> >>> referenced by if_ice_iflib.c:3480 (/usr/src/sys/dev/ice/if_ice_iflib.c:3480)<br>
> >>> if_ice_iflib.o:(ice_if_vflr_handle)<br>
><br>
> ld: error: undefined symbol: ice_vc_notify_all_vfs_link_state<br>
> >>> referenced by if_ice_iflib.c:757 (/usr/src/sys/dev/ice/if_ice_iflib.c:757)<br>
> >>> if_ice_iflib.o:(ice_update_link_status)<br>
><br>
> ld: error: undefined symbol: ice_vc_handle_vf_msg<br>
> >>> referenced by ice_lib.c:2285 (/usr/src/sys/dev/ice/ice_lib.c:2285)<br>
> >>> ice_lib.o:(ice_process_ctrlq)<br>
> *** [kernel.full] Error code 1<br>
><br>
> —<br>
> Kristof<br>
><br>
> On 18 Jul 2025, at 21:16, Warner Losh wrote:<br>
><br>
> The branch main has been updated by imp:<br>
><br>
> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=430f1acc451c7084d1d5aa7df7e7ecccea1a8b51" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=430f1acc451c7084d1d5aa7df7e7ecccea1a8b51</a><br>;
><br>
> commit 430f1acc451c7084d1d5aa7df7e7ecccea1a8b51<br>
> Author: Eric Joyner <a href="mailto:eric.joyner@intel.com" target="_blank" rel="noreferrer">eric.joyner@intel.com</a><br>
> AuthorDate: 2024-10-17 22:19:09 +0000<br>
> Commit: Warner Losh imp@FreeBSD.org<br>
> CommitDate: 2025-07-18 19:16:17 +0000<br>
><br>
> ice(4): Add MAC filter and VLAN resource limits to VFs<br>
><br>
> Adds two new parameters to iovctl config for VLAN filter limits and MAC<br>
> filter limits and gives them defaults of 64 and 16, respectively.<br>
><br>
> These are intended to limit the number of resources that a VF can<br>
> consume so that any one VF cannot starve an other VFs or the PF of<br>
> filters.<br>
><br>
> Signed-off-by: Eric Joyner <<a href="mailto:eric.joyner@intel.com" target="_blank" rel="noreferrer">eric.joyner@intel.com</a>><br>
> Signed-off-by: Krzysztof Galazka <<a href="mailto:krzysztof.galazka@intel.com" target="_blank" rel="noreferrer">krzysztof.galazka@intel.com</a>><br>
> Reviewed by: imp<br>
> Pull Request: <a href="https://github.com/freebsd/freebsd-src/pull/1573" rel="noreferrer noreferrer" target="_blank">https://github.com/freebsd/freebsd-src/pull/1573</a><br>;
><br>
> ________________________________<br>
><br>
> sys/dev/ice/ice_iov.c | 45 ++++++++++++++++++++++++++++++++++++++++++---<br>
> sys/dev/ice/ice_iov.h | 8 ++++++++<br>
> 2 files changed, 50 insertions(+), 3 deletions(-)<br>
><br>
> diff --git a/sys/dev/ice/ice_iov.c b/sys/dev/ice/ice_iov.c<br>
> index fc37a0e7679c..e06c7eb56f7a 100644<br>
> --- a/sys/dev/ice/ice_iov.c<br>
> +++ b/sys/dev/ice/ice_iov.c<br>
> @@ -117,6 +117,10 @@ ice_iov_attach(struct ice_softc *sc)<br>
> IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_QUEUES);<br>
> pci_iov_schema_add_uint16(vf_schema, "mirror-src-vsi",<br>
> IOV_SCHEMA_HASDEFAULT, ICE_INVALID_MIRROR_VSI);<br>
><br>
> pci_iov_schema_add_uint16(vf_schema, "max-vlan-allowed",<br>
><br>
> IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_VLAN_LIMIT);<br>
><br>
> pci_iov_schema_add_uint16(vf_schema, "max-mac-filters",<br>
><br>
> IOV_SCHEMA_HASDEFAULT, ICE_DEFAULT_VF_FILTER_LIMIT);<br>
><br>
> error = pci_iov_attach(dev, pf_schema, vf_schema);<br>
> if (error != 0) {<br>
><br>
> @@ -360,6 +364,9 @@ ice_iov_add_vf(struct ice_softc *sc, uint16_t vfnum, const nvlist_t *params)<br>
><br>
> vsi->mirror_src_vsi = nvlist_get_number(params, "mirror-src-vsi");<br>
><br>
> vf->vlan_limit = nvlist_get_number(params, "max-vlan-allowed");<br>
><br>
> vf->mac_filter_limit = nvlist_get_number(params, "max-mac-filters");<br>
><br>
> vf->vf_flags |= VF_FLAG_VLAN_CAP;<br>
><br>
> /* Create and setup VSI in HW */<br>
><br>
> @@ -735,10 +742,17 @@ ice_vc_add_eth_addr_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> enum virtchnl_status_code v_status = VIRTCHNL_STATUS_SUCCESS;<br>
> struct virtchnl_ether_addr_list *addr_list;<br>
> struct ice_hw *hw = &sc->hw;<br>
><br>
> u16 added_addr_cnt = 0;<br>
> int error = 0;<br>
><br>
> addr_list = (struct virtchnl_ether_addr_list *)msg_buf;<br>
><br>
> if (addr_list->num_elements ><br>
><br>
> (vf->mac_filter_limit - vf->mac_filter_cnt)) {<br>
><br>
> v_status = VIRTCHNL_STATUS_ERR_NO_MEMORY;<br>
><br>
> goto done;<br>
><br>
> }<br>
><br>
> for (int i = 0; i < addr_list->num_elements; i++) {<br>
> u8 *addr = addr_list->list[i].addr;<br>
><br>
> @@ -767,10 +781,15 @@ ice_vc_add_eth_addr_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> "%s: VF-%d: Error adding MAC addr for VSI %d\n",<br>
> func, vf->vf_num, vf->vsi->idx);<br>
> v_status = VIRTCHNL_STATUS_ERR_PARAM;<br>
><br>
> goto done;<br>
><br>
> continue;<br>
> }<br>
><br>
> /* Don't count VF's MAC against its MAC filter limit */<br>
><br>
> if (memcmp(addr, vf->mac, ETHER_ADDR_LEN))<br>
><br>
> added_addr_cnt++;<br>
> }<br>
><br>
> vf->mac_filter_cnt += added_addr_cnt;<br>
><br>
> done:<br>
> ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_ADD_ETH_ADDR,<br>
> v_status, NULL, 0, NULL);<br>
> @@ -791,6 +810,7 @@ ice_vc_del_eth_addr_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> enum virtchnl_status_code v_status = VIRTCHNL_STATUS_SUCCESS;<br>
> struct virtchnl_ether_addr_list *addr_list;<br>
> struct ice_hw *hw = &sc->hw;<br>
><br>
> u16 deleted_addr_cnt = 0;<br>
> int error = 0;<br>
><br>
> addr_list = (struct virtchnl_ether_addr_list *)msg_buf;<br>
><br>
> @@ -802,11 +822,18 @@ ice_vc_del_eth_addr_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> "%s: VF-%d: Error removing MAC addr for VSI %d\n",<br>
> func, vf->vf_num, vf->vsi->idx);<br>
> v_status = VIRTCHNL_STATUS_ERR_PARAM;<br>
><br>
> goto done;<br>
><br>
> continue;<br>
> }<br>
><br>
> /* Don't count VF's MAC against its MAC filter limit */<br>
><br>
> if (memcmp(addr_list->list[i].addr, vf->mac, ETHER_ADDR_LEN))<br>
><br>
> deleted_addr_cnt++;<br>
> }<br>
><br>
> -done:<br>
><br>
> if (deleted_addr_cnt >= vf->mac_filter_cnt)<br>
><br>
> vf->mac_filter_cnt = 0;<br>
><br>
> else<br>
><br>
> vf->mac_filter_cnt -= deleted_addr_cnt;<br>
><br>
> ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_DEL_ETH_ADDR,<br>
> v_status, NULL, 0, NULL);<br>
><br>
> }<br>
> @@ -838,6 +865,11 @@ ice_vc_add_vlan_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> goto done;<br>
> }<br>
><br>
> if (vlan_list->num_elements > (vf->vlan_limit - vf->vlan_cnt)) {<br>
><br>
> v_status = VIRTCHNL_STATUS_ERR_NO_MEMORY;<br>
><br>
> goto done;<br>
><br>
> }<br>
><br>
> status = ice_add_vlan_hw_filters(vsi, vlan_list->vlan_id,<br>
> vlan_list->num_elements);<br>
> if (status) {<br>
><br>
> @@ -849,6 +881,8 @@ ice_vc_add_vlan_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> goto done;<br>
> }<br>
><br>
> vf->vlan_cnt += vlan_list->num_elements;<br>
><br>
> done:<br>
> ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_ADD_VLAN,<br>
> v_status, NULL, 0, NULL);<br>
> @@ -892,6 +926,11 @@ ice_vc_del_vlan_msg(struct ice_softc *sc, struct ice_vf *vf, u8 *msg_buf)<br>
> goto done;<br>
> }<br>
><br>
> if (vlan_list->num_elements >= vf->vlan_cnt)<br>
><br>
> vf->vlan_cnt = 0;<br>
><br>
> else<br>
><br>
> vf->vlan_cnt -= vlan_list->num_elements;<br>
><br>
> done:<br>
> ice_aq_send_msg_to_vf(hw, vf->vf_num, VIRTCHNL_OP_DEL_VLAN,<br>
> v_status, NULL, 0, NULL);<br>
> diff --git a/sys/dev/ice/ice_iov.h b/sys/dev/ice/ice_iov.h<br>
> index c2ac5fcd5c94..c4fb3e932e3f 100644<br>
> --- a/sys/dev/ice/ice_iov.h<br>
> +++ b/sys/dev/ice/ice_iov.h<br>
> @@ -85,6 +85,11 @@ struct ice_vf {<br>
> u16 vf_num;<br>
> struct virtchnl_version_info version;<br>
><br>
> u16 mac_filter_limit;<br>
><br>
> u16 mac_filter_cnt;<br>
><br>
> u16 vlan_limit;<br>
><br>
> u16 vlan_cnt;<br>
><br>
> u16 num_irq_vectors;<br>
> u16 *vf_imap;<br>
> struct ice_irq_vector *tx_irqvs;<br>
><br>
> @@ -101,6 +106,9 @@ struct ice_vf {<br>
> #define ICE_VIRTCHNL_VALID_PROMISC_FLAGS (FLAG_VF_UNICAST_PROMISC |<br>
> FLAG_VF_MULTICAST_PROMISC)<br>
><br>
> +#define ICE_DEFAULT_VF_VLAN_LIMIT 64<br>
> +#define ICE_DEFAULT_VF_FILTER_LIMIT 16<br>
> +<br>
> int ice_iov_attach(struct ice_softc *sc);<br>
> int ice_iov_detach(struct ice_softc *sc);<br>
</blockquote></div></div></div>
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqrzboT_jGqe47jYO1%2BpymFfO4Dnf62fZ2av3m7GAQSNw>