Print this page
11506 smatch resync

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/smatch/src/check_nospec.c
          +++ new/usr/src/tools/smatch/src/check_nospec.c
↓ open down ↓ 88 lines elided ↑ open up ↑
  89   89  {
  90   90          struct range_list *rl;
  91   91  
  92   92          if (!get_user_rl_var_sym(sm->name, sm->sym, &rl))
  93   93                  return;
  94   94          sql_insert_caller_info(call, NOSPEC, param, printed_name, "");
  95   95  }
  96   96  
  97   97  static void returned_struct_members(int return_id, char *return_ranges, struct expression *expr)
  98   98  {
       99 +        struct stree *start_states = get_start_states();
  99  100          struct symbol *returned_sym;
 100  101          struct sm_state *sm;
 101  102          const char *param_name;
 102  103          struct range_list *rl;
 103  104          int param;
 104  105  
 105  106          returned_sym = expr_to_sym(expr);
 106  107  
 107  108          FOR_EACH_MY_SM(my_id, __get_cur_stree(), sm) {
      109 +                if (get_state_stree(start_states, my_id, sm->name, sm->sym) == sm->state)
      110 +                        continue;
 108  111                  param = get_param_num_from_sym(sm->sym);
 109  112                  if (param < 0) {
 110  113                          if (!returned_sym || returned_sym != sm->sym)
 111  114                                  continue;
 112  115                          param = -1;
 113  116                  }
 114  117  
 115  118                  param_name = get_param_name(sm);
 116  119                  if (!param_name)
 117  120                          continue;
↓ open down ↓ 97 lines elided ↑ open up ↑
 215  218  
 216  219  static void match_barrier(struct statement *stmt)
 217  220  {
 218  221          char *macro;
 219  222  
 220  223          macro = get_macro_name(stmt->pos);
 221  224          if (!macro)
 222  225                  return;
 223  226          if (strcmp(macro, "rmb") != 0 &&
 224  227              strcmp(macro, "smp_rmb") != 0 &&
 225      -            strcmp(macro, "barrier_nospec") != 0)
      228 +            strcmp(macro, "barrier_nospec") != 0 &&
      229 +            strcmp(macro, "preempt_disable") != 0)
 226  230                  return;
 227  231  
 228  232          set_state(barrier_id, "barrier", NULL, &nospec);
 229  233          mark_user_data_as_nospec();
 230  234  }
 231  235  
 232  236  static void db_returns_barrier(struct expression *expr, int param, char *key, char *value)
 233  237  {
 234  238          mark_user_data_as_nospec();
 235  239  }
 236  240  
      241 +static void select_return_stmt_cnt(struct expression *expr, int param, char *key, char *value)
      242 +{
      243 +        int cnt;
      244 +
      245 +        cnt = atoi(value);
      246 +        if (cnt > 400)
      247 +                mark_user_data_as_nospec();
      248 +}
      249 +
 237  250  void check_nospec(int id)
 238  251  {
 239  252          my_id = id;
 240  253  
 241  254          add_hook(&nospec_assign, ASSIGNMENT_HOOK);
 242  255  
 243  256          select_caller_info_hook(set_param_nospec, NOSPEC);
 244  257          add_unmatched_state_hook(my_id, &unmatched_state);
 245  258  
 246  259          add_hook(&match_call_info, FUNCTION_CALL_HOOK);
 247  260          add_member_info_callback(my_id, struct_member_callback);
 248  261          add_split_return_callback(&returned_struct_members);
 249  262          select_return_states_hook(NOSPEC, &db_returns_nospec);
 250  263          select_return_states_hook(NOSPEC_WB, &db_returns_barrier);
      264 +        select_return_states_hook(STMT_CNT, &select_return_stmt_cnt);
 251  265  
 252  266          add_hook(&match_asm, ASM_HOOK);
 253  267          add_hook(&match_after_nospec_asm, STMT_HOOK_AFTER);
 254  268  }
 255  269  
 256  270  void check_nospec_barrier(int id)
 257  271  {
 258  272          barrier_id = id;
 259  273  
 260  274          add_hook(&match_barrier, ASM_HOOK);
 261  275  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX