File xen.xentrace-num_present_cpus.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.xentrace-num_present_cpus.patch of Package xen (Revision a5d83e206fbd69390643ab63687f8f9d)

Currently displaying revision a5d83e206fbd69390643ab63687f8f9d , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 30 May 2023 10:45:34 +0000
Subject: xentrace num_present_cpus

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 xen/common/trace.c | 10 +++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- a/xen/common/trace.c
+++ b/xen/common/trace.c
@@ -101,25 +101,26 @@ static uint32_t calc_tinfo_first_offset(void)
  * in the currently sized struct t_info and allows prod and cons to
  * reach double the value without overflow.
  * The t_info layout is fixed and cant be changed without breaking xentrace.
  * Initialize t_info_pages based on number of trace pages.
  */
 static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset)
 {
     struct t_buf dummy_size;
     typeof(dummy_size.prod) max_size;
     struct t_info dummy_pages;
     typeof(dummy_pages.tbuf_size) max_pages;
     typeof(dummy_pages.mfn_offset[0]) max_mfn_offset;
-    unsigned int max_cpus = nr_cpu_ids;
+    unsigned int nr_cpus = num_present_cpus();
+    unsigned int max_cpus = nr_cpus;
     unsigned int t_info_words;
 
     /* force maximum value for an unsigned type */
     max_size = -1;
     max_pages = -1;
     max_mfn_offset = -1;
 
     /* max size holds up to n pages */
     max_size /= PAGE_SIZE;
 
     if ( max_size < max_pages )
         max_pages = max_size;
@@ -139,29 +140,30 @@ static int calculate_tbuf_size(unsigned int pages, uint16_t t_info_first_offset)
     if ( pages > max_pages )
     {
         printk(XENLOG_INFO "xentrace: requested number of %u pages "
                "reduced to %u\n",
                pages, max_pages);
         pages = max_pages;
     }
 
     /*
      * NB this calculation is correct, because t_info_first_offset is
      * in words, not bytes
      */
-    t_info_words = nr_cpu_ids * pages + t_info_first_offset;
+    t_info_words = nr_cpus * pages + t_info_first_offset;
     t_info_pages = PFN_UP(t_info_words * sizeof(uint32_t));
     printk(XENLOG_INFO "xentrace: requesting %u t_info pages "
-           "for %u trace pages on %u cpus\n",
-           t_info_pages, pages, nr_cpu_ids);
+           "for %u trace pages on %u cpus (o%x p%x r%x i%x)\n",
+           t_info_pages, pages, nr_cpus,
+           num_online_cpus(), num_possible_cpus(), num_present_cpus(), nr_cpu_ids);
     return pages;
 }
 
 /**
  * alloc_trace_bufs - performs initialization of the per-cpu trace buffers.
  *
  * This function is called at start of day in order to initialize the per-cpu
  * trace buffers.  The trace buffers are then available for debugging use, via
  * the %TRACE_xD macros exported in <xen/trace.h>.
  *
  * This function may also be called later when enabling trace buffers
  * via the SET_SIZE hypercall.

Places

File xen.xentrace-num_present_cpus.patch of Package xen (Revision a5d83e206fbd69390643ab63687f8f9d)

Places