From patchwork Tue Sep 5 14:52:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 111690 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp5585166ybm; Tue, 5 Sep 2017 07:52:48 -0700 (PDT) X-Received: by 10.84.217.91 with SMTP id e27mr4456791plj.99.1504623168579; Tue, 05 Sep 2017 07:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504623168; cv=none; d=google.com; s=arc-20160816; b=nZbO20iJI6nFu39WQS9HB06f0llN86vHPGlT4KA4LQvq0O5VL9h0EYzr5DiId4zVX+ 9OGiGEHPnFogtDZAbqVdXC2SNI+OPKRsX2yesaCkJpP7oY6Tg3VgowUlmYKVZn7baLkR BLFD8LYgrs+3pL3JRTaaetfZrq63ww+negmWv4e1w2axRvnETMCHb630dp1z3ROaB3mQ 1NNbnineO00metZzUUZY2KDHiLwZEa4mFP/MU9bmkBGVmi5uaaKtGiOExh+Z1Ya8MRL2 kCFYid0PcD6d9R6yQYB2K3aNQf8BJ09xqivP13QizFkPUIhuxdsBq4P4ImGx1GVwHDDh akHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=4QiWICnV1aXkBo3u9jBc/us9u1kWSriFMFHu31UQ7jU=; b=lzIzQCnnve7MLfUkOixccLEflGkUJWtys+uDRS8BM3y9HxokOH0tYy0dD4+6i4ucou OsmCYOyOfwGcJzFUDrUCf/i1e43IumxV6JGVrCJ2vIrOZuQVIrmxxyVLBUsjiiwgZL7G vgv2ZlQu9noqZX4u1DmlX1lzcltRQu1jtruOZOG3386NXw7oWCb/zaFY0QlIJoU19b23 W/q/kVNHX9yH4xIxa07BRzI0jZmooNrGwwFBzJ24FNHpPfPjPedaBw/0JCN1nSlS7Hiv +j2HE3phrKL0f3iHqrBBq6GgP5wDIsW43T+boKx9ZfggWuPRk8pxzXDLHDFzZap1vkMa 9Y6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HThIkp3c; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si365197pgd.499.2017.09.05.07.52.48; Tue, 05 Sep 2017 07:52:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HThIkp3c; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbdIEOwp (ORCPT + 6 others); Tue, 5 Sep 2017 10:52:45 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:36580 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbdIEOwT (ORCPT ); Tue, 5 Sep 2017 10:52:19 -0400 Received: by mail-wm0-f47.google.com with SMTP id i145so20451957wmf.1 for ; Tue, 05 Sep 2017 07:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4QiWICnV1aXkBo3u9jBc/us9u1kWSriFMFHu31UQ7jU=; b=HThIkp3c5lZxj5EkkYRTQZ/OUfiDkTKjB/mZnjcfUrSvJaFcrqL1+LzFw32jzUSiSi MSEqYVsqb5jePQ6w4wzW/vALMr+ENTrlysWj15oh7ptHfbvgRwjgveOUJREFQidmuDMM 9+fawuf6BPCjGZILp1nx0vj+Jf3BdyUeS3Q3I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4QiWICnV1aXkBo3u9jBc/us9u1kWSriFMFHu31UQ7jU=; b=MHVdtrII9XNKNoEHLiYTh0k8AzUtaTAvTwhiP1O2PYYZRmWJCvmLYeimOzJh4g1i49 9BJxD/mxa4x06zmU/2xsEeXDzr+VThHkFBcU04yBeB0bClM0HeP1v4aERO4bmMJ01mKT /xzU13xJehwp/faJe1RfCMeLjmG7cEPIuKBBMadH+LIWWP5mdmbilTdBkb6sSMztdTMn ezSesO0B8OGzffB1zPsJHjih4iN6Qpn8PuElHKP/VSz7fdcIoQNdhklGfuMEvHN4s4Xs KcwEBEjazutcv0VBoHel3NOX1yRk0z+u65EDCVrR5FT0GZupg7CgCzkNm5KMEg9pwy3O kjBQ== X-Gm-Message-State: AHPjjUh8fyj6WHhWzusWFbGJpoU7NIrBUTqeYZvs5Y6eXIhFQPy6aS9S rLfQIvnx/Nc6NVd4 X-Google-Smtp-Source: ADKCNb4G14w6ztLs5MjJ+mFRUHIC5jDfVF7RElAdKg8D4WGz6h2Eo16ketiLQWb9sjJC5niNdWuOuQ== X-Received: by 10.80.203.6 with SMTP id g6mr3594404edi.54.1504623138091; Tue, 05 Sep 2017 07:52:18 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id a28sm293809edc.14.2017.09.05.07.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Sep 2017 07:52:17 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andrew Jones , stable@vger.kernel.org Subject: [PULL 2/8] KVM: arm/arm64: PMU: Fix overflow interrupt injection Date: Tue, 5 Sep 2017 16:52:01 +0200 Message-Id: <20170905145207.18447-3-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170905145207.18447-1-cdall@linaro.org> References: <20170905145207.18447-1-cdall@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrew Jones kvm_pmu_overflow_set() is called from perf's interrupt handler, making the call of kvm_vgic_inject_irq() from it introduced with "KVM: arm/arm64: PMU: remove request-less vcpu kick" a really bad idea, as it's quite easy to try and retake a lock that the interrupted context is already holding. The fix is to use a vcpu kick, leaving the interrupt injection to kvm_pmu_sync_hwstate(), like it was doing before the refactoring. We don't just revert, though, because before the kick was request-less, leaving the vcpu exposed to the request-less vcpu kick race, and also because the kick was used unnecessarily from register access handlers. Cc: stable@vger.kernel.org Reviewed-by: Christoffer Dall Signed-off-by: Andrew Jones Signed-off-by: Marc Zyngier --- arch/arm64/kvm/sys_regs.c | 2 +- include/kvm/arm_pmu.h | 2 -- virt/kvm/arm/pmu.c | 43 +++++++++++++++---------------------------- 3 files changed, 16 insertions(+), 31 deletions(-) -- 2.9.0 diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 7786288..2e070d3 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -764,7 +764,7 @@ static bool access_pmovs(struct kvm_vcpu *vcpu, struct sys_reg_params *p, if (p->is_write) { if (r->CRm & 0x2) /* accessing PMOVSSET_EL0 */ - kvm_pmu_overflow_set(vcpu, p->regval & mask); + vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask); else /* accessing PMOVSCLR_EL0 */ vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask); diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index f6e0306..f87fe20 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -48,7 +48,6 @@ void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu); void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu); void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val); void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val); -void kvm_pmu_overflow_set(struct kvm_vcpu *vcpu, u64 val); void kvm_pmu_flush_hwstate(struct kvm_vcpu *vcpu); void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu); bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu); @@ -86,7 +85,6 @@ static inline void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu) {} static inline void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu) {} static inline void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val) {} static inline void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val) {} -static inline void kvm_pmu_overflow_set(struct kvm_vcpu *vcpu, u64 val) {} static inline void kvm_pmu_flush_hwstate(struct kvm_vcpu *vcpu) {} static inline void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu) {} static inline bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu) diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c index fc8a723..8a9c423 100644 --- a/virt/kvm/arm/pmu.c +++ b/virt/kvm/arm/pmu.c @@ -203,11 +203,15 @@ static u64 kvm_pmu_overflow_status(struct kvm_vcpu *vcpu) return reg; } -static void kvm_pmu_check_overflow(struct kvm_vcpu *vcpu) +static void kvm_pmu_update_state(struct kvm_vcpu *vcpu) { struct kvm_pmu *pmu = &vcpu->arch.pmu; - bool overflow = !!kvm_pmu_overflow_status(vcpu); + bool overflow; + + if (!kvm_arm_pmu_v3_ready(vcpu)) + return; + overflow = !!kvm_pmu_overflow_status(vcpu); if (pmu->irq_level == overflow) return; @@ -215,33 +219,11 @@ static void kvm_pmu_check_overflow(struct kvm_vcpu *vcpu) if (likely(irqchip_in_kernel(vcpu->kvm))) { int ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id, - pmu->irq_num, overflow, - &vcpu->arch.pmu); + pmu->irq_num, overflow, pmu); WARN_ON(ret); } } -/** - * kvm_pmu_overflow_set - set PMU overflow interrupt - * @vcpu: The vcpu pointer - * @val: the value guest writes to PMOVSSET register - */ -void kvm_pmu_overflow_set(struct kvm_vcpu *vcpu, u64 val) -{ - if (val == 0) - return; - - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= val; - kvm_pmu_check_overflow(vcpu); -} - -static void kvm_pmu_update_state(struct kvm_vcpu *vcpu) -{ - if (!kvm_arm_pmu_v3_ready(vcpu)) - return; - kvm_pmu_check_overflow(vcpu); -} - bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu) { struct kvm_pmu *pmu = &vcpu->arch.pmu; @@ -303,7 +285,7 @@ static inline struct kvm_vcpu *kvm_pmc_to_vcpu(struct kvm_pmc *pmc) } /** - * When perf event overflows, call kvm_pmu_overflow_set to set overflow status. + * When the perf event overflows, set the overflow status and inform the vcpu. */ static void kvm_pmu_perf_overflow(struct perf_event *perf_event, struct perf_sample_data *data, @@ -313,7 +295,12 @@ static void kvm_pmu_perf_overflow(struct perf_event *perf_event, struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc); int idx = pmc->idx; - kvm_pmu_overflow_set(vcpu, BIT(idx)); + vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(idx); + + if (kvm_pmu_overflow_status(vcpu)) { + kvm_make_request(KVM_REQ_IRQ_PENDING, vcpu); + kvm_vcpu_kick(vcpu); + } } /** @@ -341,7 +328,7 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) reg = lower_32_bits(reg); vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = reg; if (!reg) - kvm_pmu_overflow_set(vcpu, BIT(i)); + vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(i); } } }