From nobody Tue Sep 9 09:49:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1745923565; cv=none; d=zohomail.com; s=zohoarc; b=hM68H7qI4Tnlufyyz9V+2Zbv7pdvewsbl+2b7biLkr8wKYHsySfpySEzrPW+kEEfkUsOehw+7WsMmESsgFhrnNoArVplhGjcOgqs5+jOSi7VQJjkmHAgEmlYb2vb8p5Mv40nMGk6G79hAjSfigMDzH1PhqbXcg3iJGgtCb5jKak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745923565; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Guy0qP1+sRkHRs1OySFj9f6NxbYAwcPSRWNO4gLKdJc=; b=iz8bmrGXEUDTbcaF/M5VbFyalcJACCuc5RxKfPZFQNsyVUrHabvhM7wf8G+U0ipdVDKiMWsZVy5qlhDPpyKyARtC7Ti2THl0mfg+3pAxEq8EsjN2lThmpvl0AlOScmRTaJ0np4jNvFaqGtkPItvEdHVMfyezf9ufhmP7Hw6k1QA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1745923565966549.9381733368725; Tue, 29 Apr 2025 03:46:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0A75012BF; Tue, 29 Apr 2025 06:46:05 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0C9A813EC; Tue, 29 Apr 2025 06:21:29 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5EAA612AF; Tue, 29 Apr 2025 06:21:20 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C8FBA12E3 for ; Tue, 29 Apr 2025 06:20:25 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-131-2wbraOPJOqGETU3eKWNdXg-1; Tue, 29 Apr 2025 06:20:23 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3025E195608E for ; Tue, 29 Apr 2025 10:20:23 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B9D0119560A3 for ; Tue, 29 Apr 2025 10:20:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745922025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Gbc6ioecK4iSCPU2WwbugAttVzZij5RvyXCXab7MlY=; b=YFx27klaRdWNmpVFZ2ZuNe3ZxgmOIAfZXAyTG7VM34+esLIi+l0mWvTylkHj6cQ9BiDWY8 7PD8kUDWWtYrngCmNjrr7pgGBDTSy13ZKE0ZDkgPe7Ar99b/3FGOZ/u8fMbeYBJtGouIDC mSpCqZ2zyA+VpmzUlWejPeViBOLurFg= X-MC-Unique: 2wbraOPJOqGETU3eKWNdXg-1 X-Mimecast-MFC-AGG-ID: 2wbraOPJOqGETU3eKWNdXg_1745922023 To: devel@lists.libvirt.org Subject: [PATCH 14/15] cpu_x86: Refactor virCPUx86CompareCandidateFeatureList Date: Tue, 29 Apr 2025 12:19:49 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: X2df8ZtZ3i4PKhi_2WjEYZZo0z29oZgG7ZRqC_3Mhqo_1745922023 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NXRXN6XYZLMOMG4URSTOVZR75HNOSMEK X-Message-ID-Hash: NXRXN6XYZLMOMG4URSTOVZR75HNOSMEK X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jiri Denemark via Devel Reply-To: Jiri Denemark X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1745923567700019100 Content-Type: text/plain; charset="utf-8" From: Jiri Denemark Refactor weight calculation to a separate virCPUx86WeightFeatures function to avoid code duplication. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/cpu/cpu_x86.c | 83 ++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 32aa01bc14..b0fe2bed4c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2090,63 +2090,72 @@ virCPUx86Compare(virCPUDef *host, /* Base penalty for disabled features. */ #define BASE_PENALTY 2 =20 +struct virCPUx86Weight { + size_t total; + size_t enabled; + size_t disabled; +}; + +static void +virCPUx86WeightFeatures(const virCPUDef *cpu, + struct virCPUx86Weight *weight) +{ + int penalty =3D BASE_PENALTY; + size_t i; + + weight->enabled =3D cpu->nfeatures; + weight->disabled =3D 0; + + if (cpu->type =3D=3D VIR_CPU_TYPE_HOST) { + weight->total =3D cpu->nfeatures; + return; + } + + for (i =3D 0; i < weight->enabled; i++) { + if (cpu->features[i].policy =3D=3D VIR_CPU_FEATURE_DISABLE) { + weight->enabled--; + weight->disabled +=3D penalty; + penalty++; + } + } + + weight->total =3D weight->enabled + weight->disabled; +} + + static int virCPUx86CompareCandidateFeatureList(virCPUDef *cpuCurrent, virCPUDef *cpuCandidate, bool isPreferred) { - size_t current =3D cpuCurrent->nfeatures; - size_t enabledCurrent =3D current; - size_t disabledCurrent =3D 0; - size_t candidate =3D cpuCandidate->nfeatures; - size_t enabled =3D candidate; - size_t disabled =3D 0; + struct virCPUx86Weight current =3D { 0 }; + struct virCPUx86Weight candidate =3D { 0 }; =20 - if (cpuCandidate->type !=3D VIR_CPU_TYPE_HOST) { - size_t i; - int penalty =3D BASE_PENALTY; + virCPUx86WeightFeatures(cpuCurrent, ¤t); + virCPUx86WeightFeatures(cpuCandidate, &candidate); =20 - for (i =3D 0; i < enabledCurrent; i++) { - if (cpuCurrent->features[i].policy =3D=3D VIR_CPU_FEATURE_DISA= BLE) { - enabledCurrent--; - disabledCurrent +=3D penalty; - penalty++; - } - } - current =3D enabledCurrent + disabledCurrent; - - penalty =3D BASE_PENALTY; - for (i =3D 0; i < enabled; i++) { - if (cpuCandidate->features[i].policy =3D=3D VIR_CPU_FEATURE_DI= SABLE) { - enabled--; - disabled +=3D penalty; - penalty++; - } - } - candidate =3D enabled + disabled; - } - - if (candidate < current || - (candidate =3D=3D current && disabled < disabledCurrent)) { + if (candidate.total < current.total || + (candidate.total =3D=3D current.total && + candidate.disabled < current.disabled)) { VIR_DEBUG("%s is better than %s: %zu (%zu, %zu) < %zu (%zu, %zu)", cpuCandidate->model, cpuCurrent->model, - candidate, enabled, disabled, - current, enabledCurrent, disabledCurrent); + candidate.total, candidate.enabled, candidate.disabled, + current.total, current.enabled, current.disabled); return 1; } =20 - if (isPreferred && disabled < disabledCurrent) { + if (isPreferred && candidate.disabled < current.disabled) { VIR_DEBUG("%s is in the list of preferred models and provides fewe= r " "disabled features than %s: %zu < %zu", cpuCandidate->model, cpuCurrent->model, - disabled, disabledCurrent); + candidate.disabled, current.disabled); return 1; } =20 VIR_DEBUG("%s is not better than %s: %zu (%zu, %zu) >=3D %zu (%zu, %zu= )", cpuCandidate->model, cpuCurrent->model, - candidate, enabled, disabled, - current, enabledCurrent, disabledCurrent); + candidate.total, candidate.enabled, candidate.disabled, + current.total, current.enabled, current.disabled); return 0; } =20 --=20 2.49.0