[{"id":1763177,"web_url":"http://patchwork.ozlabs.org/comment/1763177/","msgid":"<2d27e542-da33-2b7f-fc11-b4979d71553b@canonical.com>","list_archive_url":null,"date":"2017-09-05T10:16:21","subject":"ACK: [SRU][Xenial][PATCH 1/1] KVM: PPC: Book3S HV: Enable TM before\n\taccessing TM registers","submitter":{"id":2900,"url":"http://patchwork.ozlabs.org/api/people/2900/","name":"Colin Ian King","email":"colin.king@canonical.com"},"content":"On 05/09/17 01:06, Daniel Axtens wrote:\n> BugLink: https://bugs.launchpad.net/bugs/1714420\n> \n> Commit 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state\n> properly\", 2017-06-15) added code to read transactional memory (TM)\n> registers but forgot to enable TM before doing so. The result is\n> that if userspace does have live values in the TM registers, a KVM_RUN\n> ioctl 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> \n> The fix is just to turn on the TM bit in the MSR before accessing the\n> registers.\n> \n> Cc: stable@vger.kernel.org # v3.14+\n> Fixes: 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state properly\")\n> Reported-by: Jan Stancek \n> Tested-by: Jan Stancek \n> Signed-off-by: Paul Mackerras \n> (cherry picked from commit e47057151422a67ce08747176fa21cb3b526a2c9)\n> Signed-off-by: Daniel Axtens \n> ---\n> arch/powerpc/kvm/book3s_hv.c | 2 ++\n> 1 file changed, 2 insertions(+)\n> \n> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c\n> index 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> \n\nClean cherry pick, has been tested by IBM, looks good to me. Thanks Daniel.\n\nAcked-by: Colin Ian King ","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=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmjL34TTKz9s3w;\n\tTue, 5 Sep 2017 20:16:27 +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 1dpAu7-0006Z2-4b; Tue, 05 Sep 2017 10:16:23 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dpAu6-0006Yq-9Q\n\tfor kernel-team@lists.canonical.com; Tue, 05 Sep 2017 10:16:22 +0000","from 1.general.cking.uk.vpn ([10.172.193.212])\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from )\n\tid 1dpAu5-0006oE-ST; Tue, 05 Sep 2017 10:16:22 +0000"],"Subject":"ACK: [SRU][Xenial][PATCH 1/1] KVM: PPC: Book3S HV: Enable TM before\n\taccessing TM registers","To":"Daniel Axtens ,\n\tkernel-team@lists.canonical.com","References":"<20170905000617.21888-1-daniel.axtens@canonical.com>\n\t<20170905000617.21888-2-daniel.axtens@canonical.com>","From":"Colin Ian King ","Message-ID":"<2d27e542-da33-2b7f-fc11-b4979d71553b@canonical.com>","Date":"Tue, 5 Sep 2017 11:16:21 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101\n\tThunderbird/45.8.0","MIME-Version":"1.0","In-Reply-To":"<20170905000617.21888-2-daniel.axtens@canonical.com>","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "}},{"id":1763411,"web_url":"http://patchwork.ozlabs.org/comment/1763411/","msgid":"<346dfbc7-b9f3-17b8-5341-88ba47705eac@canonical.com>","list_archive_url":null,"date":"2017-09-05T14:43:05","subject":"ACK: [SRU][Xenial][PATCH 1/1] KVM: PPC: Book3S HV: Enable TM before\n\taccessing TM registers","submitter":{"id":2898,"url":"http://patchwork.ozlabs.org/api/people/2898/","name":"Stefan Bader","email":"stefan.bader@canonical.com"},"content":"On 05.09.2017 02:06, Daniel Axtens wrote:\n> BugLink: https://bugs.launchpad.net/bugs/1714420\n> \n> Commit 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state\n> properly\", 2017-06-15) added code to read transactional memory (TM)\n> registers but forgot to enable TM before doing so. The result is\n> that if userspace does have live values in the TM registers, a KVM_RUN\n> ioctl 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> \n> The fix is just to turn on the TM bit in the MSR before accessing the\n> registers.\n> \n> Cc: stable@vger.kernel.org # v3.14+\n> Fixes: 46a704f8409f (\"KVM: PPC: Book3S HV: Preserve userspace HTM state properly\")\n> Reported-by: Jan Stancek \n> Tested-by: Jan Stancek \n> Signed-off-by: Paul Mackerras \n> (cherry picked from commit e47057151422a67ce08747176fa21cb3b526a2c9)\n> Signed-off-by: Daniel Axtens \nAcked-by: Stefan Bader \n\n> ---\n> arch/powerpc/kvm/book3s_hv.c | 2 ++\n> 1 file changed, 2 insertions(+)\n> \n> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c\n> index 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>","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=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmqFz0Zsqz9t2v;\n\tWed, 6 Sep 2017 00:43:19 +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 1dpF4N-0002pR-8a; Tue, 05 Sep 2017 14:43:15 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dpF4M-0002pF-7U\n\tfor kernel-team@lists.ubuntu.com; Tue, 05 Sep 2017 14:43:14 +0000","from 1.general.smb.uk.vpn ([10.172.193.28])\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from )\n\tid 1dpF4L-0004da-Vf\n\tfor kernel-team@lists.ubuntu.com; Tue, 05 Sep 2017 14:43:14 +0000"],"Subject":"ACK: [SRU][Xenial][PATCH 1/1] KVM: PPC: Book3S HV: Enable TM before\n\taccessing TM registers","To":"kernel-team@lists.ubuntu.com","References":"<20170905000617.21888-1-daniel.axtens@canonical.com>\n\t<20170905000617.21888-2-daniel.axtens@canonical.com>","From":"Stefan Bader ","Message-ID":"<346dfbc7-b9f3-17b8-5341-88ba47705eac@canonical.com>","Date":"Tue, 5 Sep 2017 16:43:05 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170905000617.21888-2-daniel.axtens@canonical.com>","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","Content-Type":"multipart/mixed;\n\tboundary=\"===============2151346040279257884==\"","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "}}]