From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755249AbbCBOcW (ORCPT ); Mon, 2 Mar 2015 09:32:22 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:42944 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754615AbbCBOZ7 (ORCPT ); Mon, 2 Mar 2015 09:25:59 -0500 From: Wang Nan To: , , , , CC: , , , Subject: [RFC PATCH v4 19/34] ftrace: don't update record flags if code modification fail. Date: Mon, 2 Mar 2015 22:24:57 +0800 Message-ID: <1425306312-3437-20-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X86 and common ftrace_replace_code() behave differently. In x86, rec->flags get updated only when (almost) all works are done. In common code, rec->flags is updated before code modification, and never get restored when code modification fails. This patch ensures rec->flags kept its original value if ftrace_replace_code() fail. A later patch will correct that function for x86. Signed-off-by: Wang Nan --- kernel/trace/ftrace.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 45e5cb1..6c6cbb1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2254,23 +2254,30 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) /* This needs to be done before we call ftrace_update_record */ ftrace_old_addr = ftrace_get_addr_curr(rec); - ret = ftrace_update_record(rec, enable); + ret = ftrace_test_record(rec, enable); switch (ret) { case FTRACE_UPDATE_IGNORE: return 0; case FTRACE_UPDATE_MAKE_CALL: - return ftrace_make_call(rec, ftrace_addr); + ret = ftrace_make_call(rec, ftrace_addr); + break; case FTRACE_UPDATE_MAKE_NOP: - return ftrace_make_nop(NULL, rec, ftrace_old_addr); + ret = ftrace_make_nop(NULL, rec, ftrace_old_addr); + break; case FTRACE_UPDATE_MODIFY_CALL: - return ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr); + ret = ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr); + break; } - return -1; /* unknow ftrace bug */ + if (ret) + return -1; /* unknow ftrace bug */ + + ftrace_update_record(rec, enable); + return 0; } void __weak ftrace_replace_code(int enable) -- 1.8.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: wangnan0@huawei.com (Wang Nan) Date: Mon, 2 Mar 2015 22:24:57 +0800 Subject: [RFC PATCH v4 19/34] ftrace: don't update record flags if code modification fail. In-Reply-To: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> Message-ID: <1425306312-3437-20-git-send-email-wangnan0@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org X86 and common ftrace_replace_code() behave differently. In x86, rec->flags get updated only when (almost) all works are done. In common code, rec->flags is updated before code modification, and never get restored when code modification fails. This patch ensures rec->flags kept its original value if ftrace_replace_code() fail. A later patch will correct that function for x86. Signed-off-by: Wang Nan --- kernel/trace/ftrace.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 45e5cb1..6c6cbb1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2254,23 +2254,30 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) /* This needs to be done before we call ftrace_update_record */ ftrace_old_addr = ftrace_get_addr_curr(rec); - ret = ftrace_update_record(rec, enable); + ret = ftrace_test_record(rec, enable); switch (ret) { case FTRACE_UPDATE_IGNORE: return 0; case FTRACE_UPDATE_MAKE_CALL: - return ftrace_make_call(rec, ftrace_addr); + ret = ftrace_make_call(rec, ftrace_addr); + break; case FTRACE_UPDATE_MAKE_NOP: - return ftrace_make_nop(NULL, rec, ftrace_old_addr); + ret = ftrace_make_nop(NULL, rec, ftrace_old_addr); + break; case FTRACE_UPDATE_MODIFY_CALL: - return ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr); + ret = ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr); + break; } - return -1; /* unknow ftrace bug */ + if (ret) + return -1; /* unknow ftrace bug */ + + ftrace_update_record(rec, enable); + return 0; } void __weak ftrace_replace_code(int enable) -- 1.8.4