From nobody Thu Sep 19 01:01:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1721145450; cv=none; d=zohomail.com; s=zohoarc; b=iryMZpNN1IqEtDJfpTLDn+TCv+iwmuuzTGQjwPhXyBAlRHtwWb95/c5tRqfbBAdA4bLJ3vKFa5etxKUK0nF02zhUrFAVjp141NKup1afWipuAiXplP/eeuwBfOd7OCU9xlG9IEzhpAYAI0d+mTj4HfFzgb3f62PROah+T4672ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721145450; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PvfRWsW2GKoxeeeyFi9s+PxB8H95ZazM0RkReheskUQ=; b=a4eSXWGd2sHILmC0Lcrefh6frik/w9TKT0Zdd+/qvmRGV3uhYuvxOQNLgn1fcRdubOzCM0sGfPZaR9s2fldPmORoOEPsSAMB2V9DSvvHq6lQN4gVPWiveApVRY5TjPAkvqMIZ2btt/RWikYGrtE7ZB+ityk6zkP7x/oVK1KXzD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721145450248797.0158140770408; Tue, 16 Jul 2024 08:57:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTkWl-0000ju-Ge; Tue, 16 Jul 2024 11:55:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTkWc-0000BK-Ay for qemu-devel@nongnu.org; Tue, 16 Jul 2024 11:55:35 -0400 Received: from mgamail.intel.com ([192.198.163.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTkWV-0007SW-G1 for qemu-devel@nongnu.org; Tue, 16 Jul 2024 11:55:33 -0400 Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2024 08:55:07 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa008.jf.intel.com with ESMTP; 16 Jul 2024 08:55:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721145328; x=1752681328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o17ZIKIksTITRMcAguc7dJOs/NSuZsgFkBWTlPrKm8w=; b=YKOajdTYThucNjGmATYyFoQaKLnGidbMDok7XqsGRUjFeH0QlJB1i5lX XTCnRFmUwx3b72mZQnnMlQq2PU+lyABQpYl7+TDDyXSdDS3nzXqvqg5Jf dBM4B6/BTAoI0Rbx6iPJ7FemIP/tsskG8UvpEpaQUx7fUaQqsNBWph7ER WUMBp89hiYonyzq1XetDyRkiJ9PXXQAAxQQdbZPMXDjjE2xHGOHoIKvr4 oHilhyU/2rMvzTVmDRwdzyItRGCOCIpYiIGPOAvb+kPZBDwQNV5uShSWN mvkGUONwm08PVqVI6v1askHNnUOoBwfwaHm5TzoZOFYYBY3q9HCwf9z2+ A==; X-CSE-ConnectionGUID: NO2B+Lv+StiUbzFRMZkrIA== X-CSE-MsgGUID: sUSHpqiaTWWAbcZNMNdIRw== X-IronPort-AV: E=McAfee;i="6700,10204,11135"; a="18743770" X-IronPort-AV: E=Sophos;i="6.09,212,1716274800"; d="scan'208";a="18743770" X-CSE-ConnectionGUID: s2dEqft1QrKII9T29SAtSg== X-CSE-MsgGUID: MX4+2bZTRHqNYc+Y7yZYCQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,212,1716274800"; d="scan'208";a="50788416" From: Zhao Liu To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S . Tsirkin" , Marcel Apfelbaum , Marcelo Tosatti Cc: Xiaoyao Li , Pankaj Gupta , Zide Chen , qemu-devel@nongnu.org, kvm@vger.kernel.org, Zhao Liu Subject: [PATCH v4 7/9] target/i386/kvm: Clean up return values of MSR filter related functions Date: Wed, 17 Jul 2024 00:10:13 +0800 Message-Id: <20240716161015.263031-8-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240716161015.263031-1-zhao1.liu@intel.com> References: <20240716161015.263031-1-zhao1.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.15; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1721145450500116600 Content-Type: text/plain; charset="utf-8" At present, the error code of MSR filter enablement attempts to print in error_report(). Unfortunately, this behavior doesn't work because the MSR filter-related functions return the boolean and current error_report() use the wrong return value. So fix this by making MSR filter related functions return int type and printing such returned value in error_report(). Signed-off-by: Zhao Liu --- v4: Returned kvm_vm_ioctl() directly. (Zide) v3: new commit. --- target/i386/kvm/kvm.c | 34 ++++++++++++++-------------------- target/i386/kvm/kvm_i386.h | 4 ++-- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 4aae4ffc9ccd..f68be68eb411 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2780,8 +2780,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } } if (kvm_vm_check_extension(s, KVM_CAP_X86_USER_SPACE_MSR)) { - bool r; - ret =3D kvm_vm_enable_cap(s, KVM_CAP_X86_USER_SPACE_MSR, 0, KVM_MSR_EXIT_REASON_FILTER); if (ret) { @@ -2790,9 +2788,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s) exit(1); } =20 - r =3D kvm_filter_msr(s, MSR_CORE_THREAD_COUNT, - kvm_rdmsr_core_thread_count, NULL); - if (!r) { + ret =3D kvm_filter_msr(s, MSR_CORE_THREAD_COUNT, + kvm_rdmsr_core_thread_count, NULL); + if (ret) { error_report("Could not install MSR_CORE_THREAD_COUNT handler:= %s", strerror(-ret)); exit(1); @@ -5274,13 +5272,13 @@ void kvm_arch_update_guest_debug(CPUState *cpu, str= uct kvm_guest_debug *dbg) } } =20 -static bool kvm_install_msr_filters(KVMState *s) +static int kvm_install_msr_filters(KVMState *s) { uint64_t zero =3D 0; struct kvm_msr_filter filter =3D { .flags =3D KVM_MSR_FILTER_DEFAULT_ALLOW, }; - int r, i, j =3D 0; + int i, j =3D 0; =20 for (i =3D 0; i < KVM_MSR_FILTER_MAX_RANGES; i++) { KVMMSRHandlers *handler =3D &msr_handlers[i]; @@ -5304,18 +5302,13 @@ static bool kvm_install_msr_filters(KVMState *s) } } =20 - r =3D kvm_vm_ioctl(s, KVM_X86_SET_MSR_FILTER, &filter); - if (r) { - return false; - } - - return true; + return kvm_vm_ioctl(s, KVM_X86_SET_MSR_FILTER, &filter); } =20 -bool kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr, - QEMUWRMSRHandler *wrmsr) +int kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr, + QEMUWRMSRHandler *wrmsr) { - int i; + int i, ret; =20 for (i =3D 0; i < ARRAY_SIZE(msr_handlers); i++) { if (!msr_handlers[i].msr) { @@ -5325,16 +5318,17 @@ bool kvm_filter_msr(KVMState *s, uint32_t msr, QEMU= RDMSRHandler *rdmsr, .wrmsr =3D wrmsr, }; =20 - if (!kvm_install_msr_filters(s)) { + ret =3D kvm_install_msr_filters(s); + if (ret) { msr_handlers[i] =3D (KVMMSRHandlers) { }; - return false; + return ret; } =20 - return true; + return 0; } } =20 - return false; + return 0; } =20 static int kvm_handle_rdmsr(X86CPU *cpu, struct kvm_run *run) diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h index 34fc60774b86..91c2d6e69163 100644 --- a/target/i386/kvm/kvm_i386.h +++ b/target/i386/kvm/kvm_i386.h @@ -74,8 +74,8 @@ typedef struct kvm_msr_handlers { QEMUWRMSRHandler *wrmsr; } KVMMSRHandlers; =20 -bool kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr, - QEMUWRMSRHandler *wrmsr); +int kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr, + QEMUWRMSRHandler *wrmsr); =20 #endif /* CONFIG_KVM */ =20 --=20 2.34.1