* [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF
@ 2022-06-28 12:33 Palczewski, Mateusz
2022-06-28 22:35 ` Tony Nguyen
2022-06-28 22:36 ` Nguyen, Anthony L
0 siblings, 2 replies; 3+ messages in thread
From: Palczewski, Mateusz @ 2022-06-28 12:33 UTC (permalink / raw)
To: intel-wired-lan; +Cc: Przemyslaw Patynowski
Legacy VLAN implementation allows for untrusted VF to have 8 VLAN
filters, not counting VLAN 0 filters. Current VLAN_V2 implementation
lowers available filters for VF, by counting in VLAN 0 filter for both
TPIDs.
Fix this by counting only non zero VLAN filters.
Without this patch, untrusted VF would not be able to access 8 VLAN
filters.
Fixes: cc71de8fa133 ("ice: Add support for VIRTCHNL_VF_OFFLOAD_VLAN_V2")
Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
---
v2: Changed fixes tag
---
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index 4547bc1f7cee..24188ec594d5 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -2948,7 +2948,8 @@ ice_vc_validate_add_vlan_filter_list(struct ice_vsi *vsi,
struct virtchnl_vlan_filtering_caps *vfc,
struct virtchnl_vlan_filter_list_v2 *vfl)
{
- u16 num_requested_filters = vsi->num_vlan + vfl->num_elements;
+ u16 num_requested_filters = ice_vsi_num_non_zero_vlans(vsi) +
+ vfl->num_elements;
if (num_requested_filters > vfc->max_filters)
return false;
--
2.27.0
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF
2022-06-28 12:33 [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF Palczewski, Mateusz
@ 2022-06-28 22:35 ` Tony Nguyen
2022-06-28 22:36 ` Nguyen, Anthony L
1 sibling, 0 replies; 3+ messages in thread
From: Tony Nguyen @ 2022-06-28 22:35 UTC (permalink / raw)
To: Palczewski, Mateusz, intel-wired-lan; +Cc: Przemyslaw Patynowski
On 6/28/2022 5:33 AM, Palczewski, Mateusz wrote:
> Legacy VLAN implementation allows for untrusted VF to have 8 VLAN
> filters, not counting VLAN 0 filters. Current VLAN_V2 implementation
> lowers available filters for VF, by counting in VLAN 0 filter for both
> TPIDs.
> Fix this by counting only non zero VLAN filters.
> Without this patch, untrusted VF would not be able to access 8 VLAN
> filters.
>
> Fixes: cc71de8fa133 ("ice: Add support for VIRTCHNL_VF_OFFLOAD_VLAN_V2")
> Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
> Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
As Olek pointed out, please fix your email settings [1].
From:/Signed-off-by: email name mismatch: 'From: "Palczewski, Mateusz"
<mateusz.palczewski@intel.com>' != 'Signed-off-by: Mateusz Palczewski
<mateusz.palczewski@intel.com>'
However, based on ordering, shouldn't the author be Przemyslaw?
[1]
https://lore.kernel.org/intel-wired-lan/20220628141911.1403944-1-alexandr.lobakin@intel.com/T/#m20c8d8eb342f31bdbf88f1976a484a04bf049554
> ---
> v2: Changed fixes tag
> ---
> drivers/net/ethernet/intel/ice/ice_virtchnl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> index 4547bc1f7cee..24188ec594d5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> @@ -2948,7 +2948,8 @@ ice_vc_validate_add_vlan_filter_list(struct ice_vsi *vsi,
> struct virtchnl_vlan_filtering_caps *vfc,
> struct virtchnl_vlan_filter_list_v2 *vfl)
> {
> - u16 num_requested_filters = vsi->num_vlan + vfl->num_elements;
> + u16 num_requested_filters = ice_vsi_num_non_zero_vlans(vsi) +
> + vfl->num_elements;
>
> if (num_requested_filters > vfc->max_filters)
> return false;
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF
2022-06-28 12:33 [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF Palczewski, Mateusz
2022-06-28 22:35 ` Tony Nguyen
@ 2022-06-28 22:36 ` Nguyen, Anthony L
1 sibling, 0 replies; 3+ messages in thread
From: Nguyen, Anthony L @ 2022-06-28 22:36 UTC (permalink / raw)
To: Palczewski, Mateusz, intel-wired-lan@lists.osuosl.org
Cc: Patynowski, PrzemyslawX
On 6/28/2022 5:33 AM, Palczewski, Mateusz wrote:
> Legacy VLAN implementation allows for untrusted VF to have 8 VLAN
> filters, not counting VLAN 0 filters. Current VLAN_V2 implementation
> lowers available filters for VF, by counting in VLAN 0 filter for both
> TPIDs.
> Fix this by counting only non zero VLAN filters.
> Without this patch, untrusted VF would not be able to access 8 VLAN
> filters.
>
> Fixes: cc71de8fa133 ("ice: Add support for VIRTCHNL_VF_OFFLOAD_VLAN_V2")
> Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
> Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
As Olek pointed out, please fix your email settings [1].
From:/Signed-off-by: email name mismatch: 'From: "Palczewski, Mateusz"
<mateusz.palczewski@intel.com>' != 'Signed-off-by: Mateusz Palczewski
<mateusz.palczewski@intel.com>'
However, based on ordering, shouldn't the author be Przemyslaw?
[1]
https://lore.kernel.org/intel-wired-lan/20220628141911.1403944-1-alexandr.lobakin@intel.com/T/#m20c8d8eb342f31bdbf88f1976a484a04bf049554
> ---
> v2: Changed fixes tag
> ---
> drivers/net/ethernet/intel/ice/ice_virtchnl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> index 4547bc1f7cee..24188ec594d5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> @@ -2948,7 +2948,8 @@ ice_vc_validate_add_vlan_filter_list(struct ice_vsi *vsi,
> struct virtchnl_vlan_filtering_caps *vfc,
> struct virtchnl_vlan_filter_list_v2 *vfl)
> {
> - u16 num_requested_filters = vsi->num_vlan + vfl->num_elements;
> + u16 num_requested_filters = ice_vsi_num_non_zero_vlans(vsi) +
> + vfl->num_elements;
>
> if (num_requested_filters > vfc->max_filters)
> return false;
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-28 22:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-28 12:33 [Intel-wired-lan] [PATCH net v2] ice: Fix max VLANs available for VF Palczewski, Mateusz
2022-06-28 22:35 ` Tony Nguyen
2022-06-28 22:36 ` Nguyen, Anthony L
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox