From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9F9FC4167B for ; Fri, 25 Nov 2022 11:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229720AbiKYLxO (ORCPT ); Fri, 25 Nov 2022 06:53:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbiKYLxN (ORCPT ); Fri, 25 Nov 2022 06:53:13 -0500 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 366CA1A800 for ; Fri, 25 Nov 2022 03:53:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1669377192; x=1700913192; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=crz04ig20tpvAmEbWeHvM10lzZnFghyvDj4EsoOeDhI=; b=EEnoPylpzVWOO7cWrNVme95lRN1AOoxdjgMvd0vdT/MWHcN+kVbPvXKH x+ZHqdo83elwR7IqZwZZAzsVYF0IJe5VBxLrlnqpH+yzRa8BHmc1NDiBg 5vjaL8pjOtJnzaTs/rDgEd0THUgLdcWcOeXFtYDuxxzz3ymySpviq9r7+ e8Gs72Yt8zdeQ3JjMiXTM2Xm4mHSj4ncy70dJzjpZyl2Hdj9ETv5aIyJw WJ2sSKfGJH9CZJphOFH6LTwd5/QSImxINrH6wWeqtydC0awvnMdOMves0 +G04YFmHBPHZKN7DeeNjUDzQTX1mhZlIvjOAiwslg7xCEAsPQgYXoU2zw A==; Date: Fri, 25 Nov 2022 12:53:10 +0100 From: Vincent Whitchurch To: Leo Yan , Arnaldo Carvalho de Melo CC: Hans-Peter Nilsson , , , John Garry , Will Deacon , Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kim Phillips Subject: Re: [PATCH] perf arm64: Fix mksyscalltbl, don't lose syscalls due to sort -nu Message-ID: References: <20201228023941.E0DE2203B5@pchp3.se.axis.com> <20201229030933.GC28115@leoy-ThinkPad-X240s> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20201229030933.GC28115@leoy-ThinkPad-X240s> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 29, 2020 at 11:09:33AM +0800, Leo Yan wrote: > On Mon, Dec 28, 2020 at 03:39:41AM +0100, Hans-Peter Nilsson wrote: > > When using "sort -nu", arm64 syscalls were lost. That is, the > > io_setup syscall (number 0) and all but one (typically > > ftruncate; 64) of the syscalls that are defined symbolically > > (like "#define __NR_ftruncate __NR3264_ftruncate") at the point > > where "sort" is applied. > > > > This creation-of-syscalls.c-scheme is, judging from comments, > > copy-pasted from powerpc, and worked there because at the time, > > its tools/arch/powerpc/include/uapi/asm/unistd.h had *literals*, > > like "#define __NR_ftruncate 93". > > > > With sort being numeric and the non-numeric key effectively > > evaluating to 0, the sort option "-u" means these "duplicates" > > are removed. There's no need to remove syscall lines with > > duplicate numbers for arm64 because there are none, so let's fix > > that by just losing the "-u". Having the table numerically > > sorted on syscall-number for the rest of the syscalls looks > > nice, so keep the "-n". > > > > Signed-off-by: Hans-Peter Nilsson > > Very good catching! I tested this patch with the commands: > > $ cd $LINUX_KERN > $ tools/perf/arch/arm64/entry/syscalls/mksyscalltbl \ > $ARM64_TOOLCHAIN_PATH/aarch64-linux-gnu-gcc \ > gcc tools tools/include/uapi/asm-generic/unistd.h > > It gives out complete syscall tables: > > $ diff /tmp/mksyscall_before.txt /tmp/mksyscall_after.txt > 1a2,4 > > [223] = "fadvise64", > > [25] = "fcntl", > > [44] = "fstatfs", > 2a6,11 > > [0] = "io_setup", > > [62] = "lseek", > > [222] = "mmap", > > [71] = "sendfile", > > [43] = "statfs", > > [45] = "truncate", > > Rather than dropping option "-u" for sort command, I googled and read > the manual of "sort", but cannot find other better method. So this > patch looks good for me: > > Reviewed-by: Leo Yan > Tested-by: Leo Yan It looks like this patch was never applied? AFAICS it is still needed on current HEAD and it still applies cleanly.