On Tue, 2013-04-02 at 15:15 -0700, Jacob Pan wrote:
> RAPL(Running Average Power Limit) interface provides platform software
> with the ability to monitor, control, and get notifications on SOC
> power consumptions. Since its first appearance on Sandy Bridge, more
> features have being added to extend its usage. In RAPL, platforms are
> divided into domains for fine grained control. These domains include
> package, DRAM controller, CPU core (Power Plane 0), graphics uncore
> (power plane 1), etc.

trivia only:

> diff --git a/drivers/platform/x86/intel_rapl.c 
> b/drivers/platform/x86/intel_rapl.c
[]
> +static char *rapl_domain_names[] = {
> +     "package",
> +     "power_plane_0",
> +     "power_plane_1",
> +     "dram",
> +};

const

> +static void rapl_init_domains(void)
> +{
> +     int i, j = 0;


I think this below is unpleasant to read.
Maybe add a temporary pointer and get rid of j?

        typeof rapl_domains *t = rapl_domains;

(not typeof, but the actual type)

> +
> +     for (i = 0; i < RAPL_DOMAIN_MAX; i++) {
> +             unsigned int mask = rg_data.domain_map & (1 << i);
> +
> +             switch (mask) {
> +             case 1 << RAPL_DOMAIN_PKG:
> +                     rapl_domains[j].name =
> +                             rapl_domain_names[RAPL_DOMAIN_PKG];

                        t->name = rapl_domain_names[RAPL_DOMAIN_PKG];
                        etc...
[]
> +             if (mask)
> +                     j++;

                        t++;

> +/* in the order of enum rapl_primitives */
> +static struct rapl_primitive_info rpi[] = {

const?

> +     /* name, mask, shift, msr index, unit divisor*/
> +     PRIMITIVE_INFO_INIT(energy, ENERGY_STATUS_MASK, 0,
> +                     RAPL_DOMAIN_MSR_STATUS, ENERGY_UNIT,
> +                     RAPL_PRIMITIVE_EVENT_CAP),

[]
> +static int rapl_read_data_raw(struct rapl_domain *domain,
> +                     struct rapl_primitive_info *rp, bool xlate, u64 *data)
> +{
[]
> +     /* specical-case pkg lock bit since pkg domain uses a different bit */

special-case

[]
> +static ssize_t store_event_control(struct rapl_domain *rd, const char *buf,
> +                             size_t size)
> +{
> +     unsigned int efd, cfd, new_threshold;
> +     struct file *efile = NULL;
> +     struct file *cfile = NULL;
> +     int ret = 0;
> +     int prim;
> +     struct rapl_event *ep;
> +     u64 val;
> +
> +     if (sscanf(buf, "%u %u %u", &efd, &cfd, &new_threshold) != 3)
> +             return -EINVAL;
> +
> +     efile = eventfd_fget(efd);
> +     if (IS_ERR(efile)) {
> +             ret = PTR_ERR(efile);
> +             pr_err("failed to get eventfd file %d\n", efd);
> +             goto done;
> +     }
> +     cfile = fget(cfd);
> +     if (!cfile) {
> +             ret = -EBADF;
> +             fput(efile);
> +             goto done;
> +     }
> +     /* check if the cfile belongs to the same rapl domain */
> +     if (strcmp(rd->kobj.sd->s_name,
> +                     cfile->f_dentry->d_parent->d_name.name)) {
> +             pr_debug("cfile does not belong to domain %s\n",
> +                     rd->kobj.sd->s_name);
> +             ret = -EINVAL;
> +             goto exit_cleanup_fds;
> +     }
> +     prim = primitive_name_to_entry(
> +             (const char *)cfile->f_dentry->d_name.name);
> +     if (prim < 0) {
> +             pr_err("failed lookup primitive id for control file %s\n",
> +                     cfile->f_dentry->d_name.name);
> +             ret = -EINVAL;
> +             goto exit_cleanup_fds;
> +     }
> +     if (!(rpi[prim].flag & RAPL_PRIMITIVE_EVENT_CAP)) {
> +             pr_info("Invalid control file %d\n", prim);
> +             ret = -EINVAL;
> +             goto exit_cleanup_fds;
> +     }

Perhaps all these pr_<levels> should be pr_err as they
all lead to a failure path.


[]

> +static int stop_periodic_polling(void)
> +{
> +     if (true == polling_started) {

You don't need a comparison,
        if (polling_started) {
is perhaps better.

[]
> +static int rapl_detect_domains(void)
> +{
[]
> +     pr_info("Found %d vaild RAPL domains\n", rg_data.nr_domains);

valid

> +     rapl_domains = kzalloc(sizeof(struct rapl_domain) * rg_data.nr_domains,
> +                     GFP_KERNEL);

kcalloc

> +     if (NULL == rapl_domains) {
> +             pr_err("Failed to allocate memory for rapl domain\n");

You don't need OOM messages as the memory
subsystem already does a dump_stack on OOM.

[]

> +static int __init intel_rapl_init(void)
> +{

> +     rd_data = kzalloc(sizeof(struct rapl_domain_data) * rg_data.nr_domains,
> +                     GFP_KERNEL);

kcalloc again.

> +     if (NULL == rd_data) {
> +             pr_err("Failed to allocate memory for rapl domain data\n");

OOM too.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to