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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 BA141C74A2B for ; Wed, 10 Jul 2019 15:05:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A6AF21530 for ; Wed, 10 Jul 2019 15:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771144; bh=/tTCfsdxKc4/IJKdw22nCxXU0Y9hM+ovuTEz4TGz8OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Kd+UySAIrSKZQRKCpwdr9juNFH7vbDf1ySG6MSfIQSetfhnd29sB3Skaeo304FT05 gvzD9MAwMIqXGado1a+SB3eZbbH2rP6IZ9MctgsZWoh54ATSYGj5DMUB+nUGodWgwK 2OVIL7F+/idljoD0oRFG8qAQrF0wJSpnT7kUKioc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbfGJPCx (ORCPT ); Wed, 10 Jul 2019 11:02:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:34670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbfGJPCw (ORCPT ); Wed, 10 Jul 2019 11:02:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 B17CC21530; Wed, 10 Jul 2019 15:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562770971; bh=/tTCfsdxKc4/IJKdw22nCxXU0Y9hM+ovuTEz4TGz8OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EZ4Cm5+b9ogjQ15oXW2a1i+LFe1bgEVgVH+YknZKLpK1yt25fGNn27NMKDTN3MeH6 ZHgY7eB+pHN08JUzhCNdC6YDC80Lo78GcrWR+uJPSLekQs0o47A5WlRmMz8c+/AQCR ff/i9F545GZpXKWyGDKxNe+PFqpSEPzeL2G4pNbM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paolo Bonzini , syzbot+c03f30b4f4c46bdf8575@syzkaller.appspotmail.com, Alexander Potapenko , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 06/11] KVM: x86: degrade WARN to pr_warn_ratelimited Date: Wed, 10 Jul 2019 11:02:33 -0400 Message-Id: <20190710150240.6984-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190710150240.6984-1-sashal@kernel.org> References: <20190710150240.6984-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Bonzini [ Upstream commit 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee ] This warning can be triggered easily by userspace, so it should certainly not cause a panic if panic_on_warn is set. Reported-by: syzbot+c03f30b4f4c46bdf8575@syzkaller.appspotmail.com Suggested-by: Alexander Potapenko Acked-by: Alexander Potapenko Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b07868eb1656..37028ea85d4c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1547,7 +1547,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) vcpu->arch.tsc_always_catchup = 1; return 0; } else { - WARN(1, "user requested TSC rate below hardware speed\n"); + pr_warn_ratelimited("user requested TSC rate below hardware speed\n"); return -1; } } @@ -1557,8 +1557,8 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) user_tsc_khz, tsc_khz); if (ratio == 0 || ratio >= kvm_max_tsc_scaling_ratio) { - WARN_ONCE(1, "Invalid TSC scaling ratio - virtual-tsc-khz=%u\n", - user_tsc_khz); + pr_warn_ratelimited("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n", + user_tsc_khz); return -1; } -- 2.20.1