DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C403121723
Date: Wed, 10 Jan 2018 11:32:34 -0500
From: Steven Rostedt <rostedt@goodmis.org>
To: Alan Kao <nonerkao@gmail.com>
Cc: Palmer Dabbelt <palmer@sifive.com>, Albert Ou <albert@sifive.com>,
        Ingo Molnar <mingo@redhat.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Kamil Rytarowski <n54@gmx.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        patches@groups.riscv.org, linux-kernel@vger.kernel.org,
        Alan Kao <alankao@andestech.com>,
        Greentime Hu <greentime@andestech.com>
Subject: Re: [PATCH 2/6] riscv/ftrace: Add dynamic function tracer support
Message-ID: <20180110113234.2fa92920@vmware.local.home>
In-Reply-To: <20180110073814.32338-3-alankao@andestech.com>
References: <20180110073814.32338-1-alankao@andestech.com>
        <20180110073814.32338-3-alankao@andestech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

On Wed, 10 Jan 2018 15:38:10 +0800
Alan Kao <nonerkao@gmail.com> wrote:

> +static int ftrace_check_current_call(unsigned long hook_pos,
> +				     unsigned int *expected)
> +{
> +	unsigned int replaced[2];
> +	unsigned int nops[2] = {NOP4, NOP4};
> +
> +	/* we expect nops at the hook position */
> +	if (!expected)
> +		expected = nops;
> +
> +	/* read the text we want to modify */
> +	if (probe_kernel_read(replaced, (void *)hook_pos, MCOUNT_INSN_SIZE))
> +		return -EFAULT;
> +
> +	/* Make sure it is what we expect it to be */
> +	if (replaced[0] != expected[0] || replaced[1] != expected[1]) {

I wonder if we can have a slight enhancement by doing:

	if (memcmp(replaced, expected, sizeof(replaced)) != 0) {

-- Steve


> +		pr_err("%p: expected (%08x %08x) but get (%08x %08x)",
> +		       (void *)hook_pos, expected[0], expected[1], replaced[0],
> +		       replaced[1]);
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}