From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752305AbcHBGrX (ORCPT ); Tue, 2 Aug 2016 02:47:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:53357 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751183AbcHBGrW (ORCPT ); Tue, 2 Aug 2016 02:47:22 -0400 From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: boris.ostrovsky@oracle.com, david.vrabel@citrix.com, Juergen Gross Subject: [PATCH v2] xen: Make VPMU init message look less scary Date: Tue, 2 Aug 2016 08:43:33 +0200 Message-Id: <1470120213-16683-1-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The default for the Xen hypervisor is to not enable VPMU in order to avoid security issues. In this case the Linux kernel will issue the message "Could not initialize VPMU for cpu 0, error -95" which looks more like an error than a normal state. Change the message to something less scary in case the hypervisor returns EOPNOTSUPP when trying to activate VPMU. Signed-off-by: Juergen Gross --- V2: modify error message as suggested by Konrad Wilk --- arch/x86/xen/pmu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c index 32bdc2c..bfe8880 100644 --- a/arch/x86/xen/pmu.c +++ b/arch/x86/xen/pmu.c @@ -547,8 +547,11 @@ void xen_pmu_init(int cpu) return; fail: - pr_info_once("Could not initialize VPMU for cpu %d, error %d\n", - cpu, err); + if (err == -EOPNOTSUPP) + pr_info_once("VPMU disabled by hypervisor.\n"); + else + pr_info_once("Could not initialize VPMU for cpu %d, error %d\n", + cpu, err); free_pages((unsigned long)xenpmu_data, 0); } -- 2.6.6 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v2] xen: Make VPMU init message look less scary Date: Tue, 2 Aug 2016 08:43:33 +0200 Message-ID: <1470120213-16683-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bUTQP-00022a-N7 for xen-devel@lists.xenproject.org; Tue, 02 Aug 2016 06:43:37 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Juergen Gross , boris.ostrovsky@oracle.com, david.vrabel@citrix.com List-Id: xen-devel@lists.xenproject.org VGhlIGRlZmF1bHQgZm9yIHRoZSBYZW4gaHlwZXJ2aXNvciBpcyB0byBub3QgZW5hYmxlIFZQTVUg aW4gb3JkZXIgdG8KYXZvaWQgc2VjdXJpdHkgaXNzdWVzLiBJbiB0aGlzIGNhc2UgdGhlIExpbnV4 IGtlcm5lbCB3aWxsIGlzc3VlIHRoZQptZXNzYWdlICJDb3VsZCBub3QgaW5pdGlhbGl6ZSBWUE1V IGZvciBjcHUgMCwgZXJyb3IgLTk1IiB3aGljaCBsb29rcwptb3JlIGxpa2UgYW4gZXJyb3IgdGhh biBhIG5vcm1hbCBzdGF0ZS4KCkNoYW5nZSB0aGUgbWVzc2FnZSB0byBzb21ldGhpbmcgbGVzcyBz Y2FyeSBpbiBjYXNlIHRoZSBoeXBlcnZpc29yCnJldHVybnMgRU9QTk9UU1VQUCB3aGVuIHRyeWlu ZyB0byBhY3RpdmF0ZSBWUE1VLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3Nz QHN1c2UuY29tPgotLS0KVjI6IG1vZGlmeSBlcnJvciBtZXNzYWdlIGFzIHN1Z2dlc3RlZCBieSBL b25yYWQgV2lsawotLS0KIGFyY2gveDg2L3hlbi9wbXUuYyB8IDcgKysrKystLQogMSBmaWxlIGNo YW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni94ZW4vcG11LmMgYi9hcmNoL3g4Ni94ZW4vcG11LmMKaW5kZXggMzJiZGMyYy4uYmZlODg4 MCAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL3BtdS5jCisrKyBiL2FyY2gveDg2L3hlbi9wbXUu YwpAQCAtNTQ3LDggKzU0NywxMSBAQCB2b2lkIHhlbl9wbXVfaW5pdChpbnQgY3B1KQogCXJldHVy bjsKIAogZmFpbDoKLQlwcl9pbmZvX29uY2UoIkNvdWxkIG5vdCBpbml0aWFsaXplIFZQTVUgZm9y IGNwdSAlZCwgZXJyb3IgJWRcbiIsCi0JCWNwdSwgZXJyKTsKKwlpZiAoZXJyID09IC1FT1BOT1RT VVBQKQorCQlwcl9pbmZvX29uY2UoIlZQTVUgZGlzYWJsZWQgYnkgaHlwZXJ2aXNvci5cbiIpOwor CWVsc2UKKwkJcHJfaW5mb19vbmNlKCJDb3VsZCBub3QgaW5pdGlhbGl6ZSBWUE1VIGZvciBjcHUg JWQsIGVycm9yICVkXG4iLAorCQkJY3B1LCBlcnIpOwogCWZyZWVfcGFnZXMoKHVuc2lnbmVkIGxv bmcpeGVucG11X2RhdGEsIDApOwogfQogCi0tIAoyLjYuNgoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=