Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <821d07c7-35b5-cf8c-b9a9-09dabdb3c893@siemens.com>
Date:   Mon, 2 Jan 2023 10:01:37 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH] scripts/gdb: fix 'lx-timerlist' on newer kernel
Content-Language: en-US
To:     Lin Ma <linma@zju.edu.cn>, kbingham@kernel.org,
        linux-kernel@vger.kernel.org
References: <20230102074340.17459-1-linma@zju.edu.cn>
From:   Jan Kiszka <jan.kiszka@siemens.com>
In-Reply-To: <20230102074340.17459-1-linma@zju.edu.cn>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V2R3cndTWUJyeFB2d1F2Vmh0eVBVcXdIdkVINnhxM1lkaXBRNDBjazNpcEVD?=
 =?utf-8?B?Qzl1ZW9CbEpKaXZ1NEtBSW5QRk5Ua1VkVytHU21SY0F5aFk2ZDFiV2pILzRW?=
 =?utf-8?B?R0J3L3d2S3NWR2ZVQlM5K2t0STBIdWVYM1dEQStjbFhDVnpxVnpWMHBockF4?=
 =?utf-8?B?RWJJS1oyK2FTd0g5OEV6VmttSGFhbWdCN1YyemlMUmEySWlhTTZ6MHo1Q1NK?=
 =?utf-8?B?alp3Y1E0ODJuQTlxWjgyZXN2UDh6Vk5RSlpZKzhoWi9ITEVEaHZZbUVKT2N0?=
 =?utf-8?B?c2tBV2xsS2ZhUG11Q2NEN214cHZvRlJZczlRMVZpMHRjOGxLMzNzMkVUOVFR?=
 =?utf-8?B?OUtZTFp2R05iVVMwTGZvZGVrS290cHpseGpMbnl0QWFCUHdqem9tRVAvdWF0?=
 =?utf-8?B?OGZOKzB2a3NTUWRPcmlUL3Uwc2N3blpWeGg2d05IbkFIdURnNDFPVTlBamxU?=
 =?utf-8?B?SXpVU3c1dnBzTjlwQWtOR25TcDN0ekk1TWd1Zlo2R2g0SjI4OHIxSFc3NmVi?=
 =?utf-8?B?WGFxejM3SWwyQTBXdWljWEoxRXEzM1dJZGE0aGlpK09uY05JSTNOS2p1L1Ni?=
 =?utf-8?B?S3cxMXB6SXVlSTBUMHlzS1hSbHdPcGdHb1M1b1ZxOVY5YzRTekZ1Z25WTEJF?=
 =?utf-8?B?Tmdvcm9Kend5enlYb1U4T1VvendyejFFSWpwS3h3SS9WTlZhU215RzExeENP?=
 =?utf-8?B?aHJYOW8vWlJ2dXBBdURGZC9ySnpDYWc1SFBybjVWYTZpSTdVblBVYzUreGxF?=
 =?utf-8?B?ODhhNmpqdU1BNThJSXlVWCt3aUV4K1VibU1MaTNudlFiK3ZudC9LWHVYSFJG?=
 =?utf-8?B?MWd2RzViVjEwcWhLeDFqTU1pTzZ3OUhGSE5GM3ZqaVJ5bUVIL2YyeTIrOXN3?=
 =?utf-8?B?cE41dXNpd0lURDhqM1NMcy82VEllb29ZUm5Jei91WlZwLzY5eTBKS0MxT2Vy?=
 =?utf-8?B?S1dQV1RCeGJMTXJEc2xjR2dDK3JadU5PSXovdTRKd09WNnVBT0tmQTVvZDI4?=
 =?utf-8?B?d2trL08yck5qeEFuWXdUMUljQjYwcG9Hd08xaXVYQ0hpbzBaRlBQWXFUaXdL?=
 =?utf-8?B?RzFrQmxaT2ZVcnljMlc0aWdoOGlXb29rZ0E4Rkl0RS9aV2lzZjlZSU5jRUtn?=
 =?utf-8?B?SldzVzJ1ZDMvZHFQbEJCZy9vMkVMdHQxSDRUdVdMYkQ4V1MxOUxhMEpTeC9I?=
 =?utf-8?B?MFpRREVST3cvc0VPN0dORE1zK010SnkrWjh2WVo4U2gxV0FSWjIyOEluTTF1?=
 =?utf-8?B?YnUzMEhnQ0tLRU8xbHpHeG5XOFkyWVpZd05HZVVqVUdmZk1YZ0lEbDZpeUlL?=
 =?utf-8?B?Z2thS3dGWkhmSnlZNWx6Z2VRYWg1NEtsdjBmMGZDNXVuems1S2xHZ0hWbGs0?=
 =?utf-8?B?NEJzVmxKazEyUU12WEpyQ1crT3EyWEtIRENSUEdTUnRlYWs3WDF6RklwNjNX?=
 =?utf-8?B?VkFRN1NnY2lURVFkS1gra2o0dkVyc29qR3NrZjk0QmtjWG5YSlRVa1poYVlU?=
 =?utf-8?B?cGx2UEV0TmRDQkUrV0JjY21IUjB3SExXUGs2QXErY2dVKzBmZllkdFdka3ZT?=
 =?utf-8?B?dHo0OENybWNwKzZpemlOSlRxeXNweEQvTnlaSGgyOE1wT0E3UklmVUpUWURD?=
 =?utf-8?B?S1lpcktiajJ3SE90OWdRb3gvc3VjVTlCUkRQbW9qMHdSRkhPWnYrSnYzMitW?=
 =?utf-8?B?WWFsODdBRnhYYitxL2JuUmxYYklUemp5MHhjL1kvUmlmME1mckNzVUMwMlB6?=
 =?utf-8?B?em5Yd2FoZ1JjTjB3T0dOdk12SitoTE5VWmpxUHZEUWkrZkFXUmFSdkl1YnJF?=
 =?utf-8?B?ZHBGeHc2T3ZLRldVVDR0UU90WnRmajlCZ0RlbWtKSjNEV0xIazQvUHd0aWpO?=
 =?utf-8?B?WkkwSHNWc3E1L2UwaHlJVFFHc2EyeVU4VEpPby93TWdEMEFDZTBWM2F2a2FK?=
 =?utf-8?B?a3VmdnNsZlNETmdYNUdObC9rdjByMFI5TXkwVzhEUGx6QmxtVndXcmMzK1JM?=
 =?utf-8?B?SnluY0xsd0QxanlLM2JKTzFrMTJIekIxbFMrRStRL2ErdnprZXdxbTEza2lV?=
 =?utf-8?B?T1QzSzBUUTJZbE1KMWNjV1FzeFVmbUEvTGRPSVpWeWFja2U5NnlyelM1UXVZ?=
 =?utf-8?B?SHNQYU1BdHJFdUNyVHUxaTQzTE9PNjFsSmhsMW1aTk5UaUZPUXFFT1hzVXRG?=
 =?utf-8?B?emc9PQ==?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 046e3b7f-418f-4c81-0b9b-08daec9ff646
