Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Enlin Mu <enlin.mu@outlook.com>
To:     pmladek@suse.com, rostedt@goodmis.org, john.ogness@linutronix.de,
        senozhatsky@chromium.org, keescook@chromium.org,
        tony.luck@intel.com, gpiccoli@igalia.com, enlin.mu@unisoc.com,
        enlinmu@gmail.com
Cc:     linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: [PATCH] printk: add cpu id information to printk() output
Date:   Fri, 15 Sep 2023 15:40:34 +0800
Message-ID: <JH0PR04MB7072A4B6946EAEEB1EB8B0BE8AF6A@JH0PR04MB7072.apcprd04.prod.outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: TYSPR04MB7084:EE_|SI2PR04MB4171:EE_
X-MS-Office365-Filtering-Correlation-Id: c29f1828-eeb5-43f6-bb2b-08dbb5bf15bd
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: fmoNVx7l5tMMaVssptSp2PdUaEBqZC9hRZnMdVGpamZWv3GbHxLWmBD1C6cM246aHFWDWtogYKhCBBNpg4E397XCdj9+oQdjlniPrVcQl92z2HB0VMCgB3iqtaoO1bY2nMYebePdWKFDNHxg34izlqQmTa7qZfrX+VGg+yAIxcWSiLA3bD3xX4uom4LAGcpZziVUka9zpy/rEuUnstzSuqFgqft+8HQE0FOAXXwZI6S/wp0WVEbHb1LuzWMOrZfafcIaQ/tFUj3mdFr2QxiS3SYdVr8PF//q4B3y4Kh/EsPExYtMwkceIiqp2n95cdNxsT1jZubxPexqHsCM2aAI9KIA4/cbg0+aYcBQciVb2AnkBGRv73vOtTjJ4VJ6tK9mC7wj4DUHKZqyoYRVop+qfnEyW18hhu9Yo44B/5eF4amyXBi9PmRVf3/vh4jJ1FhaejooVHjrbLq5iCrj4ccGjYbp5nxEAS12gdqv6f4VwRxnnZkGIxNPcJO7C9UTnQi9BiTxw3iepsSzF4FLQ8KhMRcXMU56fBD68gudEF+WsdVy3CyNEsC3lVvfOFEOqJ3H
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4Nr0tEkFS2ER86IVf/0Nd2ZRy1AKgc2BjWUPuJB8e9a1SKo4jtgwpz7ihKvA?=
 =?us-ascii?Q?osurCKK22jej88p8leM1drgrDh+SSWapfeEXcYdhV66AMye2oqM2SJStns4H?=
 =?us-ascii?Q?JCYpTH2IVI3vb1YHqqas+0Tlz3bYvd1yEfM3riZ3xPdEg0VFaC3C4ZGyR0qS?=
 =?us-ascii?Q?Fo9BqFcPcYx86mvXCfJ8YZ+TfkJHk7izVvKpFVHTJorB0gjAxPf7yLl8tSvq?=
 =?us-ascii?Q?6khELTuiq2HNxMJKiWlNq0ADEBV2OTLkx+enFQKISV+ygaiuSW4bFHKvjgNC?=
 =?us-ascii?Q?AsMfqlQtKIY7Aau+HNLqDddilkZXNWjT65l2jOnIiW0bjkn249WYBJkJcia1?=
 =?us-ascii?Q?O/UCBsWWeXigWUCC/m5W4XcnIND/YegI5ATFmaxGZfuSFDIiPGkcFlix/Rub?=
 =?us-ascii?Q?sI2cKi/B/UvA2Hr8YTueN2KuKsRO7a12U1Sp76xbdo8fC72PPYmlNzBOlHuK?=
 =?us-ascii?Q?cAkFv+Zpz1Wspa4hP73seThPpRCgapOIVEeHL4wz1gmS9QdQnUNnRGsYCS63?=
 =?us-ascii?Q?qCQjoWyvtithyzKO7KFl2JLb+X8ykCNZ3oPIK1ecOSoqdYo4pbFN38r0Lf47?=
 =?us-ascii?Q?VPU4fZpZcn+dixU3WxeaObMF+UsKZdqgbZ07x35SNH3nPNFYPTNQfVCgyBeo?=
 =?us-ascii?Q?HYR+XncTDGTM83vrdLFCVXKSM7BDJDq34UM97/q16YH66tqI+0L/3Gex34ZS?=
 =?us-ascii?Q?UIUsG0zPmFH2YoZy9RgmMJ9x4f7PaPanCt3Yzo70gtYjUAA6l8kYhXcUsde9?=
 =?us-ascii?Q?lyLWOnEcI8Xlhtu4UOb0t3sKXQAh5ScLWsaYZTpw9wvQ4jxOe3/3O5PnOiYN?=
 =?us-ascii?Q?e/wro5X8IwDwqha65JwMKSzaDrXO+hhocHTvuY24k+PezE8JGgVBkC4Wuv28?=
 =?us-ascii?Q?PrRv9buiQOjhVdJT+ALnbEeutCMaQwhBI25qKb5yMRieQeAanLGM825/KOHY?=
 =?us-ascii?Q?re7kwBxH82ArZwFOO1Sojx7Td1L06bMq0pmxt+1MwNt2RivZGxUY02MrpDVF?=
 =?us-ascii?Q?FRXf3dU+I5WXOCrXbDm2FUplCjvNdI4rBZKYiBOUYQDYx9l3xt66WHY5IlOV?=
 =?us-ascii?Q?fwSM3v2YdZyEVSCtia3aYfzzcmn+lFVzqZB2O6nNSFIYqJnlgu5q18636Ve3?=
 =?us-ascii?Q?dRweCoxechy4YVuG05uNjRN7CauRGXo/latV3MqllvBCRPShX3hiIcPGpQ+m?=
 =?us-ascii?Q?66wu3ikD3FZgnCzflWvrKMRnxkIJhACx5BZXrUXRj2HW80b0qckYSnMaABSJ?=
 =?us-ascii?Q?nCEFfJbzBmRSte6ttt1O?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c29f1828-eeb5-43f6-bb2b-08dbb5bf15bd
