Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756295Ab2EGKdV (ORCPT ); Mon, 7 May 2012 06:33:21 -0400 Received: from mga02.intel.com ([134.134.136.20]:14499 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756271Ab2EGKdR (ORCPT ); Mon, 7 May 2012 06:33:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="140909323" From: "Kirill A. Shutemov" To: Fenghua Yu , Guenter Roeck , "Durgadoss R" Cc: Andi Kleen , Jean Delvare , lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH, v3] hwmon: coretemp: use list instead of fixed size array for temp data Date: Mon, 7 May 2012 13:34:08 +0300 Message-Id: <1336386848-31041-1-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 1.7.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 10280 Lines: 322 From: "Kirill A. Shutemov" Let's rework code to allow arbitrary number of cores on a CPU, not limited by hardcoded array size. Signed-off-by: Kirill A. Shutemov --- v3: - drop redundant refcounting and checks; v2: - fix NULL pointer dereference. Thanks to R, Durgadoss; - use mutex instead of spinlock for list locking. --- drivers/hwmon/coretemp.c | 120 ++++++++++++++++++++++++++++----------------- 1 files changed, 75 insertions(+), 45 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index b9d5123..fa082d5 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include #include #include @@ -52,11 +54,9 @@ module_param_named(tjmax, force_tjmax, int, 0444); MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); #define BASE_SYSFS_ATTR_NO 2 /* Sysfs Base attr no for coretemp */ -#define NUM_REAL_CORES 32 /* Number of Real cores per cpu */ #define CORETEMP_NAME_LENGTH 17 /* String Length of attrs */ #define MAX_CORE_ATTRS 4 /* Maximum no of basic attrs */ #define TOTAL_ATTRS (MAX_CORE_ATTRS + 1) -#define MAX_CORE_DATA (NUM_REAL_CORES + BASE_SYSFS_ATTR_NO) #define TO_PHYS_ID(cpu) (cpu_data(cpu).phys_proc_id) #define TO_CORE_ID(cpu) (cpu_data(cpu).cpu_core_id) @@ -82,6 +82,8 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); * @valid: If this is 1, the current temperature is valid. */ struct temp_data { + struct list_head list; + int id; int temp; int ttarget; int tjmax; @@ -101,7 +103,8 @@ struct temp_data { struct platform_data { struct device *hwmon_dev; u16 phys_proc_id; - struct temp_data *core_data[MAX_CORE_DATA]; + struct list_head temp_data_list; + struct mutex temp_data_lock; struct device_attribute name_attr; }; @@ -114,6 +117,20 @@ struct pdev_entry { static LIST_HEAD(pdev_list); static DEFINE_MUTEX(pdev_list_mutex); +static struct temp_data *get_temp_data(struct platform_data *pdata, int id) +{ + struct temp_data *tdata; + + mutex_lock(&pdata->temp_data_lock); + list_for_each_entry(tdata, &pdata->temp_data_list, list) + if (tdata->id == id) + goto out; + tdata = NULL; +out: + mutex_unlock(&pdata->temp_data_lock); + return tdata; +} + static ssize_t show_name(struct device *dev, struct device_attribute *devattr, char *buf) { @@ -125,7 +142,7 @@ static ssize_t show_label(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = get_temp_data(pdata, attr->index); if (tdata->is_pkg_data) return sprintf(buf, "Physical id %u\n", pdata->phys_proc_id); @@ -139,7 +156,7 @@ static ssize_t show_crit_alarm(struct device *dev, u32 eax, edx; struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = get_temp_data(pdata, attr->index); rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx); @@ -151,8 +168,9 @@ static ssize_t show_tjmax(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); + struct temp_data *tdata = get_temp_data(pdata, attr->index); - return sprintf(buf, "%d\n", pdata->core_data[attr->index]->tjmax); + return sprintf(buf, "%d\n", tdata->tjmax); } static ssize_t show_ttarget(struct device *dev, @@ -160,8 +178,9 @@ static ssize_t show_ttarget(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); + struct temp_data *tdata = get_temp_data(pdata, attr->index); - return sprintf(buf, "%d\n", pdata->core_data[attr->index]->ttarget); + return sprintf(buf, "%d\n", tdata->ttarget); } static ssize_t show_temp(struct device *dev, @@ -170,7 +189,7 @@ static ssize_t show_temp(struct device *dev, u32 eax, edx; struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = get_temp_data(pdata, attr->index); mutex_lock(&tdata->update_lock); @@ -188,6 +207,7 @@ static ssize_t show_temp(struct device *dev, } mutex_unlock(&tdata->update_lock); + return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN; } @@ -423,7 +443,7 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu, return tdata; } -static int __cpuinit create_core_data(struct platform_device *pdev, +static int __cpuinit create_temp_data(struct platform_device *pdev, unsigned int cpu, int pkg_flag) { struct temp_data *tdata; @@ -440,9 +460,6 @@ static int __cpuinit create_core_data(struct platform_device *pdev, */ attr_no = pkg_flag ? 1 : TO_ATTR_NO(cpu); - if (attr_no > MAX_CORE_DATA - 1) - return -ERANGE; - /* * Provide a single set of attributes for all HT siblings of a core * to avoid duplicate sensors (the processor ID and core ID of all @@ -450,8 +467,14 @@ static int __cpuinit create_core_data(struct platform_device *pdev, * Skip if a HT sibling of this core is already registered. * This is not an error. */ - if (pdata->core_data[attr_no] != NULL) - return 0; + mutex_lock(&pdata->temp_data_lock); + list_for_each_entry(tdata, &pdata->temp_data_list, list) { + if (tdata->id == attr_no) { + mutex_unlock(&pdata->temp_data_lock); + return 0; + } + } + mutex_unlock(&pdata->temp_data_lock); tdata = init_temp_data(cpu, pkg_flag); if (!tdata) @@ -480,16 +503,23 @@ static int __cpuinit create_core_data(struct platform_device *pdev, } } - pdata->core_data[attr_no] = tdata; + tdata->id = attr_no; + + mutex_lock(&pdata->temp_data_lock); + list_add(&tdata->list, &pdata->temp_data_list); + mutex_unlock(&pdata->temp_data_lock); /* Create sysfs interfaces */ err = create_core_attrs(tdata, &pdev->dev, attr_no); if (err) - goto exit_free; + goto exit_list_del; return 0; +exit_list_del: + mutex_lock(&pdata->temp_data_lock); + list_del(&tdata->list); + mutex_unlock(&pdata->temp_data_lock); exit_free: - pdata->core_data[attr_no] = NULL; kfree(tdata); return err; } @@ -502,23 +532,21 @@ static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag) if (!pdev) return; - err = create_core_data(pdev, cpu, pkg_flag); + err = create_temp_data(pdev, cpu, pkg_flag); if (err) dev_err(&pdev->dev, "Adding Core %u failed\n", cpu); } -static void coretemp_remove_core(struct platform_data *pdata, - struct device *dev, int indx) +static void coretemp_remove_core(struct temp_data *tdata, struct device *dev) { int i; - struct temp_data *tdata = pdata->core_data[indx]; /* Remove the sysfs attributes */ for (i = 0; i < tdata->attr_size; i++) device_remove_file(dev, &tdata->sd_attrs[i].dev_attr); - kfree(pdata->core_data[indx]); - pdata->core_data[indx] = NULL; + list_del(&tdata->list); + kfree(tdata); } static int __devinit coretemp_probe(struct platform_device *pdev) @@ -536,6 +564,8 @@ static int __devinit coretemp_probe(struct platform_device *pdev) goto exit_free; pdata->phys_proc_id = pdev->id; + INIT_LIST_HEAD(&pdata->temp_data_list); + mutex_init(&pdata->temp_data_lock); platform_set_drvdata(pdev, pdata); pdata->hwmon_dev = hwmon_device_register(&pdev->dev); @@ -557,11 +587,12 @@ exit_free: static int __devexit coretemp_remove(struct platform_device *pdev) { struct platform_data *pdata = platform_get_drvdata(pdev); - int i; + struct temp_data *cur, *tmp; - for (i = MAX_CORE_DATA - 1; i >= 0; --i) - if (pdata->core_data[i]) - coretemp_remove_core(pdata, &pdev->dev, i); + mutex_lock(&pdata->temp_data_lock); + list_for_each_entry_safe(cur, tmp, &pdata->temp_data_list, list) + coretemp_remove_core(cur, &pdev->dev); + mutex_unlock(&pdata->temp_data_lock); device_remove_file(&pdev->dev, &pdata->name_attr); hwmon_device_unregister(pdata->hwmon_dev); @@ -641,16 +672,17 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu) static bool __cpuinit is_any_core_online(struct platform_data *pdata) { - int i; - - /* Find online cores, except pkgtemp data */ - for (i = MAX_CORE_DATA - 1; i >= 0; --i) { - if (pdata->core_data[i] && - !pdata->core_data[i]->is_pkg_data) { - return true; - } - } - return false; + struct temp_data *tdata; + bool ret = true; + + mutex_lock(&pdata->temp_data_lock); + list_for_each_entry(tdata, &pdata->temp_data_list, list) + if (!tdata->is_pkg_data) + goto out; + ret = false; +out: + mutex_unlock(&pdata->temp_data_lock); + return ret; } static void __cpuinit get_core_online(unsigned int cpu) @@ -697,9 +729,10 @@ static void __cpuinit get_core_online(unsigned int cpu) static void __cpuinit put_core_offline(unsigned int cpu) { - int i, indx; + int i, attr_no; struct platform_data *pdata; struct platform_device *pdev = coretemp_get_pdev(cpu); + struct temp_data *tdata; /* If the physical CPU device does not exist, just return */ if (!pdev) @@ -707,14 +740,11 @@ static void __cpuinit put_core_offline(unsigned int cpu) pdata = platform_get_drvdata(pdev); - indx = TO_ATTR_NO(cpu); - - /* The core id is too big, just return */ - if (indx > MAX_CORE_DATA - 1) - return; + attr_no = TO_ATTR_NO(cpu); - if (pdata->core_data[indx] && pdata->core_data[indx]->cpu == cpu) - coretemp_remove_core(pdata, &pdev->dev, indx); + tdata = get_temp_data(pdata, attr_no); + if (tdata && tdata->cpu == cpu) + coretemp_remove_core(tdata, &pdev->dev); /* * If a HT sibling of a core is taken offline, but another HT sibling -- 1.7.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/