X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2023 09:01:40.3024
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +Nfhoi3UcGxyYyEdrgl0Oxna2XpTcQEi+XCSADKWOKI+iqMMJ//P2/aqC7fiXxQ9y4aTPn1acEPJvOfFz23qBA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR10MB7647
X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 02.01.23 08:43, Lin Ma wrote:
> After commit 511885d7061e ("lib/timerqueue: Rely on rbtree semantics for
> next timer"), the struct timerqueue_head changes internal field hence
> causes the old lx-timerlist command keeps reporting errors.
> 
> This fix addes a simple version comparison and necessary code for

typo: "adds"

> traversing timerqueue on a newer kernel. Moreover, it fixes some
> python 3.X compatibility bugs.

The gdb scripts are in lock-step with the kernel version they can
inspect. So just move the logic to the current kernel and drop support
for older versions.

Jan

> 
> Test with python 2.7 and python 3.6
> Test with 
> * commit 442284a89a65 ("scripts/gdb: add a timer list command") and 
> * commit 88603b6dc419 ("Linux 6.2-rc2") kernel
> 
> Signed-off-by: Lin Ma <linma@zju.edu.cn>
> ---
>  scripts/gdb/linux/timerlist.py | 41 ++++++++++++++++++++++------------
>  1 file changed, 27 insertions(+), 14 deletions(-)
> 
> diff --git a/scripts/gdb/linux/timerlist.py b/scripts/gdb/linux/timerlist.py
> index 071d0dd5a634..65d035df253d 100644
> --- a/scripts/gdb/linux/timerlist.py
> +++ b/scripts/gdb/linux/timerlist.py
> @@ -4,6 +4,7 @@
>  
>  import binascii
>  import gdb
> +import re
>  
>  from linux import constants
>  from linux import cpus
> @@ -42,9 +43,15 @@ def print_timer(rb_node, idx):
>      return text
>  
>  
> -def print_active_timers(base):
> -    curr = base['active']['next']['node']
> -    curr = curr.address.cast(rbtree.rb_node_type.get_type().pointer())
> +def print_active_timers(base, oldver):
> +    # 511885d7061e ("lib/timerqueue: Rely on rbtree semantics for next timer")
> +    if oldver:
> +        curr = base['active']['next']['node']
> +        curr = curr.address.cast(rbtree.rb_node_type.get_type().pointer())
> +    else:
> +        leftmost = base['active']['rb_root']['rb_leftmost']
> +        curr = leftmost.cast(rbtree.rb_node_type.get_type().pointer())
> +
>      idx = 0
>      while curr:
>          yield print_timer(curr, idx)
> @@ -52,7 +59,7 @@ def print_active_timers(base):
>          idx += 1
>  
>  
> -def print_base(base):
> +def print_base(base, oldver):
>      text = " .base:       {}\n".format(base.address)
>      text += " .index:      {}\n".format(base['index'])
>  
> @@ -62,21 +69,20 @@ def print_base(base):
>      if constants.LX_CONFIG_HIGH_RES_TIMERS:
>          text += "  .offset:     {} nsecs\n".format(base['offset'])
>      text += "active timers:\n"
> -    text += "".join([x for x in print_active_timers(base)])
> +    text += "".join([x for x in print_active_timers(base, oldver)])
>      return text
>  
>  
> -def print_cpu(hrtimer_bases, cpu, max_clock_bases):
> +def print_cpu(hrtimer_bases, cpu, max_clock_bases, oldver):
>      cpu_base = cpus.per_cpu(hrtimer_bases, cpu)
>      jiffies = gdb.parse_and_eval("jiffies_64")
>      tick_sched_ptr = gdb.parse_and_eval("&tick_cpu_sched")
>      ts = cpus.per_cpu(tick_sched_ptr, cpu)
>  
>      text = "cpu: {}\n".format(cpu)
> -    for i in xrange(max_clock_bases):
> +    for i in range(max_clock_bases):
>          text += " clock {}:\n".format(i)
> -        text += print_base(cpu_base['clock_base'][i])
> -
> +        text += print_base(cpu_base['clock_base'][i], oldver)
>          if constants.LX_CONFIG_HIGH_RES_TIMERS:
>              fmts = [("  .{}   : {} nsecs", 'expires_next'),
>                      ("  .{}    : {}", 'hres_active'),
> @@ -165,7 +171,7 @@ def pr_cpumask(mask):
>          i -= 1
>          start = i * 2
>          end = start + 2
> -        chunks.append(buf[start:end])
> +        chunks.append(str(buf[start:end]))
>          if i != 0 and i % 4 == 0:
>              chunks.append(',')
>  
> @@ -184,14 +190,21 @@ class LxTimerList(gdb.Command):
>  
>      def invoke(self, arg, from_tty):
>          hrtimer_bases = gdb.parse_and_eval("&hrtimer_bases")
> -        max_clock_bases = gdb.parse_and_eval("HRTIMER_MAX_CLOCK_BASES")
> -
> -        text = "Timer List Version: gdb scripts\n"
> +        max_clock_bases = gdb.parse_and_eval("(int)HRTIMER_MAX_CLOCK_BASES")
> +        banner = gdb.parse_and_eval("(char *)linux_banner").string()
> +        r = re.match(r"^Linux version (.+) \(.*@.*$", banner)
> +        if not r:
> +            gdb.write("failed to load image version")
> +            return
> +        lver = r.group(1)
> +        oldver = lver < '5.3.0-rc1'
> +
> +        text = "Timer List Version: gdb scripts, old version: {}\n".format(oldver)
>          text += "HRTIMER_MAX_CLOCK_BASES: {}\n".format(max_clock_bases)
>          text += "now at {} nsecs\n".format(ktime_get())
>  
>          for cpu in cpus.each_online_cpu():
> -            text += print_cpu(hrtimer_bases, cpu, max_clock_bases)
> +            text += print_cpu(hrtimer_bases, cpu, max_clock_bases, oldver)
>  
>          if constants.LX_CONFIG_GENERIC_CLOCKEVENTS:
>              if constants.LX_CONFIG_GENERIC_CLOCKEVENTS_BROADCAST:

-- 
Siemens AG, Technology
Competence Center Embedded Linux