| From de1ad87750a6b7ef8ae754fd70d8d1c355b66733 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 6 May 2022 18:10:38 -0700 |
| Subject: dim: initialize all struct fields |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| |
| [ Upstream commit ee1444b5e1df4155b591d0d9b1e72853a99ea861 ] |
| |
| The W=2 build pointed out that the code wasn't initializing all the |
| variables in the dim_cq_moder declarations with the struct initializers. |
| The net change here is zero since these structs were already static |
| const globals and were initialized with zeros by the compiler, but |
| removing compiler warnings has value in and of itself. |
| |
| lib/dim/net_dim.c: At top level: |
| lib/dim/net_dim.c:54:9: warning: missing initializer for field ‘comps’ of ‘const struct dim_cq_moder’ [-Wmissing-field-initializers] |
| 54 | NET_DIM_RX_EQE_PROFILES, |
| | ^~~~~~~~~~~~~~~~~~~~~~~ |
| In file included from lib/dim/net_dim.c:6: |
| ./include/linux/dim.h:45:13: note: ‘comps’ declared here |
| 45 | u16 comps; |
| | ^~~~~ |
| |
| and repeats for the tx struct, and once you fix the comps entry then |
| the cq_period_mode field needs the same treatment. |
| |
| Use the commonly accepted style to indicate to the compiler that we |
| know what we're doing, and add a comma at the end of each struct |
| initializer to clean up the issue, and use explicit initializers |
| for the fields we are initializing which makes the compiler happy. |
| |
| While here and fixing these lines, clean up the code slightly with |
| a fix for the super long lines by removing the word "_MODERATION" from a |
| couple defines only used in this file. |
| |
| Fixes: f8be17b81d44 ("lib/dim: Fix -Wunused-const-variable warnings") |
| Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| Link: https://lore.kernel.org/r/20220507011038.14568-1-jesse.brandeburg@intel.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| lib/dim/net_dim.c | 44 ++++++++++++++++++++++---------------------- |
| 1 file changed, 22 insertions(+), 22 deletions(-) |
| |
| diff --git a/lib/dim/net_dim.c b/lib/dim/net_dim.c |
| index 06811d866775..53f6b9c6e936 100644 |
| --- a/lib/dim/net_dim.c |
| +++ b/lib/dim/net_dim.c |
| @@ -12,41 +12,41 @@ |
| * Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES |
| */ |
| #define NET_DIM_PARAMS_NUM_PROFILES 5 |
| -#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256 |
| -#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128 |
| +#define NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE 256 |
| +#define NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE 128 |
| #define NET_DIM_DEF_PROFILE_CQE 1 |
| #define NET_DIM_DEF_PROFILE_EQE 1 |
| |
| #define NET_DIM_RX_EQE_PROFILES { \ |
| - {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| + {.usec = 1, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 8, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 64, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 128, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 256, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,} \ |
| } |
| |
| #define NET_DIM_RX_CQE_PROFILES { \ |
| - {2, 256}, \ |
| - {8, 128}, \ |
| - {16, 64}, \ |
| - {32, 64}, \ |
| - {64, 64} \ |
| + {.usec = 2, .pkts = 256,}, \ |
| + {.usec = 8, .pkts = 128,}, \ |
| + {.usec = 16, .pkts = 64,}, \ |
| + {.usec = 32, .pkts = 64,}, \ |
| + {.usec = 64, .pkts = 64,} \ |
| } |
| |
| #define NET_DIM_TX_EQE_PROFILES { \ |
| - {1, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {8, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {32, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {64, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ |
| - {128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE} \ |
| + {.usec = 1, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 8, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 32, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 64, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ |
| + {.usec = 128, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,} \ |
| } |
| |
| #define NET_DIM_TX_CQE_PROFILES { \ |
| - {5, 128}, \ |
| - {8, 64}, \ |
| - {16, 32}, \ |
| - {32, 32}, \ |
| - {64, 32} \ |
| + {.usec = 5, .pkts = 128,}, \ |
| + {.usec = 8, .pkts = 64,}, \ |
| + {.usec = 16, .pkts = 32,}, \ |
| + {.usec = 32, .pkts = 32,}, \ |
| + {.usec = 64, .pkts = 32,} \ |
| } |
| |
| static const struct dim_cq_moder |
| -- |
| 2.35.1 |
| |