Skip to content

Commit f8be17b

Browse files
Leon Romanovskydavem330
authored andcommitted
lib/dim: Fix -Wunused-const-variable warnings
DIM causes to the following warnings during kernel compilation which indicates that tx_profile and rx_profile are supposed to be declared in *.c and not in *.h files. In file included from ./include/rdma/ib_verbs.h:64, from ./include/linux/mlx5/device.h:37, from ./include/linux/mlx5/driver.h:51, from ./include/linux/mlx5/vport.h:36, from drivers/infiniband/hw/mlx5/ib_virt.c:34: ./include/linux/dim.h:326:1: warning: _tx_profile_ defined but not used [-Wunused-const-variable=] 326 | tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = { | ^~~~~~~~~~ ./include/linux/dim.h:320:1: warning: _rx_profile_ defined but not used [-Wunused-const-variable=] 320 | rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = { | ^~~~~~~~~~ Fixes: 4f75da3 ("linux/dim: Move implementation to .c files") Signed-off-by: Leon Romanovsky <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Acked-by: Saeed Mahameed <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f06d0ca commit f8be17b

File tree

2 files changed

+56
-56
lines changed

2 files changed

+56
-56
lines changed

include/linux/dim.h

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -272,62 +272,6 @@ dim_update_sample_with_comps(u16 event_ctr, u64 packets, u64 bytes, u64 comps,
272272

273273
/* Net DIM */
274274

275-
/*
276-
* Net DIM profiles:
277-
* There are different set of profiles for each CQ period mode.
278-
* There are different set of profiles for RX/TX CQs.
279-
* Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES
280-
*/
281-
#define NET_DIM_PARAMS_NUM_PROFILES 5
282-
#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
283-
#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128
284-
#define NET_DIM_DEF_PROFILE_CQE 1
285-
#define NET_DIM_DEF_PROFILE_EQE 1
286-
287-
#define NET_DIM_RX_EQE_PROFILES { \
288-
{1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
289-
{8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
290-
{64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
291-
{128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
292-
{256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
293-
}
294-
295-
#define NET_DIM_RX_CQE_PROFILES { \
296-
{2, 256}, \
297-
{8, 128}, \
298-
{16, 64}, \
299-
{32, 64}, \
300-
{64, 64} \
301-
}
302-
303-
#define NET_DIM_TX_EQE_PROFILES { \
304-
{1, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
305-
{8, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
306-
{32, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
307-
{64, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
308-
{128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE} \
309-
}
310-
311-
#define NET_DIM_TX_CQE_PROFILES { \
312-
{5, 128}, \
313-
{8, 64}, \
314-
{16, 32}, \
315-
{32, 32}, \
316-
{64, 32} \
317-
}
318-
319-
static const struct dim_cq_moder
320-
rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
321-
NET_DIM_RX_EQE_PROFILES,
322-
NET_DIM_RX_CQE_PROFILES,
323-
};
324-
325-
static const struct dim_cq_moder
326-
tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
327-
NET_DIM_TX_EQE_PROFILES,
328-
NET_DIM_TX_CQE_PROFILES,
329-
};
330-
331275
/**
332276
* net_dim_get_rx_moderation - provide a CQ moderation object for the given RX profile
333277
* @cq_period_mode: CQ period mode

lib/dim/net_dim.c

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,62 @@
55

66
#include <linux/dim.h>
77

8+
/*
9+
* Net DIM profiles:
10+
* There are different set of profiles for each CQ period mode.
11+
* There are different set of profiles for RX/TX CQs.
12+
* Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES
13+
*/
14+
#define NET_DIM_PARAMS_NUM_PROFILES 5
15+
#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
16+
#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128
17+
#define NET_DIM_DEF_PROFILE_CQE 1
18+
#define NET_DIM_DEF_PROFILE_EQE 1
19+
20+
#define NET_DIM_RX_EQE_PROFILES { \
21+
{1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
22+
{8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
23+
{64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
24+
{128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
25+
{256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
26+
}
27+
28+
#define NET_DIM_RX_CQE_PROFILES { \
29+
{2, 256}, \
30+
{8, 128}, \
31+
{16, 64}, \
32+
{32, 64}, \
33+
{64, 64} \
34+
}
35+
36+
#define NET_DIM_TX_EQE_PROFILES { \
37+
{1, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
38+
{8, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
39+
{32, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
40+
{64, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
41+
{128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE} \
42+
}
43+
44+
#define NET_DIM_TX_CQE_PROFILES { \
45+
{5, 128}, \
46+
{8, 64}, \
47+
{16, 32}, \
48+
{32, 32}, \
49+
{64, 32} \
50+
}
51+
52+
static const struct dim_cq_moder
53+
rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
54+
NET_DIM_RX_EQE_PROFILES,
55+
NET_DIM_RX_CQE_PROFILES,
56+
};
57+
58+
static const struct dim_cq_moder
59+
tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
60+
NET_DIM_TX_EQE_PROFILES,
61+
NET_DIM_TX_CQE_PROFILES,
62+
};
63+
864
struct dim_cq_moder
965
net_dim_get_rx_moderation(u8 cq_period_mode, int ix)
1066
{

0 commit comments

Comments
 (0)