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

Re: [XEN PATCH 7/9] x86/smp: drop booting_cpu variable


  • To: Krystian Hebel <krystian.hebel@xxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Thu, 8 Feb 2024 12:39:17 +0100
  • Autocrypt: addr=jbeulich@xxxxxxxx; 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
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
  • Delivery-date: Thu, 08 Feb 2024 11:39:26 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On 14.11.2023 18:50, Krystian Hebel wrote:
> CPU id is obtained as a side effect of searching for appropriate
> stack for AP. It can be used as a parameter to start_secondary().
> Coincidentally this also makes further work on making AP bring-up
> code parallel easier.

It's not just "easier", but strictly a prereq I think? Such a global
would get in the way of having multiple CPUs make it into
start_secondary() in parallel.

> --- a/xen/arch/x86/boot/x86_64.S
> +++ b/xen/arch/x86/boot/x86_64.S
> @@ -20,20 +20,24 @@ ENTRY(__high_start)
>          jz      .L_stack_set
>  
>          /* APs only: get stack base from APIC ID saved in %esp. */
> -        mov     $0, %rax
> +        mov     $0, %rbx
>          lea     cpu_data(%rip), %rcx
>          /* cpu_data[0] is BSP, skip it. */
>  1:
> -        add     $1, %rax
> +        add     $1, %rbx
>          add     $CPUINFO_X86_sizeof, %rcx
> -        cmp     $NR_CPUS, %eax
> +        cmp     $NR_CPUS, %rbx
>          jb      2f
>          hlt
>  2:
>          cmp     %esp, CPUINFO_X86_apicid(%rcx)
>          jne     1b

Once again this is code you introduced a few patches ago. Why not use
%ebx right away for that purpose? (And yes, this explains why in the
earlier patch you retained that code. Just that again suitably ordering
the series would make this look natural. Otherwise it needs at least
mentioning why dead pieces are kept around.)

> -        /* %rcx is now cpu_data[cpu], read stack base from it. */
> +        /*
> +         * At this point:
> +         * - %rcx is cpu_data[cpu], read stack base from it,
> +         * - %rbx (callee-save) is Xen cpu number, pass it to 
> start_secondary().
> +         */
>          mov     CPUINFO_X86_stack_base(%rcx), %rsp
>  
>          test    %rsp,%rsp
> @@ -101,6 +105,7 @@ ENTRY(__high_start)
>  .L_ap_cet_done:
>  #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */
>  
> +        mov     %rbx, %rdi
>          tailcall start_secondary

As alluded to above and as mentioned before - please stick to 32-bit
operations when you deal with 32 (or less) bits of data.

> --- a/xen/arch/x86/smpboot.c
> +++ b/xen/arch/x86/smpboot.c
> @@ -222,8 +222,6 @@ static void smp_callin(void)
>          cpu_relax();
>  }
>  
> -static int booting_cpu;
> -
>  /* CPUs for which sibling maps can be computed. */
>  static cpumask_t cpu_sibling_setup_map;
>  
> @@ -311,15 +309,14 @@ static void set_cpu_sibling_map(unsigned int cpu)
>      }
>  }
>  
> -void start_secondary(void *unused)
> +void start_secondary(unsigned int cpu)
>  {
>      struct cpu_info *info = get_cpu_info();
>  
>      /*
> -     * Dont put anything before smp_callin(), SMP booting is so fragile that 
> we
> +     * Don't put anything before smp_callin(), SMP booting is so fragile 
> that we
>       * want to limit the things done here to the most necessary things.
>       */
> -    unsigned int cpu = booting_cpu;
>  
>      /* Critical region without IDT or TSS.  Any fault is deadly! */
>  
> @@ -346,9 +343,9 @@ void start_secondary(void *unused)
>       */
>      spin_debug_disable();
>  
> -    get_cpu_info()->use_pv_cr3 = false;
> -    get_cpu_info()->xen_cr3 = 0;
> -    get_cpu_info()->pv_cr3 = 0;
> +    info->use_pv_cr3 = false;
> +    info->xen_cr3 = 0;
> +    info->pv_cr3 = 0;

This hunk looks unrelated. While tidying next to what's changed anyway
may be okay if suitably mentioned in the description, in this case I
think it needs splitting off.

Jan



 


Rackspace

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