From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3870CC3A5A7 for ; Wed, 4 Sep 2019 11:45:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03D0322DBF for ; Wed, 4 Sep 2019 11:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567597556; bh=l8d1aa7jQJ/+VWO5N87LIpHbBJvkf1x8vkxmsAaaPmw=; h=From:To:Cc:Subject:Date:List-ID:From; b=V5U9+4AGAi0Ii2kT515wpTEfro6heVfZn6BVZzYksweFbcrm3cmnrEs9Cwfoebpl7 TQUaH33LkpFyAZs6VdpBIyjDkWA/tIlWpMjYBPM4YMjeOBJP+Q9SNjFRpZ7Mo8lVDr kwEia3fbFG+91sh6vamoh7OLisvDpchJDYAaSRM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728021AbfIDLpz (ORCPT ); Wed, 4 Sep 2019 07:45:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:57078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725938AbfIDLpy (ORCPT ); Wed, 4 Sep 2019 07:45:54 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1263F20820; Wed, 4 Sep 2019 11:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567597553; bh=l8d1aa7jQJ/+VWO5N87LIpHbBJvkf1x8vkxmsAaaPmw=; h=From:To:Cc:Subject:Date:From; b=RFtNBZbRmcEoaVoPNrGJW0/6TiJdHVXY7qaUXkrvTVCtEuxjgH9/5O28TJaV4fSxT laVSLarKnl7bRJ+WnLYsvIC/yZHTXmb54ccLzTD6jwTLq0beVHLnaNN7M+rMh2z0os eryfvmNkA9h5RntyMUq3ogjeQQEn98EF+J/K7iWg= From: Masami Hiramatsu To: Ingo Molnar Cc: Josh Poimboeuf , Peter Zijlstra , Randy Dunlap , Borislav Petkov , Juergen Gross , Boris Ostrovsky , Stefano Stabellini , x86@kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH -tip 0/2] x86: Prohibit kprobes on XEN_EMULATE_PREFIX Date: Wed, 4 Sep 2019 20:45:47 +0900 Message-Id: <156759754770.24473.11832897710080799131.stgit@devnote2> X-Mailer: git-send-email 2.20.1 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, These patches allow x86 instruction decoder to decode xen-cpuid which has XEN_EMULATE_PREFIX, and prohibit kprobes to probe on it. Josh reported that the objtool can not decode such special prefixed instructions, and I found that we also have to prohibit kprobes to probe on such instruction. This series can be applied on -tip master branch which has merged Josh's objtool/perf sharing common x86 insn decoder series. Thank you, --- Masami Hiramatsu (2): x86: xen: insn: Decode XEN_EMULATE_PREFIX correctly x86: kprobes: Prohibit probing on instruction which has Xen prefix arch/x86/include/asm/insn.h | 2 + arch/x86/include/asm/xen/interface.h | 7 ++++- arch/x86/include/asm/xen/prefix.h | 10 +++++++ arch/x86/kernel/kprobes/core.c | 4 +++ arch/x86/lib/insn.c | 43 +++++++++++++++++++++++++++++++ tools/arch/x86/include/asm/insn.h | 2 + tools/arch/x86/include/asm/xen/prefix.h | 10 +++++++ tools/arch/x86/lib/insn.c | 43 +++++++++++++++++++++++++++++++ tools/objtool/sync-check.sh | 3 +- 9 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 arch/x86/include/asm/xen/prefix.h create mode 100644 tools/arch/x86/include/asm/xen/prefix.h -- Masami Hiramatsu (Linaro) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94EB9C3A5A7 for ; Wed, 4 Sep 2019 11:46:13 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CEC522CF7 for ; Wed, 4 Sep 2019 11:46:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="RFtNBZbR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CEC522CF7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i5TjX-0007xv-Fh; Wed, 04 Sep 2019 11:45:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i5TjX-0007xq-1q for xen-devel@lists.xenproject.org; Wed, 04 Sep 2019 11:45:55 +0000 X-Inumbo-ID: 8d13ec40-cf09-11e9-b299-bc764e2007e4 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8d13ec40-cf09-11e9-b299-bc764e2007e4; Wed, 04 Sep 2019 11:45:54 +0000 (UTC) Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1263F20820; Wed, 4 Sep 2019 11:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567597553; bh=l8d1aa7jQJ/+VWO5N87LIpHbBJvkf1x8vkxmsAaaPmw=; h=From:To:Cc:Subject:Date:From; b=RFtNBZbRmcEoaVoPNrGJW0/6TiJdHVXY7qaUXkrvTVCtEuxjgH9/5O28TJaV4fSxT laVSLarKnl7bRJ+WnLYsvIC/yZHTXmb54ccLzTD6jwTLq0beVHLnaNN7M+rMh2z0os eryfvmNkA9h5RntyMUq3ogjeQQEn98EF+J/K7iWg= From: Masami Hiramatsu To: Ingo Molnar Date: Wed, 4 Sep 2019 20:45:47 +0900 Message-Id: <156759754770.24473.11832897710080799131.stgit@devnote2> X-Mailer: git-send-email 2.20.1 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Xen-devel] [PATCH -tip 0/2] x86: Prohibit kprobes on XEN_EMULATE_PREFIX X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Peter Zijlstra , Randy Dunlap , x86@kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Josh Poimboeuf , xen-devel@lists.xenproject.org, Boris Ostrovsky Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" SGksCgpUaGVzZSBwYXRjaGVzIGFsbG93IHg4NiBpbnN0cnVjdGlvbiBkZWNvZGVyIHRvIGRlY29k ZQp4ZW4tY3B1aWQgd2hpY2ggaGFzIFhFTl9FTVVMQVRFX1BSRUZJWCwgYW5kIHByb2hpYml0Cmtw cm9iZXMgdG8gcHJvYmUgb24gaXQuCgpKb3NoIHJlcG9ydGVkIHRoYXQgdGhlIG9ianRvb2wgY2Fu IG5vdCBkZWNvZGUgc3VjaCBzcGVjaWFsCnByZWZpeGVkIGluc3RydWN0aW9ucywgYW5kIEkgZm91 bmQgdGhhdCB3ZSBhbHNvIGhhdmUgdG8KcHJvaGliaXQga3Byb2JlcyB0byBwcm9iZSBvbiBzdWNo IGluc3RydWN0aW9uLgoKVGhpcyBzZXJpZXMgY2FuIGJlIGFwcGxpZWQgb24gLXRpcCBtYXN0ZXIg YnJhbmNoIHdoaWNoCmhhcyBtZXJnZWQgSm9zaCdzIG9ianRvb2wvcGVyZiBzaGFyaW5nIGNvbW1v biB4ODYgaW5zbgpkZWNvZGVyIHNlcmllcy4KCgpUaGFuayB5b3UsCgotLS0KCk1hc2FtaSBIaXJh bWF0c3UgKDIpOgogICAgICB4ODY6IHhlbjogaW5zbjogRGVjb2RlIFhFTl9FTVVMQVRFX1BSRUZJ WCBjb3JyZWN0bHkKICAgICAgeDg2OiBrcHJvYmVzOiBQcm9oaWJpdCBwcm9iaW5nIG9uIGluc3Ry dWN0aW9uIHdoaWNoIGhhcyBYZW4gcHJlZml4CgoKIGFyY2gveDg2L2luY2x1ZGUvYXNtL2luc24u aCAgICAgICAgICAgICB8ICAgIDIgKwogYXJjaC94ODYvaW5jbHVkZS9hc20veGVuL2ludGVyZmFj ZS5oICAgIHwgICAgNyArKysrLQogYXJjaC94ODYvaW5jbHVkZS9hc20veGVuL3ByZWZpeC5oICAg ICAgIHwgICAxMCArKysrKysrCiBhcmNoL3g4Ni9rZXJuZWwva3Byb2Jlcy9jb3JlLmMgICAgICAg ICAgfCAgICA0ICsrKwogYXJjaC94ODYvbGliL2luc24uYyAgICAgICAgICAgICAgICAgICAgIHwg ICA0MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiB0b29scy9hcmNoL3g4Ni9pbmNs dWRlL2FzbS9pbnNuLmggICAgICAgfCAgICAyICsKIHRvb2xzL2FyY2gveDg2L2luY2x1ZGUvYXNt L3hlbi9wcmVmaXguaCB8ICAgMTAgKysrKysrKwogdG9vbHMvYXJjaC94ODYvbGliL2luc24uYyAg ICAgICAgICAgICAgIHwgICA0MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiB0b29s cy9vYmp0b29sL3N5bmMtY2hlY2suc2ggICAgICAgICAgICAgfCAgICAzICstCiA5IGZpbGVzIGNo YW5nZWQsIDEyMSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAw NjQ0IGFyY2gveDg2L2luY2x1ZGUvYXNtL3hlbi9wcmVmaXguaAogY3JlYXRlIG1vZGUgMTAwNjQ0 IHRvb2xzL2FyY2gveDg2L2luY2x1ZGUvYXNtL3hlbi9wcmVmaXguaAoKLS0KTWFzYW1pIEhpcmFt YXRzdSAoTGluYXJvKSA8bWhpcmFtYXRAa2VybmVsLm9yZz4KCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=