Skip to content

Commit a1c7a53

Browse files
davem330davem330
committed
Merge branch 'mlxsw-Various-static-checkers-fixes'
Ido Schimmel says: ==================== mlxsw: Various static checkers fixes Jakub told me he gets some warnings with W=1, so I decided to check with sparse, smatch and coccinelle as well. This patch set fixes all the issues found. None are actual bugs / regressions and therefore not targeted at net. Patches #1-#2 add missing kernel-doc comments. Patch #3 removes dead code. Patch #4 reworks the ACL code to avoid defining a static variable in a header file. Patch #5 removes unnecessary conversion to bool that coccinelle warns about. Patch #6 avoids false-positive uninitialized symbol errors emitted by smatch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 8a8f828 + a84acf7 commit a1c7a53

File tree

6 files changed

+109
-296
lines changed

6 files changed

+109
-296
lines changed

‎drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,41 @@
99
#include "item.h"
1010
#include "core_acl_flex_keys.h"
1111

12+
/* For the purpose of the driver, define an internal storage scratchpad
13+
* that will be used to store key/mask values. For each defined element type
14+
* define an internal storage geometry.
15+
*
16+
* When adding new elements, MLXSW_AFK_ELEMENT_STORAGE_SIZE must be increased
17+
* accordingly.
18+
*/
19+
static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = {
20+
MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 16),
21+
MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_32_47, 0x04, 2),
22+
MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_0_31, 0x06, 4),
23+
MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_32_47, 0x0A, 2),
24+
MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_0_31, 0x0C, 4),
25+
MLXSW_AFK_ELEMENT_INFO_U32(ETHERTYPE, 0x00, 0, 16),
26+
MLXSW_AFK_ELEMENT_INFO_U32(IP_PROTO, 0x10, 0, 8),
27+
MLXSW_AFK_ELEMENT_INFO_U32(VID, 0x10, 8, 12),
28+
MLXSW_AFK_ELEMENT_INFO_U32(PCP, 0x10, 20, 3),
29+
MLXSW_AFK_ELEMENT_INFO_U32(TCP_FLAGS, 0x10, 23, 9),
30+
MLXSW_AFK_ELEMENT_INFO_U32(DST_L4_PORT, 0x14, 0, 16),
31+
MLXSW_AFK_ELEMENT_INFO_U32(SRC_L4_PORT, 0x14, 16, 16),
32+
MLXSW_AFK_ELEMENT_INFO_U32(IP_TTL_, 0x18, 0, 8),
33+
MLXSW_AFK_ELEMENT_INFO_U32(IP_ECN, 0x18, 9, 2),
34+
MLXSW_AFK_ELEMENT_INFO_U32(IP_DSCP, 0x18, 11, 6),
35+
MLXSW_AFK_ELEMENT_INFO_U32(VIRT_ROUTER_8_10, 0x18, 17, 3),
36+
MLXSW_AFK_ELEMENT_INFO_U32(VIRT_ROUTER_0_7, 0x18, 20, 8),
37+
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_96_127, 0x20, 4),
38+
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_64_95, 0x24, 4),
39+
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_32_63, 0x28, 4),
40+
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_0_31, 0x2C, 4),
41+
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_96_127, 0x30, 4),
42+
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_64_95, 0x34, 4),
43+
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_32_63, 0x38, 4),
44+
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_0_31, 0x3C, 4),
45+
};
46+
1247
struct mlxsw_afk {
1348
struct list_head key_info_list;
1449
unsigned int max_blocks;
@@ -26,13 +61,15 @@ static bool mlxsw_afk_blocks_check(struct mlxsw_afk *mlxsw_afk)
2661
const struct mlxsw_afk_block *block = &mlxsw_afk->blocks[i];
2762

2863
for (j = 0; j < block->instances_count; j++) {
64+
const struct mlxsw_afk_element_info *elinfo;
2965
struct mlxsw_afk_element_inst *elinst;
3066

3167
elinst = &block->instances[j];
32-
if (elinst->type != elinst->info->type ||
68+
elinfo = &mlxsw_afk_element_infos[elinst->element];
69+
if (elinst->type != elinfo->type ||
3370
(!elinst->avoid_size_check &&
3471
elinst->item.size.bits !=
35-
elinst->info->item.size.bits))
72+
elinfo->item.size.bits))
3673
return false;
3774
}
3875
}
@@ -116,7 +153,7 @@ static void mlxsw_afk_picker_count_hits(struct mlxsw_afk *mlxsw_afk,
116153
struct mlxsw_afk_element_inst *elinst;
117154

118155
elinst = &block->instances[j];
119-
if (elinst->info->element == element) {
156+
if (elinst->element == element) {
120157
__set_bit(element, picker->hits[i].element);
121158
picker->hits[i].total++;
122159
}
@@ -301,7 +338,7 @@ mlxsw_afk_block_elinst_get(const struct mlxsw_afk_block *block,
301338
struct mlxsw_afk_element_inst *elinst;
302339

303340
elinst = &block->instances[i];
304-
if (elinst->info->element == element)
341+
if (elinst->element == element)
305342
return elinst;
306343
}
307344
return NULL;
@@ -409,9 +446,12 @@ static void
409446
mlxsw_sp_afk_encode_one(const struct mlxsw_afk_element_inst *elinst,
410447
char *output, char *storage, int u32_diff)
411448
{
412-
const struct mlxsw_item *storage_item = &elinst->info->item;
413449
const struct mlxsw_item *output_item = &elinst->item;
450+
const struct mlxsw_afk_element_info *elinfo;
451+
const struct mlxsw_item *storage_item;
414452

453+
elinfo = &mlxsw_afk_element_infos[elinst->element];
454+
storage_item = &elinfo->item;
415455
if (elinst->type == MLXSW_AFK_ELEMENT_TYPE_U32)
416456
mlxsw_sp_afk_encode_u32(storage_item, output_item,
417457
storage, output, u32_diff);

‎drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,42 +69,10 @@ struct mlxsw_afk_element_info {
6969
MLXSW_AFK_ELEMENT_INFO(MLXSW_AFK_ELEMENT_TYPE_BUF, \
7070
_element, _offset, 0, _size)
7171

72-
/* For the purpose of the driver, define an internal storage scratchpad
73-
* that will be used to store key/mask values. For each defined element type
74-
* define an internal storage geometry.
75-
*/
76-
static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = {
77-
MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 16),
78-
MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_32_47, 0x04, 2),
79-
MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_0_31, 0x06, 4),
80-
MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_32_47, 0x0A, 2),
81-
MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_0_31, 0x0C, 4),
82-
MLXSW_AFK_ELEMENT_INFO_U32(ETHERTYPE, 0x00, 0, 16),
83-
MLXSW_AFK_ELEMENT_INFO_U32(IP_PROTO, 0x10, 0, 8),
84-
MLXSW_AFK_ELEMENT_INFO_U32(VID, 0x10, 8, 12),
85-
MLXSW_AFK_ELEMENT_INFO_U32(PCP, 0x10, 20, 3),
86-
MLXSW_AFK_ELEMENT_INFO_U32(TCP_FLAGS, 0x10, 23, 9),
87-
MLXSW_AFK_ELEMENT_INFO_U32(DST_L4_PORT, 0x14, 0, 16),
88-
MLXSW_AFK_ELEMENT_INFO_U32(SRC_L4_PORT, 0x14, 16, 16),
89-
MLXSW_AFK_ELEMENT_INFO_U32(IP_TTL_, 0x18, 0, 8),
90-
MLXSW_AFK_ELEMENT_INFO_U32(IP_ECN, 0x18, 9, 2),
91-
MLXSW_AFK_ELEMENT_INFO_U32(IP_DSCP, 0x18, 11, 6),
92-
MLXSW_AFK_ELEMENT_INFO_U32(VIRT_ROUTER_8_10, 0x18, 17, 3),
93-
MLXSW_AFK_ELEMENT_INFO_U32(VIRT_ROUTER_0_7, 0x18, 20, 8),
94-
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_96_127, 0x20, 4),
95-
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_64_95, 0x24, 4),
96-
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_32_63, 0x28, 4),
97-
MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_0_31, 0x2C, 4),
98-
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_96_127, 0x30, 4),
99-
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_64_95, 0x34, 4),
100-
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_32_63, 0x38, 4),
101-
MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_0_31, 0x3C, 4),
102-
};
103-
10472
#define MLXSW_AFK_ELEMENT_STORAGE_SIZE 0x40
10573

