| 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
| ||
|
Message-ID: <2cba029f-111a-eb7e-2f52-4433aecb193c@dev.mellanox.co.il>
Date: Wed, 11 Jul 2018 12:47:40 +0300
From: Yishai Hadas <yishaih@....mellanox.co.il>
To: Saeed Mahameed <saeedm@....mellanox.co.il>
Cc: Leon Romanovsky <leon@...nel.org>,
Doug Ledford <dledford@...hat.com>,
Jason Gunthorpe <jgg@...lanox.com>,
Leon Romanovsky <leonro@...lanox.com>,
RDMA mailing list <linux-rdma@...r.kernel.org>,
Yishai Hadas <yishaih@...lanox.com>,
Saeed Mahameed <saeedm@...lanox.com>,
linux-netdev <netdev@...r.kernel.org>,
Majd Dibbiny <majd@...lanox.com>
Subject: Re: [PATCH mlx5-next 2/9] net/mlx5: Add support for flow table
destination number
On 7/11/2018 1:26 AM, Saeed Mahameed wrote:
> On Sun, Jul 8, 2018 at 3:24 AM, Leon Romanovsky <leon@...nel.org> wrote:
>> From: Yishai Hadas <yishaih@...lanox.com>
>>
>> Add support to set a destination from a flow table number.
>> This functionality will be used in downstream patches from this
>> series by the DEVX stuff.
>>
>> Signed-off-by: Yishai Hadas <yishaih@...lanox.com>
>> Signed-off-by: Leon Romanovsky <leonro@...lanox.com>
>> ---
>> .../mellanox/mlx5/core/diag/fs_tracepoint.c | 3 +++
>> drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 21 ++++++++++++++-------
>> drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +++-
>> include/linux/mlx5/fs.h | 1 +
>> include/linux/mlx5/mlx5_ifc.h | 1 +
>> 5 files changed, 22 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c
>> index b3820a34e773..0f11fff32a9b 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c
>> @@ -240,6 +240,9 @@ const char *parse_fs_dst(struct trace_seq *p,
>> case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE:
>> trace_seq_printf(p, "ft=%p\n", dst->ft);
>> break;
>> + case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM:
>> + trace_seq_printf(p, "ft_num=%u\n", dst->ft_num);
>> + break;
>> case MLX5_FLOW_DESTINATION_TYPE_TIR:
>> trace_seq_printf(p, "tir=%u\n", dst->tir_num);
>> break;
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
>> index 5a00deff5457..a98584576c2e 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
>> @@ -363,17 +363,21 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
>>
>> list_for_each_entry(dst, &fte->node.children, node.list) {
>> unsigned int id;
>> + unsigned int type;
>>
>
> reversed xmas tree, preferably just do:
>
> unsigned int id, type = dst->dest_attr.type;
>
> // use type directly instead of dst->dest_attr.type below ..
>
OK, V1 will handle this as you suggested here.
>> if (dst->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_COUNTER)
>> continue;
>>
>> - MLX5_SET(dest_format_struct, in_dests, destination_type,
>> - dst->dest_attr.type);
>> - if (dst->dest_attr.type ==
>> - MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE) {
>> + type = dst->dest_attr.type;
>> + switch (type) {
>> + case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM:
>> + id = dst->dest_attr.ft_num;
>> + type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
>> + break;
>> + case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE:
>> id = dst->dest_attr.ft->id;
>> - } else if (dst->dest_attr.type ==
>> - MLX5_FLOW_DESTINATION_TYPE_VPORT) {
>> + break;
>> + case MLX5_FLOW_DESTINATION_TYPE_VPORT:
>> id = dst->dest_attr.vport.num;
>> MLX5_SET(dest_format_struct, in_dests,
>> destination_eswitch_owner_vhca_id_valid,
>> @@ -381,9 +385,12 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
>> MLX5_SET(dest_format_struct, in_dests,
>> destination_eswitch_owner_vhca_id,
>> dst->dest_attr.vport.vhca_id);
>> - } else {
>> + break;
>> + default:
>> id = dst->dest_attr.tir_num;
>> }
>> +
>> + MLX5_SET(dest_format_struct, in_dests, destination_type, type);
>> MLX5_SET(dest_format_struct, in_dests, destination_id, id);
>> in_dests += MLX5_ST_SZ_BYTES(dest_format_struct);
>> list_size++;
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
>> index eba113cf1117..69aa298a0b1c 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
>> @@ -1356,7 +1356,9 @@ static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1,
>> (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE &&
>> d1->ft == d2->ft) ||
>> (d1->type == MLX5_FLOW_DESTINATION_TYPE_TIR &&
>> - d1->tir_num == d2->tir_num))
>> + d1->tir_num == d2->tir_num) ||
>> + (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM &&
>> + d1->ft_num == d2->ft_num))
>> return true;
>> }
>>
>> diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
>> index 757b4a30281e..a45febcf6b51 100644
>> --- a/include/linux/mlx5/fs.h
>> +++ b/include/linux/mlx5/fs.h
>> @@ -89,6 +89,7 @@ struct mlx5_flow_destination {
>> enum mlx5_flow_destination_type type;
>> union {
>> u32 tir_num;
>> + u32 ft_num;
>> struct mlx5_flow_table *ft;
>> struct mlx5_fc *counter;
>> struct {
>> diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
>> index 44a6ce01c3bb..fb89cc519703 100644
>> --- a/include/linux/mlx5/mlx5_ifc.h
>> +++ b/include/linux/mlx5/mlx5_ifc.h
>> @@ -1181,6 +1181,7 @@ enum mlx5_flow_destination_type {
>>
>> MLX5_FLOW_DESTINATION_TYPE_PORT = 0x99,
>> MLX5_FLOW_DESTINATION_TYPE_COUNTER = 0x100,
>> + MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM = 0x101,
>> };
>>
>> struct mlx5_ifc_dest_format_struct_bits {
>> --
>> 2.14.4
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Powered by blists - more mailing lists