From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754818AbdCTMfr (ORCPT ); Mon, 20 Mar 2017 08:35:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:54977 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754663AbdCTMc2 (ORCPT ); Mon, 20 Mar 2017 08:32:28 -0400 From: Jiri Slaby To: mingo@redhat.com Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, Jiri Slaby , Boris Ostrovsky , Juergen Gross , xen-devel@lists.xenproject.org, "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH v2 02/10] x86: assembly, FUNC_START for fn, DATA_START for data Date: Mon, 20 Mar 2017 13:32:14 +0100 Message-Id: <20170320123222.15453-2-jslaby@suse.cz> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170320123222.15453-1-jslaby@suse.cz> References: <9ea5e137-61f9-dccc-bb9d-ac3ff86e5867@suse.cz> <20170320123222.15453-1-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a start of series to cleanup macros used for starting functions, data, globals etc. across x86. When we have all this sorted out, this will help to inject DWARF unwinding info by objtool later. The goal is forcing SYM_FUNC_START to emit .cfi_startproc and SYM_FUNC_END to emit .cfi_endproc. Automatically at best. This particular patch makes proper use of SYM_DATA_START on data and SYM_FUNC_START on a function which was not the case on 4 locations. Signed-off-by: Jiri Slaby Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Cc: Boris Ostrovsky Cc: Juergen Gross Reviewed-by: Juergen Gross [xen parts] Cc: Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: --- arch/x86/entry/entry_64_compat.S | 3 +-- arch/x86/kernel/acpi/wakeup_64.S | 14 +++++++------- arch/x86/kernel/head_64.S | 2 +- arch/x86/kernel/mcount_64.S | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index e1721dafbcb1..73d7ff0b125c 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -342,8 +342,7 @@ ENTRY(entry_INT80_compat) jmp restore_regs_and_iret END(entry_INT80_compat) - ALIGN -GLOBAL(stub32_clone) +SYM_FUNC_START(stub32_clone) /* * The 32-bit clone ABI is: clone(..., int tls_val, int *child_tidptr). * The 64-bit clone ABI is: clone(..., int *child_tidptr, int tls_val). diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 50b8ed0317a3..0b5a5573f57d 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -125,12 +125,12 @@ ENTRY(do_suspend_lowlevel) ENDPROC(do_suspend_lowlevel) .data -ENTRY(saved_rbp) .quad 0 -ENTRY(saved_rsi) .quad 0 -ENTRY(saved_rdi) .quad 0 -ENTRY(saved_rbx) .quad 0 +SYM_DATA_START(saved_rbp) .quad 0 +SYM_DATA_START(saved_rsi) .quad 0 +SYM_DATA_START(saved_rdi) .quad 0 +SYM_DATA_START(saved_rbx) .quad 0 -ENTRY(saved_rip) .quad 0 -ENTRY(saved_rsp) .quad 0 +SYM_DATA_START(saved_rip) .quad 0 +SYM_DATA_START(saved_rsp) .quad 0 -ENTRY(saved_magic) .quad 0 +SYM_DATA_START(saved_magic) .quad 0 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index ac9d327d2e42..e093a804f1fb 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -487,7 +487,7 @@ early_gdt_descr: early_gdt_descr_base: .quad INIT_PER_CPU_VAR(gdt_page) -ENTRY(phys_base) +SYM_DATA_START(phys_base) /* This must match the first entry in level2_kernel_pgt */ .quad 0x0000000000000000 EXPORT_SYMBOL(phys_base) diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S index 7b0d3da52fb4..2b4d7045e823 100644 --- a/arch/x86/kernel/mcount_64.S +++ b/arch/x86/kernel/mcount_64.S @@ -320,7 +320,7 @@ ENTRY(ftrace_graph_caller) retq END(ftrace_graph_caller) -GLOBAL(return_to_handler) +SYM_FUNC_START(return_to_handler) subq $24, %rsp /* Save the return values */ -- 2.12.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: [PATCH v2 02/10] x86: assembly, FUNC_START for fn, DATA_START for data Date: Mon, 20 Mar 2017 13:32:14 +0100 Message-ID: <20170320123222.15453-2-jslaby@suse.cz> References: <9ea5e137-61f9-dccc-bb9d-ac3ff86e5867@suse.cz> <20170320123222.15453-1-jslaby@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170320123222.15453-1-jslaby@suse.cz> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: mingo@redhat.com Cc: Juergen Gross , Len Brown , hpa@zytor.com, linux-pm@vger.kernel.org, x86@kernel.org, "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Pavel Machek , jpoimboe@redhat.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, Jiri Slaby , Boris Ostrovsky List-Id: linux-pm@vger.kernel.org VGhpcyBpcyBhIHN0YXJ0IG9mIHNlcmllcyB0byBjbGVhbnVwIG1hY3JvcyB1c2VkIGZvciBzdGFy dGluZyBmdW5jdGlvbnMsCmRhdGEsIGdsb2JhbHMgZXRjLiBhY3Jvc3MgeDg2LiBXaGVuIHdlIGhh dmUgYWxsIHRoaXMgc29ydGVkIG91dCwgdGhpcwp3aWxsIGhlbHAgdG8gaW5qZWN0IERXQVJGIHVu d2luZGluZyBpbmZvIGJ5IG9ianRvb2wgbGF0ZXIuCgpUaGUgZ29hbCBpcyBmb3JjaW5nIFNZTV9G VU5DX1NUQVJUIHRvIGVtaXQgLmNmaV9zdGFydHByb2MgYW5kClNZTV9GVU5DX0VORCB0byBlbWl0 IC5jZmlfZW5kcHJvYy4gQXV0b21hdGljYWxseSBhdCBiZXN0LgoKVGhpcyBwYXJ0aWN1bGFyIHBh dGNoIG1ha2VzIHByb3BlciB1c2Ugb2YgU1lNX0RBVEFfU1RBUlQgb24gZGF0YSBhbmQKU1lNX0ZV TkNfU1RBUlQgb24gYSBmdW5jdGlvbiB3aGljaCB3YXMgbm90IHRoZSBjYXNlIG9uIDQgbG9jYXRp b25zLgoKU2lnbmVkLW9mZi1ieTogSmlyaSBTbGFieSA8anNsYWJ5QHN1c2UuY3o+CkNjOiBUaG9t YXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KQ2M6IEluZ28gTW9sbmFyIDxtaW5nb0By ZWRoYXQuY29tPgpDYzogIkguIFBldGVyIEFudmluIiA8aHBhQHp5dG9yLmNvbT4KQ2M6IDx4ODZA a2VybmVsLm9yZz4KQ2M6IEJvcmlzIE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9yYWNsZS5j b20+CkNjOiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClJldmlld2VkLWJ5OiBKdWVy Z2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+IFt4ZW4gcGFydHNdCkNjOiA8eGVuLWRldmVsQGxp c3RzLnhlbnByb2plY3Qub3JnPgpDYzogIlJhZmFlbCBKLiBXeXNvY2tpIiA8cmp3QHJqd3lzb2Nr aS5uZXQ+CkNjOiBMZW4gQnJvd24gPGxlbi5icm93bkBpbnRlbC5jb20+CkNjOiBQYXZlbCBNYWNo ZWsgPHBhdmVsQHVjdy5jej4KQ2M6IDxsaW51eC1wbUB2Z2VyLmtlcm5lbC5vcmc+Ci0tLQogYXJj aC94ODYvZW50cnkvZW50cnlfNjRfY29tcGF0LlMgfCAgMyArLS0KIGFyY2gveDg2L2tlcm5lbC9h Y3BpL3dha2V1cF82NC5TIHwgMTQgKysrKysrKy0tLS0tLS0KIGFyY2gveDg2L2tlcm5lbC9oZWFk XzY0LlMgICAgICAgIHwgIDIgKy0KIGFyY2gveDg2L2tlcm5lbC9tY291bnRfNjQuUyAgICAgIHwg IDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvZW50cnkvZW50cnlfNjRfY29tcGF0LlMgYi9hcmNoL3g4 Ni9lbnRyeS9lbnRyeV82NF9jb21wYXQuUwppbmRleCBlMTcyMWRhZmJjYjEuLjczZDdmZjBiMTI1 YyAxMDA2NDQKLS0tIGEvYXJjaC94ODYvZW50cnkvZW50cnlfNjRfY29tcGF0LlMKKysrIGIvYXJj aC94ODYvZW50cnkvZW50cnlfNjRfY29tcGF0LlMKQEAgLTM0Miw4ICszNDIsNyBAQCBFTlRSWShl bnRyeV9JTlQ4MF9jb21wYXQpCiAJam1wCXJlc3RvcmVfcmVnc19hbmRfaXJldAogRU5EKGVudHJ5 X0lOVDgwX2NvbXBhdCkKIAotCUFMSUdOCi1HTE9CQUwoc3R1YjMyX2Nsb25lKQorU1lNX0ZVTkNf U1RBUlQoc3R1YjMyX2Nsb25lKQogCS8qCiAJICogVGhlIDMyLWJpdCBjbG9uZSBBQkkgaXM6IGNs b25lKC4uLiwgaW50IHRsc192YWwsIGludCAqY2hpbGRfdGlkcHRyKS4KIAkgKiBUaGUgNjQtYml0 IGNsb25lIEFCSSBpczogY2xvbmUoLi4uLCBpbnQgKmNoaWxkX3RpZHB0ciwgaW50IHRsc192YWwp LgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMgYi9hcmNoL3g4 Ni9rZXJuZWwvYWNwaS93YWtldXBfNjQuUwppbmRleCA1MGI4ZWQwMzE3YTMuLjBiNWE1NTczZjU3 ZCAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMKKysrIGIvYXJj aC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMKQEAgLTEyNSwxMiArMTI1LDEyIEBAIEVOVFJZ KGRvX3N1c3BlbmRfbG93bGV2ZWwpCiBFTkRQUk9DKGRvX3N1c3BlbmRfbG93bGV2ZWwpCiAKIC5k YXRhCi1FTlRSWShzYXZlZF9yYnApCS5xdWFkCTAKLUVOVFJZKHNhdmVkX3JzaSkJLnF1YWQJMAot RU5UUlkoc2F2ZWRfcmRpKQkucXVhZAkwCi1FTlRSWShzYXZlZF9yYngpCS5xdWFkCTAKK1NZTV9E QVRBX1NUQVJUKHNhdmVkX3JicCkJCS5xdWFkCTAKK1NZTV9EQVRBX1NUQVJUKHNhdmVkX3JzaSkJ CS5xdWFkCTAKK1NZTV9EQVRBX1NUQVJUKHNhdmVkX3JkaSkJCS5xdWFkCTAKK1NZTV9EQVRBX1NU QVJUKHNhdmVkX3JieCkJCS5xdWFkCTAKIAotRU5UUlkoc2F2ZWRfcmlwKQkucXVhZAkwCi1FTlRS WShzYXZlZF9yc3ApCS5xdWFkCTAKK1NZTV9EQVRBX1NUQVJUKHNhdmVkX3JpcCkJCS5xdWFkCTAK K1NZTV9EQVRBX1NUQVJUKHNhdmVkX3JzcCkJCS5xdWFkCTAKIAotRU5UUlkoc2F2ZWRfbWFnaWMp CS5xdWFkCTAKK1NZTV9EQVRBX1NUQVJUKHNhdmVkX21hZ2ljKQkucXVhZAkwCmRpZmYgLS1naXQg YS9hcmNoL3g4Ni9rZXJuZWwvaGVhZF82NC5TIGIvYXJjaC94ODYva2VybmVsL2hlYWRfNjQuUwpp bmRleCBhYzlkMzI3ZDJlNDIuLmUwOTNhODA0ZjFmYiAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2Vy bmVsL2hlYWRfNjQuUworKysgYi9hcmNoL3g4Ni9rZXJuZWwvaGVhZF82NC5TCkBAIC00ODcsNyAr NDg3LDcgQEAgZWFybHlfZ2R0X2Rlc2NyOgogZWFybHlfZ2R0X2Rlc2NyX2Jhc2U6CiAJLnF1YWQJ SU5JVF9QRVJfQ1BVX1ZBUihnZHRfcGFnZSkKIAotRU5UUlkocGh5c19iYXNlKQorU1lNX0RBVEFf U1RBUlQocGh5c19iYXNlKQogCS8qIFRoaXMgbXVzdCBtYXRjaCB0aGUgZmlyc3QgZW50cnkgaW4g bGV2ZWwyX2tlcm5lbF9wZ3QgKi8KIAkucXVhZCAgIDB4MDAwMDAwMDAwMDAwMDAwMAogRVhQT1JU X1NZTUJPTChwaHlzX2Jhc2UpCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvbWNvdW50XzY0 LlMgYi9hcmNoL3g4Ni9rZXJuZWwvbWNvdW50XzY0LlMKaW5kZXggN2IwZDNkYTUyZmI0Li4yYjRk NzA0NWU4MjMgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9tY291bnRfNjQuUworKysgYi9h cmNoL3g4Ni9rZXJuZWwvbWNvdW50XzY0LlMKQEAgLTMyMCw3ICszMjAsNyBAQCBFTlRSWShmdHJh Y2VfZ3JhcGhfY2FsbGVyKQogCXJldHEKIEVORChmdHJhY2VfZ3JhcGhfY2FsbGVyKQogCi1HTE9C QUwocmV0dXJuX3RvX2hhbmRsZXIpCitTWU1fRlVOQ19TVEFSVChyZXR1cm5fdG9faGFuZGxlcikK IAlzdWJxICAkMjQsICVyc3AKIAogCS8qIFNhdmUgdGhlIHJldHVybiB2YWx1ZXMgKi8KLS0gCjIu MTIuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0 cy54ZW4ub3JnL3hlbi1kZXZlbAo=