* [PATCH 0/6] selftests: powerpc build fixes
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
This series fixes issues I encountered building and running the
selftests on a Ubuntu Cosmic ppc64le system.
Joel Stanley (6):
selftests: powerpc/ptrace: Make tests build
selftests: powerpc/ptrace: Remove clean rule
selftests: powerpc/ptrace: Fix linking against pthread
selftests: powerpc/signal: Make tests build
selftests: powerpc/signal: Fix signal_tm CFLAGS
selftests: powerpc/pmu: Link ebb tests with -no-pie
tools/testing/selftests/powerpc/pmu/ebb/Makefile | 3 +++
tools/testing/selftests/powerpc/ptrace/Makefile | 11 ++++-------
tools/testing/selftests/powerpc/signal/Makefile | 9 +++------
3 files changed, 10 insertions(+), 13 deletions(-)
--
2.19.1
^ permalink raw reply
* [PATCH 1/6] selftests: powerpc/ptrace: Make tests build
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
According to lib.mk, TEST_PROGS is for shell scripts. It appears we need
to define the programs as TEST_GEN_PROGS to ensure they are built.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/ptrace/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/powerpc/ptrace/Makefile b/tools/testing/selftests/powerpc/ptrace/Makefile
index 6ac71b629276..e9a3850aae86 100644
--- a/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/tools/testing/selftests/powerpc/ptrace/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
+TEST_GEN_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
ptrace-tar ptrace-tm-tar ptrace-tm-spd-tar ptrace-vsx ptrace-tm-vsx \
ptrace-tm-spd-vsx ptrace-tm-spr ptrace-hwbreak ptrace-pkey core-pkey \
perf-hwbreak ptrace-syscall
@@ -12,7 +12,7 @@ CFLAGS += -m64 -I../../../../../usr/include -I../tm -mhtm -fno-pie
ptrace-pkey core-pkey: child.h
ptrace-pkey core-pkey: LDLIBS += -pthread
-$(TEST_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h
+$(TEST_GEN_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h
clean:
- rm -f $(TEST_PROGS) *.o
+ rm -f $(TEST_GEN_PROGS) *.o
--
2.19.1
^ permalink raw reply related
* [PATCH 2/6] selftests: powerpc/ptrace: Remove clean rule
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
When running 'make ptrace':
make[1]: Entering directory 'tools/testing/selftests/powerpc/ptrace'
Makefile:18: warning: overriding recipe for target 'clean'
../../lib.mk:137: warning: ignoring old recipe for target 'clean'
The rule is unnecessary as TEST_GEN_FILES are cleaned up by the rule in
lib.mk.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/ptrace/Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/testing/selftests/powerpc/ptrace/Makefile b/tools/testing/selftests/powerpc/ptrace/Makefile
index e9a3850aae86..58de6d4a0cf4 100644
--- a/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/tools/testing/selftests/powerpc/ptrace/Makefile
@@ -13,6 +13,3 @@ ptrace-pkey core-pkey: child.h
ptrace-pkey core-pkey: LDLIBS += -pthread
$(TEST_GEN_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h
-
-clean:
- rm -f $(TEST_GEN_PROGS) *.o
--
2.19.1
^ permalink raw reply related
* [PATCH 3/6] selftests: powerpc/ptrace: Fix linking against pthread
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
Some of the ptrace tests require -ptrace when linking:
/usr/bin/ld: /tmp/ccH32S9w.o: in function `init_child_sync':
core-pkey.c:(.text+0x1d64): undefined reference to `sem_init'
The targets for these tests are modfied in lib.mk to add the $(OUTPUT)
prefix. The makefile needs to specify that modifying those rules, or
else they do not match and we miss out on the extra flags.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/ptrace/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/powerpc/ptrace/Makefile b/tools/testing/selftests/powerpc/ptrace/Makefile
index 58de6d4a0cf4..8d3f006c98cc 100644
--- a/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/tools/testing/selftests/powerpc/ptrace/Makefile
@@ -9,7 +9,7 @@ include ../../lib.mk
CFLAGS += -m64 -I../../../../../usr/include -I../tm -mhtm -fno-pie
-ptrace-pkey core-pkey: child.h
-ptrace-pkey core-pkey: LDLIBS += -pthread
+$(OUTPUT)/ptrace-pkey $(OUTPUT)/core-pkey: child.h
+$(OUTPUT)/ptrace-pkey $(OUTPUT)/core-pkey: LDLIBS += -pthread
$(TEST_GEN_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h
--
2.19.1
^ permalink raw reply related
* [PATCH 4/6] selftests: powerpc/signal: Make tests build
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
According to lib.mk, TEST_PROGS is for shell scripts. It appears we need
to define the programs as TEST_GEN_PROGS to ensure they are built.
The definition must also happen below the inclusion of lib.mk.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/signal/Makefile | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/powerpc/signal/Makefile b/tools/testing/selftests/powerpc/signal/Makefile
index d34a7c7710db..25d0973df5b3 100644
--- a/tools/testing/selftests/powerpc/signal/Makefile
+++ b/tools/testing/selftests/powerpc/signal/Makefile
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := signal signal_tm
-
-$(TEST_PROGS): ../harness.c ../utils.c signal.S
+TEST_GEN_PROGS := signal signal_tm
CFLAGS += -maltivec
signal_tm: CFLAGS += -mhtm
@@ -9,5 +7,4 @@ signal_tm: CFLAGS += -mhtm
top_srcdir = ../../../../..
include ../../lib.mk
-clean:
- rm -f $(TEST_PROGS) *.o
+$(TEST_GEN_PROGS): ../harness.c ../utils.c signal.S
--
2.19.1
^ permalink raw reply related
* [PATCH 5/6] selftests: powerpc/signal: Fix signal_tm CFLAGS
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
signal_tm tries to build with -mhtm but it currently does not.
The targets is modified in lib.mk to add the $(OUTPUT) prefix. The
makefile needs to specify that modifying the rules, or else it does
not match and we miss out on the extra flag.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/signal/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/powerpc/signal/Makefile b/tools/testing/selftests/powerpc/signal/Makefile
index 25d0973df5b3..209a958dca12 100644
--- a/tools/testing/selftests/powerpc/signal/Makefile
+++ b/tools/testing/selftests/powerpc/signal/Makefile
@@ -2,7 +2,7 @@
TEST_GEN_PROGS := signal signal_tm
CFLAGS += -maltivec
-signal_tm: CFLAGS += -mhtm
+$(OUTPUT)/signal_tm: CFLAGS += -mhtm
top_srcdir = ../../../../..
include ../../lib.mk
--
2.19.1
^ permalink raw reply related
* [PATCH 6/6] selftests: powerpc/pmu: Link ebb tests with -no-pie
From: Joel Stanley @ 2018-10-23 6:16 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-kselftest
In-Reply-To: <20181023061657.18007-1-joel@jms.id.au>
When running the ebb tests after building on a ppc64le Ubuntu machine:
$ pmu/ebb/reg_access_test: error while loading shared libraries:
R_PPC64_ADDR16_HI reloc at 0x000000013a965130 for symbol `' out of
range
This is because the Ubuntu toolchain builds has PIE enabled by default.
Change it to be always off instead.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
tools/testing/selftests/powerpc/pmu/ebb/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/testing/selftests/powerpc/pmu/ebb/Makefile b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
index bd5dfa509272..23f4caf48ffc 100644
--- a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
@@ -5,6 +5,9 @@ noarg:
# The EBB handler is 64-bit code and everything links against it
CFLAGS += -m64
+# Toolchains may build PIE by default which breaks the assembly
+LDFLAGS += -no-pie
+
TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test \
cycles_with_freeze_test pmc56_overflow_test \
ebb_vs_cpu_event_test cpu_event_vs_ebb_test \
--
2.19.1
^ permalink raw reply related
* [PATCH] selftests/powerpc: Relax L1d miss targets for rfi_flush test
From: Naveen N. Rao @ 2018-10-23 8:04 UTC (permalink / raw)
To: Michael Ellerman, Joel Stanley; +Cc: linuxppc-dev
When running the rfi_flush test, if the system is loaded, we see two
issues:
1. The L1d misses when rfi_flush is disabled increase significantly due
to other workloads interfering with the cache.
2. The L1d misses when rfi_flush is enabled sometimes goes slightly
below the expected number of misses.
To address these, let's relax the expected number of L1d misses:
1. When rfi_flush is disabled, we allow upto half the expected number of
the misses for when rfi_flush is enabled.
2. When rfi_flush is enabled, we allow ~1% lower number of cache misses.
Reported-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
.../selftests/powerpc/security/rfi_flush.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/powerpc/security/rfi_flush.c b/tools/testing/selftests/powerpc/security/rfi_flush.c
index 564ed45bbf73..0a7d0afb26b8 100644
--- a/tools/testing/selftests/powerpc/security/rfi_flush.c
+++ b/tools/testing/selftests/powerpc/security/rfi_flush.c
@@ -49,6 +49,7 @@ int rfi_flush_test(void)
struct perf_event_read v;
__u64 l1d_misses_total = 0;
unsigned long iterations = 100000, zero_size = 24 * 1024;
+ unsigned long l1d_misses_expected;
int rfi_flush_org, rfi_flush;
SKIP_IF(geteuid() != 0);
@@ -71,6 +72,12 @@ int rfi_flush_test(void)
iter = repetitions;
+ /*
+ * We expect to see l1d miss for each cacheline access when rfi_flush
+ * is set. Allow a small variation on this.
+ */
+ l1d_misses_expected = iterations * (zero_size / CACHELINE_SIZE - 2);
+
again:
FAIL_IF(perf_event_reset(fd));
@@ -78,10 +85,9 @@ int rfi_flush_test(void)
FAIL_IF(read(fd, &v, sizeof(v)) != sizeof(v));
- /* Expect at least zero_size/CACHELINE_SIZE misses per iteration */
- if (v.l1d_misses >= (iterations * zero_size / CACHELINE_SIZE) && rfi_flush)
+ if (rfi_flush && v.l1d_misses >= l1d_misses_expected)
passes++;
- else if (v.l1d_misses < iterations && !rfi_flush)
+ else if (!rfi_flush && v.l1d_misses < (l1d_misses_expected / 2))
passes++;
l1d_misses_total += v.l1d_misses;
@@ -92,13 +98,15 @@ int rfi_flush_test(void)
if (passes < repetitions) {
printf("FAIL (L1D misses with rfi_flush=%d: %llu %c %lu) [%d/%d failures]\n",
rfi_flush, l1d_misses_total, rfi_flush ? '<' : '>',
- rfi_flush ? (repetitions * iterations * zero_size / CACHELINE_SIZE) : iterations,
+ rfi_flush ? repetitions * l1d_misses_expected :
+ repetitions * l1d_misses_expected / 2,
repetitions - passes, repetitions);
rc = 1;
} else
printf("PASS (L1D misses with rfi_flush=%d: %llu %c %lu) [%d/%d pass]\n",
rfi_flush, l1d_misses_total, rfi_flush ? '>' : '<',
- rfi_flush ? (repetitions * iterations * zero_size / CACHELINE_SIZE) : iterations,
+ rfi_flush ? repetitions * l1d_misses_expected :
+ repetitions * l1d_misses_expected / 2,
passes, repetitions);
if (rfi_flush == rfi_flush_org) {
--
2.19.1
^ permalink raw reply related
* [PATCH v2] powernv: sensor-groups: Add debugfs file to enable/disable sensor groups
From: Shilpasri G Bhat @ 2018-10-23 10:36 UTC (permalink / raw)
To: mpe; +Cc: ego, linuxppc-dev, linux-kernel, Shilpasri G Bhat
This patch provides support to disable and enable platform specific
sensor groups like performance, utilization and frequency which are
currently not supported in hwmon.
Signed-off-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
---
Changes from V1:
- As per Michael Ellerman's suggestion, adding the "enable" files to debugfs.
The original code had been written in mind to accomodate the "enable" file
in the same path as "clear" attribute. As this is not required anymore
the code is cleaned up to bifurcate the functions adding "enable" and
"clear" attribute.
.../powerpc/platforms/powernv/opal-sensor-groups.c | 284 ++++++++++++++-------
1 file changed, 186 insertions(+), 98 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/opal-sensor-groups.c b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
index f7d04b6..e270dba 100644
--- a/arch/powerpc/platforms/powernv/opal-sensor-groups.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
@@ -15,22 +15,21 @@
#include <linux/kobject.h>
#include <linux/slab.h>
+#include <asm/debugfs.h>
#include <asm/opal.h>
-DEFINE_MUTEX(sg_mutex);
+#define SENSOR_GROUPS_DIR_STR "sensor_groups"
static struct kobject *sg_kobj;
-struct sg_attr {
- u32 handle;
- struct kobj_attribute attr;
-};
-
static struct sensor_group {
- char name[20];
+ struct kobj_attribute sattr;
struct attribute_group sg;
- struct sg_attr *sgattrs;
-} *sgs;
+ struct mutex mutex;
+ char name[20];
+ u32 handle;
+ u32 enable;
+} *sgroups;
int sensor_group_enable(u32 handle, bool enable)
{
@@ -60,10 +59,12 @@ int sensor_group_enable(u32 handle, bool enable)
}
EXPORT_SYMBOL_GPL(sensor_group_enable);
-static ssize_t sg_store(struct kobject *kobj, struct kobj_attribute *attr,
- const char *buf, size_t count)
+static ssize_t sgroup_clear_store(struct kobject *kobj,
+ struct kobj_attribute *attr,
+ const char *buf, size_t count)
{
- struct sg_attr *sattr = container_of(attr, struct sg_attr, attr);
+ struct sensor_group *sgroup = container_of(attr, struct sensor_group,
+ sattr);
struct opal_msg msg;
u32 data;
int ret, token;
@@ -81,11 +82,11 @@ static ssize_t sg_store(struct kobject *kobj, struct kobj_attribute *attr,
return token;
}
- ret = mutex_lock_interruptible(&sg_mutex);
+ ret = mutex_lock_interruptible(&sgroup->mutex);
if (ret)
goto out_token;
- ret = opal_sensor_group_clear(sattr->handle, token);
+ ret = opal_sensor_group_clear(sgroup->handle, token);
switch (ret) {
case OPAL_ASYNC_COMPLETION:
ret = opal_async_wait_response(token, &msg);
@@ -106,135 +107,222 @@ static ssize_t sg_store(struct kobject *kobj, struct kobj_attribute *attr,
}
out:
- mutex_unlock(&sg_mutex);
+ mutex_unlock(&sgroup->mutex);
out_token:
opal_async_release_token(token);
return ret;
}
-static struct sg_ops_info {
- int opal_no;
- const char *attr_name;
- ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
- const char *buf, size_t count);
-} ops_info[] = {
- { OPAL_SENSOR_GROUP_CLEAR, "clear", sg_store },
-};
+static int find_nr_groups(struct device_node *sensor_group_node, int opal_no)
+{
+ struct devce_node *node;
+ int count = 0;
+
+ for_each_child_of_node(sensor_group_node, node) {
+ u32 sgid, op;
+
+ if (of_device_is_compatible(node, "ibm,opal-sensor"))
+ continue;
+
+ if (of_property_read_u32(node, "ops", &op))
+ continue;
+
+ if (op != opal_no)
+ continue;
+
+ if (of_property_read_u32(node, "sensor-group-id", &sgid))
+ continue;
+ count++;
+ }
+
+ return count;
+}
-static void add_attr(int handle, struct sg_attr *attr, int index)
+#ifdef CONFIG_DEBUG_FS
+static int sgroup_enable_get(void *data, u64 *val)
{
- attr->handle = handle;
- sysfs_attr_init(&attr->attr.attr);
- attr->attr.attr.name = ops_info[index].attr_name;
- attr->attr.attr.mode = 0220;
- attr->attr.store = ops_info[index].store;
+ struct sensor_group *sgroup = (struct sensor_group *)data;
+
+ *val = sgroup->enable;
+ return 0;
}
-static int add_attr_group(const __be32 *ops, int len, struct sensor_group *sg,
- u32 handle)
+static int sgroup_enable_set(void *data, u64 val)
{
- int i, j;
- int count = 0;
+ struct sensor_group *sgroup = (struct sensor_group *)data;
+ int rc;
+
+ if (val != 0 && val != 1)
+ return -EINVAL;
+
+ rc = mutex_lock_interruptible(&sgroup->mutex);
+ if (rc)
+ return rc;
- for (i = 0; i < len; i++)
- for (j = 0; j < ARRAY_SIZE(ops_info); j++)
- if (be32_to_cpu(ops[i]) == ops_info[j].opal_no) {
- add_attr(handle, &sg->sgattrs[count], j);
- sg->sg.attrs[count] =
- &sg->sgattrs[count].attr.attr;
- count++;
- }
+ if (val != sgroup->enable) {
+ rc = sensor_group_enable(sgroup->handle, val);
+ if (!rc)
+ sgroup->enable = val;
+ }
- return sysfs_create_group(sg_kobj, &sg->sg);
+ mutex_unlock(&sgroup->mutex);
+ return rc;
}
-static int get_nr_attrs(const __be32 *ops, int len)
+DEFINE_DEBUGFS_ATTRIBUTE(sensor_debugfs_ops, sgroup_enable_get,
+ sgroup_enable_set, "%llx\n");
+static struct dentry *sensor_debugfs_parent;
+static struct sensor_group *dgroups;
+
+static void add_debugfs_attrs(struct device_node *sensor_group_node)
{
- int i, j;
- int nr_attrs = 0;
+ struct device_node *node;
+ int i = 0, count;
+
+ count = find_nr_groups(sensor_group_node, OPAL_SENSOR_GROUP_ENABLE);
+ if (!count)
+ return;
- for (i = 0; i < len; i++)
- for (j = 0; j < ARRAY_SIZE(ops_info); j++)
- if (be32_to_cpu(ops[i]) == ops_info[j].opal_no)
- nr_attrs++;
+ dgroups = kcalloc(count, sizeof(*dgroups), GFP_KERNEL);
+ if (!sgroups)
+ return;
+
+ sensor_debugfs_parent = debugfs_create_dir(SENSOR_GROUPS_DIR_STR,
+ powerpc_debugfs_root);
+ if (!sensor_debugfs_parent)
+ goto out_dgroups;
- return nr_attrs;
+ for_each_child_of_node(sensor_group_node, node) {
+ struct dentry *group;
+ u32 op, sgid, chipid;
+
+ if (of_device_is_compatible(node, "ibm,opal-sensor"))
+ continue;
+
+ if (of_property_read_u32(node, "ops", &op))
+ continue;
+
+ if (op != OPAL_SENSOR_GROUP_ENABLE)
+ continue;
+
+ if (of_property_read_u32(node, "sensor-group-id", &sgid))
+ continue;
+
+ if (!of_property_read_u32(node, "ibm,chip-id", &chipid))
+ sprintf(dgroups[i].name, "%s%d", node->name, chipid);
+ else
+ sprintf(dgroups[i].name, "%s", node->name);
+
+ dgroups[i].handle = sgid;
+ dgroups[i].enable = 1;
+ mutex_init(&dgroups[i].mutex);
+ group = debugfs_create_dir(dgroups[i].name,
+ sensor_debugfs_parent);
+ if (!group) {
+ of_node_put(node);
+ goto out_debugfs;
+ }
+
+ if (!debugfs_create_file("enable", 0664, group, &dgroups[i],
+ &sensor_debugfs_ops)) {
+ of_node_put(node);
+ goto out_debugfs;
+ }
+ i++;
+ }
+
+ return;
+
+out_debugfs:
+ debugfs_remove_recursive(sensor_debugfs_parent);
+out_dgroups:
+ kfree(dgroups);
}
+#endif /* CONFIG_DEBUG_FS */
void __init opal_sensor_groups_init(void)
{
- struct device_node *sg, *node;
- int i = 0;
+ struct device_node *sensor_group_node, *node;
+ int i = 0, count;
- sg = of_find_compatible_node(NULL, NULL, "ibm,opal-sensor-group");
- if (!sg) {
+ sensor_group_node = of_find_compatible_node(NULL, NULL,
+ "ibm,opal-sensor-group");
+ if (!sensor_group_node) {
pr_devel("Sensor groups node not found\n");
return;
}
- sgs = kcalloc(of_get_child_count(sg), sizeof(*sgs), GFP_KERNEL);
- if (!sgs)
- return;
+ count = find_nr_groups(sensor_group_node, OPAL_SENSOR_GROUP_CLEAR);
+ if (!count)
+ goto out_node_put;
- sg_kobj = kobject_create_and_add("sensor_groups", opal_kobj);
+ sgroups = kcalloc(count, sizeof(*sgroups), GFP_KERNEL);
+ if (!sgroups)
+ goto out_node_put;
+
+ sg_kobj = kobject_create_and_add(SENSOR_GROUPS_DIR_STR, opal_kobj);
if (!sg_kobj) {
pr_warn("Failed to create sensor group kobject\n");
- goto out_sgs;
+ goto out_sgroups;
}
- for_each_child_of_node(sg, node) {
- const __be32 *ops;
- u32 sgid, len, nr_attrs, chipid;
+ for_each_child_of_node(sensor_group_node, node) {
+ u32 sgid, chipid, op;
- ops = of_get_property(node, "ops", &len);
- if (!ops)
+ if (of_property_read_u32(node, "ops", &op))
continue;
- nr_attrs = get_nr_attrs(ops, len);
- if (!nr_attrs)
+ if (op != OPAL_SENSOR_GROUP_CLEAR)
continue;
- sgs[i].sgattrs = kcalloc(nr_attrs, sizeof(*sgs[i].sgattrs),
- GFP_KERNEL);
- if (!sgs[i].sgattrs)
- goto out_sgs_sgattrs;
-
- sgs[i].sg.attrs = kcalloc(nr_attrs + 1,
- sizeof(*sgs[i].sg.attrs),
- GFP_KERNEL);
-
- if (!sgs[i].sg.attrs) {
- kfree(sgs[i].sgattrs);
- goto out_sgs_sgattrs;
- }
-
- if (of_property_read_u32(node, "sensor-group-id", &sgid)) {
- pr_warn("sensor-group-id property not found\n");
- goto out_sgs_sgattrs;
- }
+ if (of_property_read_u32(node, "sensor-group-id", &sgid))
+ continue;
if (!of_property_read_u32(node, "ibm,chip-id", &chipid))
- sprintf(sgs[i].name, "%s%d", node->name, chipid);
+ sprintf(sgroups[i].name, "%s%d", node->name, chipid);
else
- sprintf(sgs[i].name, "%s", node->name);
+ sprintf(sgroups[i].name, "%s", node->name);
+
+ sgroups[i].sg.attrs = kzalloc(sizeof(struct attribute *) * 2,
+ GFP_KERNEL);
+ if (!sgroups[i].sg.attrs) {
+ of_node_put(node);
+ goto out_sg_attrs;
+ }
- sgs[i].sg.name = sgs[i].name;
- if (add_attr_group(ops, len, &sgs[i], sgid)) {
+ sgroups[i].sg.name = sgroups[i].name;
+ sgroups[i].handle = sgid;
+ sysfs_attr_init(sgroups[i].sattr.attr);
+ sgroups[i].sattr.attr.name = "clear";
+ sgroups[i].sattr.attr.mode = 0220;
+ sgroups[i].sattr.store = sgroup_clear_store;
+ sgroups[i].sg.attrs[0] = &sgroups[i].sattr.attr;
+ sgroups[i].sg.attrs[1] = NULL;
+ mutex_init(&sgroups[i].mutex);
+
+ if (sysfs_create_group(sg_kobj, &sgroups[i].sg)) {
pr_warn("Failed to create sensor attribute group %s\n",
- sgs[i].sg.name);
- goto out_sgs_sgattrs;
+ sgroups[i].sg.name);
+ kfree(sgroups[i].sg.attrs);
+ of_node_put(node);
+ goto out_sg_attrs;
}
+
i++;
}
- return;
+#ifdef CONFIG_DEBUG_FS
+ add_debugfs_attrs(sensor_group_node);
+#endif /* CONFIG_DEBUG_FS */
-out_sgs_sgattrs:
- while (--i >= 0) {
- kfree(sgs[i].sgattrs);
- kfree(sgs[i].sg.attrs);
- }
+ goto out_node_put;
+
+out_sg_attrs:
+ while (i-- > 0)
+ kfree(sgroups[i].sg.attrs);
kobject_put(sg_kobj);
-out_sgs:
- kfree(sgs);
+out_sgroups:
+ kfree(sgroups);
+out_node_put:
+ of_node_put(sensor_group_node);
}
--
1.8.3.1
^ permalink raw reply related
* [PATCH] net/wan/fsl_ucc_hdlc: error counters
From: Mathias Thore @ 2018-10-22 12:55 UTC (permalink / raw)
To: qiang.zhao, linuxppc-dev, netdev, joakim.tjernlund,
david.gounaris
Cc: Mathias Thore
Extract error information from rx and tx buffer descriptors,
and update error counters.
Signed-off-by: Mathias Thore <mathias.thore@infinera.com>
---
drivers/net/wan/fsl_ucc_hdlc.c | 51 +++++++++++++++++++++++++++++-----
include/soc/fsl/qe/ucc_fast.h | 8 +++++-
2 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 5f0366a125e2..934fc149c6b3 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -36,6 +36,7 @@
#define DRV_NAME "ucc_hdlc"
#define TDM_PPPOHT_SLIC_MAXIN
+#define RX_BD_ERRORS (R_CD_S | R_OV_S | R_CR_S | R_AB_S | R_NO_S | R_LG_S)
static struct ucc_tdm_info utdm_primary_info = {
.uf_info = {
@@ -420,12 +421,25 @@ static netdev_tx_t ucc_hdlc_tx(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK;
}
+static int hdlc_tx_restart(struct ucc_hdlc_private *priv)
+{
+ u32 cecr_subblock;
+
+ cecr_subblock =
+ ucc_fast_get_qe_cr_subblock(priv->ut_info->uf_info.ucc_num);
+
+ qe_issue_cmd(QE_RESTART_TX, cecr_subblock,
+ QE_CR_PROTOCOL_UNSPECIFIED, 0);
+ return 0;
+}
+
static int hdlc_tx_done(struct ucc_hdlc_private *priv)
{
/* Start from the next BD that should be filled */
struct net_device *dev = priv->ndev;
struct qe_bd *bd; /* BD pointer */
u16 bd_status;
+ int tx_restart = 0;
bd = priv->dirty_tx;
bd_status = ioread16be(&bd->status);
@@ -434,6 +448,15 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
while ((bd_status & T_R_S) == 0) {
struct sk_buff *skb;
+ if (bd_status & T_UN_S) { /* Underrun */
+ dev->stats.tx_fifo_errors++;
+ tx_restart = 1;
+ }
+ if (bd_status & T_CT_S) { /* Carrier lost */
+ dev->stats.tx_carrier_errors++;
+ tx_restart = 1;
+ }
+
/* BD contains already transmitted buffer. */
/* Handle the transmitted buffer and release */
/* the BD to be used with the current frame */
@@ -465,6 +488,9 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
}
priv->dirty_tx = bd;
+ if (tx_restart)
+ hdlc_tx_restart(priv);
+
return 0;
}
@@ -483,11 +509,22 @@ static int hdlc_rx_done(struct ucc_hdlc_private *priv, int rx_work_limit)
/* while there are received buffers and BD is full (~R_E) */
while (!((bd_status & (R_E_S)) || (--rx_work_limit < 0))) {
- if (bd_status & R_OV_S)
- dev->stats.rx_over_errors++;
- if (bd_status & R_CR_S) {
- dev->stats.rx_crc_errors++;
- dev->stats.rx_dropped++;
+ if (bd_status & (RX_BD_ERRORS)) {
+ dev->stats.rx_errors++;
+
+ if (bd_status & R_CD_S)
+ dev->stats.collisions++;
+ if (bd_status & R_OV_S)
+ dev->stats.rx_fifo_errors++;
+ if (bd_status & R_CR_S)
+ dev->stats.rx_crc_errors++;
+ if (bd_status & R_AB_S)
+ dev->stats.rx_over_errors++;
+ if (bd_status & R_NO_S)
+ dev->stats.rx_frame_errors++;
+ if (bd_status & R_LG_S)
+ dev->stats.rx_length_errors++;
+
goto recycle;
}
bdbuffer = priv->rx_buffer +
@@ -535,7 +572,7 @@ static int hdlc_rx_done(struct ucc_hdlc_private *priv, int rx_work_limit)
netif_receive_skb(skb);
recycle:
- iowrite16be(bd_status | R_E_S | R_I_S, &bd->status);
+ iowrite16be((bd_status & R_W_S) | R_E_S | R_I_S, &bd->status);
/* update to point at the next bd */
if (bd_status & R_W_S) {
@@ -611,7 +648,7 @@ static irqreturn_t ucc_hdlc_irq_handler(int irq, void *dev_id)
/* Errors and other events */
if (ucce >> 16 & UCC_HDLC_UCCE_BSY)
- dev->stats.rx_errors++;
+ dev->stats.rx_missed_errors++;
if (ucce >> 16 & UCC_HDLC_UCCE_TXE)
dev->stats.tx_errors++;
diff --git a/include/soc/fsl/qe/ucc_fast.h b/include/soc/fsl/qe/ucc_fast.h
index 3ee9e7c1a7d7..dcd6b865b590 100644
--- a/include/soc/fsl/qe/ucc_fast.h
+++ b/include/soc/fsl/qe/ucc_fast.h
@@ -41,8 +41,12 @@
#define R_L_S 0x0800 /* last */
#define R_F_S 0x0400 /* first */
#define R_CM_S 0x0200 /* continuous mode */
+#define R_LG_S 0x0020 /* frame length */
+#define R_NO_S 0x0010 /* nonoctet */
+#define R_AB_S 0x0008 /* abort */
#define R_CR_S 0x0004 /* crc */
-#define R_OV_S 0x0002 /* crc */
+#define R_OV_S 0x0002 /* overrun */
+#define R_CD_S 0x0001 /* carrier detect */
/* transmit BD's status */
#define T_R_S 0x8000 /* ready bit */
@@ -51,6 +55,8 @@
#define T_L_S 0x0800 /* last */
#define T_TC_S 0x0400 /* crc */
#define T_TM_S 0x0200 /* continuous mode */
+#define T_UN_S 0x0002 /* hdlc underrun */
+#define T_CT_S 0x0001 /* hdlc carrier lost */
/* Rx Data buffer must be 4 bytes aligned in most cases */
#define UCC_FAST_RX_ALIGN 4
--
2.18.1
^ permalink raw reply related
* [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Arun KS @ 2018-10-22 17:23 UTC (permalink / raw)
To: Guo Ren, Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Martin Schwidefsky, Heiko Carstens, Jeff Dike, Richard Weinberger,
Borislav Petkov, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
x86, David Airlie, Arnd Bergmann, Greg Kroah-Hartman, Oded Gabbay,
Alex Deucher, Christian König, David (ChunMing) Zhou,
Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, K. Y. Srinivasan,
Haiyang Zhang, Stephen Hemminger, Alasdair Kergon, Mike Snitzer,
dm-devel, Tiffany Lin, Andrew-CT Chen, Minghsiu Tsai, Houlong Wei,
Mauro Carvalho Chehab, Matthias Brugger, Xavier Deguillard,
Nadav Amit, VMware, Inc., James E.J. Bottomley, Helge Deller,
Laura Abbott, Sumit Semwal, Arve Hjønnevåg, Todd Kjos,
Martijn Coenen, Boris Ostrovsky, Juergen Gross, Yan, Zheng,
Sage Weil, Ilya Dryomov, Alexander Viro, Miklos Szeredi,
Trond Myklebust, Anna Schumaker, J. Bruce Fields, Jeff Layton,
Anton Altaparmakov, Alexey Dobriyan, Eric Biederman,
Rafael J. Wysocki, Pavel Machek, Len Brown, Andrey Ryabinin,
Alexander Potapenko, Dmitry Vyukov, Hugh Dickins,
Christoph Lameter, Pekka Enberg, David Rientjes, Joonsoo Kim,
Andrew Morton, Seth Jennings, Dan Streetman, Gerrit Renker,
David S. Miller, Eric Dumazet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, Vlad Yasevich, Neil Horman,
Marcelo Ricardo Leitner, Mimi Zohar, Dmitry Kasatkin,
James Morris, Serge E. Hallyn, Mark Brown, Mike Rapoport, Arun KS,
Jessica Yu, Kees Cook, Cyril Bur, Russell Currey, Michal Hocko,
Chris Wilson, Matthew Auld, Tvrtko Ursulin, Mika Kuoppala,
Thomas Zimmermann, Gustavo A. R. Silva, Philippe Ombredanne,
Kate Stewart, Anthony Yznaga, Khalid Aziz, Matthew Wilcox,
Pavel Tatashin, Kirill A. Shutemov, Dan Williams,
Souptick Joarder, Vlastimil Babka, Oscar Salvador,
Johannes Weiner, Roman Gushchin, Petr Tesarik, Jia He,
Minchan Kim, Huang Ying, Mel Gorman, Tejun Heo, Jan Kara,
Omar Sandoval, Marcos Paulo de Souza, Jérôme Glisse,
Aneesh Kumar K.V, Konstantin Khlebnikov, Jonathan Corbet,
Stefan Agner, Daniel Vacek, Andy Shevchenko, David Hildenbrand,
Mathieu Malaterre, Tetsuo Handa, Yang Shi, Alexander Duyck,
Randy Dunlap, YueHaibing, Shakeel Butt, Chintan Pandya,
Luis R. Rodriguez, Joe Perches, Jann Horn,
Sebastian Andrzej Siewior, Steven J. Hill, Kemi Wang,
Kirill Tkhai, linux-kernel, linuxppc-dev, linux-s390, linux-um,
dri-devel, amd-gfx, intel-gfx, devel, linux-media,
linux-arm-kernel, linux-mediatek, linux-parisc, devel,
linaro-mm-sig, xen-devel, ceph-devel, linux-fsdevel, linux-nfs,
linux-ntfs-dev, linux-mm, kexec, linux-pm, kasan-dev, dccp,
netdev, linux-decnet-user, netfilter-devel, coreteam, linux-sctp,
linux-integrity, linux-security-module
Cc: getarunks
Remove managed_page_count_lock spinlock and instead use atomic
variables.
Suggested-by: Michal Hocko <mhocko@suse.com>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Arun KS <arunks@codeaurora.org>
---
As discussed here,
https://patchwork.kernel.org/patch/10627521/#22261253
---
---
arch/csky/mm/init.c | 4 +-
arch/powerpc/platforms/pseries/cmm.c | 11 ++--
arch/s390/mm/init.c | 2 +-
arch/um/kernel/mem.c | 4 +-
arch/x86/kernel/cpu/microcode/core.c | 5 +-
drivers/char/agp/backend.c | 4 +-
drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +-
drivers/hv/hv_balloon.c | 19 +++----
drivers/md/dm-bufio.c | 5 +-
drivers/md/dm-crypt.c | 4 +-
drivers/md/dm-integrity.c | 4 +-
drivers/md/dm-stats.c | 3 +-
drivers/media/platform/mtk-vpu/mtk_vpu.c | 3 +-
drivers/misc/vmw_balloon.c | 2 +-
drivers/parisc/ccio-dma.c | 5 +-
drivers/parisc/sba_iommu.c | 5 +-
drivers/staging/android/ion/ion_system_heap.c | 2 +-
drivers/xen/xen-selfballoon.c | 7 +--
fs/ceph/super.h | 3 +-
fs/file_table.c | 9 ++--
fs/fuse/inode.c | 4 +-
fs/nfs/write.c | 3 +-
fs/nfsd/nfscache.c | 3 +-
fs/ntfs/malloc.h | 2 +-
fs/proc/base.c | 3 +-
include/linux/highmem.h | 2 +-
include/linux/mm.h | 2 +-
include/linux/mmzone.h | 10 +---
include/linux/swap.h | 2 +-
kernel/fork.c | 6 +--
kernel/kexec_core.c | 5 +-
kernel/power/snapshot.c | 2 +-
lib/show_mem.c | 3 +-
mm/highmem.c | 2 +-
mm/huge_memory.c | 2 +-
mm/kasan/quarantine.c | 4 +-
mm/memblock.c | 6 +--
mm/memory_hotplug.c | 4 +-
mm/mm_init.c | 3 +-
mm/oom_kill.c | 2 +-
mm/page_alloc.c | 75 ++++++++++++++-------------
mm/shmem.c | 12 +++--
mm/slab.c | 3 +-
mm/swap.c | 3 +-
mm/util.c | 2 +-
mm/vmalloc.c | 4 +-
mm/vmstat.c | 4 +-
mm/workingset.c | 2 +-
mm/zswap.c | 2 +-
net/dccp/proto.c | 6 +--
net/decnet/dn_route.c | 2 +-
net/ipv4/tcp_metrics.c | 2 +-
net/netfilter/nf_conntrack_core.c | 6 +--
net/netfilter/xt_hashlimit.c | 4 +-
net/sctp/protocol.c | 6 +--
security/integrity/ima/ima_kexec.c | 2 +-
58 files changed, 171 insertions(+), 143 deletions(-)
diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index dc07c07..3f4d35e 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c
@@ -71,7 +71,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
ClearPageReserved(virt_to_page(start));
init_page_count(virt_to_page(start));
free_page(start);
- totalram_pages++;
+ atomic_long_inc(&totalram_pages);
}
}
#endif
@@ -88,7 +88,7 @@ void free_initmem(void)
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
- totalram_pages++;
+ atomic_long_inc(&totalram_pages);
addr += PAGE_SIZE;
}
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index 25427a4..85fe503 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -208,7 +208,7 @@ static long cmm_alloc_pages(long nr)
pa->page[pa->index++] = addr;
loaned_pages++;
- totalram_pages--;
+ atomic_long_dec(&totalram_pages);
spin_unlock(&cmm_lock);
nr--;
}
@@ -247,7 +247,7 @@ static long cmm_free_pages(long nr)
free_page(addr);
loaned_pages--;
nr--;
- totalram_pages++;
+ atomic_long_inc(&totalram_pages);
}
spin_unlock(&cmm_lock);
cmm_dbg("End request with %ld pages unfulfilled\n", nr);
@@ -291,7 +291,8 @@ static void cmm_get_mpp(void)
int rc;
struct hvcall_mpp_data mpp_data;
signed long active_pages_target, page_loan_request, target;
- signed long total_pages = totalram_pages + loaned_pages;
+ signed long total_pages = atomic_long_read(&totalram_pages) +
+ loaned_pages;
signed long min_mem_pages = (min_mem_mb * 1024 * 1024) / PAGE_SIZE;
rc = h_get_mpp(&mpp_data);
@@ -322,7 +323,7 @@ static void cmm_get_mpp(void)
cmm_dbg("delta = %ld, loaned = %lu, target = %lu, oom = %lu, totalram = %lu\n",
page_loan_request, loaned_pages, loaned_pages_target,
- oom_freed_pages, totalram_pages);
+ oom_freed_pages, atomic_long_read(&totalram_pages));
}
static struct notifier_block cmm_oom_nb = {
@@ -581,7 +582,7 @@ static int cmm_mem_going_offline(void *arg)
free_page(pa_curr->page[idx]);
freed++;
loaned_pages--;
- totalram_pages++;
+ atomic_long_inc(&totalram_pages);
pa_curr->page[idx] = pa_last->page[--pa_last->index];
if (pa_last->index == 0) {
if (pa_curr == pa_last)
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 76d0708..d6529e8 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -59,7 +59,7 @@ static void __init setup_zero_pages(void)
order = 7;
/* Limit number of empty zero pages for small memory sizes */
- while (order > 2 && (totalram_pages >> 10) < (1UL << order))
+ while (order > 2 && (atomic_long_read(&totalram_pages) >> 10) < (1UL << order))
order--;
empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 1067469..da78a06 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -51,8 +51,8 @@ void __init mem_init(void)
/* this will put all low memory onto the freelists */
memblock_free_all();
- max_low_pfn = totalram_pages;
- max_pfn = totalram_pages;
+ max_low_pfn = atomic_long_read(&totalram_pages);
+ max_pfn = atomic_long_read(&totalram_pages);
mem_init_print_info(NULL);
kmalloc_ok = 1;
}
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 2637ff0..4ccc8dd 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -435,8 +435,9 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,
{
ssize_t ret = -EINVAL;
- if ((len >> PAGE_SHIFT) > totalram_pages) {
- pr_err("too much data (max %ld pages)\n", totalram_pages);
+ if ((len >> PAGE_SHIFT) > atomic_long_read(&totalram_pages)) {
+ pr_err("too much data (max %ld pages)\n",
+ atomic_long_read(&totalram_pages));
return ret;
}
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 38ffb28..2753e1d 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -115,9 +115,9 @@ static int agp_find_max(void)
long memory, index, result;
#if PAGE_SHIFT < 20
- memory = totalram_pages >> (20 - PAGE_SHIFT);
+ memory = atomic_long_read(&totalram_pages) >> (20 - PAGE_SHIFT);
#else
- memory = totalram_pages << (PAGE_SHIFT - 20);
+ memory = atomic_long_read(&totalram_pages) << (PAGE_SHIFT - 20);
#endif
index = 1;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index 56412b0..ca18502 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -848,7 +848,7 @@ static int kfd_fill_mem_info_for_cpu(int numa_node_id, int *avail_size,
*/
pgdat = NODE_DATA(numa_node_id);
for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++)
- mem_in_bytes += pgdat->node_zones[zone_type].managed_pages;
+ mem_in_bytes += atomic_long_read(&pgdat->node_zones[zone_type].managed_pages);
mem_in_bytes <<= PAGE_SHIFT;
sub_type_hdr->length_low = lower_32_bits(mem_in_bytes);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0c8aa57..b4c245b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2539,7 +2539,7 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
* If there's no chance of allocating enough pages for the whole
* object, bail early.
*/
- if (page_count > totalram_pages)
+ if (page_count > atomic_long_read(&totalram_pages))
return -ENOMEM;
st = kmalloc(sizeof(*st), GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index 8e2e269..9ea10eb 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -170,7 +170,7 @@ static int igt_ppgtt_alloc(void *arg)
* This should ensure that we do not run into the oomkiller during
* the test and take down the machine wilfully.
*/
- limit = totalram_pages << PAGE_SHIFT;
+ limit = atomic_long_read(&totalram_pages) << PAGE_SHIFT;
limit = min(ppgtt->vm.total, limit);
/* Check we can allocate the entire range */
@@ -1244,7 +1244,7 @@ static int exercise_mock(struct drm_i915_private *i915,
u64 hole_start, u64 hole_end,
unsigned long end_time))
{
- const u64 limit = totalram_pages << PAGE_SHIFT;
+ const u64 limit = atomic_long_read(&totalram_pages) << PAGE_SHIFT;
struct i915_gem_context *ctx;
struct i915_hw_ppgtt *ppgtt;
IGT_TIMEOUT(end_time);
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index c5bc0b5..4498c94 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -1092,6 +1092,7 @@ static void process_info(struct hv_dynmem_device *dm, struct dm_info_msg *msg)
static unsigned long compute_balloon_floor(void)
{
unsigned long min_pages;
+ unsigned long totalram = (unsigned long)atomic_long_read(&totalram_pages);
#define MB2PAGES(mb) ((mb) << (20 - PAGE_SHIFT))
/* Simple continuous piecewiese linear function:
* max MiB -> min MiB gradient
@@ -1104,16 +1105,16 @@ static unsigned long compute_balloon_floor(void)
* 8192 744 (1/16)
* 32768 1512 (1/32)
*/
- if (totalram_pages < MB2PAGES(128))
- min_pages = MB2PAGES(8) + (totalram_pages >> 1);
- else if (totalram_pages < MB2PAGES(512))
- min_pages = MB2PAGES(40) + (totalram_pages >> 2);
- else if (totalram_pages < MB2PAGES(2048))
- min_pages = MB2PAGES(104) + (totalram_pages >> 3);
- else if (totalram_pages < MB2PAGES(8192))
- min_pages = MB2PAGES(232) + (totalram_pages >> 4);
+ if (totalram < MB2PAGES(128))
+ min_pages = MB2PAGES(8) + (totalram >> 1);
+ else if (totalram < MB2PAGES(512))
+ min_pages = MB2PAGES(40) + (totalram >> 2);
+ else if (totalram < MB2PAGES(2048))
+ min_pages = MB2PAGES(104) + (totalram >> 3);
+ else if (totalram < MB2PAGES(8192))
+ min_pages = MB2PAGES(232) + (totalram >> 4);
else
- min_pages = MB2PAGES(488) + (totalram_pages >> 5);
+ min_pages = MB2PAGES(488) + (totalram >> 5);
#undef MB2PAGES
return min_pages;
}
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index dc385b7..6d61259 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -1887,8 +1887,9 @@ static int __init dm_bufio_init(void)
dm_bufio_allocated_vmalloc = 0;
dm_bufio_current_allocated = 0;
- mem = (__u64)mult_frac(totalram_pages - totalhigh_pages,
- DM_BUFIO_MEMORY_PERCENT, 100) << PAGE_SHIFT;
+ mem = (__u64)mult_frac(atomic_long_read(&totalram_pages) -
+ atomic_long_read(&totalhigh_pages),
+ DM_BUFIO_MEMORY_PERCENT, 100) << PAGE_SHIFT;
if (mem > ULONG_MAX)
mem = ULONG_MAX;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 0481223..1c58f4c 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -2158,7 +2158,9 @@ static int crypt_wipe_key(struct crypt_config *cc)
static void crypt_calculate_pages_per_client(void)
{
- unsigned long pages = (totalram_pages - totalhigh_pages) * DM_CRYPT_MEMORY_PERCENT / 100;
+ unsigned long pages = (atomic_long_read(&totalram_pages) -
+ atomic_long_read(&totalhigh_pages)) *
+ DM_CRYPT_MEMORY_PERCENT / 100;
if (!dm_crypt_clients_n)
return;
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index bb3096b..d91c931 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -2843,7 +2843,9 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
journal_pages = roundup((__u64)ic->journal_sections * ic->journal_section_sectors,
PAGE_SIZE >> SECTOR_SHIFT) >> (PAGE_SHIFT - SECTOR_SHIFT);
journal_desc_size = journal_pages * sizeof(struct page_list);
- if (journal_pages >= totalram_pages - totalhigh_pages || journal_desc_size > ULONG_MAX) {
+ if (journal_pages >= atomic_long_read(&totalram_pages) -
+ atomic_long_read(&totalhigh_pages) ||
+ journal_desc_size > ULONG_MAX) {
*error = "Journal doesn't fit into memory";
r = -ENOMEM;
goto bad;
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index 21de30b..f154a07 100644
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -85,7 +85,8 @@ static bool __check_shared_memory(size_t alloc_size)
a = shared_memory_amount + alloc_size;
if (a < shared_memory_amount)
return false;
- if (a >> PAGE_SHIFT > totalram_pages / DM_STATS_MEMORY_FACTOR)
+ if (a >> PAGE_SHIFT > atomic_long_read(&totalram_pages) /
+ DM_STATS_MEMORY_FACTOR)
return false;
#ifdef CONFIG_MMU
if (a > (VMALLOC_END - VMALLOC_START) / DM_STATS_VMALLOC_FACTOR)
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index 616f78b..ee3654a 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -855,7 +855,8 @@ static int mtk_vpu_probe(struct platform_device *pdev)
/* Set PTCM to 96K and DTCM to 32K */
vpu_cfg_writel(vpu, 0x2, VPU_TCM_CFG);
- vpu->enable_4GB = !!(totalram_pages > (SZ_2G >> PAGE_SHIFT));
+ vpu->enable_4GB = !!(atomic_long_read(&totalram_pages) >
+ (SZ_2G >> PAGE_SHIFT));
dev_info(dev, "4GB mode %u\n", vpu->enable_4GB);
if (vpu->enable_4GB) {
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 9b0b3fa..0ac0fee 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -570,7 +570,7 @@ static int vmballoon_send_get_target(struct vmballoon *b)
unsigned long status;
unsigned long limit;
- limit = totalram_pages;
+ limit = atomic_long_read(&totalram_pages);
/* Ensure limit fits in 32-bits */
if (limit != (u32)limit)
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 6148236..705df1a 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1255,7 +1255,8 @@ void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
*/
- iova_space_size = (u32) (totalram_pages / count_parisc_driver(&ccio_driver));
+ iova_space_size = (u32) (atomic_long_read(&totalram_pages) /
+ count_parisc_driver(&ccio_driver));
/* limit IOVA space size to 1MB-1GB */
@@ -1294,7 +1295,7 @@ void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
__func__, ioc->ioc_regs,
- (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
+ (unsigned long) atomic_long_read(&totalram_pages) >> (20 - PAGE_SHIFT),
iova_space_size>>20,
iov_order + PAGE_SHIFT);
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 11de0ec..02f4ce9 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1419,7 +1419,8 @@ static int setup_ibase_imask_callback(struct device *dev, void *data)
** for DMA hints - ergo only 30 bits max.
*/
- iova_space_size = (u32) (totalram_pages/global_ioc_cnt);
+ iova_space_size = (u32) (atomic_long_read(&totalram_pages)/
+ global_ioc_cnt);
/* limit IOVA space size to 1MB-1GB */
if (iova_space_size < (1 << (20 - PAGE_SHIFT))) {
@@ -1444,7 +1445,7 @@ static int setup_ibase_imask_callback(struct device *dev, void *data)
DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
__func__,
ioc->ioc_hpa,
- (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
+ (unsigned long) atomic_long_read(&totalram_pages) >> (20 - PAGE_SHIFT),
iova_space_size>>20,
iov_order + PAGE_SHIFT);
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 548bb02..64bd925 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -110,7 +110,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
unsigned long size_remaining = PAGE_ALIGN(size);
unsigned int max_order = orders[0];
- if (size / PAGE_SIZE > totalram_pages / 2)
+ if (size / PAGE_SIZE > atomic_long_read(&totalram_pages) / 2)
return -ENOMEM;
INIT_LIST_HEAD(&pages);
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index 5165aa8..0b925fd 100644
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -189,7 +189,7 @@ static void selfballoon_process(struct work_struct *work)
bool reset_timer = false;
if (xen_selfballooning_enabled) {
- cur_pages = totalram_pages;
+ cur_pages = atomic_long_read(&totalram_pages);
tgt_pages = cur_pages; /* default is no change */
goal_pages = vm_memory_committed() +
totalreserve_pages +
@@ -227,7 +227,8 @@ static void selfballoon_process(struct work_struct *work)
if (tgt_pages < floor_pages)
tgt_pages = floor_pages;
balloon_set_new_target(tgt_pages +
- balloon_stats.current_pages - totalram_pages);
+ balloon_stats.current_pages -
+ atomic_long_read(&totalram_pages));
reset_timer = true;
}
#ifdef CONFIG_FRONTSWAP
@@ -569,7 +570,7 @@ int xen_selfballoon_init(bool use_selfballooning, bool use_frontswap_selfshrink)
* much more reliably and response faster in some cases.
*/
if (!selfballoon_reserved_mb) {
- reserve_pages = totalram_pages / 10;
+ reserve_pages = atomic_long_read(&totalram_pages) / 10;
selfballoon_reserved_mb = PAGES2MB(reserve_pages);
}
schedule_delayed_work(&selfballoon_worker, selfballoon_interval * HZ);
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 582e28f..92f56d3 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -807,7 +807,8 @@ static inline int default_congestion_kb(void)
* This allows larger machines to have larger/more transfers.
* Limit the default to 256M
*/
- congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);
+ congestion_kb = (16*int_sqrt(atomic_long_read(&totalram_pages))) <<
+ (PAGE_SHIFT-10);
if (congestion_kb > 256*1024)
congestion_kb = 256*1024;
diff --git a/fs/file_table.c b/fs/file_table.c
index e03c8d1..5dde5c3 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -383,10 +383,13 @@ void __init files_init(void)
void __init files_maxfiles_init(void)
{
unsigned long n;
- unsigned long memreserve = (totalram_pages - nr_free_pages()) * 3/2;
+ unsigned long memreserve = (atomic_long_read(&totalram_pages) -
+ nr_free_pages()) * 3/2;
- memreserve = min(memreserve, totalram_pages - 1);
- n = ((totalram_pages - memreserve) * (PAGE_SIZE / 1024)) / 10;
+ memreserve = min(memreserve,
+ (unsigned long)atomic_long_read(&totalram_pages) - 1);
+ n = ((atomic_long_read(&totalram_pages) - memreserve) *
+ (PAGE_SIZE / 1024)) / 10;
files_stat.max_files = max_t(unsigned long, n, NR_FILE);
}
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 4727ef6..acdbaf7 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -825,8 +825,8 @@ static struct dentry *fuse_get_parent(struct dentry *child)
static void sanitize_global_limit(unsigned *limit)
{
if (*limit == 0)
- *limit = ((totalram_pages << PAGE_SHIFT) >> 13) /
- sizeof(struct fuse_req);
+ *limit = ((atomic_long_read(&totalram_pages)
+ << PAGE_SHIFT) >> 13) / sizeof(struct fuse_req);
if (*limit >= 1 << 16)
*limit = (1 << 16) - 1;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 586726a..e3663b7 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -2121,7 +2121,8 @@ int __init nfs_init_writepagecache(void)
* This allows larger machines to have larger/more transfers.
* Limit the default to 256M
*/
- nfs_congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);
+ nfs_congestion_kb = (16*int_sqrt(atomic_long_read(&totalram_pages))) <<
+ (PAGE_SHIFT-10);
if (nfs_congestion_kb > 256*1024)
nfs_congestion_kb = 256*1024;
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index e2fe0e9..e877558 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -99,7 +99,8 @@ static unsigned long nfsd_reply_cache_scan(struct shrinker *shrink,
nfsd_cache_size_limit(void)
{
unsigned int limit;
- unsigned long low_pages = totalram_pages - totalhigh_pages;
+ unsigned long low_pages = atomic_long_read(&totalram_pages) -
+ atomic_long_read(&totalhigh_pages);
limit = (16 * int_sqrt(low_pages)) << (PAGE_SHIFT-10);
return min_t(unsigned int, limit, 256*1024);
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index ab172e5..4ae6bbe 100644
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@@ -47,7 +47,7 @@ static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask)
return kmalloc(PAGE_SIZE, gfp_mask & ~__GFP_HIGHMEM);
/* return (void *)__get_free_page(gfp_mask); */
}
- if (likely((size >> PAGE_SHIFT) < totalram_pages))
+ if (likely((size >> PAGE_SHIFT) < atomic_long_read(&totalram_pages)))
return __vmalloc(size, gfp_mask, PAGE_KERNEL);
return NULL;
}
diff --git a/fs/proc/base.c b/fs/proc/base.c
index ce34654..9ef26dc 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -530,7 +530,8 @@ static ssize_t lstats_write(struct file *file, const char __user *buf,
static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
- unsigned long totalpages = totalram_pages + total_swap_pages;
+ unsigned long totalpages = atomic_long_read(&totalram_pages) +
+ total_swap_pages;
unsigned long points = 0;
points = oom_badness(task, NULL, NULL, totalpages) *
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 0690679..84edaa2 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -36,7 +36,7 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size)
/* declarations for linux/mm/highmem.c */
unsigned int nr_free_highpages(void);
-extern unsigned long totalhigh_pages;
+extern atomic_long_t totalhigh_pages;
void kmap_flush_unused(void);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index fcf9cc9..af952fc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -48,7 +48,7 @@ static inline void set_max_mapnr(unsigned long limit)
static inline void set_max_mapnr(unsigned long limit) { }
#endif
-extern unsigned long totalram_pages;
+extern atomic_long_t totalram_pages;
extern void * high_memory;
extern int page_cluster;
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 8555509..2639b05 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -428,14 +428,8 @@ struct zone {
* Write access to present_pages at runtime should be protected by
* mem_hotplug_begin/end(). Any reader who can't tolerant drift of
* present_pages should get_online_mems() to get a stable value.
- *
- * Read access to managed_pages should be safe because it's unsigned
- * long. Write access to zone->managed_pages and totalram_pages are
- * protected by managed_page_count_lock at runtime. Idealy only
- * adjust_managed_page_count() should be used instead of directly
- * touching zone->managed_pages and totalram_pages.
*/
- unsigned long managed_pages;
+ atomic_long_t managed_pages;
unsigned long spanned_pages;
unsigned long present_pages;
@@ -814,7 +808,7 @@ static inline bool is_dev_zone(const struct zone *zone)
*/
static inline bool managed_zone(struct zone *zone)
{
- return zone->managed_pages;
+ return atomic_long_read(&zone->managed_pages);
}
/* Returns true if a zone has memory */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index d098743..b34c6e7 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -309,7 +309,7 @@ struct vma_swap_readahead {
} while (0)
/* linux/mm/page_alloc.c */
-extern unsigned long totalram_pages;
+extern atomic_long_t totalram_pages;
extern unsigned long totalreserve_pages;
extern unsigned long nr_free_buffer_pages(void);
extern unsigned long nr_free_pagecache_pages(void);
diff --git a/kernel/fork.c b/kernel/fork.c
index 2f78d32..b6068c5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -744,11 +744,11 @@ static void set_max_threads(unsigned int max_threads_suggested)
* The number of threads shall be limited such that the thread
* structures may only consume a small part of the available memory.
*/
- if (fls64(totalram_pages) + fls64(PAGE_SIZE) > 64)
+ if (fls64(atomic_long_read(&totalram_pages)) + fls64(PAGE_SIZE) > 64)
threads = MAX_THREADS;
else
- threads = div64_u64((u64) totalram_pages * (u64) PAGE_SIZE,
- (u64) THREAD_SIZE * 8UL);
+ threads = div64_u64((u64) atomic_long_read(&totalram_pages) *
+ (u64) PAGE_SIZE, (u64) THREAD_SIZE * 8UL);
if (threads > max_threads_suggested)
threads = max_threads_suggested;
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 86ef06d..ed85ddd 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -217,13 +217,14 @@ int sanity_check_segment_list(struct kimage *image)
* wasted allocating pages, which can cause a soft lockup.
*/
for (i = 0; i < nr_segments; i++) {
- if (PAGE_COUNT(image->segment[i].memsz) > totalram_pages / 2)
+ if (PAGE_COUNT(image->segment[i].memsz) >
+ atomic_long_read(&totalram_pages) / 2)
return -EINVAL;
total_pages += PAGE_COUNT(image->segment[i].memsz);
}
- if (total_pages > totalram_pages / 2)
+ if (total_pages > atomic_long_read(&totalram_pages) / 2)
return -EINVAL;
/*
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index b0308a2..142a3c76 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -105,7 +105,7 @@ void __init hibernate_reserved_size_init(void)
void __init hibernate_image_size_init(void)
{
- image_size = ((totalram_pages * 2) / 5) * PAGE_SIZE;
+ image_size = ((atomic_long_read(&totalram_pages) * 2) / 5) * PAGE_SIZE;
}
/*
diff --git a/lib/show_mem.c b/lib/show_mem.c
index 0beaa1d..0701f63 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -28,7 +28,8 @@ void show_mem(unsigned int filter, nodemask_t *nodemask)
continue;
total += zone->present_pages;
- reserved += zone->present_pages - zone->managed_pages;
+ reserved += zone->present_pages -
+ atomic_long_read(&zone->managed_pages);
if (is_highmem_idx(zoneid))
highmem += zone->present_pages;
diff --git a/mm/highmem.c b/mm/highmem.c
index 59db322..93a45c0 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -105,7 +105,7 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
}
#endif
-unsigned long totalhigh_pages __read_mostly;
+atomic_long_t totalhigh_pages __read_mostly;
EXPORT_SYMBOL(totalhigh_pages);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d394d18..f2f18b5 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -420,7 +420,7 @@ static int __init hugepage_init(void)
* where the extra memory used could hurt more than TLB overhead
* is likely to save. The admin can still enable it through /sys.
*/
- if (totalram_pages < (512 << (20 - PAGE_SHIFT))) {
+ if (atomic_long_read(&totalram_pages) < (512 << (20 - PAGE_SHIFT))) {
transparent_hugepage_flags = 0;
return 0;
}
diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index b209dba..4d36aed 100644
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -236,8 +236,8 @@ void quarantine_reduce(void)
* Update quarantine size in case of hotplug. Allocate a fraction of
* the installed memory to quarantine minus per-cpu queue limits.
*/
- total_size = (READ_ONCE(totalram_pages) << PAGE_SHIFT) /
- QUARANTINE_FRACTION;
+ total_size = (READ_ONCE(atomic_long_read(&totalram_pages)) <<
+ PAGE_SHIFT) / QUARANTINE_FRACTION;
percpu_quarantines = QUARANTINE_PERCPU_SIZE * num_online_cpus();
new_quarantine_size = (total_size < percpu_quarantines) ?
0 : total_size - percpu_quarantines;
diff --git a/mm/memblock.c b/mm/memblock.c
index eddcac2..43f53e9 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1627,7 +1627,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
for (; cursor < end; cursor++) {
memblock_free_pages(pfn_to_page(cursor), cursor, 0);
- totalram_pages++;
+ atomic_long_inc(&totalram_pages);
}
}
@@ -2001,7 +2001,7 @@ void reset_node_managed_pages(pg_data_t *pgdat)
struct zone *z;
for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
- z->managed_pages = 0;
+ atomic_long_set(&z->managed_pages, 0);
}
void __init reset_all_zones_managed_pages(void)
@@ -2029,7 +2029,7 @@ unsigned long __init memblock_free_all(void)
reset_all_zones_managed_pages();
pages = free_low_memory_core_early();
- totalram_pages += pages;
+ atomic_long_add(pages, &totalram_pages);
return pages;
}
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index dbbb945..0725984 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -657,10 +657,10 @@ void __online_page_free(struct page *page)
static int generic_online_page(struct page *page, unsigned int order)
{
__free_pages_core(page, order);
- totalram_pages += (1UL << order);
+ atomic_long_add((1UL << order), &totalram_pages);
#ifdef CONFIG_HIGHMEM
if (PageHighMem(page))
- totalhigh_pages += (1UL << order);
+ atomic_long_add((1UL << order), &totalhigh_pages);
#endif
return 0;
}
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 6838a53..93a6611 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -146,7 +146,8 @@ static void __meminit mm_compute_batch(void)
s32 batch = max_t(s32, nr*2, 32);
/* batch size set to 0.4% of (total memory/#cpus), or max int32 */
- memsized_batch = min_t(u64, (totalram_pages/nr)/256, 0x7fffffff);
+ memsized_batch = min_t(u64, (atomic_long_read(&totalram_pages)/nr)/256,
+ 0x7fffffff);
vm_committed_as_batch = max_t(s32, memsized_batch, batch);
}
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 6589f60..1a37d68 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -269,7 +269,7 @@ static enum oom_constraint constrained_alloc(struct oom_control *oc)
}
/* Default to all available memory */
- oc->totalpages = totalram_pages + total_swap_pages;
+ oc->totalpages = atomic_long_read(&totalram_pages) + total_swap_pages;
if (!IS_ENABLED(CONFIG_NUMA))
return CONSTRAINT_NONE;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4bd858d..c7b26e3 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -121,10 +121,7 @@
};
EXPORT_SYMBOL(node_states);
-/* Protect totalram_pages and zone->managed_pages */
-static DEFINE_SPINLOCK(managed_page_count_lock);
-
-unsigned long totalram_pages __read_mostly;
+atomic_long_t totalram_pages __read_mostly;
unsigned long totalreserve_pages __read_mostly;
unsigned long totalcma_pages __read_mostly;
@@ -1275,7 +1272,7 @@ void __free_pages_core(struct page *page, unsigned int order)
set_page_count(p, 0);
}
- page_zone(page)->managed_pages += nr_pages;
+ atomic_long_add(nr_pages, &page_zone(page)->managed_pages);
set_page_refcounted(page);
__free_pages(page, order);
}
@@ -2254,7 +2251,8 @@ static void reserve_highatomic_pageblock(struct page *page, struct zone *zone,
* Limit the number reserved to 1 pageblock or roughly 1% of a zone.
* Check is race-prone but harmless.
*/
- max_managed = (zone->managed_pages / 100) + pageblock_nr_pages;
+ max_managed = (atomic_long_read(&zone->managed_pages) / 100) +
+ pageblock_nr_pages;
if (zone->nr_reserved_highatomic >= max_managed)
return;
@@ -4658,7 +4656,7 @@ static unsigned long nr_free_zone_pages(int offset)
struct zonelist *zonelist = node_zonelist(numa_node_id(), GFP_KERNEL);
for_each_zone_zonelist(zone, z, zonelist, offset) {
- unsigned long size = zone->managed_pages;
+ unsigned long size = atomic_long_read(&zone->managed_pages);
unsigned long high = high_wmark_pages(zone);
if (size > high)
sum += size - high;
@@ -4744,11 +4742,15 @@ long si_mem_available(void)
void si_meminfo(struct sysinfo *val)
{
- val->totalram = totalram_pages;
+ val->totalram = atomic_long_read(&totalram_pages);
val->sharedram = global_node_page_state(NR_SHMEM);
val->freeram = global_zone_page_state(NR_FREE_PAGES);
val->bufferram = nr_blockdev_pages();
- val->totalhigh = totalhigh_pages;
+#ifdef CONFIG_HIGHMEM
+ val->totalhigh = atomic_long_read(&totalhigh_pages);
+#else
+ val->totalhigh = 0;
+#endif
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
@@ -4765,7 +4767,7 @@ void si_meminfo_node(struct sysinfo *val, int nid)
pg_data_t *pgdat = NODE_DATA(nid);
for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++)
- managed_pages += pgdat->node_zones[zone_type].managed_pages;
+ managed_pages += atomic_long_read(&pgdat->node_zones[zone_type].managed_pages);
val->totalram = managed_pages;
val->sharedram = node_page_state(pgdat, NR_SHMEM);
val->freeram = sum_zone_node_page_state(nid, NR_FREE_PAGES);
@@ -4774,7 +4776,7 @@ void si_meminfo_node(struct sysinfo *val, int nid)
struct zone *zone = &pgdat->node_zones[zone_type];
if (is_highmem(zone)) {
- managed_highpages += zone->managed_pages;
+ managed_highpages += atomic_long_read(&zone->managed_pages);
free_highpages += zone_page_state(zone, NR_FREE_PAGES);
}
}
@@ -4981,7 +4983,7 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask)
K(zone_page_state(zone, NR_ZONE_UNEVICTABLE)),
K(zone_page_state(zone, NR_ZONE_WRITE_PENDING)),
K(zone->present_pages),
- K(zone->managed_pages),
+ K(atomic_long_read(&zone->managed_pages)),
K(zone_page_state(zone, NR_MLOCK)),
zone_page_state(zone, NR_KERNEL_STACK_KB),
K(zone_page_state(zone, NR_PAGETABLE)),
@@ -5643,7 +5645,7 @@ static int zone_batchsize(struct zone *zone)
* The per-cpu-pages pools are set to around 1000th of the
* size of the zone.
*/
- batch = zone->managed_pages / 1024;
+ batch = atomic_long_read(&zone->managed_pages) / 1024;
/* But no more than a meg. */
if (batch * PAGE_SIZE > 1024 * 1024)
batch = (1024 * 1024) / PAGE_SIZE;
@@ -5754,7 +5756,7 @@ static void pageset_set_high_and_batch(struct zone *zone,
{
if (percpu_pagelist_fraction)
pageset_set_high(pcp,
- (zone->managed_pages /
+ (atomic_long_read(&zone->managed_pages) /
percpu_pagelist_fraction));
else
pageset_set_batch(pcp, zone_batchsize(zone));
@@ -6309,7 +6311,7 @@ static void __meminit pgdat_init_internals(struct pglist_data *pgdat)
static void __meminit zone_init_internals(struct zone *zone, enum zone_type idx, int nid,
unsigned long remaining_pages)
{
- zone->managed_pages = remaining_pages;
+ atomic_long_set(&zone->managed_pages, remaining_pages);
zone_set_nid(zone, nid);
zone->name = zone_names[idx];
zone->zone_pgdat = NODE_DATA(nid);
@@ -7061,14 +7063,12 @@ static int __init cmdline_parse_movablecore(char *p)
void adjust_managed_page_count(struct page *page, long count)
{
- spin_lock(&managed_page_count_lock);
- page_zone(page)->managed_pages += count;
- totalram_pages += count;
+ atomic_long_add(count, &page_zone(page)->managed_pages);
+ atomic_long_add(count, &totalram_pages);
#ifdef CONFIG_HIGHMEM
if (PageHighMem(page))
- totalhigh_pages += count;
+ atomic_long_add(count, &totalhigh_pages);
#endif
- spin_unlock(&managed_page_count_lock);
}
EXPORT_SYMBOL(adjust_managed_page_count);
@@ -7109,9 +7109,9 @@ unsigned long free_reserved_area(void *start, void *end, int poison, char *s)
void free_highmem_page(struct page *page)
{
__free_reserved_page(page);
- totalram_pages++;
- page_zone(page)->managed_pages++;
- totalhigh_pages++;
+ atomic_long_inc(&totalram_pages);
+ atomic_long_inc(&page_zone(page)->managed_pages);
+ atomic_long_inc(&totalhigh_pages);
}
#endif
@@ -7160,10 +7160,10 @@ void __init mem_init_print_info(const char *str)
physpages << (PAGE_SHIFT - 10),
codesize >> 10, datasize >> 10, rosize >> 10,
(init_data_size + init_code_size) >> 10, bss_size >> 10,
- (physpages - totalram_pages - totalcma_pages) << (PAGE_SHIFT - 10),
+ (physpages - atomic_long_read(&totalram_pages) - totalcma_pages) << (PAGE_SHIFT - 10),
totalcma_pages << (PAGE_SHIFT - 10),
#ifdef CONFIG_HIGHMEM
- totalhigh_pages << (PAGE_SHIFT - 10),
+ atomic_long_read(&totalhigh_pages) << (PAGE_SHIFT - 10),
#endif
str ? ", " : "", str ? str : "");
}
@@ -7253,8 +7253,8 @@ static void calculate_totalreserve_pages(void)
/* we treat the high watermark as reserved pages. */
max += high_wmark_pages(zone);
- if (max > zone->managed_pages)
- max = zone->managed_pages;
+ if (max > atomic_long_read(&zone->managed_pages))
+ max = atomic_long_read(&zone->managed_pages);
pgdat->totalreserve_pages += max;
@@ -7278,7 +7278,7 @@ static void setup_per_zone_lowmem_reserve(void)
for_each_online_pgdat(pgdat) {
for (j = 0; j < MAX_NR_ZONES; j++) {
struct zone *zone = pgdat->node_zones + j;
- unsigned long managed_pages = zone->managed_pages;
+ unsigned long managed_pages = atomic_long_read(&zone->managed_pages);
zone->lowmem_reserve[j] = 0;
@@ -7296,7 +7296,7 @@ static void setup_per_zone_lowmem_reserve(void)
lower_zone->lowmem_reserve[j] =
managed_pages / sysctl_lowmem_reserve_ratio[idx];
}
- managed_pages += lower_zone->managed_pages;
+ managed_pages += atomic_long_read(&lower_zone->managed_pages);
}
}
}
@@ -7315,14 +7315,14 @@ static void __setup_per_zone_wmarks(void)
/* Calculate total number of !ZONE_HIGHMEM pages */
for_each_zone(zone) {
if (!is_highmem(zone))
- lowmem_pages += zone->managed_pages;
+ lowmem_pages += atomic_long_read(&zone->managed_pages);
}
for_each_zone(zone) {
u64 tmp;
spin_lock_irqsave(&zone->lock, flags);
- tmp = (u64)pages_min * zone->managed_pages;
+ tmp = (u64)pages_min * atomic_long_read(&zone->managed_pages);
do_div(tmp, lowmem_pages);
if (is_highmem(zone)) {
/*
@@ -7336,7 +7336,8 @@ static void __setup_per_zone_wmarks(void)
*/
unsigned long min_pages;
- min_pages = zone->managed_pages / 1024;
+ min_pages = atomic_long_read(&zone->managed_pages) /
+ 1024;
min_pages = clamp(min_pages, SWAP_CLUSTER_MAX, 128UL);
zone->watermark[WMARK_MIN] = min_pages;
} else {
@@ -7353,7 +7354,7 @@ static void __setup_per_zone_wmarks(void)
* ensure a minimum size on small systems.
*/
tmp = max_t(u64, tmp >> 2,
- mult_frac(zone->managed_pages,
+ mult_frac(atomic_long_read(&zone->managed_pages),
watermark_scale_factor, 10000));
zone->watermark[WMARK_LOW] = min_wmark_pages(zone) + tmp;
@@ -7483,7 +7484,8 @@ static void setup_min_unmapped_ratio(void)
pgdat->min_unmapped_pages = 0;
for_each_zone(zone)
- zone->zone_pgdat->min_unmapped_pages += (zone->managed_pages *
+ zone->zone_pgdat->min_unmapped_pages +=
+ (atomic_long_read(&zone->managed_pages) *
sysctl_min_unmapped_ratio) / 100;
}
@@ -7511,8 +7513,9 @@ static void setup_min_slab_ratio(void)
pgdat->min_slab_pages = 0;
for_each_zone(zone)
- zone->zone_pgdat->min_slab_pages += (zone->managed_pages *
- sysctl_min_slab_ratio) / 100;
+ zone->zone_pgdat->min_slab_pages +=
+ (atomic_long_read(&zone->managed_pages) *
+ sysctl_min_slab_ratio) / 100;
}
int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *table, int write,
diff --git a/mm/shmem.c b/mm/shmem.c
index a6964ba..edd55db 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -109,12 +109,18 @@ struct shmem_falloc {
#ifdef CONFIG_TMPFS
static unsigned long shmem_default_max_blocks(void)
{
- return totalram_pages / 2;
+ return atomic_long_read(&totalram_pages) / 2;
}
static unsigned long shmem_default_max_inodes(void)
{
- return min(totalram_pages - totalhigh_pages, totalram_pages / 2);
+ return min((unsigned long)atomic_long_read(&totalram_pages) -
+#ifdef CONFIG_HIGHMEM
+ (unsigned long) atomic_long_read(&totalhigh_pages),
+#else
+ 0,
+#endif
+ (unsigned long)atomic_long_read(&totalram_pages) / 2);
}
#endif
@@ -3274,7 +3280,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
size = memparse(value,&rest);
if (*rest == '%') {
size <<= PAGE_SHIFT;
- size *= totalram_pages;
+ size *= atomic_long_read(&totalram_pages);
do_div(size, 100);
rest++;
}
diff --git a/mm/slab.c b/mm/slab.c
index 2a5654b..70252b0 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1248,7 +1248,8 @@ void __init kmem_cache_init(void)
* page orders on machines with more than 32MB of memory if
* not overridden on the command line.
*/
- if (!slab_max_order_set && totalram_pages > (32 << 20) >> PAGE_SHIFT)
+ if (!slab_max_order_set && atomic_long_read(&totalram_pages) >
+ (32 << 20) >> PAGE_SHIFT)
slab_max_order = SLAB_MAX_ORDER_HI;
/* Bootstrap is tricky, because several objects are allocated
diff --git a/mm/swap.c b/mm/swap.c
index aa48371..e85bc4a 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -1023,7 +1023,8 @@ unsigned pagevec_lookup_range_nr_tag(struct pagevec *pvec,
*/
void __init swap_setup(void)
{
- unsigned long megs = totalram_pages >> (20 - PAGE_SHIFT);
+ unsigned long megs = atomic_long_read(&totalram_pages) >>
+ (20 - PAGE_SHIFT);
/* Use a smaller cluster for small-memory machines */
if (megs < 16)
diff --git a/mm/util.c b/mm/util.c
index 7f1f165..a3ae8ee 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -600,7 +600,7 @@ unsigned long vm_commit_limit(void)
if (sysctl_overcommit_kbytes)
allowed = sysctl_overcommit_kbytes >> (PAGE_SHIFT - 10);
else
- allowed = ((totalram_pages - hugetlb_total_pages())
+ allowed = ((atomic_long_read(&totalram_pages) - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100);
allowed += total_swap_pages;
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 97d4b25..f177af8 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1634,7 +1634,7 @@ void *vmap(struct page **pages, unsigned int count,
might_sleep();
- if (count > totalram_pages)
+ if (count > atomic_long_read(&totalram_pages))
return NULL;
size = (unsigned long)count << PAGE_SHIFT;
@@ -1739,7 +1739,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
unsigned long real_size = size;
size = PAGE_ALIGN(size);
- if (!size || (size >> PAGE_SHIFT) > totalram_pages)
+ if (!size || (size >> PAGE_SHIFT) > atomic_long_read(&totalram_pages))
goto fail;
area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 6038ce5..20551e8 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -227,7 +227,7 @@ int calculate_normal_threshold(struct zone *zone)
* 125 1024 10 16-32 GB 9
*/
- mem = zone->managed_pages >> (27 - PAGE_SHIFT);
+ mem = atomic_long_read(&zone->managed_pages) >> (27 - PAGE_SHIFT);
threshold = 2 * fls(num_online_cpus()) * (1 + fls(mem));
@@ -1569,7 +1569,7 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
high_wmark_pages(zone),
zone->spanned_pages,
zone->present_pages,
- zone->managed_pages);
+ atomic_long_read(&zone->managed_pages));
seq_printf(m,
"\n protection: (%ld",
diff --git a/mm/workingset.c b/mm/workingset.c
index b15799d..dcd4e16 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -550,7 +550,7 @@ static int __init workingset_init(void)
* double the initial memory by using totalram_pages as-is.
*/
timestamp_bits = BITS_PER_LONG - EVICTION_SHIFT;
- max_order = fls_long(totalram_pages - 1);
+ max_order = fls_long(atomic_long_read(&totalram_pages) - 1);
if (max_order > timestamp_bits)
bucket_order = max_order - timestamp_bits;
pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
diff --git a/mm/zswap.c b/mm/zswap.c
index cd91fd9..5d2d7b9 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -219,7 +219,7 @@ struct zswap_tree {
static bool zswap_is_full(void)
{
- return totalram_pages * zswap_max_pool_percent / 100 <
+ return atomic_long_read(&totalram_pages) * zswap_max_pool_percent / 100 <
DIV_ROUND_UP(zswap_pool_total_size, PAGE_SIZE);
}
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 875858c..4a92d11 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1154,10 +1154,10 @@ static int __init dccp_init(void)
*
* The methodology is similar to that of the buffer cache.
*/
- if (totalram_pages >= (128 * 1024))
- goal = totalram_pages >> (21 - PAGE_SHIFT);
+ if (atomic_long_read(&totalram_pages) >= (128 * 1024))
+ goal = atomic_long_read(&totalram_pages) >> (21 - PAGE_SHIFT);
else
- goal = totalram_pages >> (23 - PAGE_SHIFT);
+ goal = atomic_long_read(&totalram_pages) >> (23 - PAGE_SHIFT);
if (thash_entries)
goal = (thash_entries *
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 1c002c0..bb49b0f 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1866,7 +1866,7 @@ void __init dn_route_init(void)
dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
add_timer(&dn_route_timer);
- goal = totalram_pages >> (26 - PAGE_SHIFT);
+ goal = atomic_long_read(&totalram_pages) >> (26 - PAGE_SHIFT);
for(order = 0; (1UL << order) < goal; order++)
/* NOTHING */;
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 03b51cd..d91bdab 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -1000,7 +1000,7 @@ static int __net_init tcp_net_metrics_init(struct net *net)
slots = tcpmhash_entries;
if (!slots) {
- if (totalram_pages >= 128 * 1024)
+ if (atomic_long_read(&totalram_pages) >= 128 * 1024)
slots = 16 * 1024;
else
slots = 8 * 1024;
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index ca1168d..3285df9 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2267,11 +2267,11 @@ int nf_conntrack_init_start(void)
* >= 4GB machines have 65536 buckets.
*/
nf_conntrack_htable_size
- = (((totalram_pages << PAGE_SHIFT) / 16384)
+ = (((atomic_long_read(&totalram_pages) << PAGE_SHIFT) / 16384)
/ sizeof(struct hlist_head));
- if (totalram_pages > (4 * (1024 * 1024 * 1024 / PAGE_SIZE)))
+ if (atomic_long_read(&totalram_pages) > (4 * (1024 * 1024 * 1024 / PAGE_SIZE)))
nf_conntrack_htable_size = 65536;
- else if (totalram_pages > (1024 * 1024 * 1024 / PAGE_SIZE))
+ else if (atomic_long_read(&totalram_pages) > (1024 * 1024 * 1024 / PAGE_SIZE))
nf_conntrack_htable_size = 16384;
if (nf_conntrack_htable_size < 32)
nf_conntrack_htable_size = 32;
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 3e7d259..3c79a0f 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -279,9 +279,9 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,
if (cfg->size) {
size = cfg->size;
} else {
- size = (totalram_pages << PAGE_SHIFT) / 16384 /
+ size = (atomic_long_read(&totalram_pages) << PAGE_SHIFT) / 16384 /
sizeof(struct hlist_head);
- if (totalram_pages > 1024 * 1024 * 1024 / PAGE_SIZE)
+ if (atomic_long_read(&totalram_pages) > 1024 * 1024 * 1024 / PAGE_SIZE)
size = 8192;
if (size < 16)
size = 16;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 9b277bd..4ca4def 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1426,10 +1426,10 @@ static __init int sctp_init(void)
* The methodology is similar to that of the tcp hash tables.
* Though not identical. Start by getting a goal size
*/
- if (totalram_pages >= (128 * 1024))
- goal = totalram_pages >> (22 - PAGE_SHIFT);
+ if (atomic_long_read(&totalram_pages) >= (128 * 1024))
+ goal = atomic_long_read(&totalram_pages) >> (22 - PAGE_SHIFT);
else
- goal = totalram_pages >> (24 - PAGE_SHIFT);
+ goal = atomic_long_read(&totalram_pages) >> (24 - PAGE_SHIFT);
/* Then compute the page order for said goal */
order = get_order(goal);
diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
index 16bd187..8bb32ad 100644
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -106,7 +106,7 @@ void ima_add_kexec_buffer(struct kimage *image)
kexec_segment_size = ALIGN(ima_get_binary_runtime_size() +
PAGE_SIZE / 2, PAGE_SIZE);
if ((kexec_segment_size == ULONG_MAX) ||
- ((kexec_segment_size >> PAGE_SHIFT) > totalram_pages / 2)) {
+ ((kexec_segment_size >> PAGE_SHIFT) > atomic_long_read(&totalram_pages) / 2)) {
pr_err("Binary measurement list too large.\n");
return;
}
--
1.9.1
^ permalink raw reply related
* Re: [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Michal Hocko @ 2018-10-22 18:11 UTC (permalink / raw)
To: Arun KS
Cc: Mike Snitzer, Kemi Wang, dri-devel, J. Bruce Fields, linux-sctp,
Paul Mackerras, Pavel Machek, Christoph Lameter, K. Y. Srinivasan,
Sumit Semwal, David (ChunMing) Zhou, Petr Tesarik, ceph-devel,
James E.J. Bottomley, kasan-dev, Marcos Paulo de Souza,
Steven J. Hill, David Rientjes, Anthony Yznaga, Daniel Vacek,
Roman Gushchin, Len Brown, linux-pm, Vlastimil Babka, linux-um,
Mike Rapoport, Alexander Viro, Thomas Gleixner, Trond Myklebust,
Anton Altaparmakov, linux-parisc, Mathieu Malaterre,
Greg Kroah-Hartman, Randy Dunlap, Rafael J. Wysocki, linux-kernel,
Cyril Bur, Arve Hjønnevåg, netfilter-devel,
Souptick Joarder, Dmitry Kasatkin, Alex Deucher, Andrew Morton,
Andrew-CT Chen, Gustavo A. R. Silva, David Airlie, dm-devel,
Nadav Amit, Omar Sandoval, Alasdair Kergon, linux-s390,
Stephen Hemminger, intel-gfx, Helge Deller, Hugh Dickins,
Luis R. Rodriguez, coreteam, Jozsef Kadlecsik, Andrey Ryabinin,
linux-media, YueHaibing, Todd Kjos, Philippe Ombredanne,
Jani Nikula, Jia He, Tejun Heo, Shakeel Butt, Houlong Wei, devel,
Boris Ostrovsky, Martijn Coenen, linux-arm-kernel, Khalid Aziz,
Oded Gabbay, linaro-mm-sig, linux-ntfs-dev, Jonathan Corbet,
Florian Westphal, Anna Schumaker, Pekka Enberg, Minchan Kim,
Eric Biederman, Aneesh Kumar K.V, Martin Schwidefsky, Joonsoo Kim,
Kate Stewart, Marcelo Ricardo Leitner, linux-fsdevel,
Tetsuo Handa, Joonas Lahtinen, Heiko Carstens, Stefan Agner,
James Morris, netdev, amd-gfx, Jan Kara, Alexander Duyck,
Gerrit Renker, Andy Shevchenko, Miklos Szeredi, David Hildenbrand,
Matthew Wilcox, Konstantin Khlebnikov, Matthew Auld, Guo Ren,
Huang Ying, Alexey Kuznetsov, Ilya Dryomov, Alexey Dobriyan,
Pablo Neira Ayuso, Serge E. Hallyn, Kees Cook, Arnd Bergmann,
Haiyang Zhang, Mark Brown, Borislav Petkov, Rodrigo Vivi,
Dan Williams, Mauro Carvalho Chehab, Dan Streetman,
Oscar Salvador, linux-nfs, Neil Horman, Tvrtko Ursulin,
Jeff Layton, Eric Dumazet, Jessica Yu, Joe Perches,
David S. Miller, Kirill A. Shutemov, Minghsiu Tsai,
Christian König, VMware, Inc., Sebastian Andrzej Siewior,
Chris Wilson, linux-mm, Alexander Potapenko, H. Peter Anvin,
getarunks, Chintan Pandya, devel, Yan, Zheng, xen-devel,
Sage Weil, dccp, Richard Weinberger, Seth Jennings, x86,
Ingo Molnar, Laura Abbott, Mimi Zohar, Jeff Dike, Pavel Tatashin,
Jann Horn, Xavier Deguillard, Johannes Weiner,
Jérôme Glisse, Kirill Tkhai, linux-mediatek,
Matthias Brugger, Tiffany Lin, linux-integrity, Dmitry Vyukov,
Juergen Gross, Yang Shi, Hideaki YOSHIFUJI, linuxppc-dev,
Vlad Yasevich, linux-decnet-user, kexec, linux-security-module,
Thomas Zimmermann, Mika Kuoppala, Mel Gorman
In-Reply-To: <1540229092-25207-1-git-send-email-arunks@codeaurora.org>
On Mon 22-10-18 22:53:22, Arun KS wrote:
> Remove managed_page_count_lock spinlock and instead use atomic
> variables.
I assume this has been auto-generated. If yes, it would be better to
mention the script so that people can review it and regenerate for
comparision. Such a large change is hard to review manually.
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* Re: [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Joe Perches @ 2018-10-23 4:15 UTC (permalink / raw)
To: Arun KS, Guo Ren, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman, Martin Schwidefsky, Heiko Carstens, Jeff Dike,
Richard Weinberger, Borislav Petkov, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, David Airlie, Arnd Bergmann,
Greg Kroah-Hartman, Oded Gabbay, Alex Deucher,
Christian König, David (ChunMing) Zhou, Jani Nikula,
Joonas Lahtinen, Rodrigo Vivi, K. Y. Srinivasan, Haiyang Zhang,
Stephen Hemminger, Alasdair Kergon, Mike Snitzer, dm-devel,
Tiffany Lin, Andrew-CT Chen, Minghsiu Tsai, Houlong Wei,
Mauro Carvalho Chehab, Matthias Brugger, Xavier Deguillard,
Nadav Amit, VMware, Inc., James E.J. Bottomley, Helge Deller,
Laura Abbott, Sumit Semwal, Arve Hjønnevåg, Todd Kjos,
Martijn Coenen, Boris Ostrovsky, Juergen Gross, Yan, Zheng,
Sage Weil, Ilya Dryomov, Alexander Viro, Miklos Szeredi,
Trond Myklebust, Anna Schumaker, J. Bruce Fields, Jeff Layton,
Anton Altaparmakov, Alexey Dobriyan, Eric Biederman,
Rafael J. Wysocki, Pavel Machek, Len Brown, Andrey Ryabinin,
Alexander Potapenko, Dmitry Vyukov, Hugh Dickins,
Christoph Lameter, Pekka Enberg, David Rientjes, Joonsoo Kim,
Andrew Morton, Seth Jennings, Dan Streetman, Gerrit Renker,
David S. Miller, Eric Dumazet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, Vlad Yasevich, Neil Horman,
Marcelo Ricardo Leitner, Mimi Zohar, Dmitry Kasatkin,
James Morris, Serge E. Hallyn, Mark Brown, Mike Rapoport,
Jessica Yu, Kees Cook, Cyril Bur, Russell Currey, Michal Hocko,
Chris Wilson, Matthew Auld, Tvrtko Ursulin, Mika Kuoppala,
Thomas Zimmermann, Gustavo A. R. Silva, Philippe Ombredanne,
Kate Stewart, Anthony Yznaga, Khalid Aziz, Matthew Wilcox,
Pavel Tatashin, Kirill A. Shutemov, Dan Williams,
Souptick Joarder, Vlastimil Babka, Oscar Salvador,
Johannes Weiner, Roman Gushchin, Petr Tesarik, Jia He,
Minchan Kim, Huang Ying, Mel Gorman, Tejun Heo, Jan Kara,
Omar Sandoval, Marcos Paulo de Souza, Jérôme Glisse,
Aneesh Kumar K.V, Konstantin Khlebnikov, Jonathan Corbet,
Stefan Agner, Daniel Vacek, Andy Shevchenko, David Hildenbrand,
Mathieu Malaterre, Tetsuo Handa, Yang Shi, Alexander Duyck,
Randy Dunlap, YueHaibing, Shakeel Butt, Chintan Pandya,
Luis R. Rodriguez, Jann Horn, Sebastian Andrzej Siewior,
Steven J. Hill, Kemi Wang, Kirill Tkhai, linux-kernel,
linuxppc-dev, linux-s390, linux-um, dri-devel, amd-gfx, intel-gfx,
devel, linux-media, linux-arm-kernel, linux-mediatek,
linux-parisc, devel, linaro-mm-sig, xen-devel, ceph-devel,
linux-fsdevel, linux-nfs, linux-ntfs-dev, linux-mm, kexec,
linux-pm, kasan-dev, dccp, netdev, linux-decnet-user,
netfilter-devel, coreteam, linux-sctp, linux-integrity,
linux-security-module
Cc: getarunks
In-Reply-To: <1540229092-25207-1-git-send-email-arunks@codeaurora.org>
On Mon, 2018-10-22 at 22:53 +0530, Arun KS wrote:
> Remove managed_page_count_lock spinlock and instead use atomic
> variables.
Perhaps better to define and use macros for the accesses
instead of specific uses of atomic_long_<inc/dec/read>
Something like:
#define totalram_pages() (unsigned long)atomic_long_read(&_totalram_pages)
#define totalram_pages_inc() (unsigned long)atomic_long_inc(&_totalram_pages)
#define totalram_pages_dec() (unsigned long)atomic_long_dec(&_totalram_pages)
^ permalink raw reply
* Re: [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Arun Sudhilal @ 2018-10-23 4:46 UTC (permalink / raw)
To: mhocko
Cc: snitzer, kemi.wang, dri-devel, bfields, linux-sctp, paulus, pavel,
cl, kys, sumit.semwal, David1.Zhou, ptesarik, ceph-devel, jejb,
kasan-dev, marcos.souza.org, steven.hill, rientjes,
anthony.yznaga, neelx, guro, len.brown, linux-pm, vbabka,
linux-um, rppt, viro, tglx, trond.myklebust, anton, linux-parisc,
malat, gregkh, rdunlap, rjw, linux-kernel, cyrilbur, arve,
netfilter-devel, jrdr.linux, dmitry.kasatkin, alexander.deucher,
arunks, Andrew Morton, andrew-ct.chen, gustavo, airlied, dm-devel,
namit, osandov, agk, linux-s390, sthemmin, intel-gfx, deller,
hughd, mcgrof, coreteam, kadlec, aryabinin, linux-media,
yuehaibing, tkjos, pombredanne, jani.nikula, jia.he, Tejun Heo,
shakeelb, houlong.wei, devel, boris.ostrovsky, maco,
linux-arm-kernel, khalid, oded.gabbay, linaro-mm-sig,
linux-ntfs-dev, corbet, fw, anna.schumaker, penberg, minchan,
ebiederm, aneesh.kumar, schwidefsky, iamjoonsoo.kim, kstewart,
marcelo.leitner, linux-fsdevel, penguin-kernel, joonas.lahtinen,
heiko.carstens, stefan, jmorris, netdev, amd-gfx, jack,
alexander.h.duyck, gerrit, andriy.shevchenko, miklos, david,
willy, khlebnikov, matthew.auld, ren_guo, ying.huang, kuznet,
idryomov, adobriyan, pablo, serge, keescook, arnd, haiyangz,
broonie, bp, rodrigo.vivi, dan.j.williams, mchehab, ddstreet,
osalvador, linux-nfs, nhorman, tvrtko.ursulin, jlayton, edumazet,
jeyu, joe, davem, kirill.shutemov, minghsiu.tsai,
christian.koenig, pv-drivers, bigeasy, chris, linux-mm, glider,
hpa, cpandya, devel, zyan, xen-devel, sage, dccp, richard,
sjenning, x86, mingo, labbott, zohar, jdike, pavel.tatashin,
jannh, xdeguillard, hannes, jglisse, ktkhai, linux-mediatek,
matthias.bgg, tiffany.lin, linux-integrity, dvyukov, jgross,
yang.shi, yoshfuji, linuxppc-dev, vyasevich, linux-decnet-user,
kexec, linux-security-module, tzimmermann, mika.kuoppala, mgorman
In-Reply-To: <20181022181122.GK18839@dhcp22.suse.cz>
On Mon, Oct 22, 2018 at 11:41 PM Michal Hocko <mhocko@kernel.org> wrote:
>
> On Mon 22-10-18 22:53:22, Arun KS wrote:
> > Remove managed_page_count_lock spinlock and instead use atomic
> > variables.
>
Hello Michal,
> I assume this has been auto-generated. If yes, it would be better to
> mention the script so that people can review it and regenerate for
> comparision. Such a large change is hard to review manually.
Changes were made partially with script. For totalram_pages and
totalhigh_pages,
find dir -type f -exec sed -i
's/totalram_pages/atomic_long_read(\&totalram_pages)/g' {} \;
find dir -type f -exec sed -i
's/totalhigh_pages/atomic_long_read(\&totalhigh_pages)/g' {} \;
For managed_pages it was mostly manual edits after using,
find mm/ -type f -exec sed -i
's/zone->managed_pages/atomic_long_read(\&zone->managed_pages)/g' {}
\;
Regards,
Arun
> --
> Michal Hocko
> SUSE Labs
^ permalink raw reply
* Re: [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Huang, Ying @ 2018-10-23 5:37 UTC (permalink / raw)
To: Arun KS
Cc: Mike Snitzer, Kemi Wang, dri-devel, J. Bruce Fields, linux-sctp,
Paul Mackerras, Pavel Machek, Christoph Lameter, K. Y. Srinivasan,
Sumit Semwal, David (ChunMing) Zhou, Petr Tesarik, ceph-devel,
James E.J. Bottomley, kasan-dev, Marcos Paulo de Souza,
Steven J. Hill, David Rientjes, Anthony Yznaga, Daniel Vacek,
Roman Gushchin, Len Brown, linux-pm, Vlastimil Babka, linux-um,
Mike Rapoport, Alexander Viro, Thomas Gleixner, Trond Myklebust,
Anton Altaparmakov, linux-parisc, Mathieu Malaterre,
Greg Kroah-Hartman, Randy Dunlap, Rafael J. Wysocki, linux-kernel,
Cyril Bur, Arve Hjønnevåg, netfilter-devel,
Souptick Joarder, Dmitry Kasatkin, Alex Deucher, Andrew Morton,
Andrew-CT Chen, Gustavo A. R. Silva, David Airlie, dm-devel,
Nadav Amit, Omar Sandoval, Alasdair Kergon, linux-s390,
Stephen Hemminger, intel-gfx, Helge Deller, Hugh Dickins,
Luis R. Rodriguez, coreteam, Jozsef Kadlecsik, Andrey Ryabinin,
linux-media, YueHaibing, Todd Kjos, Philippe Ombredanne,
Jani Nikula, Jia He, Tejun Heo, Shakeel Butt, Houlong Wei, devel,
Boris Ostrovsky, Martijn Coenen, linux-arm-kernel, Khalid Aziz,
Oded Gabbay, linaro-mm-sig, linux-ntfs-dev, Jonathan Corbet,
Florian Westphal, Anna Schumaker, Pekka Enberg, Minchan Kim,
Eric Biederman, Aneesh Kumar K.V, Martin Schwidefsky, Joonsoo Kim,
Kate Stewart, Marcelo Ricardo Leitner, linux-fsdevel,
Tetsuo Handa, Joonas Lahtinen, Heiko Carstens, Stefan Agner,
James Morris, netdev, amd-gfx, Jan Kara, Alexander Duyck,
Gerrit Renker, Andy Shevchenko, Miklos Szeredi, David Hildenbrand,
Matthew Wilcox, Konstantin Khlebnikov, Matthew Auld, Guo Ren,
Alexey Kuznetsov, Ilya Dryomov, Alexey Dobriyan,
Pablo Neira Ayuso, Serge E. Hallyn, Kees Cook, Arnd Bergmann,
Haiyang Zhang, Mark Brown, Borislav Petkov, Rodrigo Vivi,
Dan Williams, Mauro Carvalho Chehab, Dan Streetman,
Oscar Salvador, linux-nfs, Neil Horman, Tvrtko Ursulin,
Jeff Layton, Eric Dumazet, Jessica Yu, Joe Perches,
David S. Miller, Kirill A. Shutemov, Michal Hocko, Minghsiu Tsai,
Christian König, VMware, Inc., Sebastian Andrzej Siewior,
Chris Wilson, linux-mm, Alexander Potapenko, H. Peter Anvin,
getarunks, Chintan Pandya, devel, Yan, Zheng, xen-devel,
Sage Weil, dccp, Richard Weinberger, Seth Jennings, x86,
Ingo Molnar, Laura Abbott, Mimi Zohar, Jeff Dike, Pavel Tatashin,
Jann Horn, Xavier Deguillard, Johannes Weiner,
Jérôme Glisse, Kirill Tkhai, linux-mediatek,
Matthias Brugger, Tiffany Lin, linux-integrity, Dmitry Vyukov,
Juergen Gross, Yang Shi, Hideaki YOSHIFUJI, linuxppc-dev,
Vlad Yasevich, linux-decnet-user, kexec, linux-security-module,
Thomas Zimmermann, Mika Kuoppala, Mel Gorman
In-Reply-To: <1540229092-25207-1-git-send-email-arunks@codeaurora.org>
Arun KS <arunks@codeaurora.org> writes:
> Remove managed_page_count_lock spinlock and instead use atomic
> variables.
>
> Suggested-by: Michal Hocko <mhocko@suse.com>
> Suggested-by: Vlastimil Babka <vbabka@suse.cz>
> Signed-off-by: Arun KS <arunks@codeaurora.org>
>
> ---
> As discussed here,
> https://patchwork.kernel.org/patch/10627521/#22261253
My 2 cents. I think you should include at least part of the discussion
in the patch description to make it more readable by itself.
Best Regards,
Huang, Ying
^ permalink raw reply
* Re: [PATCH] mm: convert totalram_pages, totalhigh_pages and managed_pages to atomic.
From: Arun KS @ 2018-10-23 4:48 UTC (permalink / raw)
To: Joe Perches
Cc: Mike Snitzer, Kemi Wang, dri-devel, J. Bruce Fields, linux-sctp,
Paul Mackerras, Pavel Machek, Christoph Lameter, K. Y. Srinivasan,
Sumit Semwal, David (ChunMing) Zhou, Petr Tesarik, ceph-devel,
James E.J. Bottomley, kasan-dev, Marcos Paulo de Souza,
Steven J. Hill, David Rientjes, Anthony Yznaga, Daniel Vacek,
Roman Gushchin, Len Brown, linux-pm, Vlastimil Babka, linux-um,
Mike Rapoport, Alexander Viro, Thomas Gleixner, Trond Myklebust,
Anton Altaparmakov, linux-parisc, Mathieu Malaterre,
Greg Kroah-Hartman, Randy Dunlap, Rafael J. Wysocki, linux-kernel,
Cyril Bur, Arve Hjønnevåg, netfilter-devel,
Souptick Joarder, Dmitry Kasatkin, Alex Deucher, Andrew Morton,
Andrew-CT Chen, Gustavo A. R. Silva, David Airlie, dm-devel,
Nadav Amit, Omar Sandoval, Alasdair Kergon, linux-s390,
Stephen Hemminger, intel-gfx, Helge Deller, Hugh Dickins,
Luis R. Rodriguez, coreteam, Jozsef Kadlecsik, Andrey Ryabinin,
linux-media, YueHaibing, Todd Kjos, Philippe Ombredanne,
Jani Nikula, Jia He, Tejun Heo, Shakeel Butt, Houlong Wei,
Boris Ostrovsky, Martijn Coenen, linux-arm-kernel, Khalid Aziz,
Oded Gabbay, linaro-mm-sig, linux-ntfs-dev, Jonathan Corbet,
Florian Westphal, Anna Schumaker, Pekka Enberg, Minchan Kim,
Eric Biederman, Aneesh Kumar K.V, Martin Schwidefsky, Joonsoo Kim,
Kate Stewart, Marcelo Ricardo Leitner, linux-fsdevel,
Tetsuo Handa, Joonas Lahtinen, Heiko Carstens, Stefan Agner,
James Morris, netdev, amd-gfx, Jan Kara, Alexander Duyck,
Gerrit Renker, Andy Shevchenko, Miklos Szeredi, David Hildenbrand,
Matthew Wilcox, Konstantin Khlebnikov, Matthew Auld, Guo Ren,
Huang Ying, Alexey Kuznetsov, Ilya Dryomov, Alexey Dobriyan,
Pablo Neira Ayuso, Serge E. Hallyn, Kees Cook, Arnd Bergmann,
Haiyang Zhang, Mark Brown, Borislav Petkov, Rodrigo Vivi,
Dan Williams, Mauro Carvalho Chehab, Dan Streetman,
Oscar Salvador, linux-nfs, Neil Horman, Tvrtko Ursulin,
Jeff Layton, Eric Dumazet, Jessica Yu, devel, David S. Miller,
Kirill A. Shutemov, Michal Hocko, Minghsiu Tsai,
Christian König, VMware, Inc., Sebastian Andrzej Siewior,
Chris Wilson, linux-mm, Alexander Potapenko, H. Peter Anvin,
getarunks, Chintan Pandya, devel, Yan, Zheng, xen-devel,
Sage Weil, dccp, Richard Weinberger, Seth Jennings, x86,
Ingo Molnar, Laura Abbott, Mimi Zohar, Jeff Dike, Pavel Tatashin,
Jann Horn, Xavier Deguillard, Johannes Weiner,
Jérôme Glisse, Kirill Tkhai, linux-mediatek,
Matthias Brugger, Tiffany Lin, linux-integrity, Dmitry Vyukov,
Juergen Gross, Yang Shi, Hideaki YOSHIFUJI, linuxppc-dev,
Vlad Yasevich, linux-decnet-user, kexec, linux-security-module,
Thomas Zimmermann, Mika Kuoppala, Mel Gorman
In-Reply-To: <c57bcc584b3700c483b0311881ec3ae8786f88b1.camel@perches.com>
On 2018-10-23 09:45, Joe Perches wrote:
> On Mon, 2018-10-22 at 22:53 +0530, Arun KS wrote:
>> Remove managed_page_count_lock spinlock and instead use atomic
>> variables.
>
Hello Joe,
> Perhaps better to define and use macros for the accesses
> instead of specific uses of atomic_long_<inc/dec/read>
>
> Something like:
>
> #define totalram_pages() (unsigned
> long)atomic_long_read(&_totalram_pages)
> #define totalram_pages_inc() (unsigned
> long)atomic_long_inc(&_totalram_pages)
> #define totalram_pages_dec() (unsigned
> long)atomic_long_dec(&_totalram_pages)
That sounds like a nice idea.
Regards,
Arun
^ permalink raw reply
* [PATCH] net/wan/fsl_ucc_hdlc: add BQL support
From: Mathias Thore @ 2018-10-23 11:48 UTC (permalink / raw)
To: qiang.zhao, linuxppc-dev, netdev, joakim.tjernlund,
david.gounaris
Cc: Mathias Thore
Add byte queue limits support in the fsl_ucc_hdlc driver.
Signed-off-by: Mathias Thore <mathias.thore@infinera.com>
---
Note that this patch is created relative to another patch that was
applied recently: net/wan/fsl_ucc_hdlc: error counters
drivers/net/wan/fsl_ucc_hdlc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 4d6409605207..7a42336c8af8 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -391,6 +391,7 @@ static netdev_tx_t ucc_hdlc_tx(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb);
return -ENOMEM;
}
+ netdev_sent_queue(dev, skb->len);
spin_lock_irqsave(&priv->lock, flags);
/* Start from the next BD that should be filled */
@@ -447,6 +448,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
{
/* Start from the next BD that should be filled */
struct net_device *dev = priv->ndev;
+ unsigned int bytes_sent = 0;
+ int howmany = 0;
struct qe_bd *bd; /* BD pointer */
u16 bd_status;
int tx_restart = 0;
@@ -474,6 +477,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
skb = priv->tx_skbuff[priv->skb_dirtytx];
if (!skb)
break;
+ howmany++;
+ bytes_sent += skb->len;
dev->stats.tx_packets++;
memset(priv->tx_buffer +
(be32_to_cpu(bd->buf) - priv->dma_tx_addr),
@@ -501,6 +506,7 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
if (tx_restart)
hdlc_tx_restart(priv);
+ netdev_completed_queue(dev, howmany, bytes_sent);
return 0;
}
@@ -721,6 +727,7 @@ static int uhdlc_open(struct net_device *dev)
priv->hdlc_busy = 1;
netif_device_attach(priv->ndev);
napi_enable(&priv->napi);
+ netdev_reset_queue(dev);
netif_start_queue(dev);
hdlc_open(dev);
}
@@ -812,6 +819,7 @@ static int uhdlc_close(struct net_device *dev)
free_irq(priv->ut_info->uf_info.irq, priv);
netif_stop_queue(dev);
+ netdev_reset_queue(dev);
priv->hdlc_busy = 0;
return 0;
--
2.18.1
^ permalink raw reply related
* Re: [PATCH 0/8] add generic builtin command line
From: Maksym Kokhan @ 2018-10-23 14:43 UTC (permalink / raw)
To: Daniel Walker
Cc: linux-mips, linux-efi, Ruslan Bilovol, Will Deacon,
Paul Mackerras, H. Peter Anvin, Frank Rowand, x86, Russell King,
Ingo Molnar, Catalin Marinas, James Hogan, Daniel Walker,
devicetree, Rob Herring, Borislav Petkov, Thomas Gleixner,
Andrii Bordunov, Ard Biesheuvel, linux-kernel, Ralf Baechle,
Paul Burton, Andrew Morton, linuxppc-dev
In-Reply-To: <CAMT6-xiQ0vGcKpA+SiWHQWQFwU9Oo9j=Zin+UXDoPqKTz5fbeA@mail.gmail.com>
On Mon, Oct 8, 2018 at 9:01 PM Maksym Kokhan
<maksym.kokhan@globallogic.com> wrote:
>
> Hi, Daniel
>
> On Sat, Sep 29, 2018 at 9:17 PM <dwalker@fifo99.com> wrote:
> >
> > On Thu, Sep 27, 2018 at 07:55:08PM +0300, Maksym Kokhan wrote:
> > > Daniel Walker (7):
> > > add generic builtin command line
> > > drivers: of: ifdef out cmdline section
> > > x86: convert to generic builtin command line
> > > arm: convert to generic builtin command line
> > > arm64: convert to generic builtin command line
> > > mips: convert to generic builtin command line
> > > powerpc: convert to generic builtin command line
> > >
> >
> > When I originally submitted these I had a very good conversion with Rob Herring
> > on the device tree changes. It seemed fairly clear that my approach in these
> > changes could be done better. It effected specifically arm64, but a lot of other
> > platforms use the device tree integrally. With arm64 you can reduce the changes
> > down to only Kconfig changes, and that would likely be the case for many of the
> > other architecture. I made patches to do this a while back, but have not had
> > time to test them and push them out.
>
> Can you please share this patches? I could test them and use to improve this
> generic command line implementation.
>
> > In terms of mips I think there's a fair amount of work needed to pull out their
> > architecture specific mangling into something generic. Part of my motivation for
> > these was to take the architecture specific feature and open that up for all the
> > architecture. So it makes sense that the mips changes should become part of
> > that.
>
> This is really makes sense, and we have intentions to implement it
> afterward. It would be easier to initially merge this simple
> implementation and then develop it step by step.
>
> > The only changes which have no comments are the generic changes, x86, and
> > powerpc. Those patches have been used at Cisco for years with no issues.
> > I added those changes into my -next tree for a round of testing. Assuming there
> > are no issues I can work out the merging with the architecture maintainers.
> > As for the other changes I think they can be done in time, as long as the
> > generic parts of upstream the rest can be worked on by any of the architecture
> > developers.
>
> Thanks,
> Maksym
We still have no response to patches for x86, arm, arm64 and powerpc.
Is current generic command line implementation appropriate for these
architectures?
Is it possible to merge these patches in the current form (for x86,
arm, arm64 and powerpc)?
Thanks,
Maksym
^ permalink raw reply
* Re: [PATCH 0/8] add generic builtin command line
From: Russell King - ARM Linux @ 2018-10-23 14:48 UTC (permalink / raw)
To: Maksym Kokhan
Cc: linux-mips, linux-efi, Ruslan Bilovol, Will Deacon,
Paul Mackerras, H. Peter Anvin, Daniel Walker, Frank Rowand, x86,
Ingo Molnar, Catalin Marinas, James Hogan, Daniel Walker,
devicetree, Rob Herring, Borislav Petkov, Thomas Gleixner,
Andrii Bordunov, Ard Biesheuvel, linux-kernel, Ralf Baechle,
Paul Burton, Andrew Morton, linuxppc-dev
In-Reply-To: <CAMT6-xj1rjVAy1AWFiMHc5wH36eu=TUSMtdKU=-qRtUbwr9bkg@mail.gmail.com>
On Tue, Oct 23, 2018 at 05:43:18PM +0300, Maksym Kokhan wrote:
> We still have no response to patches for x86, arm, arm64 and powerpc.
> Is current generic command line implementation appropriate for these
> architectures?
> Is it possible to merge these patches in the current form (for x86,
> arm, arm64 and powerpc)?
You may wish to consider your recipients - I seem to only have received
the cover and patch 1 (which doesn't include any ARM specific bits).
It may be that you're not getting responses because people haven't seen
your patches.
Thanks.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply
* Re: [PATCH 3/9] powerpc/mm: Remove extern from function definition
From: LEROY Christophe @ 2018-10-23 15:38 UTC (permalink / raw)
To: Breno Leitao; +Cc: linuxppc-dev
In-Reply-To: <1540220060-30162-3-git-send-email-leitao@debian.org>
Breno Leitao <leitao@debian.org> a écrit :
> Function huge_ptep_set_access_flags() has the 'extern' keyword in the
> function definition and also in the function declaration. This causes a
> warning in 'sparse' since the 'extern' storage class should be used only on
> symbol declarations.
>
> arch/powerpc/mm/pgtable.c:232:12: warning: function
> 'huge_ptep_set_access_flags' with external linkage has definition
>
> This patch removes the keyword from the definition part, while keeps it in
> the declaration part.
I think checkpatch also says that extern should be avoided in declarations.
Can you remove both ?
Christophe
>
> Signed-off-by: Breno Leitao <leitao@debian.org>
> ---
> arch/powerpc/mm/pgtable.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
> index d71c7777669c..213933b78077 100644
> --- a/arch/powerpc/mm/pgtable.c
> +++ b/arch/powerpc/mm/pgtable.c
> @@ -229,7 +229,7 @@ int ptep_set_access_flags(struct vm_area_struct
> *vma, unsigned long address,
> }
>
> #ifdef CONFIG_HUGETLB_PAGE
> -extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
> +int huge_ptep_set_access_flags(struct vm_area_struct *vma,
> unsigned long addr, pte_t *ptep,
> pte_t pte, int dirty)
> {
> --
> 2.19.0
^ permalink raw reply
* ethernet "bus" number in DTS ?
From: Joakim Tjernlund @ 2018-10-23 16:49 UTC (permalink / raw)
To: linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org
SPI (and others) has a way to define bus number in a aliases:
aliases {
ethernet4 = &enet4;
ethernet0 = &enet0;
ethernet1 = &enet1;
ethernet2 = &enet2;
ethernet3 = &enet3;
spi0 = &spi0
};
The 0 in the spi0 alias will translate to bus num 0 so one can control the /dev nodes, like /dev/spidev0
I am looking for the same for ethernet devices:
ethernet4 = &enet4; /* should become eth4 */
ethernet0 = &enet0; /* should become eth0 */
but I cannot find something like that for eth devices.
Could such functionality be added?
Jocke
^ permalink raw reply
* Re: [PATCH] selftests/powerpc: Fix ptrace tm failure
From: Segher Boessenkool @ 2018-10-23 17:00 UTC (permalink / raw)
To: Breno Leitao; +Cc: mikey, linuxppc-dev, stable, gromero
In-Reply-To: <1540242986-7510-1-git-send-email-leitao@debian.org>
On Mon, Oct 22, 2018 at 06:16:26PM -0300, Breno Leitao wrote:
> Test ptrace-tm-spd-gpr fails on current kernel (4.19) due to a segmentation
> fault that happens on the child process prior to setting cptr[2] = 1. This
> causes the parent process to wait forever at 'while (!pptr[2])' and the test to
> be killed by the test harness framework by timeout, thus, failing.
>
> The segmentation fault happens because of a inline assembly being
> generated as:
>
> 0x10000355c <tm_spd_gpr+492> lfs f0, 0(0)
>
> This is reading memory position 0x0 and causing the segmentation fault.
>
> This code is being generated by ASM_LOAD_FPR_SINGLE_PRECISION(flt_4), where
> flt_4 is passed to the inline assembly block as:
>
> [flt_4] "r" (&d)
>
> Since the inline assembly 'r' constraint means any GPR, gpr0 is being
> chosen, thus causing this issue when issuing a Load Floating-Point Single
> instruction.
>
> This patch simply changes the constraint to 'b', which specify that this
> register will be used as base, and r0 is not allowed to be used, avoiding
> this issue.
>
> Other than that, removing flt_2 register from the input operands, since it
> is not used by the inline assembly code at all.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Segher Boessenkool <segher@kernel.crashing.org>
Segher
^ permalink raw reply
* Re: ethernet "bus" number in DTS ?
From: Florian Fainelli @ 2018-10-23 17:03 UTC (permalink / raw)
To: Joakim Tjernlund, linuxppc-dev@lists.ozlabs.org,
netdev@vger.kernel.org
Cc: andrew
In-Reply-To: <88328977dfeaf667a98d791074b721fe730d285b.camel@infinera.com>
On 10/23/18 9:49 AM, Joakim Tjernlund wrote:
> SPI (and others) has a way to define bus number in a aliases:
> aliases {
> ethernet4 = &enet4;
> ethernet0 = &enet0;
> ethernet1 = &enet1;
> ethernet2 = &enet2;
> ethernet3 = &enet3;
> spi0 = &spi0
> };
> The 0 in the spi0 alias will translate to bus num 0 so one can control the /dev nodes, like /dev/spidev0
> I am looking for the same for ethernet devices:
> ethernet4 = &enet4; /* should become eth4 */
> ethernet0 = &enet0; /* should become eth0 */
> but I cannot find something like that for eth devices.
>
> Could such functionality be added?
It could, do we want and need to, no. You have the Ethernet alias in
/sys/class/net/*/device/uevent already that would allow you to perform
that (re)naming in user-space:
# cat /sys/class/net/eth0/device/uevent
DRIVER=bcmgenet
OF_NAME=ethernet
OF_FULLNAME=/rdb/ethernet@f0480000
OF_TYPE=network
OF_COMPATIBLE_0=brcm,genet-v5
OF_COMPATIBLE_N=1
OF_ALIAS_0=eth0 <==================
MODALIAS=of:NethernetTnetworkCbrcm,genet-v5
--
Florian
^ permalink raw reply
* Re: ethernet "bus" number in DTS ?
From: Andrew Lunn @ 2018-10-23 17:08 UTC (permalink / raw)
To: Joakim Tjernlund; +Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
In-Reply-To: <88328977dfeaf667a98d791074b721fe730d285b.camel@infinera.com>
On Tue, Oct 23, 2018 at 04:49:59PM +0000, Joakim Tjernlund wrote:
> SPI (and others) has a way to define bus number in a aliases:
> aliases {
> ethernet4 = &enet4;
> ethernet0 = &enet0;
> ethernet1 = &enet1;
> ethernet2 = &enet2;
> ethernet3 = &enet3;
> spi0 = &spi0
> };
> The 0 in the spi0 alias will translate to bus num 0 so one can control the /dev nodes, like /dev/spidev0
> I am looking for the same for ethernet devices:
> ethernet4 = &enet4; /* should become eth4 */
> ethernet0 = &enet0; /* should become eth0 */
> but I cannot find something like that for eth devices.
>
> Could such functionality be added?
Hi Jocke
This has been discussed before. Take a look at
arch/arm/boot/dts/armada-38x.dtsi
/*
* As a special exception to the "order by
* register address" rule, the eth0 node is
* placed here to ensure that it gets
* registered as the first interface, since
* the network subsystem doesn't allow naming
* interfaces using DT aliases. Without this,
* the ordering of interfaces is different
* from the one used in U-Boot and the
* labeling of interfaces on the boards, which
* is very confusing for users.
*/
You should be able to find the discuss about this, and why aliases
cannot be used.
Andrew
^ permalink raw reply
* Re: [PATCH] net/wan/fsl_ucc_hdlc: add BQL support
From: David Miller @ 2018-10-23 17:56 UTC (permalink / raw)
To: mathias.thore; +Cc: netdev, linuxppc-dev, david.gounaris, qiang.zhao
In-Reply-To: <20181023114832.31350-1-mathias.thore@infinera.com>
From: Mathias Thore <mathias.thore@infinera.com>
Date: Tue, 23 Oct 2018 13:48:32 +0200
> Add byte queue limits support in the fsl_ucc_hdlc driver.
>
> Signed-off-by: Mathias Thore <mathias.thore@infinera.com>
> ---
>
> Note that this patch is created relative to another patch that was
> applied recently: net/wan/fsl_ucc_hdlc: error counters
net-next is closed, please resubmit this when net-next opens back up.
Thank you.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox