{"id":810102,"url":"http://patchwork.ozlabs.org/api/patches/810102/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170904233905.20352-2-dja@axtens.net/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/projects/15/?format=json","name":"Ubuntu Kernel","link_name":"ubuntu-kernel","list_id":"kernel-team.lists.ubuntu.com","list_email":"kernel-team@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170904233905.20352-2-dja@axtens.net>","list_archive_url":null,"date":"2017-09-04T23:39:05","name":"[SRU,Xenial,1/1] KVM: PPC: Book3S HV: Enable TM before accessing TM registers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ed0a14d4427851dc71887bae118b7f7045205dab","submitter":{"id":65792,"url":"http://patchwork.ozlabs.org/api/people/65792/?format=json","name":"Daniel Axtens","email":"dja@axtens.net"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170904233905.20352-2-dja@axtens.net/mbox/","series":[{"id":1571,"url":"http://patchwork.ozlabs.org/api/series/1571/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=1571","date":"2017-09-04T23:39:05","name":"Fixes for LP#1714859","version":1,"mbox":"http://patchwork.ozlabs.org/series/1571/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810102/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810102/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=axtens.net header.i=@axtens.net\n\theader.b=\"hA2ZYmgl\"; dkim-atps=neutral"],"Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmmJ91vG4z9t24;\n\tTue, 5 Sep 2017 22:30:01 +1000 (AEST)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1dpCzO-0004fm-5g; Tue, 05 Sep 2017 12:29:58 +0000","from mail-pg0-f66.google.com ([74.125.83.66])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2)\n\t(envelope-from ) id 1dp0xj-0008FD-6U\n\tfor kernel-team@lists.canonical.com; Mon, 04 Sep 2017 23:39:27 +0000","by mail-pg0-f66.google.com with SMTP id j6so949530pgc.4\n\tfor ;\n\tMon, 04 Sep 2017 16:39:27 -0700 (PDT)","from localhost.localdomain (124-171-202-56.dyn.iinet.net.au.\n\t[124.171.202.56]) by smtp.gmail.com with ESMTPSA id\n\tq67sm13069375pfg.37.2017.09.04.16.39.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 04 Sep 2017 16:39:25 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=eDnXnXQUnFrp7aYUYDDGvTTRnMtIOJNx58NixbNTXfc=;\n\tb=hA2ZYmgl4MdCW8C+9Yt/hhpsI7O9SD7UEs8614Q4pO9IM8PhSU9Zdj0fq8BUx29qJv\n\tw6qfxSkGYu+oLvR5G7lR7uvu23x+HijXRP0qTY1161teg0Ir9cfXgYeJoPtpt9XO6L72\n\toiflLmI0nxdyJkFyNjm0PuedMQsyXXcRx6wpc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=eDnXnXQUnFrp7aYUYDDGvTTRnMtIOJNx58NixbNTXfc=;\n\tb=hTYQ6fcoSP0vAYM86n97l8nBPXPfL6Y2wAFxc3EBTZL9n9TMwsX93F47HyL1KYuWcB\n\tk/UxvcK3aqxSDqSNDPNDJ9zAo2cGqvvZzadup2vG+upY2tPkaSE6HLc/AjitOwnxAVVN\n\t4RtmhwDy2dO9bDFrzs6yCExQhgX0DBR4HNR0gq5bBlRyAfDCUK58N8cq1YgjkQqVNVUO\n\tnA1o6pUtoJ9Whhz0DiurNWGvRmaaa570BALK0ci/LK/4eShoAWfReXVVzWk3Wu7eUH6y\n\t0nwiG3BkE8mYBMTJfEF6N13HcmBkYrdMP+K8qPssL8ZN8Gy3V93OK3g1dKogST3j4+PM\n\t5LSw==","X-Gm-Message-State":"AHPjjUhfQ5cRHQd+shO8wr9uJ4oVMyb1KJqj163z9kQNwy8+3AFta1gh\n\tTywc4ifwzHvg5I84jCWTDg==","X-Google-Smtp-Source":"ADKCNb42eCJNXlmm8FFdRrMFu8d1xbdZGDh1Rn58HGSllC84i5wgtPDPVw5NkQ2gQ1jzWExQt4oxxA==","X-Received":"by 10.101.67.200 with SMTP id n8mr2045702pgp.317.1504568365720; \n\tMon, 04 Sep 2017 16:39:25 -0700 (PDT)","From":"Daniel Axtens ","To":"kernel-team@lists.canonical.com","Subject":"[SRU][Xenial][PATCH 1/1] KVM: PPC: Book3S HV: Enable TM before\n\taccessing TM registers","Date":"Tue, 5 Sep 2017 09:39:05 +1000","Message-Id":"<20170904233905.20352-2-dja@axtens.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170904233905.20352-1-dja@axtens.net>","References":"<20170904233905.20352-1-dja@axtens.net>","X-Mailman-Approved-At":"Tue, 05 Sep 2017 12:29:56 +0000","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"danielgb@au1.ibm.com","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "},"content":"From: Paul Mackerras \n\nBugLink: https://bugs.launchpad.net/bugs/1714420\n\nCommit 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state\nproperly\", 2017-06-15) added code to read transactional memory (TM)\nregisters but forgot to enable TM before doing so. The result is\nthat if userspace does have live values in the TM registers, a KVM_RUN\nioctl will cause a host kernel crash like this:\n\n[ 181.328511] Unrecoverable TM Unavailable Exception f60 at d00000001e7d9980\n[ 181.328605] Oops: Unrecoverable TM Unavailable Exception, sig: 6 [#1]\n[ 181.328613] SMP NR_CPUS=2048\n[ 181.328613] NUMA\n[ 181.328618] PowerNV\n[ 181.328646] Modules linked in: vhost_net vhost tap nfs_layout_nfsv41_files rpcsec_gss_krb5 nfsv4 dns_resolver nfs\n+fscache xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat\n+nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun ebtable_filter ebtables\n+ip6table_filter ip6_tables iptable_filter bridge stp llc kvm_hv kvm nfsd ses enclosure scsi_transport_sas ghash_generic\n+auth_rpcgss gf128mul xts sg ctr nfs_acl lockd vmx_crypto shpchp ipmi_powernv i2c_opal grace ipmi_devintf i2c_core\n+powernv_rng sunrpc ipmi_msghandler ibmpowernv uio_pdrv_genirq uio leds_powernv powernv_op_panel ip_tables xfs sd_mod\n+lpfc ipr bnx2x libata mdio ptp pps_core scsi_transport_fc libcrc32c dm_mirror dm_region_hash dm_log dm_mod\n[ 181.329278] CPU: 40 PID: 9926 Comm: CPU 0/KVM Not tainted 4.12.0+ #1\n[ 181.329337] task: c000003fc6980000 task.stack: c000003fe4d80000\n[ 181.329396] NIP: d00000001e7d9980 LR: d00000001e77381c CTR: d00000001e7d98f0\n[ 181.329465] REGS: c000003fe4d837e0 TRAP: 0f60 Not tainted (4.12.0+)\n[ 181.329523] MSR: 9000000000009033 \n[ 181.329527] CR: 24022448 XER: 00000000\n[ 181.329608] CFAR: d00000001e773818 SOFTE: 1\n[ 181.329608] GPR00: d00000001e77381c c000003fe4d83a60 d00000001e7ef410 c000003fdcfe0000\n[ 181.329608] GPR04: c000003fe4f00000 0000000000000000 0000000000000000 c000003fd7954800\n[ 181.329608] GPR08: 0000000000000001 c000003fc6980000 0000000000000000 d00000001e7e2880\n[ 181.329608] GPR12: d00000001e7d98f0 c000000007b19000 00000001295220e0 00007fffc0ce2090\n[ 181.329608] GPR16: 0000010011886608 00007fff8c89f260 0000000000000001 00007fff8c080028\n[ 181.329608] GPR20: 0000000000000000 00000100118500a6 0000010011850000 0000010011850000\n[ 181.329608] GPR24: 00007fffc0ce1b48 0000010011850000 00000000d673b901 0000000000000000\n[ 181.329608] GPR28: 0000000000000000 c000003fdcfe0000 c000003fdcfe0000 c000003fe4f00000\n[ 181.330199] NIP [d00000001e7d9980] kvmppc_vcpu_run_hv+0x90/0x6b0 [kvm_hv]\n[ 181.330264] LR [d00000001e77381c] kvmppc_vcpu_run+0x2c/0x40 [kvm]\n[ 181.330322] Call Trace:\n[ 181.330351] [c000003fe4d83a60] [d00000001e773478] kvmppc_set_one_reg+0x48/0x340 [kvm] (unreliable)\n[ 181.330437] [c000003fe4d83b30] [d00000001e77381c] kvmppc_vcpu_run+0x2c/0x40 [kvm]\n[ 181.330513] [c000003fe4d83b50] [d00000001e7700b4] kvm_arch_vcpu_ioctl_run+0x114/0x2a0 [kvm]\n[ 181.330586] [c000003fe4d83bd0] [d00000001e7642f8] kvm_vcpu_ioctl+0x598/0x7a0 [kvm]\n[ 181.330658] [c000003fe4d83d40] [c0000000003451b8] do_vfs_ioctl+0xc8/0x8b0\n[ 181.330717] [c000003fe4d83de0] [c000000000345a64] SyS_ioctl+0xc4/0x120\n[ 181.330776] [c000003fe4d83e30] [c00000000000b004] system_call+0x58/0x6c\n[ 181.330833] Instruction dump:\n[ 181.330869] e92d0260 e9290b50 e9290108 792807e3 41820058 e92d0260 e9290b50 e9290108\n[ 181.330941] 792ae8a4 794a1f87 408204f4 e92d0260 <7d4022a6> f9490ff0 e92d0260 7d4122a6\n[ 181.331013] ---[ end trace 6f6ddeb4bfe92a92 ]---\n\nThe fix is just to turn on the TM bit in the MSR before accessing the\nregisters.\n\nCc: stable@vger.kernel.org # v3.14+\nFixes: 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state properly\")\nReported-by: Jan Stancek \nTested-by: Jan Stancek \nSigned-off-by: Paul Mackerras \n(cherry picked from commit e47057151422a67ce08747176fa21cb3b526a2c9)\nSigned-off-by: Daniel Axtens \n---\n arch/powerpc/kvm/book3s_hv.c | 2 ++\n 1 file changed, 2 insertions(+)","diff":"diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c\nindex 0283de0fe7d0..36e841e10db1 100644\n--- a/arch/powerpc/kvm/book3s_hv.c\n+++ b/arch/powerpc/kvm/book3s_hv.c\n@@ -2708,6 +2708,8 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu)\n \t\t\trun->fail_entry.hardware_entry_failure_reason = 0;\n \t\t\treturn -EINVAL;\n \t\t}\n+\t\t/* Enable TM so we can read the TM SPRs */\n+\t\tmtmsr(mfmsr() | MSR_TM);\n \t\tcurrent->thread.tm_tfhar = mfspr(SPRN_TFHAR);\n \t\tcurrent->thread.tm_tfiar = mfspr(SPRN_TFIAR);\n \t\tcurrent->thread.tm_texasr = mfspr(SPRN_TEXASR);\n","prefixes":["SRU","Xenial","1/1"]}