| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 22 Jan 2020 13:42:33 +0000
From: Paul Blakey <paulb@...lanox.com>
To: Leon Romanovsky <leon@...nel.org>
CC: Saeed Mahameed <saeedm@...lanox.com>,
Oz Shlomo <ozsh@...lanox.com>,
Jakub Kicinski <jakub.kicinski@...ronome.com>,
Vlad Buslov <vladbu@...lanox.com>,
David Miller <davem@...emloft.net>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Jiri Pirko <jiri@...nulli.us>
Subject: Re: [PATCH net-next-mlx5 03/13] net/mlx5: E-Switch, Move source port
on reg_c0 to the upper 16 bits
On 1/21/2020 9:08 PM, Leon Romanovsky wrote:
> On Tue, Jan 21, 2020 at 06:16:12PM +0200, Paul Blakey wrote:
>> Multi chain support requires the miss path to continue the processing
>> from the last chain id, and for that we need to save the chain
>> miss tag (a mapping for 32bit chain id) on reg_c0 which will
>> come in a next patch.
>>
>> Currently reg_c0 is exclusively used to store the source port
>> metadata, giving it 32bit, it is created from 16bits of vcha_id,
>> and 16bits of vport number.
>>
>> We will move this source port metadata to upper 16bits, and leave the
>> lower bits for the chain miss tag. We compress the reg_c0 source port
>> metadata to 16bits by taking 8 bits from vhca_id, and 8bits from
>> the vport number.
>>
>> Since we compress the vport number to 8bits statically, and leave two
>> top ids for special PF/ECPF numbers, we will only support a max of 254
>> vports with this strategy.
>>
>> Signed-off-by: Paul Blakey <paulb@...lanox.com>
>> Reviewed-by: Oz Shlomo <ozsh@...lanox.com>
>> Reviewed-by: Mark Bloch <markb@...lanox.com>
>> ---
>> drivers/infiniband/hw/mlx5/main.c | 3 +-
>> .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 81 +++++++++++++++++++---
>> include/linux/mlx5/eswitch.h | 11 ++-
>> 3 files changed, 82 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
>> index 90489c5..844351c 100644
>> --- a/drivers/infiniband/hw/mlx5/main.c
>> +++ b/drivers/infiniband/hw/mlx5/main.c
>> @@ -3535,7 +3535,8 @@ static void mlx5_ib_set_rule_source_port(struct mlx5_ib_dev *dev,
>> misc = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
>> misc_parameters_2);
>>
>> - MLX5_SET_TO_ONES(fte_match_set_misc2, misc, metadata_reg_c_0);
>> + MLX5_SET(fte_match_set_misc2, misc, metadata_reg_c_0,
>> + mlx5_eswitch_get_vport_metadata_mask());
>> } else {
>> misc = MLX5_ADDR_OF(fte_match_param, spec->match_value,
>> misc_parameters);
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> index a6d0b62..873b19c 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> @@ -50,6 +50,19 @@
>> #define MLX5_ESW_MISS_FLOWS (2)
>> #define UPLINK_REP_INDEX 0
>>
>> +/* Reg C0 usage:
>> + * Reg C0 = < VHCA_ID_BITS(8) | VPORT BITS(8) | CHAIN_TAG(16) >
>> + *
>> + * Highest 8 bits of the reg c0 is the vhca_id, next 8 bits is vport_num,
>> + * the rest (lowest 16 bits) is left for tc chain tag restoration.
>> + * VHCA_ID + VPORT comprise the SOURCE_PORT matching.
>> + */
>> +#define VHCA_ID_BITS 8
>> +#define VPORT_BITS 8
>> +#define SOURCE_PORT_METADATA_BITS (VHCA_ID_BITS + VPORT_BITS)
>> +#define SOURCE_PORT_METADATA_OFFSET (32 - SOURCE_PORT_METADATA_BITS)
>> +#define CHAIN_TAG_METADATA_BITS (32 - SOURCE_PORT_METADATA_BITS)
>> +
[...]
>> +u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw,
>> u16 vport_num)
>> {
>> - return ((MLX5_CAP_GEN(esw->dev, vhca_id) & 0xffff) << 16) | vport_num;
>> + u32 vport_num_mask = GENMASK(VPORT_BITS - 1, 0);
>> + u32 vhca_id_mask = GENMASK(VHCA_ID_BITS - 1, 0);
>> + u32 vhca_id = MLX5_CAP_GEN(esw->dev, vhca_id);
>> + u32 val;
>> +
>> + /* Make sure the vhca_id fits the VHCA_ID_BITS */
>> + WARN_ON_ONCE(vhca_id >= BIT(VHCA_ID_BITS));
>> +
>> + /* Trim vhca_id to VHCA_ID_BITS */
>> + vhca_id &= vhca_id_mask;
>> +
>> + /* Make sure pf and ecpf map to end of VPORT_BITS range so they
>> + * don't overlap with VF numbers, and themselves, after trimming.
>> + */
>> + WARN_ON_ONCE((MLX5_VPORT_UPLINK & vport_num_mask) <
>> + vport_num_mask - 1);
>> + WARN_ON_ONCE((MLX5_VPORT_ECPF & vport_num_mask) <
>> + vport_num_mask - 1);
>> + WARN_ON_ONCE((MLX5_VPORT_UPLINK & vport_num_mask) ==
>> + (MLX5_VPORT_ECPF & vport_num_mask));
>> +
>> + /* Make sure that the VF vport_num fits VPORT_BITS and don't
>> + * overlap with pf and ecpf.
>> + */
>> + if (vport_num != MLX5_VPORT_UPLINK &&
>> + vport_num != MLX5_VPORT_ECPF)
>> + WARN_ON_ONCE(vport_num >= vport_num_mask - 1);
>> +
>> + /* We can now trim vport_num to VPORT_BITS */
>> + vport_num &= vport_num_mask;
>> +
>> + val = (vhca_id << VPORT_BITS) | vport_num;
>> + return val << (32 - SOURCE_PORT_METADATA_BITS);
>> }
>> EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_match);
>> +
>> +u32 mlx5_eswitch_get_vport_metadata_mask(void)
>> +{
>> + return GENMASK(31, 32 - SOURCE_PORT_METADATA_BITS);
>> +}
>> +EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_mask);
> This function can be inline in .h file easily and actually does nothing
> except return 0xFFFF.
We will move this and relevant defines to the h file, and remove the exported symbol
>> diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h
>> index 98e667b..080b67c 100644
>> --- a/include/linux/mlx5/eswitch.h
>> +++ b/include/linux/mlx5/eswitch.h
>> @@ -71,8 +71,9 @@ enum devlink_eswitch_encap_mode
>> mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
>>
>> bool mlx5_eswitch_vport_match_metadata_enabled(const struct mlx5_eswitch *esw);
>> -u32 mlx5_eswitch_get_vport_metadata_for_match(const struct mlx5_eswitch *esw,
>> +u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw,
>> u16 vport_num);
>> +u32 mlx5_eswitch_get_vport_metadata_mask(void);
>> u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
>> #else /* CONFIG_MLX5_ESWITCH */
>>
>> @@ -94,11 +95,17 @@ static inline u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)
>> };
>>
>> static inline u32
>> -mlx5_eswitch_get_vport_metadata_for_match(const struct mlx5_eswitch *esw,
>> +mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw,
>> int vport_num)
>> {
>> return 0;
>> };
>> +
>> +static inline u32
>> +mlx5_eswitch_get_vport_metadata_mask(void)
>> +{
>> + return 0;
>> +}
>> #endif /* CONFIG_MLX5_ESWITCH */
>>
>> #endif
>> --
>> 1.8.3.1
>>
Powered by blists - more mailing lists