10674
struct mlxsw_afk_element_inst { /* element instance in actual block */
107-
const struct mlxsw_afk_element_info *info;
75+
enum mlxsw_afk_element element;
10876
enum mlxsw_afk_element_type type;
10977
struct mlxsw_item item; /* element geometry in block */
11078
int u32_key_diff; /* in case value needs to be adjusted before write
@@ -116,7 +84,7 @@ struct mlxsw_afk_element_inst { /* element instance in actual block */
11684
#define MLXSW_AFK_ELEMENT_INST(_type, _element, _offset, \
11785
_shift, _size, _u32_key_diff, _avoid_size_check) \
11886
{ \
119-
.info = &mlxsw_afk_element_infos[MLXSW_AFK_ELEMENT_##_element], \
87+
.element = MLXSW_AFK_ELEMENT_##_element, \
12088
.type = _type, \
12189
.item = { \
12290
.offset = _offset, \

‎drivers/net/ethernet/mellanox/mlxsw/i2c.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353

5454
/**
5555
* struct mlxsw_i2c - device private data:
56+
* @cmd: command attributes;
5657
* @cmd.mb_size_in: input mailbox size;
5758
* @cmd.mb_off_in: input mailbox offset in register space;
5859
* @cmd.mb_size_out: output mailbox size;

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c‎

Lines changed: 8 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,6 @@ static int mlxsw_sp_fid_vni_op(struct mlxsw_sp *mlxsw_sp, u16 fid_index,
438438
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);
439439
}
440440

441-
static int mlxsw_sp_fid_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,
442-
u16 vid, bool valid)
443-
{
444-
enum mlxsw_reg_svfa_mt mt = MLXSW_REG_SVFA_MT_VID_TO_FID;
445-
char svfa_pl[MLXSW_REG_SVFA_LEN];
446-
447-
mlxsw_reg_svfa_pack(svfa_pl, 0, mt, valid, fid_index, vid);
448-
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svfa), svfa_pl);
449-
}
450-
451441
static int __mlxsw_sp_fid_port_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,
452442
u8 local_port, u16 vid, bool valid)
453443
{
@@ -458,140 +448,6 @@ static int __mlxsw_sp_fid_port_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,
458448
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svfa), svfa_pl);
459449
}
460450

461-
static int mlxsw_sp_fid_8021q_configure(struct mlxsw_sp_fid *fid)
462-
{
463-
struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;
464-
struct mlxsw_sp_fid_8021q *fid_8021q;
465-
int err;
466-
467-
err = mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, fid->fid_index, true);
468-
if (err)
469-
return err;
470-
471-
fid_8021q = mlxsw_sp_fid_8021q_fid(fid);
472-
err = mlxsw_sp_fid_vid_map(mlxsw_sp, fid->fid_index, fid_8021q->vid,
473-
true);
474-
if (err)
475-
goto err_fid_map;
476-
477-
return 0;
478-
479-
err_fid_map:
480-
mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, 0, false);
481-
return err;
482-
}
483-
484-
static void mlxsw_sp_fid_8021q_deconfigure(struct mlxsw_sp_fid *fid)
485-
{
486-
struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;
487-
struct mlxsw_sp_fid_8021q *fid_8021q;
488-
489-
fid_8021q = mlxsw_sp_fid_8021q_fid(fid);
490-
mlxsw_sp_fid_vid_map(mlxsw_sp, fid->fid_index, fid_8021q->vid, false);
491-
mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, 0, false);
492-
}
493-
494-
static int mlxsw_sp_fid_8021q_index_alloc(struct mlxsw_sp_fid *fid,
495-
const void *arg, u16 *p_fid_index)
496-
{
497-
struct mlxsw_sp_fid_family *fid_family = fid->fid_family;
498-
u16 vid = *(u16 *) arg;
499-
500-
/* Use 1:1 mapping for simplicity although not a must */
501-
if (vid < fid_family->start_index || vid > fid_family->end_index)
502-
return -EINVAL;
503-
*p_fid_index = vid;
504-
505-
return 0;
506-
}
507-
508-
static bool
509-
mlxsw_sp_fid_8021q_compare(const struct mlxsw_sp_fid *fid, const void *arg)
510-
{
511-
u16 vid = *(u16 *) arg;
512-
513-
return mlxsw_sp_fid_8021q_fid(fid)->vid == vid;
514-
}
515-
516-
static u16 mlxsw_sp_fid_8021q_flood_index(const struct mlxsw_sp_fid *fid)
517-
{
518-
return fid->fid_index;
519-
}
520-
521-
static int mlxsw_sp_fid_8021q_port_vid_map(struct mlxsw_sp_fid *fid,
522-
struct mlxsw_sp_port *mlxsw_sp_port,
523-
u16 vid)
524-
{
525-
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
526-
u8 local_port = mlxsw_sp_port->local_port;
527-
528-
/* In case there are no {Port, VID} => FID mappings on the port,
529-
* we can use the global VID => FID mapping we created when the
530-
* FID was configured.
531-
*/
532-
if (mlxsw_sp->fid_core->port_fid_mappings[local_port] == 0)
533-
return 0;
534-
return __mlxsw_sp_fid_port_vid_map(mlxsw_sp, fid->fid_index, local_port,
535-
vid, true);
536-
}
537-
538-
static void
539-
mlxsw_sp_fid_8021q_port_vid_unmap(struct mlxsw_sp_fid *fid,
540-
struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)
541-
{
542-
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
543-
u8 local_port = mlxsw_sp_port->local_port;
544-
545-
if (mlxsw_sp->fid_core->port_fid_mappings[local_port] == 0)
546-
return;
547-
__mlxsw_sp_fid_port_vid_map(mlxsw_sp, fid->fid_index, local_port, vid,
548-
false);
549-
}
550-
551-
static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021q_ops = {
552-
.setup = mlxsw_sp_fid_8021q_setup,
553-
.configure = mlxsw_sp_fid_8021q_configure,
554-
.deconfigure = mlxsw_sp_fid_8021q_deconfigure,
555-
.index_alloc = mlxsw_sp_fid_8021q_index_alloc,
556-
.compare = mlxsw_sp_fid_8021q_compare,
557-
.flood_index = mlxsw_sp_fid_8021q_flood_index,
558-
.port_vid_map = mlxsw_sp_fid_8021q_port_vid_map,
559-
.port_vid_unmap = mlxsw_sp_fid_8021q_port_vid_unmap,
560-
};
561-
562-
static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021q_flood_tables[] = {
563-
{
564-
.packet_type = MLXSW_SP_FLOOD_TYPE_UC,
565-
.bridge_type = MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,
566-
.table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,
567-
.table_index = 0,
568-
},
569-
{
570-
.packet_type = MLXSW_SP_FLOOD_TYPE_MC,
571-
.bridge_type = MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,
572-
.table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,
573-
.table_index = 1,
574-
},
575-
{
576-
.packet_type = MLXSW_SP_FLOOD_TYPE_BC,
577-
.bridge_type = MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,
578-
.table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,
579-
.table_index = 2,
580-
},
581-
};
582-
583-
/* Range and flood configuration must match mlxsw_config_profile */
584-
static const struct mlxsw_sp_fid_family mlxsw_sp_fid_8021q_family = {
585-
.type = MLXSW_SP_FID_TYPE_8021Q,
586-
.fid_size = sizeof(struct mlxsw_sp_fid_8021q),
587-
.start_index = 1,
588-
.end_index = VLAN_VID_MASK,
589-
.flood_tables = mlxsw_sp_fid_8021q_flood_tables,
590-
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021q_flood_tables),
591-
.rif_type = MLXSW_SP_RIF_TYPE_VLAN,
592-
.ops = &mlxsw_sp_fid_8021q_ops,
593-
};
594-
595451
static struct mlxsw_sp_fid_8021d *
596452
mlxsw_sp_fid_8021d_fid(const struct mlxsw_sp_fid *fid)
597453
{
@@ -846,6 +702,14 @@ static const struct mlxsw_sp_fid_family mlxsw_sp_fid_8021d_family = {
846702
.lag_vid_valid = 1,
847703
};
848704

705+
static bool
706+
mlxsw_sp_fid_8021q_compare(const struct mlxsw_sp_fid *fid, const void *arg)
707+
{
708+
u16 vid = *(u16 *) arg;
709+
710+
return mlxsw_sp_fid_8021q_fid(fid)->vid == vid;
711+
}
712+
849713
static void
850714
mlxsw_sp_fid_8021q_fdb_clear_offload(const struct mlxsw_sp_fid *fid,
851715
const struct net_device *nve_dev)

0 commit comments

Comments
 (0)