From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754458AbcCBOd0 (ORCPT ); Wed, 2 Mar 2016 09:33:26 -0500 Received: from smtprelay0057.hostedemail.com ([216.40.44.57]:40733 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753314AbcCBOdY (ORCPT ); Wed, 2 Mar 2016 09:33:24 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3354:3622:3865:3870:5007:6261:7875:8603:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12438:12517:12519:12740:13138:13231:13439:14659:21080:21088:30012:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: bike25_1d7422d6b7c4b X-Filterd-Recvd-Size: 3139 Date: Wed, 2 Mar 2016 09:33:20 -0500 From: Steven Rostedt To: Tom Zanussi Cc: masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org, mathieu.desnoyers@efficios.com, peterz@infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v15 02/23] tracing: Add 'hist' event trigger command Message-ID: <20160302093320.483228b8@gandalf.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 26 Feb 2016 10:01:05 -0600 Tom Zanussi wrote: > +static int create_hitcount_val(struct hist_trigger_data *hist_data) > +{ > + hist_data->fields[HITCOUNT_IDX] = > + create_hist_field(NULL, HIST_FIELD_FL_HITCOUNT); > + if (!hist_data->fields[HITCOUNT_IDX]) > + return -ENOMEM; > + > + if (WARN_ON(++hist_data->n_vals > TRACING_MAP_VALS_MAX)) Never put side effects in a WARN_ON() macro. Some configs define WARN_ON() as a nop. Which would break this code. Always do the following: hist_data->n_vals++; if (WARN_ON(hist_data->n_vals > TRACING_MAP_VALS_MAX)) > + return -EINVAL; > + > + return 0; > +} > + > +static int create_val_fields(struct hist_trigger_data *hist_data, > + struct trace_event_file *file) > +{ > + int ret; > + > + ret = create_hitcount_val(hist_data); > + > + return ret; > +} > + > +static int create_key_field(struct hist_trigger_data *hist_data, > + unsigned int key_idx, > + struct trace_event_file *file, > + char *field_str) > +{ > + struct ftrace_event_field *field = NULL; > + unsigned long flags = 0; > + unsigned int key_size; > + int ret = 0; > + > + if (WARN_ON(key_idx >= TRACING_MAP_FIELDS_MAX)) > + return -EINVAL; > + > + flags |= HIST_FIELD_FL_KEY; > + > + field = trace_find_event_field(file->event_call, field_str); > + if (!field) { > + ret = -EINVAL; > + goto out; > + } > + > + key_size = field->size; > + > + hist_data->fields[key_idx] = create_hist_field(field, flags); > + if (!hist_data->fields[key_idx]) { > + ret = -ENOMEM; > + goto out; > + } > + > + key_size = ALIGN(key_size, sizeof(u64)); > + hist_data->fields[key_idx]->size = key_size; > + hist_data->key_size = key_size; > + if (hist_data->key_size > HIST_KEY_SIZE_MAX) { > + ret = -EINVAL; > + goto out; > + } > + > + if (WARN_ON(++hist_data->n_keys > TRACING_MAP_KEYS_MAX)) Same here. > + return -EINVAL; > + > + ret = key_size; > + out: > + return ret; > +} > + -- Steve