* Re: [PATCH] net: add SO_MAX_DGRAM_QLEN for AF_UNIX SOCK_DGRAM sockets
From: Eric Dumazet @ 2015-03-03 14:30 UTC (permalink / raw)
To: Christian Seiler
Cc: David Miller, netdev-u79uwXL29TY76Z2rM5mHXA,
dan-+z8lB9qDZjnk1uMJSBkQmQ, edumazet-hpIqsD4AKlfQT0dZR+AlfA,
hannes-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r,
linux-api-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <0b5908020d83bcbaa7f4938e5cb433ea-+GPkE3DhqnY@public.gmane.org>
On Tue, 2015-03-03 at 10:04 +0100, Christian Seiler wrote:
> Also note that if I have a stream socket, by default I can buffer up to
> 256 kiB of data in the kernel. I did some test measurements on x86_64
> and including overhead of internal bookkeeping structures, I can fit up
> to 555 datagrams in there if each is at most 192 bytes long, at least
> 333 datagrams if each is at most 704 bytes long and at least 185
> datagrams if each is at most 1728 bytes long. If I compare these
> numbers to 11, that's an order of magnitude in difference.
Problem about AF_UNIX socket is file descriptor passing.
Increasing the 10 limit allows attackers to OOM host faster I guess.
You could extend the limit if we were sure queued messages were without
passed fds.
Then, we could either increase sysctl_max_dgram_qlen or do something
like :
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 526b6edab018..a608317e7dd4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -643,7 +643,9 @@ static struct sock *unix_create1(struct net *net, struct socket *sock)
&af_unix_sk_receive_queue_lock_key);
sk->sk_write_space = unix_write_space;
- sk->sk_max_ack_backlog = net->unx.sysctl_max_dgram_qlen;
+ sk->sk_max_ack_backlog = max_t(u32,
+ net->unx.sysctl_max_dgram_qlen,
+ sk->sk_rcvbuf / SKB_TRUESIZE(256));
sk->sk_destruct = unix_sock_destructor;
u = unix_sk(sk);
u->path.dentry = NULL;
^ permalink raw reply related
* Re: [PATCH] selftests: Add install, generate tar, and run_kselftest tools
From: Dave Jones @ 2015-03-03 14:49 UTC (permalink / raw)
To: Shuah Khan
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-api-u79uwXL29TY76Z2rM5mHXA, mpe-Gsx/Oe8HsFggBc27wqDAHg
In-Reply-To: <1425358088-9667-1-git-send-email-shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
On Mon, Mar 02, 2015 at 09:48:08PM -0700, Shuah Khan wrote:
> kselftest_install.sh tool adds support for installing selftests
> at user specified location/kselftest. By default this tool
> will install selftests in the selftests/kselftest directory.
> For example, kselftest_install /tmp will install tests under
> /tmp/kselftest
How is this an improvement over having each test install method isolated
to its own Makefile ?
> +# Installs normal tests and skips special tests and kselftest tools
> +# gen_kselftesr_tar.sh and kselftes_install.sh
> +# Also skips problematic xxxx* file that gets created when execveat
> +# test is built. The file name is too long and resulting in error
> +# messages.
> + find `pwd`/* -type d -name rcutorture -prune -o -type f \
> + -executable -print | grep -v 'tar\|install\|xxxx' | \
> + xargs install -t $install_dir
> +# Install shell scripts that aren't executables
> + find `pwd`/* -type d -name rcutorture -prune -o -name "*.sh" -print | \
> + grep -v 'tar\|install\|run\|on-off' | \
> + xargs install -t $install_dir
> +# Special handling for cpu-hotplug and memory-hotplug .sh with the same name
> + install `pwd`/cpu-hotplug/on-off-test.sh \
> + $install_dir/cpu-on-off-test.sh
> + install `pwd`/memory-hotplug/on-off-test.sh \
> + $install_dir/mem-on-off-test.sh
> +# Special handling for scripts without .sh extension
> + install `pwd`/vm/run_vmtests $install_dir
> + install `pwd`/net/run_netsocktests $install_dir
> + install `pwd`/net/run_afpackettests $install_dir
> + install `pwd`/sysctl/common_tests $install_dir
> +# Install dependent directories for ftrace and exec tests
> + cp -r `pwd`/ftrace/test.d $install_dir
> + install `pwd`/exec/execveat.denatured $install_dir
> + cp -r `pwd`/exec/subdir $install_dir
This already makes my eyes hurt, and is only going to grow as more tests
get added. Additionally when two people are trying to add tests at the
same time, you're guaranteeing future merge conflicts here.
Dave
^ permalink raw reply
* Re: [PATCH] net: add SO_MAX_DGRAM_QLEN for AF_UNIX SOCK_DGRAM sockets
From: Christian Seiler @ 2015-03-03 15:05 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, netdev, dan, edumazet, hannes, linux-api
In-Reply-To: <1425393019.5130.181.camel@edumazet-glaptop2.roam.corp.google.com>
Am 2015-03-03 15:30, schrieb Eric Dumazet:
>> Also note that if I have a stream socket, by default I can buffer up
>> to
>> 256 kiB of data in the kernel. I did some test measurements on
>> x86_64
>> and including overhead of internal bookkeeping structures, I can fit
>> up
>> to 555 datagrams in there if each is at most 192 bytes long, at
>> least
>> 333 datagrams if each is at most 704 bytes long and at least 185
>> datagrams if each is at most 1728 bytes long. If I compare these
>> numbers to 11, that's an order of magnitude in difference.
>
> Problem about AF_UNIX socket is file descriptor passing.
>
> Increasing the 10 limit allows attackers to OOM host faster I guess.
But what's really preventing that currently? Sure, there's a limit to
the maximum number of file descriptors a process may create, but that's
usually high enough that one could create just a bunch of sockets and
queue stuff in all of them. Sure, if the limit is increased, this could
occur earlier, but my guess is that one would have to put
unrealistically tight restrictions on number of FDs / etc. in order to
really prevent OOM currently. And because modern applications tend to
use a ton of FDs, distros tend to set the FD number limits really high
by default. And my patch does allow the second limit to be changed.
> You could extend the limit if we were sure queued messages were
> without
> passed fds.
How about this? Add a flag that allows the user to specify that
SCM_RIGHTS will never be used on this socket, and that if the user
wants to increase the queue length beyond the initial limit, the
process has to either be privileged or that flag has to be set (and can
then not be unset again). On the other hand, decreasing below the
current value will not enforce this flag.
> Then, we could either increase sysctl_max_dgram_qlen or do something
> like :
>
> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
> index 526b6edab018..a608317e7dd4 100644
> --- a/net/unix/af_unix.c
> +++ b/net/unix/af_unix.c
> @@ -643,7 +643,9 @@ static struct sock *unix_create1(struct net *net,
> struct socket *sock)
> &af_unix_sk_receive_queue_lock_key);
>
> sk->sk_write_space = unix_write_space;
> - sk->sk_max_ack_backlog = net->unx.sysctl_max_dgram_qlen;
> + sk->sk_max_ack_backlog = max_t(u32,
> + net->unx.sysctl_max_dgram_qlen,
> + sk->sk_rcvbuf / SKB_TRUESIZE(256));
> sk->sk_destruct = unix_sock_destructor;
> u = unix_sk(sk);
> u->path.dentry = NULL;
Doesn't this assume a typical datagram size of 256 bytes? Isn't that
something that should be left up to the user? Also, suddenly the RCVBUF
size of UNIX domain sockets suddenly becomes relevant, even though it
is never actually checked when it comes to queuing the messages (only
the SNDBUF size of the sending socket is checked). This creates really
inconsistent semantics in my eyes where the receive buffer is useful
for some things, but not for others.
Christian
^ permalink raw reply
* Re: [PATCH] ipv6: expose RFC4191 route preference via rtnetlink
From: Jiri Pirko @ 2015-03-03 15:17 UTC (permalink / raw)
To: Lubomir Rintel
Cc: netdev, linux-kernel, linux-api, David S. Miller,
Alexey Kuznetsov
In-Reply-To: <1425376912-31983-1-git-send-email-lkundrak@v3.sk>
Tue, Mar 03, 2015 at 11:01:52AM CET, lkundrak@v3.sk wrote:
>This makes it possible to retain the route preference when RAs are handled in
>userspace.
>
>Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
>---
> include/uapi/linux/rtnetlink.h | 1 +
> net/ipv6/route.c | 16 +++++++++++++++-
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
>index 5cc5d66..0671524 100644
>--- a/include/uapi/linux/rtnetlink.h
>+++ b/include/uapi/linux/rtnetlink.h
>@@ -303,6 +303,7 @@ enum rtattr_type_t {
> RTA_TABLE,
> RTA_MARK,
> RTA_MFC_STATS,
>+ RTA_PREF,
> __RTA_MAX
> };
>
>diff --git a/net/ipv6/route.c b/net/ipv6/route.c
>index 47b5109..08f689e 100644
>--- a/net/ipv6/route.c
>+++ b/net/ipv6/route.c
>@@ -2401,6 +2401,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {
> [RTA_PRIORITY] = { .type = NLA_U32 },
> [RTA_METRICS] = { .type = NLA_NESTED },
> [RTA_MULTIPATH] = { .len = sizeof(struct rtnexthop) },
>+ [RTA_PREF] = { .type = NLA_U8 },
> };
>
> static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
>@@ -2408,6 +2409,7 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
> {
> struct rtmsg *rtm;
> struct nlattr *tb[RTA_MAX+1];
>+ unsigned int pref;
> int err;
>
> err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy);
>@@ -2483,6 +2485,14 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
> cfg->fc_mp_len = nla_len(tb[RTA_MULTIPATH]);
> }
>
>+ if (tb[RTA_PREF]) {
>+ pref = nla_get_u8(tb[RTA_PREF]);
>+ if (pref == ICMPV6_ROUTER_PREF_LOW ||
>+ pref == ICMPV6_ROUTER_PREF_MEDIUM ||
>+ pref == ICMPV6_ROUTER_PREF_HIGH)
>+ cfg->fc_flags |= RTF_PREF(pref);
Don't we want to do "goto errout;" in case pref is invalid ?
>+ }
>+
> err = 0;
> errout:
> return err;
>@@ -2586,7 +2596,8 @@ static inline size_t rt6_nlmsg_size(void)
> + nla_total_size(4) /* RTA_PRIORITY */
> + RTAX_MAX * nla_total_size(4) /* RTA_METRICS */
> + nla_total_size(sizeof(struct rta_cacheinfo))
>- + nla_total_size(TCP_CA_NAME_MAX); /* RTAX_CC_ALGO */
>+ + nla_total_size(TCP_CA_NAME_MAX) /* RTAX_CC_ALGO */
>+ + nla_total_size(1); /* RTA_PREF */
> }
>
> static int rt6_fill_node(struct net *net,
>@@ -2727,6 +2738,9 @@ static int rt6_fill_node(struct net *net,
> if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0)
> goto nla_put_failure;
>
>+ if (nla_put_u8(skb, RTA_PREF, IPV6_EXTRACT_PREF(rt->rt6i_flags)))
>+ goto nla_put_failure;
>+
> nlmsg_end(skb, nlh);
> return 0;
>
>--
>2.1.0
>
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] net: add SO_MAX_DGRAM_QLEN for AF_UNIX SOCK_DGRAM sockets
From: Eric Dumazet @ 2015-03-03 15:56 UTC (permalink / raw)
To: Christian Seiler
Cc: David Miller, netdev-u79uwXL29TY76Z2rM5mHXA,
dan-+z8lB9qDZjnk1uMJSBkQmQ, edumazet-hpIqsD4AKlfQT0dZR+AlfA,
hannes-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r,
linux-api-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <55ee39bff7875967acb06f25fa695f95-+GPkE3DhqnY@public.gmane.org>
On Tue, 2015-03-03 at 16:05 +0100, Christian Seiler wrote:
> Doesn't this assume a typical datagram size of 256 bytes? Isn't that
> something that should be left up to the user? Also, suddenly the RCVBUF
> size of UNIX domain sockets suddenly becomes relevant, even though it
> is never actually checked when it comes to queuing the messages (only
> the SNDBUF size of the sending socket is checked). This creates really
> inconsistent semantics in my eyes where the receive buffer is useful
> for some things, but not for others.
Simple : If limit is expressed in term of packets, not in term of memory
usage, then the limit is in number of packets, not in bytes.
This is the reason we have pfifo and bfifo qdisc :
Admin can choose what he wants to limit on a device : packets or bytes.
If you want to allow the limitation being done in same SO_RCVBUF spirit,
you need to submit a patch for that.
(Using skb_set_owner_r() and tracking sk->sk_rmem_alloc instead of
skb_queue_len(&sk->sk_receive_queue) )
^ permalink raw reply
* Re: [PATCH] selftests: Add install, generate tar, and run_kselftest tools
From: Shuah Khan @ 2015-03-03 17:07 UTC (permalink / raw)
To: Dave Jones, mpe; +Cc: linux-kernel, linux-api, mmarek
In-Reply-To: <20150303144916.GA24111@codemonkey.org.uk>
On 03/03/2015 07:49 AM, Dave Jones wrote:
> On Mon, Mar 02, 2015 at 09:48:08PM -0700, Shuah Khan wrote:
> > kselftest_install.sh tool adds support for installing selftests
> > at user specified location/kselftest. By default this tool
> > will install selftests in the selftests/kselftest directory.
> > For example, kselftest_install /tmp will install tests under
> > /tmp/kselftest
>
> How is this an improvement over having each test install method isolated
> to its own Makefile ?
Dave/Michael,
Makefile approach requires changes to all the existing test Makefiles.
After looking at the churn to individual Makefiles, I have the following
concerns.
I am concerned about maintenance and potential for mistakes in install
logic in individual Makefiles when new tests get added. I keep seeing
run_tests target breaking when new tests get added and also when
existing tests get modified.
That said, I looked at Michael's patches and Michael's work does address
several of my concerns. Hence, the following plan:
I will take the following patches from Michael after requested
changes are made:
- [PATCH 1/9] selftests: Introduce minimal shared logic for
running tests
This improves current run_tests logic. Will need changes to
account for duplicate cpu and memory hot-plug scripts. Both are
named on-off-test.sh - won't make a difference for this patch,
but will for install logic
Note: I am seeing failures when I run sudo make kselftest after
applying this patch
/bin/sh: 1: ./run_netsocktests: Permission denied
selftests: run_netsocktests [FAIL]
/bin/sh: 1: ./run_afpackettests: Permission denied
selftests: run_afpackettests [FAIL]
/bin/sh: 1: ./run_numerictests: Permission denied
selftests: run_numerictests [FAIL]
/bin/sh: 1: ./run_stringtests: Permission denied
selftests: run_stringtests [FAIL]
/bin/sh: 1: ./run_vmtests: Permission denied
Please make sure make kselftest doesn't regress when run
as root as well as user. In addition, the following don't
regress:
make -C tools/testing/selftests TARGETS=test1 run_tests
make -C tools/testing/selftests TARGETS="test1 test2" run_tests
make -C tools/testing/selftests run_hotplug
Please see Documentation/kselftest.txt - don't want to regress
the current use-cases.
- [PATCH 2/9] selftests: Add install target
Looks like lib.mk logic is addressing some of my concerns about the
individual Makefile install logic.
I would like to see 1. the all script name changed to run_kselftest.sh
- [PATCH 3/9] selftests: Add install support for the powerpc tests
This is good as is.
- [PATCH 5/9] kbuild: Don't pass -rR to selftest makefiles
Drop kselftest_install from this patch. There is no need.
More on this below.
- PATCH 6/9] selftests: Set CC using CROSS_COMPILE once in lib.mk
- [PATCH 7/9] selftests/timers: Use implicit rules
Please check John Stultz's timers test work to make sure there is no
conflict. Please see: [PATCH 01/19] selftests/timers: Cleanup
Makefile to make it easier to add future tests
https://lkml.org/lkml/2015/2/5/56
- [PATCH 8/9] selftests/mqueue: Use implicit rules
This is good as is.
- [PATCH 9/9] selftests/mount: Use implicit rules
This is good as is.
Drop these patches:
- [PATCH 4/9] kbuild: add a new kselftest_install make target to install
selftests
I am not seeing any value in adding install target to the main
Makefile. Invoking test run makes sense as it allows user
to run them from the git without install step which makes sense.
Being able to invoke install from main Makefile really doesn't
add any value. We can isolate install logic under selftests and
also avoid adding one more target to the main Makefile.
I still want a wrapper script for install, so:
- I will change kselftest_install.sh to leverage the above work. It can
just invoke make install at the selftests directory after figuring
base directory logic etc. This will be based on the above patches.
- Keep gen_kselftest_tar.sh as is - no changes need.
- I can drop run_kselftest tool completely, since emit logic in
Michael's work takes care of it.
Comments and questions? I am cc'ing Michal Marek to keep him in
the loop.
Michael! Please let me know if you want to see responses to your
individual patches, in addition to this email.
thanks,
-- Shuah
--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978
^ permalink raw reply
* [PATCH tip/core/rcu 01/20] smpboot: Add common code for notification from dying CPU
From: Paul E. McKenney @ 2015-03-03 17:42 UTC (permalink / raw)
To: linux-kernel
Cc: mingo, laijs, dipankar, akpm, mathieu.desnoyers, josh, tglx,
peterz, rostedt, dhowells, edumazet, dvhart, fweisbec, oleg,
bobby.prani, Paul E. McKenney, linux-api, linux-arch
In-Reply-To: <20150303174144.GA13139@linux.vnet.ibm.com>
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
RCU ignores offlined CPUs, so they cannot safely run RCU read-side code.
(They -can- use SRCU, but not RCU.) This means that any use of RCU
during or after the call to arch_cpu_idle_dead(). Unfortunately,
commit 2ed53c0d6cc99 added a complete() call, which will contain RCU
read-side critical sections if there is a task waiting to be awakened.
Which, as it turns out, there almost never is. In my qemu/KVM testing,
the to-be-awakened task is not yet asleep more than 99.5% of the time.
In current mainline, failure is even harder to reproduce, requiring a
virtualized environment that delays the outgoing CPU by at least three
jiffies between the time it exits its stop_machine() task at CPU_DYING
time and the time it calls arch_cpu_idle_dead() from the idle loop.
However, this problem really can occur, especially in virtualized
environments, and therefore really does need to be fixed
This suggests moving back to the polling loop, but using a much shorter
wait, with gentle exponential backoff instead of the old 100-millisecond
wait. Most of the time, the loop will exit without waiting at all,
and almost all of the remaining uses will wait only five microseconds.
If the outgoing CPU is preempted, a loop will wait one jiffy, then
increase the wait by a factor of 11/10ths, rounding up. As before, there
is a five-second timeout.
This commit therefore provides common-code infrastructure to do the
dying-to-surviving CPU handoff in a safe manner. This code also
provides an indication at CPU-online of whether the CPU to be onlined
previously timed out on offline. The new cpu_check_up_prepare() function
returns -EBUSY if this CPU previously took more than five seconds to
go offline, or -EAGAIN if it has not yet managed to go offline. The
rationale for -EAGAIN is that it might still be preempted, so an additional
wait might well find it correctly offlined. Architecture-specific code
can decide how to handle these conditions. Systems in which CPUs take
themselves completely offline might respond to an -EBUSY return as if
it was a zero (success) return. Systems in which the surviving CPU must
take some action might take it at this time, or might simply mark the
other CPU as unusable.
Note that architectures that take the easy way out and simply pass the
-EBUSY and -EAGAIN upwards will change the sysfs API.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: <linux-api@vger.kernel.org>
Cc: <linux-arch@vger.kernel.org>
---
include/linux/cpu.h | 12 ++++
kernel/smpboot.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 168 insertions(+)
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 4260e8594bd7..4744ef915acd 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -95,6 +95,8 @@ enum {
* Called on the new cpu, just before
* enabling interrupts. Must not sleep,
* must not fail */
+#define CPU_BROKEN 0x000C /* CPU (unsigned)v did not die properly,
+ * perhaps due to preemption. */
/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
* operation in progress
@@ -271,4 +273,14 @@ void arch_cpu_idle_enter(void);
void arch_cpu_idle_exit(void);
void arch_cpu_idle_dead(void);
+DECLARE_PER_CPU(bool, cpu_dead_idle);
+
+int cpu_report_state(int cpu);
+int cpu_check_up_prepare(int cpu);
+void cpu_set_state_online(int cpu);
+#ifdef CONFIG_HOTPLUG_CPU
+bool cpu_wait_death(unsigned int cpu, int seconds);
+bool cpu_report_death(void);
+#endif /* #ifdef CONFIG_HOTPLUG_CPU */
+
#endif /* _LINUX_CPU_H_ */
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 40190f28db35..065499f432ec 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -4,6 +4,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
#include <linux/smp.h>
+#include <linux/delay.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/slab.h>
@@ -314,3 +315,158 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
put_online_cpus();
}
EXPORT_SYMBOL_GPL(smpboot_unregister_percpu_thread);
+
+static DEFINE_PER_CPU(atomic_t, cpu_hotplug_state) = ATOMIC_INIT(CPU_POST_DEAD);
+
+/*
+ * Called to poll specified CPU's state, for example, when waiting for
+ * a CPU to come online.
+ */
+int cpu_report_state(int cpu)
+{
+ return atomic_read(&per_cpu(cpu_hotplug_state, cpu));
+}
+
+/*
+ * If CPU has died properly, set its state to CPU_UP_PREPARE and
+ * return success. Otherwise, return -EBUSY if the CPU died after
+ * cpu_wait_death() timed out. And yet otherwise again, return -EAGAIN
+ * if cpu_wait_death() timed out and the CPU still hasn't gotten around
+ * to dying. In the latter two cases, the CPU might not be set up
+ * properly, but it is up to the arch-specific code to decide.
+ * Finally, -EIO indicates an unanticipated problem.
+ *
+ * Note that it is permissible to omit this call entirely, as is
+ * done in architectures that do no CPU-hotplug error checking.
+ */
+int cpu_check_up_prepare(int cpu)
+{
+ if (!IS_ENABLED(CONFIG_HOTPLUG_CPU)) {
+ atomic_set(&per_cpu(cpu_hotplug_state, cpu), CPU_UP_PREPARE);
+ return 0;
+ }
+
+ switch (atomic_read(&per_cpu(cpu_hotplug_state, cpu))) {
+
+ case CPU_POST_DEAD:
+
+ /* The CPU died properly, so just start it up again. */
+ atomic_set(&per_cpu(cpu_hotplug_state, cpu), CPU_UP_PREPARE);
+ return 0;
+
+ case CPU_TASKS_FROZEN | CPU_DEAD:
+
+ /*
+ * Timeout during CPU death, so let caller know.
+ * The outgoing CPU completed its processing, but after
+ * cpu_wait_death() timed out and reported the error. The
+ * caller is free to proceed, in which case the state
+ * will be reset properly by cpu_set_state_online().
+ * Proceeding despite this -EBUSY return makes sense
+ * for systems where the outgoing CPUs take themselves
+ * offline, with no post-death manipulation required from
+ * a surviving CPU.
+ */
+ return -EBUSY;
+
+ case CPU_BROKEN:
+
+ /*
+ * The most likely reason we got here is that there was
+ * a timeout during CPU death, and the outgoing CPU never
+ * did complete its processing. This could happen on
+ * a virtualized system if the outgoing VCPU gets preempted
+ * for more than five seconds, and the user attempts to
+ * immediately online that same CPU. Trying again later
+ * might return -EBUSY above, hence -EAGAIN.
+ */
+ return -EAGAIN;
+
+ default:
+
+ /* Should not happen. Famous last words. */
+ return -EIO;
+ }
+}
+
+/*
+ * Mark the specified CPU online.
+ *
+ * Note that it is permissible to omit this call entirely, as is
+ * done in architectures that do no CPU-hotplug error checking.
+ */
+void cpu_set_state_online(int cpu)
+{
+ (void)atomic_xchg(&per_cpu(cpu_hotplug_state, cpu), CPU_ONLINE);
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+
+/*
+ * Wait for the specified CPU to exit the idle loop and die.
+ */
+bool cpu_wait_death(unsigned int cpu, int seconds)
+{
+ int jf_left = seconds * HZ;
+ int oldstate;
+ bool ret = true;
+ int sleep_jf = 1;
+
+ might_sleep();
+
+ /* The outgoing CPU will normally get done quite quickly. */
+ if (atomic_read(&per_cpu(cpu_hotplug_state, cpu)) == CPU_DEAD)
+ goto update_state;
+ udelay(5);
+
+ /* But if the outgoing CPU dawdles, wait increasingly long times. */
+ while (atomic_read(&per_cpu(cpu_hotplug_state, cpu)) != CPU_DEAD) {
+ schedule_timeout_uninterruptible(sleep_jf);
+ jf_left -= sleep_jf;
+ if (jf_left <= 0)
+ break;
+ sleep_jf = DIV_ROUND_UP(sleep_jf * 11, 10);
+ }
+update_state:
+ oldstate = atomic_read(&per_cpu(cpu_hotplug_state, cpu));
+ if (oldstate == CPU_DEAD) {
+ /* Outgoing CPU died normally, update state. */
+ smp_mb(); /* atomic_read() before update. */
+ atomic_set(&per_cpu(cpu_hotplug_state, cpu), CPU_POST_DEAD);
+ } else {
+ /* Outgoing CPU still hasn't died, set state accordingly. */
+ if (atomic_cmpxchg(&per_cpu(cpu_hotplug_state, cpu),
+ oldstate, CPU_BROKEN) != oldstate)
+ goto update_state;
+ ret = false;
+ }
+ return ret;
+}
+
+/*
+ * Called by the outgoing CPU to report its successful death. Return
+ * false if this report follows the surviving CPU's timing out.
+ *
+ * A separate "CPU_TASKS_FROZEN | CPU_DEAD" is used when the surviving
+ * CPU timed out. This approach allows architectures to omit calls to
+ * cpu_check_up_prepare() and cpu_set_state_online() without defeating
+ * the next cpu_wait_death()'s polling loop.
+ */
+bool cpu_report_death(void)
+{
+ int oldstate;
+ int newstate;
+ int cpu = smp_processor_id();
+
+ do {
+ oldstate = atomic_read(&per_cpu(cpu_hotplug_state, cpu));
+ if (oldstate == CPU_ONLINE)
+ newstate = CPU_DEAD;
+ else
+ newstate = CPU_TASKS_FROZEN | CPU_DEAD;
+ } while (atomic_cmpxchg(&per_cpu(cpu_hotplug_state, cpu),
+ oldstate, newstate) != oldstate);
+ return newstate == CPU_DEAD;
+}
+
+#endif /* #ifdef CONFIG_HOTPLUG_CPU */
--
1.8.1.5
^ permalink raw reply related
* Re: [PATCH 0/9] N900 Modem Speech Support
From: Pali Rohár @ 2015-03-03 17:46 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Peter Ujfalusi, Kai Vehmanen, Pavel Machek, Aaro Koskinen,
Ivaylo Dimitrov, linux-omap, linux-kernel, linux-api
In-Reply-To: <20150302205148.GA24744@earth>
[-- Attachment #1: Type: Text/Plain, Size: 1204 bytes --]
On Monday 02 March 2015 21:51:48 Sebastian Reichel wrote:
> Hi,
>
> On Mon, Mar 02, 2015 at 08:05:31PM +0100, Pali Rohár wrote:
> > On Monday 02 March 2015 05:38:50 Sebastian Reichel wrote:
> > > This patchset contains the missing speech data support for
> > > the Nokia N900 modem.
> > > [...]
> >
> > Hello, do you have also DT patches? Or no DT changes are
> > needed?
>
> No DT changes are needed. The DT already contains the
> n900-modem endpoint (look for compatible =
> "nokia,n900-modem"), which is handled by
> drivers/hsi/clients/nokia-modem.c.
>
> The nokia-modem driver currently takes care of gpios, irqs,
> pinctrl and loads ssi-protocol. After this patchset it also
> loads cmt-speech.
>
> > Is this cmt_speech version one from linux-n900 git tree? or
> > it is new or modified?
>
> The first 3 patches are from linux-n900 git tree, the other
> patches are cleanups and fixups for mainline. Some of those
> are partly available in the linux-n900 git tree.
>
> -- Sebastian
Maybe in this case you can add my Tested-By as I tested code from
linux-n900 git tree more times also with (modified) Maemo system.
--
Pali Rohár
pali.rohar@gmail.com
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH v2 16/18] ARM: dts: Introduce STM32F429 MCU
From: Maxime Coquelin @ 2015-03-03 17:59 UTC (permalink / raw)
To: Andreas Färber
Cc: Uwe Kleine-König, Geert Uytterhoeven, Rob Herring,
Philipp Zabel, Jonathan Corbet, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Russell King, Daniel Lezcano,
Thomas Gleixner, Linus Walleij, Greg Kroah-Hartman, Jiri Slaby,
Arnd Bergmann, Andrew Morton, David S. Miller,
Mauro Carvalho Chehab, Joe Perches, Antti Palosaari, Tejun Heo
In-Reply-To: <54F4A0F7.80606-l3A5Bk7waGM@public.gmane.org>
Hi Andreas,
Thanks for this detailed review.
2015-03-02 18:42 GMT+01:00 Andreas Färber <afaerber-l3A5Bk7waGM@public.gmane.org>:
> Hi Maxime,
>
> Please don't put the whole world in To, that makes replying to you much
> harder. You can put maintainers in CC instead.
Ok.
>
> Am 20.02.2015 um 19:01 schrieb Maxime Coquelin:
>> The STMicrolectornics's STM32F419 MCU has the following main features:
>> - Cortex-M4 core running up to @180MHz
>> - 2MB internal flash, 256KBytes internal RAM
>> - FMC controller to connect SDRAM, NOR and NAND memories
>> - SD/MMC/SDIO support
>> - Ethernet controller
>> - USB OTFG FS & HS controllers
>> - I2C, SPI, CAN busses support
>> - Several 16 & 32 bits general purpose timers
>> - Serial Audio interface
>> - LCD controller
>>
>> Signed-off-by: Maxime Coquelin <mcoquelin.stm32-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>> arch/arm/boot/dts/Makefile | 1 +
>> arch/arm/boot/dts/stm32f429-disco.dts | 41 ++++
>> arch/arm/boot/dts/stm32f429.dtsi | 396 ++++++++++++++++++++++++++++++++++
>> 3 files changed, 438 insertions(+)
>> create mode 100644 arch/arm/boot/dts/stm32f429-disco.dts
>> create mode 100644 arch/arm/boot/dts/stm32f429.dtsi
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 91bd5bd..d7da0ef 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -442,6 +442,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
>> stih416-b2000.dtb \
>> stih416-b2020.dtb \
>> stih416-b2020e.dtb
>> +dtb-$(CONFIG_ARCH_STM32)+= stm32f429-disco.dtb
>> dtb-$(CONFIG_MACH_SUN4I) += \
>> sun4i-a10-a1000.dtb \
>> sun4i-a10-ba10-tvbox.dtb \
>> diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts
>> new file mode 100644
>> index 0000000..0e79cc1
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/stm32f429-disco.dts
>> @@ -0,0 +1,41 @@
>
> Add a suitable license header here? There had been attempts to
> dual-license as GPL and MIT/X11.
I agree to add the dual GPL and MIT/X11 licence.
>
>> +/dts-v1/;
>> +#include "stm32f429.dtsi"
>> +
>> +/ {
>> + model = "STMicroelectronics's STM32F429i-DISCO board";
>
> "'s" seems uncommon here and "s's" looks wrong. Just use
> "STMicroelectronics STM32F429I-DISCO board"?
Ok, it will be fixed in v3.
>
>> + compatible = "st,stm32f429i-disco", "st,stm32f429";
>> +
>> + chosen {
>> + bootargs = "console=ttyS0,115200 root=/dev/ram rdinit=/linuxrc";
>> + linux,stdout-path = &usart1;
>
> I have actually been using USART3, following a guide I found on GitHub.
> Which pins do you use for USART1, and is one better than the other?
I used U-boot from Emcraft, which uses USART1, that is the only reason
I used this one.
Regarding USART3, I had a look at your boot-wrapper, and you configure
the USART3 to PC10/PC11 pins.
From the schematics, I see the PC10 pin is connected to the LCD.
>
>> + };
>> +
>> + memory {
>> + reg = <0xd0000000 0x800000>;
>
> I have it at 0x90000000!
Ok. But you use a specific setting:
https://github.com/afaerber/afboot-stm32/blob/master/foo.c#L338
By default this is the PC Card bank (Bank 4) at 0x90000000.
Maybe you could change your boot-wrapper to use also the default setting?
>
>> + };
>> +
>> + aliases {
>> + ttyS0 = &usart1;
>
> Why ttyS0 here? Shouldn't that be serial0 by convention?
I was not aware of this. Do you know whether it is documented somewhere?
Anyway, I will change to serial0 in next version.
>
>> + };
>> +
>> + soc {
>> + usart1: usart@40011000 {
>> + status = "okay";
>> + };
>
> This is a new target, so please use the new-style &usart1 {...};
> reference rather than replicating the hierarchy.
Ok.
>
>> +
>> + leds {
>
> These LEDs are definitely not on the SoC, they're on the board. Please
> move one level up.
Ok.
>
>> + compatible = "gpio-leds";
>
> In this file you're being parsimonious with newline, yet in the .dtsi
> you unnecessarily add newlines before the trailing status property.
>
>> + red {
>> + #gpio-cells = <2>;
>
> This looks weird. Drop it?
Yes.
>
>> + label = "Front Panel LED";
>
> "Front Panel"? Both LEDs are on the front, and several other
> architectures avoid spaces in the label for accessing it from /sys.
That's an unfortunate copy/paste. For sure it has no meaning here.
>
>> + gpios = <&gpiog 14 0>;
>
> GPIO_ACTIVE_HIGH
Ok.
>
>> + linux,default-trigger = "heartbeat";
>
> Suggest to leave both off by default.
Ok.
>
>> + };
>> + green {
>> + #gpio-cells = <2>;
>
> Ditto.
>
>> + gpios = <&gpiog 13 0>;
>
> Ditto.
>
>> + default-state = "off";
>> + };
>> + };
>> + };
>> +};
>> diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
>> new file mode 100644
>> index 0000000..5b3442a
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/stm32f429.dtsi
>> @@ -0,0 +1,396 @@
>> +/*
>> + * Device tree for STM32F429
>
> License?
Yes. I will do the same as for the board file.
>
>> + */
>> +#include "armv7-m.dtsi"
>> +#include <dt-bindings/pinctrl/pinctrl-stm32.h>
>> +#include <dt-bindings/reset/st,stm32f429.h>
>> +
>> +/ {
>> +
>> + aliases {
>> + gpio0 = &gpioa;
>> + gpio1 = &gpiob;
>> + gpio2 = &gpioc;
>> + gpio3 = &gpiod;
>> + gpio4 = &gpioe;
>> + gpio5 = &gpiof;
>> + gpio6 = &gpiog;
>> + gpio7 = &gpioh;
>> + gpio8 = &gpioi;
>> + gpio9 = &gpioj;
>> + gpio10 = &gpiok;
>> + };
>> +
>> + clocks {
>> + clk_sysclk: clk-sysclk {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <180000000>;
>> + };
>> +
>> + clk_hclk: clk-hclk {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <180000000>;
>> + };
>> +
>> + clk_pclk1: clk-pclk1 {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <45000000>;
>> + };
>> +
>> + clk_pclk2: clk-pclk2 {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <90000000>;
>> + };
>> +
>> + clk_pmtr1: clk-pmtr1 {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <90000000>;
>> + };
>> +
>> + clk_pmtr2: clk-pmtr2 {
>> + #clock-cells = <0>;
>> + compatible = "fixed-clock";
>> + clock-frequency = <180000000>;
>> + };
>> +
>> + clk_systick: clk-systick {
>> + compatible = "fixed-factor-clock";
>> + clocks = <&clk_hclk>;
>> + #clock-cells = <0>;
>> + clock-div = <8>;
>> + clock-mult = <1>;
>> + };
>
> Most of these should be replaceable with my clk driver.
>
I agree, but adding more drivers is likely to delay the STM32 machine
to be merged.
Once this first round accepted, it will be easier for others to contribute.
It will help to have sooner a good support of the machine.
Does that look reasonable for you?
>> + };
>> +
>> + systick: timer@e000e010 {
>> + clocks = <&clk_systick>;
>> +
>> + status = "okay";
>> + };
>
> &systick {...};
Ok.
>
>> +
>> + soc {
>> + reset: reset@40023810 {
>> + #reset-cells = <1>;
>> + compatible = "st,stm32-reset";
>> + reg = <0x40023810 0x18>;
>> + };
>
> Still, this feels wrong, given that it's an RCC IP block...
Ok, this was already pointed out by Philipp.
I will rework the driver so that the node covers the full RCC IP.
>
>> +
>> + pin-controller {
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + compatible = "st,stm32-pinctrl";
>> + ranges = <0 0x40020000 0x3000>;
>> +
>> + gpioa: gpio@40020000 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x0 0x400>;
>> + resets = <&reset GPIOA_RESET>;
>> + st,bank-name = "GPIOA";
>> + };
>> +
>> + gpiob: gpio@40020400 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x400 0x400>;
>> + resets = <&reset GPIOB_RESET>;
>> + st,bank-name = "GPIOB";
>> + };
>> +
>> + gpioc: gpio@40020800 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x800 0x400>;
>> + resets = <&reset GPIOC_RESET>;
>> + st,bank-name = "GPIOC";
>> + };
>> +
>> + gpiod: gpio@40020c00 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0xc00 0x400>;
>> + resets = <&reset GPIOD_RESET>;
>> + st,bank-name = "GPIOD";
>> + };
>> +
>> + gpioe: gpio@40021000 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x1000 0x400>;
>> + resets = <&reset GPIOE_RESET>;
>> + st,bank-name = "GPIOE";
>> + };
>> +
>> + gpiof: gpio@40021400 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x1400 0x400>;
>> + resets = <&reset GPIOF_RESET>;
>> + st,bank-name = "GPIOF";
>> + };
>> +
>> + gpiog: gpio@40021800 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x1800 0x400>;
>> + resets = <&reset GPIOG_RESET>;
>> + st,bank-name = "GPIOG";
>> + };
>> +
>> + gpioh: gpio@40021c00 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x1c00 0x400>;
>> + resets = <&reset GPIOH_RESET>;
>> + st,bank-name = "GPIOH";
>> + };
>> +
>> + gpioi: gpio@40022000 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x2000 0x400>;
>> + resets = <&reset GPIOI_RESET>;
>> + st,bank-name = "GPIOI";
>> + };
>> +
>> + gpioj: gpio@40022400 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x2400 0x400>;
>> + resets = <&reset GPIOJ_RESET>;
>> + st,bank-name = "GPIOJ";
>> + };
>> +
>> + gpiok: gpio@40022800 {
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + reg = <0x2800 0x400>;
>> + resets = <&reset GPIOK_RESET>;
>> + st,bank-name = "GPIOK";
>> + };
>> +
>> + usart1 {
>> + pinctrl_usart1: usart1-0 {
>> + st,pins {
>> + tx = <&gpioa 9 ALT7 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioa 10 ALT7 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart2 {
>> + pinctrl_usart2: usart2-0 {
>> + st,pins {
>> + tx = <&gpioa 2 ALT7 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioa 3 ALT7 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart3 {
>> + pinctrl_usart3: usart3-0 {
>> + st,pins {
>> + tx = <&gpiob 10 ALT7 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpiob 11 ALT7 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart4 {
>> + pinctrl_usart4: usart4-0 {
>> + st,pins {
>> + tx = <&gpioa 0 ALT8 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioa 1 ALT8 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart5 {
>> + pinctrl_usart5: usart5-0 {
>> + st,pins {
>> + tx = <&gpioc 12 ALT8 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpiod 2 ALT8 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart6 {
>> + pinctrl_usart6: usart6-0 {
>> + st,pins {
>> + tx = <&gpioc 6 ALT8 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioc 7 ALT8 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart7 {
>> + pinctrl_usart7: usart7-0 {
>> + st,pins {
>> + tx = <&gpioe 8 ALT8 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioe 7 ALT8 NO_PULL>;
>> + };
>> + };
>> + };
>> +
>> + usart8 {
>> + pinctrl_usart8: usart8-0 {
>> + st,pins {
>> + tx = <&gpioe 1 ALT8 NO_PULL PUSH_PULL LOW_SPEED>;
>> + rx = <&gpioe 0 ALT8 NO_PULL>;
>> + };
>> + };
>> + };
>
> Can't the outer level be avoided here to save space and indentation?
Yes. I will rework this too.
>
>> + };
>> +
>> + timer2: timer@40000000 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40000000 0x400>;
>> + interrupts = <28>;
>> + resets = <&reset TIM2_RESET>;
>> + clocks = <&clk_pmtr1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + timer3: timer@40000400 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40000400 0x400>;
>> + interrupts = <29>;
>> + resets = <&reset TIM3_RESET>;
>> + clocks = <&clk_pmtr1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + timer4: timer@40000800 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40000800 0x400>;
>> + interrupts = <30>;
>> + resets = <&reset TIM4_RESET>;
>> + clocks = <&clk_pmtr1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + timer5: timer@40000c00 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40000c00 0x400>;
>> + interrupts = <50>;
>> + resets = <&reset TIM5_RESET>;
>> + clocks = <&clk_pmtr1>;
>> + };
>> +
>> + timer6: timer@40001000 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40001000 0x400>;
>> + interrupts = <54>;
>> + resets = <&reset TIM6_RESET>;
>> + clocks = <&clk_pmtr1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + timer7: timer@40001400 {
>> + compatible = "st,stm32-timer";
>> + reg = <0x40001400 0x400>;
>> + interrupts = <55>;
>> + resets = <&reset TIM7_RESET>;
>> + clocks = <&clk_pmtr1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart1: usart@40011000 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40011000 0x400>;
>> + interrupts = <37>;
>> + clocks = <&clk_pclk2>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart2: usart@40004400 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40004400 0x400>;
>> + interrupts = <38>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>
> Copy&paste, also below. Is this really .dtsi material?
Sorry, I am not sure to understand what you mean.
Could you elaborate please?
>
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart3: usart@40004800 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40004800 0x400>;
>> + interrupts = <39>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart4: usart@40004c00 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40004c00 0x400>;
>> + interrupts = <52>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart5: usart@40005000 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40005000 0x400>;
>> + interrupts = <53>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart6: usart@40011400 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40011400 0x400>;
>> + interrupts = <71>;
>> + clocks = <&clk_pclk2>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart7: usart@40007800 {
>
> Please order all nodes by unit address, not by label.
Ok.
>
>> + compatible = "st,stm32-usart";
>> + reg = <0x40007800 0x400>;
>> + interrupts = <82>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>> +
>> + usart8: usart@40007c00 {
>> + compatible = "st,stm32-usart";
>> + reg = <0x40007c00 0x400>;
>> + interrupts = <83>;
>> + clocks = <&clk_pclk1>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usart1>;
>> +
>> + status = "disabled";
>> + };
>
> I remember two of them not being USART but UART? Similarly, two of them
> support flow control (or two don't?), for which we would either need a
> property or two different compatible strings.
I have to check what would best fit to handle these differences.
I will come back to you later on this point.
Thanks!
Maxime
>
>> + };
>> +};
>
> Regards,
> Andreas
>
> --
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
> Graham Norton; HRB 21284 (AG Nürnberg)
>
^ permalink raw reply
* Re: [PATCH] net: add SO_MAX_DGRAM_QLEN for AF_UNIX SOCK_DGRAM sockets
From: David Miller @ 2015-03-03 18:59 UTC (permalink / raw)
To: christian; +Cc: netdev, dan, edumazet, hannes, linux-api
In-Reply-To: <0b5908020d83bcbaa7f4938e5cb433ea@iwakd.de>
From: Christian Seiler <christian@iwakd.de>
Date: Tue, 03 Mar 2015 10:04:10 +0100
> - More importantly, timestamps of messages can't be faked at all. So
> in the example of a socket used for syslog purposes, all the
> timestamps on the messages queued would be wrong.
You can timestamp in the application and put that into your protocol
for sending the syslog messages.
^ permalink raw reply
* Re: [PATCH v2 04/18] clocksource: Add ARM System timer driver
From: Paul Bolle @ 2015-03-03 19:43 UTC (permalink / raw)
To: Maxime Coquelin
Cc: Uwe Kleine-König, Andreas Färber, Geert Uytterhoeven,
Rob Herring, Philipp Zabel, Jonathan Corbet, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
Daniel Lezcano, Thomas Gleixner, Linus Walleij,
Greg Kroah-Hartman, Jiri Slaby, Arnd Bergmann, Andrew Morton,
David S. Miller, Mauro Carvalho Chehab, Joe Perches
In-Reply-To: <CALszF6Bm_Y4ZLednjpmP-hMix3gA23FwLm5hViEjr1QojUY+Mg@mail.gmail.com>
Maxime Coquelin schreef op ma 02-03-2015 om 17:53 [+0100]:
> Do you agree if I define it like this:
>
> config ARMV7M_SYSTICK
> bool "Clocksource driver for ARMv7-M System timer"
> depends on OF && (CPU_V7M || COMPILE_TEST)
> select CLKSRC_OF
> select CLKSRC_MMIO
> help
> This options enables clocksource support for the ARMv7-M system
> timer unit.
I don't really have strong feelings on whatever way you choose to fix
the, well, minor problem I pointed out.
Having said that, if a Kconfig entry without a prompt (and therefor,
without help) actually does what you want it to do, why bother adding a
prompt and a one line help text?
Paul Bolle
^ permalink raw reply
* Re: [PATCH RFC 1/3] Drivers: hv: kvp: convert userspace/kernel communication to using char device
From: Radim Krčmář @ 2015-03-03 19:47 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: K. Y. Srinivasan, devel-tBiZLqfeLfOHmIFyCCdPziST3g8Odh+X,
Haiyang Zhang, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Dexuan Cui,
Greg Kroah-Hartman, linux-api-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <87pp8qif00.fsf-hpI3/L/TUU23oHxwIazZmlaTQe2KTcn/@public.gmane.org>
2015-03-03 10:53+0100, Vitaly Kuznetsov:
> Radim Krčmář <rkrcmar-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> writes:
> > 2015-02-27 17:14+0100, Vitaly Kuznetsov:
> >> Re-implement the communication using misc char device. Use ioctl to do
> >> kernel/userspace version negotiation (doesn't make much sense at this moment
> >> as we're breaking backwards compatibility but can be used in future).
> >
> > The ioctl is used too creatively for my liking: as an out-of-band
> > communication that is required after the main channel has been opened.
> > It would be simpler to inject the version into first x bytes of the
> > stream, making a read() after open() mandatory.
>
> We need to perform a handshake - kernel part sends its version and
> receives daemon's version.
(We could also design a backward-compatible protocol, which should be
possible for an application this simple, but keeping options is wise.)
> We can definitelly pack everything in the
> data stream but why do we need to avoid ioctls?
I think it is better if the kernel sends its version (set of features)
first, so it would be just a simple two-way handshake.
Kernel-initiated communication is not possible over ioctl and it doesn't
give extra options for handshake either.
> It seems to me the
> handshake we're performing here belongs to a 'control' stream, not
> 'data' stream.
Handshake makes sense after we open the device and before any 'data' can
appear on it, so multiplexing the same carrier also prevents a lot of
stupid cases, like ioctls from different applications.
Not to mention that asynchronicity itself has a fairly bad record.
(I don't really understand the difference between 'control' and 'data'.)
^ permalink raw reply
* Re: [PATCH v13 0/2] crypto: AF_ALG: add AEAD support
From: Herbert Xu @ 2015-03-04 9:16 UTC (permalink / raw)
To: Stephan Mueller
Cc: 'Quentin Gouchet', Daniel Borkmann, linux-api,
linux-crypto, linux-kernel
In-Reply-To: <2180298.gqj58NYuqx@tachyon.chronox.de>
On Sat, Feb 28, 2015 at 08:49:22PM +0100, Stephan Mueller wrote:
> Hi,
>
> This patch set adds AEAD support to the AF_ALG interface
> exported by the kernel crypto API.
>
> The AEAD implementation uses the same approach as provided with
> skcipher by offering the following interfaces:
>
> * sendmsg and recvmsg interfaces allowing multiple
> invocations supporting a threaded user space. To support
> multi-threaded user space, kernel-side buffering
> is implemented similarly to skcipher.
>
> * splice / vmsplice interfaces allowing a zero-copy
> invocation
>
> The new AEAD interface is fully tested with the test application
> provided at [1]. That test application exercises all newly added user space
> interfaces. The testing covers:
>
> * use of the sendmsg/recvmsg interface
>
> * use of the splice / vmsplice interface
>
> * invocation of all AF_ALG types (aead, rng, skcipher, hash)
>
> * using all types of operation (encryption, decryption, keyed MD,
> MD, random numbers, AEAD decryption with positive and negative
> authentication verification)
>
> * stress testing by running all tests for 30 minutes in an
> endless loop
>
> * test execution on 64 bit and 32 bit
All applied. Thanks a lot for your hard work!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [PATCH v13 0/2] crypto: AF_ALG: add AEAD support
From: Stephan Mueller @ 2015-03-04 9:25 UTC (permalink / raw)
To: Herbert Xu
Cc: 'Quentin Gouchet', Daniel Borkmann, linux-api,
linux-crypto, linux-kernel
In-Reply-To: <20150304091632.GB9195@gondor.apana.org.au>
Am Mittwoch, 4. März 2015, 22:16:32 schrieb Herbert Xu:
Hi Herbert,
>On Sat, Feb 28, 2015 at 08:49:22PM +0100, Stephan Mueller wrote:
>> Hi,
>>
>> This patch set adds AEAD support to the AF_ALG interface
>> exported by the kernel crypto API.
>>
>
>All applied. Thanks a lot for your hard work!
And thank you a lot for your patience with me! I am glad that it
received such hard assessment as it is a user space interface.
Ciao
Stephan
^ permalink raw reply
* [PATCH] kbuild: Don't pass -rR to selftest makefiles
From: Michael Ellerman @ 2015-03-04 10:19 UTC (permalink / raw)
To: shuahkh; +Cc: linux-kernel, davej, mmarek, linux-api
The makefiles under tools/testing/selftests are not real kbuild
makefiles, they are regular stand alone makefiles. As such they *do*
want all the standard implicit rules and variables defined.
So before calling those makefiles, filter -rR out of MAKEFLAGS.
Without this not all the selftests are built correctly when called via
the top-level Makefile.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e6a9b1b94656..da72798644fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1085,7 +1085,7 @@ headers_check: headers_install
PHONY += kselftest
kselftest:
- $(Q)$(MAKE) -C tools/testing/selftests run_tests
+ $(Q)$(MAKE) -C tools/testing/selftests MAKEFLAGS="$(filter-out rR,$(MAKEFLAGS))" run_tests
# ---------------------------------------------------------------------------
# Modules
--
2.1.0
^ permalink raw reply related
* Re: [PATCH] selftests: Add install, generate tar, and run_kselftest tools
From: Michael Ellerman @ 2015-03-04 10:19 UTC (permalink / raw)
To: Shuah Khan; +Cc: Dave Jones, linux-kernel, linux-api, mmarek
In-Reply-To: <54F5EA38.4010306@osg.samsung.com>
On Tue, 2015-03-03 at 10:07 -0700, Shuah Khan wrote:
> On 03/03/2015 07:49 AM, Dave Jones wrote:
> > On Mon, Mar 02, 2015 at 09:48:08PM -0700, Shuah Khan wrote:
> > > kselftest_install.sh tool adds support for installing selftests
> > > at user specified location/kselftest. By default this tool
> > > will install selftests in the selftests/kselftest directory.
> > > For example, kselftest_install /tmp will install tests under
> > > /tmp/kselftest
> >
> > How is this an improvement over having each test install method isolated
> > to its own Makefile ?
>
> Dave/Michael,
>
> Makefile approach requires changes to all the existing test Makefiles.
> After looking at the churn to individual Makefiles, I have the following
> concerns.
>
> I am concerned about maintenance and potential for mistakes in install
> logic in individual Makefiles when new tests get added. I keep seeing
> run_tests target breaking when new tests get added and also when
> existing tests get modified.
With most of the logic isolated in lib.mk I don't think this is a concern.
As an example here is the minimal Makefile required for a simple new test:
$ cat tools/testing/selftests/hello-world/Makefile
TEST_PROGS := hello-world
all: $(TEST_PROGS)
include ../lib.mk
clean:
rm -f $(TEST_PROGS)
That will build, work with run_tests and work with install.
In fact we can merge a template directory like the above with an example
Makefile to make it super easy for people to add new tests with the right
logic.
> That said, I looked at Michael's patches and Michael's work does address
> several of my concerns. Hence, the following plan:
>
> I will take the following patches from Michael after requested
> changes are made:
>
> - [PATCH 1/9] selftests: Introduce minimal shared logic for
> running tests
> This improves current run_tests logic. Will need changes to
> account for duplicate cpu and memory hot-plug scripts. Both are
> named on-off-test.sh - won't make a difference for this patch,
> but will for install logic
The duplicate names don't matter because I put the installed tests in a sub
directory:
$ cd tools/testing/selftests
$ find install/ -name on-off-test.sh
install/memory-hotplug/on-off-test.sh
install/cpu-hotplug/on-off-test.sh
> Note: I am seeing failures when I run sudo make kselftest after
> applying this patch
>
> /bin/sh: 1: ./run_netsocktests: Permission denied
> selftests: run_netsocktests [FAIL]
> /bin/sh: 1: ./run_afpackettests: Permission denied
> selftests: run_afpackettests [FAIL]
>
> /bin/sh: 1: ./run_numerictests: Permission denied
> selftests: run_numerictests [FAIL]
> /bin/sh: 1: ./run_stringtests: Permission denied
> selftests: run_stringtests [FAIL]
>
> /bin/sh: 1: ./run_vmtests: Permission denied
Ah sorry, I lost the change to the permission bits somewhere along the line.
Thanks for testing. Fixed in v3.
> Please make sure make kselftest doesn't regress when run
> as root as well as user. In addition, the following don't
> regress:
>
> make -C tools/testing/selftests TARGETS=test1 run_tests
> make -C tools/testing/selftests TARGETS="test1 test2" run_tests
> make -C tools/testing/selftests run_hotplug
>
> Please see Documentation/kselftest.txt - don't want to regress
> the current use-cases.
None of those have regressed as far as I can see.
> - [PATCH 2/9] selftests: Add install target
> Looks like lib.mk logic is addressing some of my concerns about the
> individual Makefile install logic.
> I would like to see 1. the all script name changed to run_kselftest.sh
I don't see why it needs "kselftest" in the name, it's *inside* the install
directory, but I'll rename it because I don't care that much.
> - [PATCH 5/9] kbuild: Don't pass -rR to selftest makefiles
> Drop kselftest_install from this patch. There is no need.
> More on this below.
OK. That makes this patch orthogonal to the rest, and it's actually a bug fix,
so I'll send it separately and ideally you can merge it for 4.0.
> - [PATCH 7/9] selftests/timers: Use implicit rules
> Please check John Stultz's timers test work to make sure there is no
> conflict. Please see: [PATCH 01/19] selftests/timers: Cleanup
> Makefile to make it easier to add future tests
> https://lkml.org/lkml/2015/2/5/56
There will definitely be a conflict. As the maintainer you should either fixup
the conflict, or if you can't, merge one series and then ask the author of the
other series to base their work on top of the other.
In this case the two patches are very similar, so it probably doesn't matter
which you merge first. You'll just have to incorporate the CFLAGS changes from
John's patch into the final result.
> Drop these patches:
> - [PATCH 4/9] kbuild: add a new kselftest_install make target to install selftests
> I am not seeing any value in adding install target to the main
> Makefile.
Fine by me.
> I still want a wrapper script for install, so:
>
> - I will change kselftest_install.sh to leverage the above work. It can
> just invoke make install at the selftests directory after figuring
> base directory logic etc. This will be based on the above patches.
>
> - Keep gen_kselftest_tar.sh as is - no changes need.
>
> - I can drop run_kselftest tool completely, since emit logic in
> Michael's work takes care of it.
>
> Comments and questions? I am cc'ing Michal Marek to keep him in
> the loop.
>
> Michael! Please let me know if you want to see responses to your
> individual patches, in addition to this email.
No that's fine.
I'll repost the series shortly.
cheers
^ permalink raw reply
* [PATCH v3 1/7] selftests: Introduce minimal shared logic for running tests
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh-JPH+aEBZ4P+UEJcrhfAQsw
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
davej-rdkfGonbjUTCLXcRTR1eJlpr/1R2p/CL, mmarek-AlSwsSmVLrQ,
linux-api-u79uwXL29TY76Z2rM5mHXA
This adds a Make include file which most selftests can then include to
get the run_tests logic.
On its own this has the advantage of some reduction in repetition, and
also means the pass/fail message is defined in fewer places.
However the key advantage is it will allow us to implement install very
simply in a subsequent patch.
The default implementation just executes each program in $(TEST_PROGS).
We use a variable to hold the default implementation of $(RUN_TESTS)
because that gives us a clean way to override it if necessary, ie. using
override. The mount, memory-hotplug and mqueue tests use that to provide
a different implementation.
Tests are not run via /bin/bash, so if they are scripts they must be
executable, we add a+x to several.
Signed-off-by: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
---
v3: Rebase onto 4.0-rc2, add +x to more scripts that need it.
tools/testing/selftests/breakpoints/Makefile | 5 +++--
tools/testing/selftests/cpu-hotplug/Makefile | 5 +++--
tools/testing/selftests/cpu-hotplug/on-off-test.sh | 0
tools/testing/selftests/efivarfs/Makefile | 5 +++--
tools/testing/selftests/efivarfs/efivarfs.sh | 0
tools/testing/selftests/exec/Makefile | 5 +++--
tools/testing/selftests/firmware/Makefile | 20 ++------------------
tools/testing/selftests/firmware/fw_filesystem.sh | 0
tools/testing/selftests/firmware/fw_userhelper.sh | 0
tools/testing/selftests/ftrace/Makefile | 5 +++--
tools/testing/selftests/ipc/Makefile | 5 +++--
tools/testing/selftests/kcmp/Makefile | 5 +++--
tools/testing/selftests/lib.mk | 10 ++++++++++
tools/testing/selftests/memfd/Makefile | 6 +++---
tools/testing/selftests/memory-hotplug/Makefile | 5 +++--
.../testing/selftests/memory-hotplug/on-off-test.sh | 0
tools/testing/selftests/mount/Makefile | 8 ++------
tools/testing/selftests/mqueue/Makefile | 9 ++++++---
tools/testing/selftests/net/Makefile | 8 ++++----
tools/testing/selftests/net/run_afpackettests | 0
tools/testing/selftests/net/run_netsocktests | 0
tools/testing/selftests/ptrace/Makefile | 5 +++--
tools/testing/selftests/size/Makefile | 5 +++--
tools/testing/selftests/sysctl/Makefile | 11 ++---------
tools/testing/selftests/sysctl/run_numerictests | 0
tools/testing/selftests/sysctl/run_stringtests | 0
tools/testing/selftests/timers/Makefile | 5 +++--
tools/testing/selftests/user/Makefile | 5 +++--
tools/testing/selftests/vm/Makefile | 5 +++--
tools/testing/selftests/vm/run_vmtests | 0
30 files changed, 68 insertions(+), 69 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/cpu-hotplug/on-off-test.sh
mode change 100644 => 100755 tools/testing/selftests/efivarfs/efivarfs.sh
mode change 100644 => 100755 tools/testing/selftests/firmware/fw_filesystem.sh
mode change 100644 => 100755 tools/testing/selftests/firmware/fw_userhelper.sh
create mode 100644 tools/testing/selftests/lib.mk
mode change 100644 => 100755 tools/testing/selftests/memory-hotplug/on-off-test.sh
mode change 100644 => 100755 tools/testing/selftests/net/run_afpackettests
mode change 100644 => 100755 tools/testing/selftests/net/run_netsocktests
mode change 100644 => 100755 tools/testing/selftests/sysctl/run_numerictests
mode change 100644 => 100755 tools/testing/selftests/sysctl/run_stringtests
mode change 100644 => 100755 tools/testing/selftests/vm/run_vmtests
diff --git a/tools/testing/selftests/breakpoints/Makefile b/tools/testing/selftests/breakpoints/Makefile
index e18b42b254af..182235640209 100644
--- a/tools/testing/selftests/breakpoints/Makefile
+++ b/tools/testing/selftests/breakpoints/Makefile
@@ -16,8 +16,9 @@ else
echo "Not an x86 target, can't build breakpoints selftests"
endif
-run_tests:
- @./breakpoint_test || echo "breakpoints selftests: [FAIL]"
+TEST_PROGS := breakpoint_test
+
+include ../lib.mk
clean:
rm -fr breakpoint_test
diff --git a/tools/testing/selftests/cpu-hotplug/Makefile b/tools/testing/selftests/cpu-hotplug/Makefile
index e9c28d8dc84b..15f02591d22c 100644
--- a/tools/testing/selftests/cpu-hotplug/Makefile
+++ b/tools/testing/selftests/cpu-hotplug/Makefile
@@ -1,7 +1,8 @@
all:
-run_tests:
- @/bin/bash ./on-off-test.sh || echo "cpu-hotplug selftests: [FAIL]"
+TEST_PROGS := on-off-test.sh
+
+include ../lib.mk
run_full_test:
@/bin/bash ./on-off-test.sh -a || echo "cpu-hotplug selftests: [FAIL]"
diff --git a/tools/testing/selftests/cpu-hotplug/on-off-test.sh b/tools/testing/selftests/cpu-hotplug/on-off-test.sh
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/efivarfs/Makefile b/tools/testing/selftests/efivarfs/Makefile
index 29e8c6bc81b0..3052d0bda24b 100644
--- a/tools/testing/selftests/efivarfs/Makefile
+++ b/tools/testing/selftests/efivarfs/Makefile
@@ -5,8 +5,9 @@ test_objs = open-unlink create-read
all: $(test_objs)
-run_tests: all
- @/bin/bash ./efivarfs.sh || echo "efivarfs selftests: [FAIL]"
+TEST_PROGS := efivarfs.sh
+
+include ../lib.mk
clean:
rm -f $(test_objs)
diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile
index 66dfc2ce1788..a0098daeb73d 100644
--- a/tools/testing/selftests/exec/Makefile
+++ b/tools/testing/selftests/exec/Makefile
@@ -18,8 +18,9 @@ execveat.denatured: execveat
%: %.c
$(CC) $(CFLAGS) -o $@ $^
-run_tests: all
- ./execveat
+TEST_PROGS := execveat
+
+include ../lib.mk
clean:
rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx*
diff --git a/tools/testing/selftests/firmware/Makefile b/tools/testing/selftests/firmware/Makefile
index e23cce0bbc3a..9bf82234855b 100644
--- a/tools/testing/selftests/firmware/Makefile
+++ b/tools/testing/selftests/firmware/Makefile
@@ -3,25 +3,9 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:
-fw_filesystem:
- @if /bin/sh ./fw_filesystem.sh ; then \
- echo "fw_filesystem: ok"; \
- else \
- echo "fw_filesystem: [FAIL]"; \
- exit 1; \
- fi
+TEST_PROGS := fw_filesystem.sh fw_userhelper.sh
-fw_userhelper:
- @if /bin/sh ./fw_userhelper.sh ; then \
- echo "fw_userhelper: ok"; \
- else \
- echo "fw_userhelper: [FAIL]"; \
- exit 1; \
- fi
-
-run_tests: all fw_filesystem fw_userhelper
+include ../lib.mk
# Nothing to clean up.
clean:
-
-.PHONY: all clean run_tests fw_filesystem fw_userhelper
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/firmware/fw_userhelper.sh b/tools/testing/selftests/firmware/fw_userhelper.sh
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/ftrace/Makefile b/tools/testing/selftests/ftrace/Makefile
index 76cc9f156267..346720639d1d 100644
--- a/tools/testing/selftests/ftrace/Makefile
+++ b/tools/testing/selftests/ftrace/Makefile
@@ -1,7 +1,8 @@
all:
-run_tests:
- @/bin/sh ./ftracetest || echo "ftrace selftests: [FAIL]"
+TEST_PROGS := ftracetest
+
+include ../lib.mk
clean:
rm -rf logs/*
diff --git a/tools/testing/selftests/ipc/Makefile b/tools/testing/selftests/ipc/Makefile
index 74bbefdeaf4c..3b6013da4f59 100644
--- a/tools/testing/selftests/ipc/Makefile
+++ b/tools/testing/selftests/ipc/Makefile
@@ -18,8 +18,9 @@ else
echo "Not an x86 target, can't build msgque selftest"
endif
-run_tests: all
- ./msgque_test
+TEST_PROGS := msgque_test
+
+include ../lib.mk
clean:
rm -fr ./msgque_test
diff --git a/tools/testing/selftests/kcmp/Makefile b/tools/testing/selftests/kcmp/Makefile
index ff0eefdc6ceb..0eecd183058c 100644
--- a/tools/testing/selftests/kcmp/Makefile
+++ b/tools/testing/selftests/kcmp/Makefile
@@ -3,8 +3,9 @@ CFLAGS += -I../../../../usr/include/
all: kcmp_test
-run_tests: all
- @./kcmp_test || echo "kcmp_test: [FAIL]"
+TEST_PROGS := kcmp_test
+
+include ../lib.mk
clean:
$(RM) kcmp_test kcmp-test-file
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
new file mode 100644
index 000000000000..b30c5a49cb61
--- /dev/null
+++ b/tools/testing/selftests/lib.mk
@@ -0,0 +1,10 @@
+define RUN_TESTS
+ @for TEST in $(TEST_PROGS); do \
+ (./$$TEST && echo "selftests: $$TEST [PASS]") || echo "selftests: $$TEST [FAIL]"; \
+ done;
+endef
+
+run_tests: all
+ $(RUN_TESTS)
+
+.PHONY: run_tests all clean
diff --git a/tools/testing/selftests/memfd/Makefile b/tools/testing/selftests/memfd/Makefile
index b80cd10d53ba..191dee9d6fd3 100644
--- a/tools/testing/selftests/memfd/Makefile
+++ b/tools/testing/selftests/memfd/Makefile
@@ -5,9 +5,9 @@ CFLAGS += -I../../../../include/
all:
gcc $(CFLAGS) memfd_test.c -o memfd_test
-run_tests: all
- gcc $(CFLAGS) memfd_test.c -o memfd_test
- @./memfd_test || echo "memfd_test: [FAIL]"
+TEST_PROGS := memfd_test
+
+include ../lib.mk
build_fuse:
gcc $(CFLAGS) fuse_mnt.c `pkg-config fuse --cflags --libs` -o fuse_mnt
diff --git a/tools/testing/selftests/memory-hotplug/Makefile b/tools/testing/selftests/memory-hotplug/Makefile
index d46b8d489cd2..8f7dea66ecac 100644
--- a/tools/testing/selftests/memory-hotplug/Makefile
+++ b/tools/testing/selftests/memory-hotplug/Makefile
@@ -1,7 +1,8 @@
all:
-run_tests:
- @/bin/bash ./on-off-test.sh -r 2 || echo "memory-hotplug selftests: [FAIL]"
+include ../lib.mk
+
+override RUN_TESTS := ./on-off-test.sh -r 2 || echo "selftests: memory-hotplug [FAIL]"
run_full_test:
@/bin/bash ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
diff --git a/tools/testing/selftests/memory-hotplug/on-off-test.sh b/tools/testing/selftests/memory-hotplug/on-off-test.sh
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/mount/Makefile b/tools/testing/selftests/mount/Makefile
index 337d853c2b72..06931dfd3ef0 100644
--- a/tools/testing/selftests/mount/Makefile
+++ b/tools/testing/selftests/mount/Makefile
@@ -5,13 +5,9 @@ all: unprivileged-remount-test
unprivileged-remount-test: unprivileged-remount-test.c
gcc -Wall -O2 unprivileged-remount-test.c -o unprivileged-remount-test
-# Allow specific tests to be selected.
-test_unprivileged_remount: unprivileged-remount-test
- @if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi
+include ../lib.mk
-run_tests: all test_unprivileged_remount
+override RUN_TESTS := if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi
clean:
rm -f unprivileged-remount-test
-
-.PHONY: all test_unprivileged_remount
diff --git a/tools/testing/selftests/mqueue/Makefile b/tools/testing/selftests/mqueue/Makefile
index 8056e2e68fa4..cbc300ef11bf 100644
--- a/tools/testing/selftests/mqueue/Makefile
+++ b/tools/testing/selftests/mqueue/Makefile
@@ -2,9 +2,12 @@ all:
gcc -O2 mq_open_tests.c -o mq_open_tests -lrt
gcc -O2 -o mq_perf_tests mq_perf_tests.c -lrt -lpthread -lpopt
-run_tests:
- @./mq_open_tests /test1 || echo "mq_open_tests: [FAIL]"
- @./mq_perf_tests || echo "mq_perf_tests: [FAIL]"
+include ../lib.mk
+
+override define RUN_TESTS
+ @./mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"
+ @./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
+endef
clean:
rm -f mq_open_tests mq_perf_tests
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 62f22cc9941c..fa8187ff15e6 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -11,9 +11,9 @@ all: $(NET_PROGS)
%: %.c
$(CC) $(CFLAGS) -o $@ $^
-run_tests: all
- @/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]"
- @/bin/sh ./run_afpackettests || echo "afpackettests: [FAIL]"
- ./test_bpf.sh
+TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh
+
+include ../lib.mk
+
clean:
$(RM) $(NET_PROGS)
diff --git a/tools/testing/selftests/net/run_afpackettests b/tools/testing/selftests/net/run_afpackettests
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/net/run_netsocktests b/tools/testing/selftests/net/run_netsocktests
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/ptrace/Makefile b/tools/testing/selftests/ptrace/Makefile
index 47ae2d385ce8..453927fea90c 100644
--- a/tools/testing/selftests/ptrace/Makefile
+++ b/tools/testing/selftests/ptrace/Makefile
@@ -6,5 +6,6 @@ all: peeksiginfo
clean:
rm -f peeksiginfo
-run_tests: all
- @./peeksiginfo || echo "peeksiginfo selftests: [FAIL]"
+TEST_PROGS := peeksiginfo
+
+include ../lib.mk
diff --git a/tools/testing/selftests/size/Makefile b/tools/testing/selftests/size/Makefile
index 04dc25e4fa92..e4353d74ea6e 100644
--- a/tools/testing/selftests/size/Makefile
+++ b/tools/testing/selftests/size/Makefile
@@ -5,8 +5,9 @@ all: get_size
get_size: get_size.c
$(CC) -static -ffreestanding -nostartfiles -s $< -o $@
-run_tests: all
- ./get_size
+TEST_PROGS := get_size
+
+include ../lib.mk
clean:
$(RM) get_size
diff --git a/tools/testing/selftests/sysctl/Makefile b/tools/testing/selftests/sysctl/Makefile
index 0a92adaf0865..c9660f5ef9f9 100644
--- a/tools/testing/selftests/sysctl/Makefile
+++ b/tools/testing/selftests/sysctl/Makefile
@@ -4,16 +4,9 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests".
all:
-# Allow specific tests to be selected.
-test_num:
- @/bin/sh ./run_numerictests
+TEST_PROGS := run_numerictests run_stringtests
-test_string:
- @/bin/sh ./run_stringtests
-
-run_tests: all test_num test_string
+include ../lib.mk
# Nothing to clean up.
clean:
-
-.PHONY: all run_tests clean test_num test_string
diff --git a/tools/testing/selftests/sysctl/run_numerictests b/tools/testing/selftests/sysctl/run_numerictests
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/sysctl/run_stringtests b/tools/testing/selftests/sysctl/run_stringtests
old mode 100644
new mode 100755
diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
index eb2859f4ad21..149cee3b7b8a 100644
--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@ -1,8 +1,9 @@
all:
gcc posix_timers.c -o posix_timers -lrt
-run_tests: all
- ./posix_timers
+TEST_PROGS := posix_timers
+
+include ../lib.mk
clean:
rm -f ./posix_timers
diff --git a/tools/testing/selftests/user/Makefile b/tools/testing/selftests/user/Makefile
index 12c9d15bab07..d401b63c5b1a 100644
--- a/tools/testing/selftests/user/Makefile
+++ b/tools/testing/selftests/user/Makefile
@@ -3,5 +3,6 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:
-run_tests: all
- ./test_user_copy.sh
+TEST_PROGS := test_user_copy.sh
+
+include ../lib.mk
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 077828c889f1..90e56090b0ed 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -9,8 +9,9 @@ all: $(BINARIES)
%: %.c
$(CC) $(CFLAGS) -o $@ $^ -lrt
-run_tests: all
- @/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1)
+TEST_PROGS := run_vmtests
+
+include ../lib.mk
clean:
$(RM) $(BINARIES)
diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests
old mode 100644
new mode 100755
--
2.1.0
^ permalink raw reply related
* [PATCH v3 2/7] selftests: Add install target
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh-JPH+aEBZ4P+UEJcrhfAQsw
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
davej-rdkfGonbjUTCLXcRTR1eJlpr/1R2p/CL, mmarek-AlSwsSmVLrQ,
linux-api-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1425465694-27095-1-git-send-email-mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
This adds make install support to selftests. The basic usage is:
$ cd tools/testing/selftests
$ make install
That installs into tools/testing/selftests/install, which can then be
copied where ever necessary.
The install destination is also configurable using eg:
$ INSTALL_PATH=/mnt/selftests make install
The implementation uses two targets in the child makefiles. The first
"install" is expected to install all files into $(INSTALL_PATH).
The second, "emit_tests", is expected to emit the test instructions (ie.
bash script) on stdout. Separating this from install means the child
makefiles need no knowledge of the location of the test script.
Signed-off-by: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
---
v3: Rebase onto 4.0-rc2.
Rename all.sh to run_kselftest.sh.
Add --no-print-directory to emit_tests invocation.
tools/testing/selftests/Makefile | 33 +++++++++++++++++++++++++
tools/testing/selftests/exec/Makefile | 3 +++
tools/testing/selftests/lib.mk | 23 ++++++++++++++++-
tools/testing/selftests/memory-hotplug/Makefile | 2 ++
tools/testing/selftests/mount/Makefile | 2 ++
tools/testing/selftests/mqueue/Makefile | 7 ++++++
tools/testing/selftests/net/Makefile | 1 +
tools/testing/selftests/sysctl/Makefile | 1 +
8 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 4e511221a0c1..afba23fa8cfd 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -47,7 +47,40 @@ clean_hotplug:
make -C $$TARGET clean; \
done;
+INSTALL_PATH ?= install
+INSTALL_PATH := $(abspath $(INSTALL_PATH))
+ALL_SCRIPT := $(INSTALL_PATH)/run_kselftest.sh
+
+install:
+ifdef INSTALL_PATH
+ @# Ask all targets to install their files
+ mkdir -p $(INSTALL_PATH)
+ for TARGET in $(TARGETS); do \
+ mkdir -p $(INSTALL_PATH)/$$TARGET ; \
+ make -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
+ done;
+
+ @# Ask all targets to emit their test scripts
+ echo "#!/bin/bash\n\n" > $(ALL_SCRIPT)
+ echo "cd \$$(dirname \$$0)" >> $(ALL_SCRIPT)
+ echo "ROOT=\$$PWD\n" >> $(ALL_SCRIPT)
+
+ for TARGET in $(TARGETS); do \
+ echo "echo ; echo Running tests in $$TARGET" >> $(ALL_SCRIPT); \
+ echo "echo ========================================" >> $(ALL_SCRIPT); \
+ echo "cd $$TARGET" >> $(ALL_SCRIPT); \
+ make -s --no-print-directory -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
+ echo "cd \$$ROOT\n" >> $(ALL_SCRIPT); \
+ done;
+
+ chmod u+x $(ALL_SCRIPT)
+else
+ $(error Error: set INSTALL_PATH to use install)
+endif
+
clean:
for TARGET in $(TARGETS); do \
make -C $$TARGET clean; \
done;
+
+.PHONY: install
diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile
index a0098daeb73d..886cabe307b1 100644
--- a/tools/testing/selftests/exec/Makefile
+++ b/tools/testing/selftests/exec/Makefile
@@ -19,8 +19,11 @@ execveat.denatured: execveat
$(CC) $(CFLAGS) -o $@ $^
TEST_PROGS := execveat
+TEST_FILES := $(DEPS)
include ../lib.mk
+override EMIT_TESTS := echo "mkdir -p subdir; (./execveat && echo \"selftests: execveat [PASS]\") || echo \"selftests: execveat [FAIL]\""
+
clean:
rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx*
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index b30c5a49cb61..7bd3dabe2846 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -7,4 +7,25 @@ endef
run_tests: all
$(RUN_TESTS)
-.PHONY: run_tests all clean
+define INSTALL_RULE
+ mkdir -p $(INSTALL_PATH)
+ install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_FILES)
+endef
+
+install: all
+ifdef INSTALL_PATH
+ $(INSTALL_RULE)
+else
+ $(error Error: set INSTALL_PATH to use install)
+endif
+
+define EMIT_TESTS
+ @for TEST in $(TEST_PROGS); do \
+ echo "(./$$TEST && echo \"selftests: $$TEST [PASS]\") || echo \"selftests: $$TEST [FAIL]\""; \
+ done;
+endef
+
+emit_tests:
+ $(EMIT_TESTS)
+
+.PHONY: run_tests all clean install emit_tests
diff --git a/tools/testing/selftests/memory-hotplug/Makefile b/tools/testing/selftests/memory-hotplug/Makefile
index 8f7dea66ecac..598a1f68f534 100644
--- a/tools/testing/selftests/memory-hotplug/Makefile
+++ b/tools/testing/selftests/memory-hotplug/Makefile
@@ -2,7 +2,9 @@ all:
include ../lib.mk
+TEST_PROGS := on-off-test.sh
override RUN_TESTS := ./on-off-test.sh -r 2 || echo "selftests: memory-hotplug [FAIL]"
+override EMIT_TESTS := echo "$(RUN_TESTS)"
run_full_test:
@/bin/bash ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
diff --git a/tools/testing/selftests/mount/Makefile b/tools/testing/selftests/mount/Makefile
index 06931dfd3ef0..a5b367f032ba 100644
--- a/tools/testing/selftests/mount/Makefile
+++ b/tools/testing/selftests/mount/Makefile
@@ -7,7 +7,9 @@ unprivileged-remount-test: unprivileged-remount-test.c
include ../lib.mk
+TEST_PROGS := unprivileged-remount-test
override RUN_TESTS := if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi
+override EMIT_TESTS := echo "$(RUN_TESTS)"
clean:
rm -f unprivileged-remount-test
diff --git a/tools/testing/selftests/mqueue/Makefile b/tools/testing/selftests/mqueue/Makefile
index cbc300ef11bf..6ca7261b55dc 100644
--- a/tools/testing/selftests/mqueue/Makefile
+++ b/tools/testing/selftests/mqueue/Makefile
@@ -9,5 +9,12 @@ override define RUN_TESTS
@./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
endef
+TEST_PROGS := mq_open_tests mq_perf_tests
+
+override define EMIT_TESTS
+ echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""
+ echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""
+endef
+
clean:
rm -f mq_open_tests mq_perf_tests
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index fa8187ff15e6..6ba2ac7bbb0d 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -12,6 +12,7 @@ all: $(NET_PROGS)
$(CC) $(CFLAGS) -o $@ $^
TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh
+TEST_FILES := $(NET_PROGS)
include ../lib.mk
diff --git a/tools/testing/selftests/sysctl/Makefile b/tools/testing/selftests/sysctl/Makefile
index c9660f5ef9f9..b3c33e071f10 100644
--- a/tools/testing/selftests/sysctl/Makefile
+++ b/tools/testing/selftests/sysctl/Makefile
@@ -5,6 +5,7 @@
all:
TEST_PROGS := run_numerictests run_stringtests
+TEST_FILES := common_tests
include ../lib.mk
--
2.1.0
^ permalink raw reply related
* [PATCH v3 3/7] selftests: Add install support for the powerpc tests
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh; +Cc: linux-kernel, davej, mmarek, linux-api
In-Reply-To: <1425465694-27095-1-git-send-email-mpe@ellerman.id.au>
The bulk of the selftests are actually below the powerpc sub directory.
This adds support for installing them, when on a powerpc machine, or if
ARCH and CROSS_COMPILE are set appropriately.
This is a little more complicated because of the sub directory structure
under powerpc, but much of the common logic in lib.mk is still used. The
net effect of the patch is still a reduction in code.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
tools/testing/selftests/powerpc/Makefile | 19 ++++++++-
tools/testing/selftests/powerpc/copyloops/Makefile | 15 +++----
tools/testing/selftests/powerpc/mm/Makefile | 15 +++----
tools/testing/selftests/powerpc/pmu/Makefile | 48 ++++++++++++----------
tools/testing/selftests/powerpc/pmu/ebb/Makefile | 13 +++---
.../testing/selftests/powerpc/primitives/Makefile | 15 +++----
.../testing/selftests/powerpc/stringloops/Makefile | 15 +++----
tools/testing/selftests/powerpc/tm/Makefile | 15 +++----
8 files changed, 73 insertions(+), 82 deletions(-)
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile
index 1d5e7ad2c460..22c4f8ffa422 100644
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@ -22,10 +22,25 @@ all: $(TARGETS)
$(TARGETS):
$(MAKE) -k -C $@ all
-run_tests: all
+include ../lib.mk
+
+override define RUN_TESTS
@for TARGET in $(TARGETS); do \
$(MAKE) -C $$TARGET run_tests; \
done;
+endef
+
+override define INSTALL_RULE
+ @for TARGET in $(TARGETS); do \
+ $(MAKE) -C $$TARGET install; \
+ done;
+endef
+
+override define EMIT_TESTS
+ @for TARGET in $(TARGETS); do \
+ $(MAKE) -s -C $$TARGET emit_tests; \
+ done;
+endef
clean:
@for TARGET in $(TARGETS); do \
@@ -36,4 +51,4 @@ clean:
tags:
find . -name '*.c' -o -name '*.h' | xargs ctags
-.PHONY: all run_tests clean tags $(TARGETS)
+.PHONY: tags $(TARGETS)
diff --git a/tools/testing/selftests/powerpc/copyloops/Makefile b/tools/testing/selftests/powerpc/copyloops/Makefile
index 6f2d3be227f9..c05023514ce8 100644
--- a/tools/testing/selftests/powerpc/copyloops/Makefile
+++ b/tools/testing/selftests/powerpc/copyloops/Makefile
@@ -6,24 +6,19 @@ CFLAGS += -D SELFTEST
# Use our CFLAGS for the implicit .S rule
ASFLAGS = $(CFLAGS)
-PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7
+TEST_PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7
EXTRA_SOURCES := validate.c ../harness.c
-all: $(PROGS)
+all: $(TEST_PROGS)
copyuser_64: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_base
copyuser_power7: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_power7
memcpy_64: CPPFLAGS += -D COPY_LOOP=test_memcpy
memcpy_power7: CPPFLAGS += -D COPY_LOOP=test_memcpy_power7
-$(PROGS): $(EXTRA_SOURCES)
+$(TEST_PROGS): $(EXTRA_SOURCES)
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
-.PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
diff --git a/tools/testing/selftests/powerpc/mm/Makefile b/tools/testing/selftests/powerpc/mm/Makefile
index a14c538dd7f8..41cc3ed66818 100644
--- a/tools/testing/selftests/powerpc/mm/Makefile
+++ b/tools/testing/selftests/powerpc/mm/Makefile
@@ -1,21 +1,16 @@
noarg:
$(MAKE) -C ../
-PROGS := hugetlb_vs_thp_test subpage_prot
+TEST_PROGS := hugetlb_vs_thp_test subpage_prot
-all: $(PROGS) tempfile
+all: $(TEST_PROGS) tempfile
-$(PROGS): ../harness.c
+$(TEST_PROGS): ../harness.c
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
tempfile:
dd if=/dev/zero of=tempfile bs=64k count=1
clean:
- rm -f $(PROGS) tempfile
-
-.PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) tempfile
diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile
index c9f4263906a5..5a161175bbd4 100644
--- a/tools/testing/selftests/powerpc/pmu/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/Makefile
@@ -1,38 +1,42 @@
noarg:
$(MAKE) -C ../
-PROGS := count_instructions l3_bank_test per_event_excludes
+TEST_PROGS := count_instructions l3_bank_test per_event_excludes
EXTRA_SOURCES := ../harness.c event.c lib.c
-SUB_TARGETS = ebb
+all: $(TEST_PROGS) ebb
-all: $(PROGS) $(SUB_TARGETS)
-
-$(PROGS): $(EXTRA_SOURCES)
+$(TEST_PROGS): $(EXTRA_SOURCES)
# loop.S can only be built 64-bit
count_instructions: loop.S count_instructions.c $(EXTRA_SOURCES)
$(CC) $(CFLAGS) -m64 -o $@ $^
-run_tests: all sub_run_tests
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
-clean: sub_clean
- rm -f $(PROGS) loop.o
+DEFAULT_RUN_TESTS := $(RUN_TESTS)
+override define RUN_TESTS
+ $(DEFAULT_RUN_TESTS)
+ $(MAKE) -C ebb run_tests
+endef
-$(SUB_TARGETS):
- $(MAKE) -k -C $@ all
+DEFAULT_EMIT_TESTS := $(EMIT_TESTS)
+override define EMIT_TESTS
+ $(DEFAULT_EMIT_TESTS)
+ $(MAKE) -s -C ebb emit_tests
+endef
-sub_run_tests: all
- @for TARGET in $(SUB_TARGETS); do \
- $(MAKE) -C $$TARGET run_tests; \
- done;
+DEFAULT_INSTALL := $(INSTALL_RULE)
+override define INSTALL_RULE
+ $(DEFAULT_INSTALL_RULE)
+ $(MAKE) -C ebb install
+endef
-sub_clean:
- @for TARGET in $(SUB_TARGETS); do \
- $(MAKE) -C $$TARGET clean; \
- done;
+clean:
+ rm -f $(TEST_PROGS) loop.o
+ $(MAKE) -C ebb clean
+
+ebb:
+ $(MAKE) -k -C $@ all
-.PHONY: all run_tests clean sub_run_tests sub_clean $(SUB_TARGETS)
+.PHONY: all run_tests clean ebb
diff --git a/tools/testing/selftests/powerpc/pmu/ebb/Makefile b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
index 3dc4332698cb..5cdc9dbf2b27 100644
--- a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
@@ -4,7 +4,7 @@ noarg:
# The EBB handler is 64-bit code and everything links against it
CFLAGS += -m64
-PROGS := reg_access_test event_attributes_test cycles_test \
+TEST_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 \
cpu_event_pinned_vs_ebb_test task_event_vs_ebb_test \
@@ -16,18 +16,15 @@ PROGS := reg_access_test event_attributes_test cycles_test \
lost_exception_test no_handler_test \
cycles_with_mmcr2_test
-all: $(PROGS)
+all: $(TEST_PROGS)
-$(PROGS): ../../harness.c ../event.c ../lib.c ebb.c ebb_handler.S trace.c busy_loop.S
+$(TEST_PROGS): ../../harness.c ../event.c ../lib.c ebb.c ebb_handler.S trace.c busy_loop.S
instruction_count_test: ../loop.S
lost_exception_test: ../lib.c
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../../lib.mk
clean:
- rm -f $(PROGS)
+ rm -f $(TEST_PROGS)
diff --git a/tools/testing/selftests/powerpc/primitives/Makefile b/tools/testing/selftests/powerpc/primitives/Makefile
index ea737ca01732..b68c6221d3d1 100644
--- a/tools/testing/selftests/powerpc/primitives/Makefile
+++ b/tools/testing/selftests/powerpc/primitives/Makefile
@@ -1,17 +1,12 @@
CFLAGS += -I$(CURDIR)
-PROGS := load_unaligned_zeropad
+TEST_PROGS := load_unaligned_zeropad
-all: $(PROGS)
+all: $(TEST_PROGS)
-$(PROGS): ../harness.c
+$(TEST_PROGS): ../harness.c
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
-.PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
diff --git a/tools/testing/selftests/powerpc/stringloops/Makefile b/tools/testing/selftests/powerpc/stringloops/Makefile
index 506d77346477..2a728f4d2873 100644
--- a/tools/testing/selftests/powerpc/stringloops/Makefile
+++ b/tools/testing/selftests/powerpc/stringloops/Makefile
@@ -2,19 +2,14 @@
CFLAGS += -m64
CFLAGS += -I$(CURDIR)
-PROGS := memcmp
+TEST_PROGS := memcmp
EXTRA_SOURCES := memcmp_64.S ../harness.c
-all: $(PROGS)
+all: $(TEST_PROGS)
-$(PROGS): $(EXTRA_SOURCES)
+$(TEST_PROGS): $(EXTRA_SOURCES)
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
-.PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
diff --git a/tools/testing/selftests/powerpc/tm/Makefile b/tools/testing/selftests/powerpc/tm/Makefile
index 2cede239a074..34f2ec634b40 100644
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@ -1,15 +1,10 @@
-PROGS := tm-resched-dscr
+TEST_PROGS := tm-resched-dscr
-all: $(PROGS)
+all: $(TEST_PROGS)
-$(PROGS): ../harness.c
+$(TEST_PROGS): ../harness.c
-run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
-.PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
--
2.1.0
^ permalink raw reply related
* [PATCH v3 4/7] selftests: Set CC using CROSS_COMPILE once in lib.mk
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh-JPH+aEBZ4P+UEJcrhfAQsw
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
davej-rdkfGonbjUTCLXcRTR1eJlpr/1R2p/CL, mmarek-AlSwsSmVLrQ,
linux-api-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1425465694-27095-1-git-send-email-mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
This avoids repeating the logic in every Makefile. We mimic the
top-level Makefile and use $(CROSS_COMPILE)gcc.
Signed-off-by: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
---
tools/testing/selftests/efivarfs/Makefile | 1 -
tools/testing/selftests/exec/Makefile | 1 -
tools/testing/selftests/kcmp/Makefile | 1 -
tools/testing/selftests/lib.mk | 4 ++++
tools/testing/selftests/net/Makefile | 1 -
tools/testing/selftests/powerpc/Makefile | 3 +--
tools/testing/selftests/size/Makefile | 2 --
tools/testing/selftests/vm/Makefile | 1 -
8 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/efivarfs/Makefile b/tools/testing/selftests/efivarfs/Makefile
index 3052d0bda24b..d683486a859b 100644
--- a/tools/testing/selftests/efivarfs/Makefile
+++ b/tools/testing/selftests/efivarfs/Makefile
@@ -1,4 +1,3 @@
-CC = $(CROSS_COMPILE)gcc
CFLAGS = -Wall
test_objs = open-unlink create-read
diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile
index 886cabe307b1..4edb7d0da29b 100644
--- a/tools/testing/selftests/exec/Makefile
+++ b/tools/testing/selftests/exec/Makefile
@@ -1,4 +1,3 @@
-CC = $(CROSS_COMPILE)gcc
CFLAGS = -Wall
BINARIES = execveat
DEPS = execveat.symlink execveat.denatured script subdir
diff --git a/tools/testing/selftests/kcmp/Makefile b/tools/testing/selftests/kcmp/Makefile
index 0eecd183058c..2ae7450a9a89 100644
--- a/tools/testing/selftests/kcmp/Makefile
+++ b/tools/testing/selftests/kcmp/Makefile
@@ -1,4 +1,3 @@
-CC := $(CROSS_COMPILE)$(CC)
CFLAGS += -I../../../../usr/include/
all: kcmp_test
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 7bd3dabe2846..860906694a10 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -1,3 +1,7 @@
+# This mimics the top-level Makefile. We do it explicitly here so that this
+# Makefile can operate with or without the kbuild infrastructure.
+CC := $(CROSS_COMPILE)gcc
+
define RUN_TESTS
@for TEST in $(TEST_PROGS); do \
(./$$TEST && echo "selftests: $$TEST [PASS]") || echo "selftests: $$TEST [FAIL]"; \
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 6ba2ac7bbb0d..fac4782c51d8 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -1,6 +1,5 @@
# Makefile for net selftests
-CC = $(CROSS_COMPILE)gcc
CFLAGS = -Wall -O2 -g
CFLAGS += -I../../../../usr/include/
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile
index 22c4f8ffa422..2958fe9a74e9 100644
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@ -8,10 +8,9 @@ ifeq ($(ARCH),powerpc)
GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown")
-CC := $(CROSS_COMPILE)$(CC)
CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR) $(CFLAGS)
-export CC CFLAGS
+export CFLAGS
TARGETS = pmu copyloops mm tm primitives stringloops
diff --git a/tools/testing/selftests/size/Makefile b/tools/testing/selftests/size/Makefile
index e4353d74ea6e..bbd0b5398b61 100644
--- a/tools/testing/selftests/size/Makefile
+++ b/tools/testing/selftests/size/Makefile
@@ -1,5 +1,3 @@
-CC = $(CROSS_COMPILE)gcc
-
all: get_size
get_size: get_size.c
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 90e56090b0ed..cd1a55a279aa 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -1,6 +1,5 @@
# Makefile for vm selftests
-CC = $(CROSS_COMPILE)gcc
CFLAGS = -Wall
BINARIES = hugepage-mmap hugepage-shm map_hugetlb thuge-gen hugetlbfstest
BINARIES += transhuge-stress
--
2.1.0
^ permalink raw reply related
* [PATCH v3 5/7] selftests/timers: Use implicit rules
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh; +Cc: linux-kernel, davej, mmarek, linux-api
In-Reply-To: <1425465694-27095-1-git-send-email-mpe@ellerman.id.au>
There's no need to open-code the build rules, use the implicit ones.
This has the nice side effect of enabling cross compilation.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
tools/testing/selftests/timers/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
index 149cee3b7b8a..87340405e4b3 100644
--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@ -1,9 +1,9 @@
-all:
- gcc posix_timers.c -o posix_timers -lrt
-
TEST_PROGS := posix_timers
+LDLIBS += -lrt
+
+all: $(TEST_PROGS)
include ../lib.mk
clean:
- rm -f ./posix_timers
+ rm -f $(TEST_PROGS)
--
2.1.0
^ permalink raw reply related
* [PATCH v3 6/7] selftests/mqueue: Use implicit rules
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh; +Cc: linux-kernel, davej, mmarek, linux-api
In-Reply-To: <1425465694-27095-1-git-send-email-mpe@ellerman.id.au>
There's no need to open-code the build rules, use the implicit ones.
This has the nice side effect of enabling cross compilation.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
tools/testing/selftests/mqueue/Makefile | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/mqueue/Makefile b/tools/testing/selftests/mqueue/Makefile
index 6ca7261b55dc..ed85a1d7ee36 100644
--- a/tools/testing/selftests/mqueue/Makefile
+++ b/tools/testing/selftests/mqueue/Makefile
@@ -1,6 +1,11 @@
-all:
- gcc -O2 mq_open_tests.c -o mq_open_tests -lrt
- gcc -O2 -o mq_perf_tests mq_perf_tests.c -lrt -lpthread -lpopt
+TEST_PROGS := mq_open_tests mq_perf_tests
+
+CFLAGS += -O2
+LDLIBS += -lrt
+
+mq_perf_tests: LDLIBS += -lpthread -lpopt
+
+all: $(TEST_PROGS)
include ../lib.mk
@@ -9,12 +14,10 @@ override define RUN_TESTS
@./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
endef
-TEST_PROGS := mq_open_tests mq_perf_tests
-
override define EMIT_TESTS
echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""
echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""
endef
clean:
- rm -f mq_open_tests mq_perf_tests
+ rm -f $(TEST_PROGS)
--
2.1.0
^ permalink raw reply related
* [PATCH v3 7/7] selftests/mount: Use implicit rules
From: Michael Ellerman @ 2015-03-04 10:41 UTC (permalink / raw)
To: shuahkh; +Cc: linux-kernel, davej, mmarek, linux-api
In-Reply-To: <1425465694-27095-1-git-send-email-mpe@ellerman.id.au>
There's no need to open-code the build rules, use the implicit ones.
This has the nice side effect of enabling cross compilation.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
tools/testing/selftests/mount/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/mount/Makefile b/tools/testing/selftests/mount/Makefile
index a5b367f032ba..a6c62bedb0d9 100644
--- a/tools/testing/selftests/mount/Makefile
+++ b/tools/testing/selftests/mount/Makefile
@@ -1,13 +1,13 @@
# Makefile for mount selftests.
-all: unprivileged-remount-test
+TEST_PROGS := unprivileged-remount-test
+
+CFLAGS += -O2 -Wall
-unprivileged-remount-test: unprivileged-remount-test.c
- gcc -Wall -O2 unprivileged-remount-test.c -o unprivileged-remount-test
+all: $(TEST_PROGS)
include ../lib.mk
-TEST_PROGS := unprivileged-remount-test
override RUN_TESTS := if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi
override EMIT_TESTS := echo "$(RUN_TESTS)"
--
2.1.0
^ permalink raw reply related
* Re: [PATCHv2 1/2] HSI: cmt_speech: Add cmt-speech driver
From: Paul Bolle @ 2015-03-04 11:09 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Peter Ujfalusi, Kai Vehmanen, Pavel Machek, Pali Rohar,
Aaro Koskinen, Ivaylo Dimitrov, linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-api-u79uwXL29TY76Z2rM5mHXA, Kai Vehmanen
In-Reply-To: <1425343454-6551-2-git-send-email-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
A license nit only.
Sebastian Reichel schreef op di 03-03-2015 om 01:44 [+0100]:
> --- /dev/null
> +++ b/drivers/hsi/clients/cmt_speech.c
> @@ -0,0 +1,1457 @@
> +/*
> + * cmt_speech.c - HSI CMT speech driver
> + *
> + * Copyright (C) 2008,2009,2010 Nokia Corporation. All rights reserved.
> + *
> + * Contact: Kai Vehmanen <kai.vehmanen-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> + * Original author: Peter Ujfalusi <peter.ujfalusi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> + * 02110-1301 USA
> + */
This states the license is GPL v2.
> +MODULE_LICENSE("GPL");
So you probably want
MODULE_LICENSE("GPL v2");
here.
Paul Bolle
^ permalink raw reply
* Re: [PATCH v2 04/18] clocksource: Add ARM System timer driver
From: Maxime Coquelin @ 2015-03-04 12:08 UTC (permalink / raw)
To: Paul Bolle
Cc: Uwe Kleine-König, Andreas Färber, Geert Uytterhoeven,
Rob Herring, Philipp Zabel, Jonathan Corbet, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
Daniel Lezcano, Thomas Gleixner, Linus Walleij,
Greg Kroah-Hartman, Jiri Slaby, Arnd Bergmann, Andrew Morton,
David S. Miller, Mauro Carvalho Chehab, Joe Perches
In-Reply-To: <1425411786.2606.24.camel@tiscali.nl>
2015-03-03 20:43 GMT+01:00 Paul Bolle <pebolle@tiscali.nl>:
> Maxime Coquelin schreef op ma 02-03-2015 om 17:53 [+0100]:
>> Do you agree if I define it like this:
>>
>> config ARMV7M_SYSTICK
>> bool "Clocksource driver for ARMv7-M System timer"
>> depends on OF && (CPU_V7M || COMPILE_TEST)
>> select CLKSRC_OF
>> select CLKSRC_MMIO
>> help
>> This options enables clocksource support for the ARMv7-M system
>> timer unit.
>
> I don't really have strong feelings on whatever way you choose to fix
> the, well, minor problem I pointed out.
>
> Having said that, if a Kconfig entry without a prompt (and therefor,
> without help) actually does what you want it to do, why bother adding a
> prompt and a one line help text?
This is because I added also support for COMPILE_TEST coverage as per
Uwe advice,
and thought it was necessary to have an entry for this.
Maybe I'm just wrong?
Thanks,
Maxime
>
>
> Paul Bolle
>
^ 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