X-MS-Exchange-CrossTenant-AuthSource: JH0PR04MB7072.apcprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 07:40:54.2983
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR04MB4171
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 15 Sep 2023 00:41:21 -0700 (PDT)

From: Enlin Mu <enlin.mu@unisoc.com>

Sometimes we want to print cpu id of printk() messages to consoles

Signed-off-by: Enlin Mu <enlin.mu@unisoc.com>
---
 include/linux/threads.h |  3 +++
 kernel/printk/printk.c  | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/linux/threads.h b/include/linux/threads.h
index c34173e6c5f1..6700bd9a174f 100644
--- a/include/linux/threads.h
+++ b/include/linux/threads.h
@@ -34,6 +34,9 @@
 #define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \
 	(sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT))
 
+#define CPU_ID_SHIFT 23
+#define CPU_ID_MASK  0xff800000
+
 /*
  * Define a minimum number of pids per cpu.  Heuristically based
  * on original pid max of 32k for 32 cpus.  Also, increase the
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 7e0b4dd02398..f3f3ca89b251 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -629,8 +629,12 @@ static ssize_t info_print_ext_header(char *buf, size_t size,
 #ifdef CONFIG_PRINTK_CALLER
 	u32 id = info->caller_id;
 
-	snprintf(caller, sizeof(caller), ",caller=%c%u",
-		 id & 0x80000000 ? 'C' : 'T', id & ~0x80000000);
+	if (id&0x80000000)
+		snprintf(caller, sizeof(caller), ",caller=C%u",
+			id & ~0x80000000);
+	else
+		snprintf(caller, sizeof(caller), ",caller=T%uC%u",
+			id & ~CPU_ID_MASK, id >> CPU_ID_SHIFT);
 #else
 	caller[0] = '\0';
 #endif
@@ -1333,8 +1337,12 @@ static size_t print_caller(u32 id, char *buf)
 {
 	char caller[12];
 
-	snprintf(caller, sizeof(caller), "%c%u",
-		 id & 0x80000000 ? 'C' : 'T', id & ~0x80000000);
+	if (id & 0x80000000)
+		snprintf(caller, sizeof(caller), "C%u",
+			id & ~0x80000000);
+	else
+		snprintf(caller, sizeof(caller), "T%uC%u",
+			id & ~CPU_ID_MASK, id >> CPU_ID_SHIFT);
 	return sprintf(buf, "[%6s]", caller);
 }
 #else
@@ -2069,7 +2077,7 @@ static inline void printk_delay(int level)
 
 static inline u32 printk_caller_id(void)
 {
-	return in_task() ? task_pid_nr(current) :
+	return in_task() ? task_pid_nr(current) | (smp_processor_id() << CPU_ID_SHIFT) :
 		0x80000000 + smp_processor_id();
 }
 
-- 
2.25.1