From nobody Thu Jul 23 22:28:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1781524882; cv=none; d=zohomail.com; s=zohoarc; b=I+ALvVryzYEVBxUxHcKr+DGdPKwTEcf7jvEXvONI3nZIVjWnykr7ZLQKiKlbksm0Se43gpdNxWSxqbHNoNpQFxfi1kCQxhAIxsHNxlhHRzRTWT46o4HIQ8IfrWJiH9cXUEX79xykYe3yfDVq2AiJQ5+NoO/NhAzFJiSnrghSyNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781524882; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eazOSZbXY1it+mlud/La/UkvM4wEAF2FLpdZ7kq+Tpg=; b=H7uMAB98LMv4ifEFsGkzxka9Vvx4rrC+jKaReSO9Rls95e0Hs7O9e8uCEowb6jx2LVWvVLr/dys/b12d47r3kme/stc46BFd9uFrH4R9cab5+kJbLaguKt4qwN3B2jF7/58xYbej2Wj9+ufgGDHBF1NEpOaxKhzGzILB/bYVGHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1781524882645186.35224528827712; Mon, 15 Jun 2026 05:01:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1338183.1599187 (Exim 4.92) (envelope-from ) id 1wZ5zf-0006VO-UQ; Mon, 15 Jun 2026 12:00:43 +0000 Received: by outflank-mailman (output) from mailman id 1338183.1599187; Mon, 15 Jun 2026 12:00:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wZ5zf-0006VH-RY; Mon, 15 Jun 2026 12:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1338183; Mon, 15 Jun 2026 12:00:42 +0000 Received: from mx.expurgate.net ([194.145.224.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wZ5ze-0006TW-CY for xen-devel@lists.xenproject.org; Mon, 15 Jun 2026 12:00:42 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wZ5zd-000RFh-A8 for xen-devel@lists.xenproject.org; Mon, 15 Jun 2026 14:00:41 +0200 Received: from [10.42.69.3] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2fe95b-5cb7-0a2a0a5109dd-0a2a4503d416-36 for ; Mon, 15 Jun 2026 14:00:41 +0200 Received: from [209.85.128.41] (helo=mail-wm1-f41.google.com) by tlsNG-33051d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2fe968-672d-0a2a45030019-d1558029b107-3 for ; Mon, 15 Jun 2026 14:00:41 +0200 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490b613a17bso29071505e9.3 for ; Mon, 15 Jun 2026 05:00:41 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-492203d05d1sm338907405e9.12.2026.06.15.05.00.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Jun 2026 05:00:39 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:Autocrypt:Subject:From:Cc:To:Content-Language:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1781524840; x=1782129640; darn=lists.xenproject.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=eazOSZbXY1it+mlud/La/UkvM4wEAF2FLpdZ7kq+Tpg=; b=PTSqSBWpo1i00CGf47OPUni49slchSw0hbnBvVGeJsYTQsGlCA/CBB2337ns3obbr1 f7JQZ7sSGfbyBH4D1obeq01tbl9XgWCxNk+5UDPM7/RADbRsWhANyIb0rHBweUkN3XaI XDwXzLzUuoLD/OaAkcJejqoQwDVLgyIVoCXgZn0HekDDO45qv8X88OL2hwnfTAhCeja/ 3+6T0+Q5EzKXs0aitZ8SizVELIHJIHJ9y3jQHFTXOBzr5mvleGjYDfvg8PPMzdeuGGaK Q1SBKifi60XqVvbVyM2fP1Lw2RqgZKdQycI+i0K9JT3RCCEBofkq6Z11YT3Gc40yZ9T3 hWRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781524840; x=1782129640; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eazOSZbXY1it+mlud/La/UkvM4wEAF2FLpdZ7kq+Tpg=; b=XAqdm64LzuQ8H1MK/EVWyDsg7eOuyz43nxgWKx5VxPJcD5CSWrUUOwijyVyT+S1jUm YQ6nv+3BlEYjq/XnRRfaUiZabd7jqeqO8rFDgOynLwjm1O9oXpGGnjocRSWMI27dzU4f yMxIW2IU9QC24BUtWJ+rA9WqZWRJzQuGuw8dXofzjlY95O2F8+NlAQrtjyDvRYzQVtWj ntRIEpx3zyBHSU1QC+hDYE/+GhXFs6zciPJVOh+rG+7PHxeMJIYjoxwvNXAqobrgfDCm U+hNIczKHuBsfDHbwkaWNFEvZybRJAWl90gzJ/ZRz4jnoVIun/N4mraxE6WXIrt6vIDj 9qPg== X-Gm-Message-State: AOJu0Ywamkaw1/3yRblykjyrV5IGeqcGEQBS6kyZiNCx9EWmYgSMxwOQ 1pguibL8/GOP1YGdfgc3izVg6K35vfMlJu8qsxrcerZVyVJ1tbnvkY/KxRXLCMNQ369GeeaDjFy mRrk= X-Gm-Gg: Acq92OEOykCQXdYCadvzL8M5UjEhS+qg2xdNQ6BQFG6akkuDvUXC4D7DJCeaQ4Aqn9H 4+Hz/BAzgx5st6Phktzj9SX0c0eA1Fn8Jyb5DomrnleMGqBr/FqZSPzLnW4OBLhSo3FJpGzp4hc RLhXyh7b7d+3l4QcC7E3FoBB8yanybRHsHd/WOAdUdK8z4D4lwVmHMaTrBllXLt2lKLegD/DGJx eTzE2gIdQFibIzs53i313LOdMz007ZwOmaUclmj3ITJ1pMBOoHbZutEcHXJUoMUtKljxEixKC4W ISXwSUBqeT+DW0buYUeEBmZb1tzuvKJrZfveO4cZmDHk/HYH6cJLjME47+fy3moM22ZOIiLBYIL pG7P6kbzgg6Z0JOhOW1z9ZEyUU2Q4cGJC1nOtFJa3FphKfUfDcbMBKeDHrTPyYWIwgN839eMlBG WIS8sSfOvju/cjXinxaDCX3GpDzhiHUu1uEWUahpBnjIVEQC7ivL38DNw3FfwbhViniwE4o1PIP eRYe2waOILFqID97AN4jDlnrA== X-Received: by 2002:a05:600c:ad9:b0:490:b58b:a4a5 with SMTP id 5b1f17b1804b1-490ec50f800mr126507985e9.31.1781524840378; Mon, 15 Jun 2026 05:00:40 -0700 (PDT) Message-ID: <8b7daaa3-418e-4ec7-90a6-775e0a964b76@suse.com> Date: Mon, 15 Jun 2026 14:00:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Dario Faggioli , Juergen Gross , George Dunlap , Oleksii Kurochko From: Jan Beulich Subject: [PATCH for-4.22?] domctl: correct return value of XEN_DOMCTL_[gs]etvcpuaffinity Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-33051d/1781524841-41794938-2858D23A/0/0 X-purgate-type: clean X-purgate-size: 2516 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1781524885443158500 Content-Type: text/plain; charset="utf-8" cpumask_to_xenctl_bitmap() may return errors. Clearing the error indicator of an earlier such call by a (successful) later call is misleading the caller. For "set", keep setting soft affinity if the hard affinity copy- back fails; only accumulate respective errors. While fiddling with return values, also drop a redundant clearing of "ret". This eliminates a Misra C:2012 rule 2.2 ("There shall be no dead code") violation. Fixes: 6e4ecc6d5884 ("sched: DOMCTL_*vcpuaffinity works with hard and soft = affinity") Signed-off-by: Jan Beulich --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -1705,6 +1705,7 @@ int vcpu_affinity_domctl(struct domain * { cpumask_var_t new_affinity, old_affinity; cpumask_t *online =3D cpupool_domain_master_cpumask(v->domain); + int hret =3D 0; =20 /* * We want to be able to restore hard affinity if we are trying @@ -1726,8 +1727,6 @@ int vcpu_affinity_domctl(struct domain * if ( vcpuaff->flags & XEN_VCPUAFFINITY_FORCE ) vcpu_temporary_affinity(v, NR_CPUS, VCPU_AFFINITY_OVERRIDE); =20 - ret =3D 0; - /* * We both set a new affinity and report back to the caller what * the scheduler will be effectively using. @@ -1746,7 +1745,7 @@ int vcpu_affinity_domctl(struct domain * * cpupool's online mask and the new hard affinity. */ cpumask_and(new_affinity, online, unit->cpu_hard_affinity); - ret =3D cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_hard, new_af= finity); + hret =3D cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_hard, new_a= ffinity); } if ( vcpuaff->flags & XEN_VCPUAFFINITY_SOFT ) { @@ -1777,6 +1776,8 @@ int vcpu_affinity_domctl(struct domain * ret =3D cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_soft, new_af= finity); } =20 + ret =3D hret ?: ret; + setvcpuaffinity_out: free_cpumask_var(new_affinity); free_cpumask_var(old_affinity); @@ -1788,7 +1789,7 @@ int vcpu_affinity_domctl(struct domain * unit->cpu_hard_affinity); if ( vcpuaff->flags & XEN_VCPUAFFINITY_SOFT ) ret =3D cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_soft, - unit->cpu_soft_affinity); + unit->cpu_soft_affinity) ?: ret; } =20 return ret;