[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2] core-parking: fix build with gcc12 and NR_CPUS=1


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Fri, 9 Sep 2022 16:30:10 +0200
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pYInDRVqF3/giNMsCtExKTIiVPwObn6L8MAQq6YWhG8=; b=DNtp+P9iu0lk11MhkA3iYBoHP6hrjgjr6ZTuJWxmbHG5254HojL+KIIYfQ/izZxTvSyQJlGbYfPNAOmVNb/gGq8/e7Ngjz/sVDdErJbo94QXeOfiA/WZvG0zcUBTqG2rueZyFIiXKekO+THJkTKVFkU9tAmzWGWQtIWHnVr72SJN6f+mqR+F9+3KBz/3MnDuz6skjyRv1M+UjoFMY5SVsw9zaKRJqAU0DlvzzSkc6UpPDKhqJoPq4IsVKj1kTkzmJh7I5+bPAtX3BMGi75nlQlWYfLzx8TNWzLvnw7eCux1cexkuWrGw9SL6fthBZuwf3Omh+NlwUVMCl0rNCcSuNQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LTDB6wC5upZX8sr4LyxMqoN8COcSJdyUi3SvPKQtuYG59gZL1vYQKwpBvY2FRljLtTeqqHH5GpBx26fMOrCckptxU60t1X0zOERnBw/ko21zJorDK7pCZwdljB0NLRJnRO937BfTneoXNUXnf6NW6L94Z7LO4v5yLLdpBpVSi06nTHu8zWrWOgLfGIB+/290yCT3GoCOKUloRAt9KX+Gv7PeVJiSgF/VRH2fYOl3b/w3PY+Mea22kPv1iT04tCK1oSjehYiYFETNY+cqr3zQZs7yKuZeCSox97Mydh9gLa8j52UzIHiXOHqGEOyrTQiRfBDD7pPA7YZE70zg4DD3eg==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>
  • Delivery-date: Fri, 09 Sep 2022 14:30:21 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

Gcc12 takes issue with core_parking_remove()'s

    for ( ; i < cur_idle_nums; ++i )
        core_parking_cpunum[i] = core_parking_cpunum[i + 1];

complaining that the right hand side array access is past the bounds of
1. Clearly the compiler can't know that cur_idle_nums can only ever be
zero in this case (as the sole CPU cannot be parked).

Arrange for core_parking.c's contents to not be needed altogether, and
then disable its building when NR_CPUS == 1.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
v2: Disable building of core_parking.c altogether.

--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -10,7 +10,7 @@ config X86
        select ALTERNATIVE_CALL
        select ARCH_MAP_DOMAIN_PAGE
        select ARCH_SUPPORTS_INT128
-       select CORE_PARKING
+       select CORE_PARKING if NR_CPUS > 1
        select HAS_ALTERNATIVE
        select HAS_COMPAT
        select HAS_CPUFREQ
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -727,12 +727,17 @@ ret_t do_platform_op(
         case XEN_CORE_PARKING_SET:
             idle_nums = min_t(uint32_t,
                     op->u.core_parking.idle_nums, num_present_cpus() - 1);
-            ret = continue_hypercall_on_cpu(
-                    0, core_parking_helper, (void *)(unsigned long)idle_nums);
+            if ( CONFIG_NR_CPUS > 1 )
+                ret = continue_hypercall_on_cpu(
+                        0, core_parking_helper,
+                        (void *)(unsigned long)idle_nums);
+            else if ( idle_nums )
+                ret = -EINVAL;
             break;
 
         case XEN_CORE_PARKING_GET:
-            op->u.core_parking.idle_nums = get_cur_idle_nums();
+            op->u.core_parking.idle_nums = CONFIG_NR_CPUS > 1
+                                           ? get_cur_idle_nums() : 0;
             ret = __copy_field_to_guest(u_xenpf_op, op, u.core_parking) ?
                   -EFAULT : 0;
             break;
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -157,7 +157,7 @@ long arch_do_sysctl(
         long (*fn)(void *);
         void *hcpu;
 
-        switch ( op )
+        switch ( op | -(CONFIG_NR_CPUS == 1) )
         {
         case XEN_SYSCTL_CPU_HOTPLUG_ONLINE:
             plug = true;



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.