From patchwork Wed Jan 31 10:48:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13539177 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7353478679; Wed, 31 Jan 2024 10:49:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698192; cv=fail; b=trUXSZDF14JehNBvb1CRNznLWg92rLKwQlqdDvxHuJGiv9O8xBUc5mX/MGjEHj0kQ17vM3XsF2nVHRCv76Tk+cBwFnFlUBxfGbDmQiULRU1PWVWsIwSQYczWOLDKYQ08/Y2XyvyiTBJEIObvdIwB4yb/xrHxC5TI4h1hhp7cXaw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698192; c=relaxed/simple; bh=mzegE1Hm1luMZWqJaViUopOGFiXrPo4bP5VJj3ngZgM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=tA6lZICrg1AFj1hnm5lMXh2uEzhQUrW8NHIiZPknW5zNPKTaEBsSz0NIzi9nqYD1fETLuAnBEXyXkgM0CtpdO2N4Z65zim2yHMnVceAYi5DTHRBrMmBPzehUfHDqAcgRtr6MufWgIRW8XINkZ1/61ATaYOn+pnzM/eVcO2Han7c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=U8d2Op63; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Fh10FD20; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="U8d2Op63"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Fh10FD20" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9iBV6027717; Wed, 31 Jan 2024 10:49:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=BLGK+/yelwV7pr4yA0vANDfEwh+KPgt/lK/Xih1/Si0=; b=U8d2Op63gd+pIS5ipL5JpJXa/qjvMzOKwHadFPvgJZ8/tEdTvpVh1e2ruqywIaQR4Izy i4k3j88wSfey7gu91GrHg8oUzPwXBZ3je9HKW/vCw8wDA8jWuM7h9Zn7LPdBtva4OY2J taVDO8JGXLbk4S1D8l3m9+wBImXCz+0OMkAEDb2qnsCL06S40T/cqiWZVLB8tNUyLsep IUOZcx/bWzDzzEH9Y1rFwjxpAl9tNeNKUEJM2EnVjkN+Eg5g2oIkqfs4tsOcdyk7YZOe DsUl82UUdNfJfXkW9WxqOPonzKuUQyhWcrVpXwU3TDDEQ5DmQWenjmIcjZ3bAmiNh+bh XQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvtcv1jks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:30 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40VAC0lV014630; Wed, 31 Jan 2024 10:49:12 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr9evy5c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S8i0GzpeBFYsiIxDbJwX0grsfblSEfapE3+Wk7IfQVip1M0BrFyND6wDqs2C8ma7GbFbHytQPe3kDvHemWP8iUbXy+17TIc1rvwiA9RhFvTMVUaVUjS1akVP3+kmRnAz09aHlTeIftFDv+F6ErbFBmJI85Tee+nh4PdjCSoHNCd7TtEr/39YKR6RjD0JxgNbYiQwWaCO0shbIvg9ee0i7Xkx2wGj3iQUE1Q6jcY7PROeT7Ee6dfNXjFPfKsKvv3K/pueoZT2xO8lsXj9WvibRyWgHOZFAUrMR+REMyrcYgp5j6lG8cPWrlj07RknCNA7x/8oHm81Z9Aw2pj/R7VgQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BLGK+/yelwV7pr4yA0vANDfEwh+KPgt/lK/Xih1/Si0=; b=K0YXK/qpOIXd7sTm28mqG6cvWmBb0cALh5RO0b3TktYpzqei5SuMrjiU+pwJDunX3BkmpEn+LdEz3JBqev3Dh/SdET3OR/RdSXOJRtfvXXBahvdF8OWi0f5ImhHlcKL4/iAlYlGcBp9iA7Xuq7aC6Q/BhepTlXMbjQU3lXU1/u5POdaGzBvMI5GKKFlzPF9qcwKd6SnAVsbnHsGRDAS5y0l60lc06aaP+fq/9Sk+2zLsxAugd4xcWH2hyxnC5XYTWrzlqAekbXkgNJZDlKwE21+Qy2uxZFoW/akCZf/bm5atsx01MViL61x+Zi2HhLOaRKGBkYNnvSKA/UrysxNhOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BLGK+/yelwV7pr4yA0vANDfEwh+KPgt/lK/Xih1/Si0=; b=Fh10FD20gOKE9WxnIH5Z0e2OUQlKHw2wc8Zmgl6RyJzH47cfDGn7gJKcuSS1KHJ/beHZShMBWPrhJSp9pixiXEVUOUQJmCj2AB4ZwsGdCsJvM5ho6ZIzabd9rNLC99oJOG27kHKeeYg7KN2u/fDU9Fh8Ftbfk6rDXGj76ui5JPM= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by DS7PR10MB7323.namprd10.prod.outlook.com (2603:10b6:8:ec::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22; Wed, 31 Jan 2024 10:49:10 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c%5]) with mapi id 15.20.7249.024; Wed, 31 Jan 2024 10:49:10 +0000 From: John Garry To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org, rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kbuild@vger.kernel.org, John Garry Subject: [PATCH RFC 1/4] init: Add uts_release Date: Wed, 31 Jan 2024 10:48:48 +0000 Message-Id: <20240131104851.2311358-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com> References: <20240131104851.2311358-1-john.g.garry@oracle.com> X-ClientProxiedBy: LO4P265CA0214.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:33a::9) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|DS7PR10MB7323:EE_ X-MS-Office365-Filtering-Correlation-Id: 1597dfe2-76e5-46d9-b553-08dc224a41c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V9hsGFRFC5ExnGKtqB0eec4gxkuaaR7SJkcYqFtsDsrQWGtlpTsJI7k+azN5EyseSDH7VmzFhpVZdLHbLCoOuyFR3h9TpGDZKfTM/ZIiua/qeK7hrYYofOn7+iSqt/m2S+w00Wsa0b0wOoxapv7n0r8L7x6sLIzmecXlcAK4EyEXOv7XAzwGpS4cel5jwgFGxAsk8/HFDHirCrd93zs/RkitcMA/vlgYK4i7zkZBGlw1hiWtEODX6I+U7+8lP9PTqRFx/jh0nC6VbjtongZKDzajDlXy78eDRmVOhaO+QO9y+s7a9nIALryMc/U3k9hnTehdIaiUSPwD71UWAhw8EaySY5tjFIRl9+LahvfpOCuNUi0b2gvaLAZf8iL3h7dkQfAZMqDns3il6gRqVHRff2/b+kywvOVdg04I2uuMlsrpHGNfBRia0KKaCg0MM72ib5s+qzQFUOv4Qrk7GO+27cCmAdZYWjm3+JAwcubOVWl+ZT6XCMgbUWiJ8UvqGuxL59Fiw/x082MCJrBwqYeyemw+MBfhc4UiS24wpA612QkX4oIud5H4/2Nplr/sL1HrAY65BWARvSLXY6qdtNNRy9uEXVkzPuOFUFuCy4hcJJ4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(921011)(26005)(2616005)(1076003)(107886003)(6486002)(41300700001)(478600001)(6506007)(6666004)(8676002)(6512007)(36756003)(8936002)(4326008)(316002)(66556008)(66476007)(66946007)(2906002)(7416002)(5660300002)(38100700002)(103116003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9NJa4PLwK0ePZ+slLAB0OSi4LEC1D9Yt3j8vINpvtSLrKX59DJVOwZrJXBeEpZX718E3c7P4wfErqb1+dSsIhxAqw1vsee3518wJFJAI4q1WnVwwfd19DCl2AGe6iI9Hy6Dyo/UCqV4R6EwpqYMNklmDtEthkkkCWAHhu+3JbT5jrDnUfCiLeA94ibrd7JuUNL1dEYhz7SXxk0CVsQU4stG2E1b8261BeIr0P/BLza3PZ4Y6ffriTMqQ8XtrXNqD/rMA/u79PDuu1CZ7Xk79eOHcxvhGkTQd7o9A0nbjvJBO0J9fhhWI+iaIlcpepRHfQ9mMT4Jq/NwYG24ikuhCxuP6pkac0XtGpQ4iR+6RT3bl1BNQooH1Yum/T3aaCGq73LfyhVavTTRE8A5K0Xq1lScTiTFdHO9w/sM7eOwx/wKb9xSLXzCdO/GGgWwPwotTwOug1qwmIAP3ytOWWSu74Slzm5icjCFkjlfX4fE8OnpX2c5UFKv1eNSHkvyljJKaCjteeFsx19RRrmnwoFtgcwrEaNER3xwila3xHu4WLOls0a4K9Qi0FG8PXzavtSpRyxypPbJ1gdSxFhD1/kcAUDnFCnMutfOhV6EtHt0sgUBicv9dxX6zbSpI1Qjk13BuMfn2IJY3MMqjOKk3U6gqpBW2+u7nzwaGAAWOSc8a+y1u8Wsyr1ozXt06SjzkovE0TqRpCZd2nJsJ2iP1AsmTHIlgXHA07ap5peTmSLmmikdAd5a6adqS8SNoGkH1Fe3sekMefAxZuXrnmXX1jvxyys+FyfXtsUtj7w0ViuvIZZsUEVaiP8m9w+epDCnQt6LSxVLtsWufkFtZ6qPSTovPDTrP6NcntJVQMmULaHt2OOjtTzlFxJxF07n8HeWGZ8NBU4FTJAdaeK3EpAyzvqPfBknxlaEI9T9XktWI09Z2JWlrPQ2JM3dYvS4hc3d8oFnT2JtkjQA4aw5O7T/UkaJwG7ViG/PTY1lE+xHz+5Ft/F3X/TUsP7rkl/j+AqWGYQKNfFdsOJA9K82Y4q+k/oV+7nAcwTYktX6HtiizOYRm216Zh5Se4gP5/iXuf7bTlpJjYzHOUfWa4oWW670fY45KKyHFD/Qmu/4oXiT0WoQ0XXsjWlLRQ/zv9WAh0lbbcFjye7UC902uGQ/9XL706WIbcG3d7TSjGqiH0NzdnjFdNDy3RG/QvGnpdHZIw9szzkVMg4KYMw42BvwRclG24FYnaZLkyA0D32h0s21FMvPyTE7rtu90e5chO+WngYDbq7M7DjDvHbxvBS8rhZVpeb0SFWDL1YF/U1Y55M+WwHud7aNqXHXeFSngYcUWRlzHWp7E7nJ5dvgNIPiUd64t3MiN70fwnY4TOYF/s0CsLIX6j3hsxK7cD73P1Ca7duhSmUvOPPBg7iePcc5dac5mFTuWJIed7tdzbmYrHxp4htCjcmXVGRKHYktFIKQN5hCfiU/W6K9qIwu2hdwtVV+0Hffg03Py1jjtGDUjRABiR4emsQGQXihioRFaEqtUts2iVlNrGEAzm4B+oaz81VC/DeI0A2HQm9z064xnVgwdxA/jUPZFLpBfAxMoyKTmgDyd6AOgCRP2JszGF1ZjR5A/kjVDrA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KKXRWCDO3IZdlCZYoB6chMiGWg0pyXriP6McRNTt0KWiSH4/aqu3faR7/sl1qhdUh3H+hPvwERwXqsDsI+R0EuVQ4EvoQFaZny4vqJBWIKHBO4utBU/BP0HZgWldq43YUPWPokbC/8zz21J3+Sz8zwZz1iJEZcgC+zN7YNFT8jUducHbjc7WnPru157aYsTgpL7eb+JpRtnZlk+fcH4fUJ3gctkEYfz9SQWUgifhbamN4XbHooc0unXSrHg6LJi82876jGpjrL5yGTgKB1Nt4YJByyMkmjOr4yXQ0T0fJPv8nAxhXJYwAPN3KAaj9IcJUrljke9LiKamL3qvNhjSeaf65WjCAr2YbAfxfXzC47Cr+ntHoksLHN7E/eg8Kh4HWWLrqNRCXG9wer57ssHevK3PfJ2XrGw5K43lxO1rGZ69ayNzeEJsfzcVoVbqgynzQdBHY5jz+6jPJ3GGHqf6nM6NHvlxyuiId9MKltTsmx/vP4+FSzC8yvu3Rshw5QYp3irfGSRUFGIXIclibzHcP+cNqpOZN3Cf2a1L5xZtv8+gxUP4Kk42MgoXRfNhF0P3I89JsT/DIcxJOE33g1Qv7iiNdOLHj1x+Hba+KvHqZUM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1597dfe2-76e5-46d9-b553-08dc224a41c2 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:10.7831 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F2eabCRR83Lfc555u0gcaA8wvk5XVlOVKziABmdznMc4e5XATfkEyeCaq8xPqCYWc/WkRhToWm+lY601Ie1YdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 bulkscore=0 malwarescore=0 suspectscore=0 phishscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401310082 X-Proofpoint-ORIG-GUID: SuQwf3zk0a532sbJweIx1GEmDkQNVzzE X-Proofpoint-GUID: SuQwf3zk0a532sbJweIx1GEmDkQNVzzE Add a char [] for UTS_RELEASE so that we don't need to rebuild code which references UTS_RELEASE. Signed-off-by: John Garry --- include/linux/utsname.h | 1 + init/version.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/linux/utsname.h b/include/linux/utsname.h index bf7613ba412b..15b0b1c9a9ee 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h @@ -88,5 +88,6 @@ static inline struct new_utsname *init_utsname(void) } extern struct rw_semaphore uts_sem; +extern const char uts_release[]; #endif /* _LINUX_UTSNAME_H */ diff --git a/init/version.c b/init/version.c index 94c96f6fbfe6..87fecdd4fbfb 100644 --- a/init/version.c +++ b/init/version.c @@ -16,6 +16,7 @@ #include #include #include +#include static int __init early_hostname(char *arg) { @@ -48,6 +49,8 @@ BUILD_LTO_INFO; struct uts_namespace init_uts_ns __weak; const char linux_banner[] __weak; +const char uts_release[] = UTS_RELEASE; +EXPORT_SYMBOL_GPL(uts_release); #include "version-timestamp.c" From patchwork Wed Jan 31 10:48:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13539174 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8A4A28E11; Wed, 31 Jan 2024 10:49:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698181; cv=fail; b=R64lae+RrpZfoXBNhWY3szvsCjktszHV9TEoHT4QO28k2tHYTKPNrMlNgXcyhkqo4o4Zw6wl6fGNYeZArNc+FSEEhob1ThHMaBZWMjyqszc4MMehVECJ0RtP2/lh2nn0/OgRfxHx+NfximlOyh1yQcdT0acZQfzHnj78fEdL8ew= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698181; c=relaxed/simple; bh=LSdIHh/+jFkN+/XKnfhGJGJX4N3bTPtaU9GDeHA782k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fiu2UHb7vFZN4H03J0K9dKOLl851MKkGOmcfRF/hS/Ozjwmq2RMJVtDSzBv25JrDsnHpAixaze4FppcgoVixcf4qS333lvqsbQtXl3CxkcO6R5yDxqCjkJBXtzHr5aNywA3ep5s4vO1O0vKu/gtRcBhMMINKHcCTKmIjpGKoovk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=SWQfqcQf; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=haRUIuMm; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="SWQfqcQf"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="haRUIuMm" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9iPiW004890; Wed, 31 Jan 2024 10:49:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=riQrs+AeWWiuAzjtKGHW5NGkcv6fUQ+SitUhVI8ckxk=; b=SWQfqcQf/+wwyF7ECHh5RCvmVKJdhu4bHFFsnpYiDSQmREURFNX31ChHOWvA1xf7u3Jm sNCICXVHS899QVRVH0py4pA54ugPTRxJHb1UZ4/8JLUBDL5/IViqWmi+eipy7yJehfMP KoyCaBUQMaIX43g90fQyXW8o5s0z/msI/JUBYjvnnlcEE3TCiZ6qnjurD01n2EE8Mgdl zRkRUR4uMd40SzUc/x3YEo3dElAZ6jf9dPDXGrEkFd3CodSqym9z84lHhdnTwvrv1wpo ExsdIE/WuYCP2aHKzAlgj6Ie9qCJBXHj14pBy+jUWpaiFLbBVDBb/iddVpDIV3+i/EA8 6Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvre2hp4y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:16 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9BwCG040140; Wed, 31 Jan 2024 10:49:15 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr98vunw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mNpVMsEOZcbHhFEtjCwwzrZ9cGjDQGTkfN3SNG5M7HSoV7hnqqynNOuHcjHjTRcMXGxtO7h/JKOpzzO5qhVUwkWOpq2B0HYW5se2vIRNNdjh6qTacCxp6TKKmAF7/iKVAKmsUR1ImdCybraVpatAyYlBmNmvjBIgJZ/f0Xn5rdGBAwEn8zavBpfZ3TCf0U7rdlIXN0oroQf2mXtuNLSdTGOL0Ck2Guyt70voKLjpolXWjG5jcLgFhOnnaKLB60Xt8QmyFnKX0gZy9fexw8ZsAEjYVNp7rvm85mIPFasQhBlhQ8s8P2IIJMZW2rNtUaBCPTmokW11D7L1em/pAUyMEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=riQrs+AeWWiuAzjtKGHW5NGkcv6fUQ+SitUhVI8ckxk=; b=kHyega3WSMe6Ewa0QQHFRoPPLtR1VRxOZlkX1I4RRRi/o66GIiVHP+akjOiclAnC2OZItA+lIEYEpYY/9FSg46q8wSpDge9mmbKW0szCLWQ5RC3nD2jiel1a9IHT+4waSMkVMNVKRiqwmFvli3GVqqGAs+BF5zU+exp5pHO16g2bGtbNMozOklIT/leOKdeDIwdEuZWWgaLFmqG7xL16Z4Lyc93LK3qOYNHm/yNwMdOmtL0p764mu+OpOL4qWqyjNqEW4H673x7NfQxXXNZBnH+HUV2aXqOoYjSaPadEytPvouSPKkGEDWPWVFA6epuOHVLl9T0EiSb+uynz6N2gPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=riQrs+AeWWiuAzjtKGHW5NGkcv6fUQ+SitUhVI8ckxk=; b=haRUIuMma7YVoMU4pjz7Ze2wk1OyrYR5LsNVyvx80Hxe7T4Q1SCSBr6KxEWBGgo8HrlotXYO6/IcdDUoq/sxac0bn8JIkYKzO3Gu6Gb/zzfDhSEEMa2aj1r+tbXGdk+gDWOuJ9mTTzcKtdEGnrw9A8q9EHEz+M+vhQxjsjtGqFw= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by DS7PR10MB7323.namprd10.prod.outlook.com (2603:10b6:8:ec::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22; Wed, 31 Jan 2024 10:49:13 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c%5]) with mapi id 15.20.7249.024; Wed, 31 Jan 2024 10:49:12 +0000 From: John Garry To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org, rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kbuild@vger.kernel.org, John Garry Subject: [PATCH RFC 2/4] tracing: Use uts_release Date: Wed, 31 Jan 2024 10:48:49 +0000 Message-Id: <20240131104851.2311358-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com> References: <20240131104851.2311358-1-john.g.garry@oracle.com> X-ClientProxiedBy: PH8PR02CA0014.namprd02.prod.outlook.com (2603:10b6:510:2d0::6) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|DS7PR10MB7323:EE_ X-MS-Office365-Filtering-Correlation-Id: 185c2e6e-9e4a-40dc-8fdb-08dc224a430b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJvB7gNXgS0rfTUeM8BXPztZekKKp+7z1OWDY0Q2eCvoR4uwP5lsPgPD0auMGu7czIyTr0MXG9/DHLrRxnfN3qbglhBNv7QP1+O70ZifuB/+FlSLdtII8V5jQN9G0qOOEMcdUK+BPaPn+9I7APQ7Baym2gdcHkMhoKt5YrvHC0YpaVBBoHrSQHDydgS3kmd5/ot4FqpjxJHutuBqmSLVfkebftxSiLVuUgvwRQh3NeukggNPt3LpewHvR1SjEd63atGLjY5pay0LBjkype4q2m5PAonqV8FihbcaoP1wCJhmKaoTVWik23pdKIv77ZE2a5LqwWzl6KKqr1rDmbRfGFv7gWdW0yrQBuykH6LYKtA4RkPqUdoQiNAMmP1QuaRkCBoFd2XkF3UB3nG42XINcOOh7vQcBPiKcmPgw9pDOOMP5BMs3s25GZY96KdBAp3qdCiwkUvJEDc8FbRY+yoEcAHa5hKlqeAzkrOt+s+xzcxfdsRIKodoLH2HuV3JnpPd7VVCBA58JSTsu3ZrQkrQr0RvchBIrh5eUNVeK8cNoSuUvtA9xaTDZbzLquVIBX2RQ7fpWEl3l5E7dnpojX827MJjKHy82vdRfyy5zFljLt0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(921011)(26005)(2616005)(1076003)(107886003)(83380400001)(6486002)(41300700001)(478600001)(6506007)(6666004)(8676002)(6512007)(36756003)(8936002)(4326008)(316002)(66556008)(66476007)(66946007)(2906002)(7416002)(5660300002)(38100700002)(103116003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eGv73Lr9leCLY1S2aSLyX82fjpai5mA1sEDcLGvHKGu/kmFxUzlzgVL6wYl32FiqnSbrXA4pJx5/H8Y16oOxtYqI2/Vcq55hpAsED4CqpoaPdnQ9OpEqaxWVJQ7MIgLP03g9DYH32vvZa4eDzgEK4B8wttTLg6u3y5/+o7S2zcN1dbcvJzgUUmQmt7h3LOLXYrCDeJAd7/MZyfFU5ybqJ4QjZbSZb8s7CiLjCfyyKjQws9N6MrX/bGiuDNVCfklO6nvFlxUEidEyG/6R5gJ6SgHBMk/6/V7KWLbBNTVV3EZUeMhmEJHhXd+lU3rf5ea9n/EyDLRfcxpDB0LCMf5HMKo/agFIOuLLU/M9G/B0Tra3kS5cQqgQyRcIJY5nCTYr/Pm8gpkP4DBlWUrZZGdSaBJNp3kKqV0Mxj/MaCV8c9T662Si2ih/+qFdVSr4CdOsUIr9wjM7dHN+J8xXuf38hO43T4elSGhL9zZytPjltPJFFN+CT8z2shJ3ATMFgARB0nF9Q/8bpQufrn5EwoG+S9zDwDuwe2L7ahQ7ZBApIJSOoxbRNyXgTiSp5OV2505ejD/gEh+rEO/4diqpLFS4Pg4hGHVwOmyrbhbyF3pZbLf7k2hloBHzB9a43B5IK9ljLvyNDwiJMh9NdoSiY60lKptmaMWNRBFKyaVGJrm8Yy8wiq5Tcz4cRtK0EfXvH8JKS2pTQkbesOfM6gCSSx8TGd2HenZx3+G+Bbqnl2wTnPR5e7jOyGL3JBWgdDJKhJgkhytER5wKktp4TaPpdNx+vQjI7v15diaNJysuOel+wYDQKymdc/pSHCtEASKg6l5v9q8oeqkLXQkxyrDqN9WF2h0k4cCYYjEvXF7M+joYkulw6S7PZBYQSyHpsv+s+bAy8DXSm2eR/2KSeFzGXsuapRRPHg4mb/6jrZbaS9ez8Pfspp5u76od5te2OU3P1Cik297t2GTvpvnBzt7HKiz8RtQeMuCb6xAk3VOXrEQxhfMv5HSwffe/wBNKBDX9mtGOyWtbXn9A1Nm1t/Rwhoqa6EFP6Izef53RyUtJv/kSfjHDf0zgzEIuyz3y908l2HrluD+DwAjkw7Zt+TTGATIaYHhdR9Pdiy4MiLDaABjv2h639lIEawwboWcsyyhLs4vB3bEN15C6+zyzD3XOLiOz+BgUPRaJxwotVmHz/V8WM7NpGHg+BTIojscpsDa22X1bWoB6rGKoQ1dLW1gvG4uuO0iYEarOvhwuR5IYAYykxOYFKlecahJpeD+BRykU6tQE7xOfVEJqnm3YZicFDWOUuQyHoBwNDeW5Y+qAZicFw8lpN2tvmq3Osx9FnwJg5RjOuevi5DjhlIIAgbfTwh2Mo3xa2QBcxdmzWTIQ7nZa3RBdEd4Ldi9Te3UB2EaUXTH3RRZvxvTJP4ONYIrnxvqmeI9lmtikeaM+UILZwYVObM6f4a9sjy7A93EqqU/wRELrPTyXxMHBw3ujpPORhn3XVD3ThUyXwB1IKOwdPFNAaimVvq74UgDfVY/EYlyHm1WsEylOJmUmOJq/uhNq13X2Cf2HIA3swo8u8EG8rlr9oFXIlaubgpugPoRe4CUSQlW9xoZj5i2TPdkgjo9lpAHQzg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +/8DZ4AsvsWo4THif2O5UBeWbzmH19fUUM/n0F65Hq+tSqRNA0n5JCOf3vFNm94xGjJKUmk+xR8WW1kBq899wL0uGgGWm1PXNVFa2o54ucg2Vba5DRYSx9lnf2J2FpnqbaHruVuUxuTNwqkMSUW5JiL8nrQ7B/jJ6Il5KadXSZffsubEhEdMr+DmO+NK/NflVi5XxxR1MXb/Q06t56Voj4mkKFYRriYAajNR3lkeG+6LtJuXPc46OFqAvOLFgcSBNwtxQdAkLjGNJL75qUHdgsGZJIt+hsmLSTM3LcRUBfwFzJxbFFedQMgoJYiHdJSaDze/tosq4aB1nbchBuBDEecYwpdphCPX9R/ut7f/vkIdNKLQcIJCZGABBCYGxtteLG+qIeSWKyj/ODG4k27i0b4qF2fv2bKcM8gVi61xz/V8PPitCXwhIjAAg5Ft+XiGXbR27sMx2YdGjwulTGNSn1n9mXMR+EDA438kX59Czw+k89WHZ5NN/C1zAlxpe+Id0rFdF2eetiUja4SsScdOCw/qULpJM3k8StypThj/huKQaCym7FMz9O3OYi0pDFIysTvUeUdOkctsfHujLO6ahu1bqAl+NAn5n8U37JXYLNg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 185c2e6e-9e4a-40dc-8fdb-08dc224a430b X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:12.8921 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dXvjnRkkfyFDVWS7PlIgx5pvu8MvDJnpYySs6EH3C+LnKUcnnEX4YFsYB5M0zPLl5ja0R38UBf98P2XlvCXACA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401310082 X-Proofpoint-GUID: fG4_O7z_NgJOY3bCFdhiHrtxY6Arv3ox X-Proofpoint-ORIG-GUID: fG4_O7z_NgJOY3bCFdhiHrtxY6Arv3ox Instead of using UTS_RELEASE, use uts_release, which means that we don't need to rebuild the code just for the git head commit changing. Signed-off-by: John Garry Acked-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2a7c6fd934e9..68513924beb4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -13,7 +13,7 @@ * Copyright (C) 2004 Nadia Yvette Chambers */ #include -#include +#include #include #include #include @@ -4354,7 +4354,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter) get_total_entries(buf, &total, &entries); seq_printf(m, "# %s latency trace v1.1.5 on %s\n", - name, UTS_RELEASE); + name, uts_release); seq_puts(m, "# -----------------------------------" "---------------------------------\n"); seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |" From patchwork Wed Jan 31 10:48:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13539176 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A74A669E01; Wed, 31 Jan 2024 10:49:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698182; cv=fail; b=T+67EMACfcXS6Ah+9NQlGY1A/8u7gZCRTHPNxXdiyndx3NBEm/LJiyPrq+qY5yDDrvZ2zthWYcXx23K9xVYO6y9sNOJuqRA8KdWPQrbCPc0et0x1Ts++sWDAR/UIkPSP1A0NAlt48b4TXwQrmrUHPVzz0NdUu+ipN/og7pmohCg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698182; c=relaxed/simple; bh=DlfAuXlB/5ULW80F5bSB2AZa7n6iHxDSO4EopGHwhgY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=n3rgFjFsHlTQ37byya9mOA7YAieocED24o6XRz8plMJgt5jpGzyqVRKGco7twA8/7clEEI/n84NPiZVzURMWoyMUBJvFzZXuMuiMhVZEwoAYdgACsuZ1PXnUPbEWW/R9ZHNECpxKrSqLln1vAKnDIzVY9RR8m6sxVbU4NcsPQDo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=WhVmZjKm; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=A9EdMHIM; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="WhVmZjKm"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="A9EdMHIM" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9iOHW004855; Wed, 31 Jan 2024 10:49:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=P8JJpyrkFGlpvFAE89/qAv/NtUexUbO72vW7m8ppNt4=; b=WhVmZjKmZwl+Hi2FANNO5KGtSBjoOnL39CtHl6pV1OsL/VM6vn1F+BdkJm/3eiNgbd1Z BztgquUNX2PAxREJKFqvnRmX/IIfNoQ5lnRyVmrqf/p3B2n4bwfl4atrP95GKYzcD4A7 jDqpyiRWAMSuG3KH1Br8dzw8/F442zCo6bM07vjx6x6Bbhhtsb+4xdYiGTqsETyXjLM3 /vOqVmwMc3HVQ5iuvilz2EiOkzWVg+K9yFrWu1Uvq6mB9Oj4F7x9BTYZCIEXXYuLq9Ho PIF6Wnm/XZe3VOD9bVm/Q4E2NzEoWbqRdPnvn56yUVK51mM1zMkDf5bE5YNss0eJU+D5 Ag== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvre2hp53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:18 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9q3Hv007821; Wed, 31 Jan 2024 10:49:16 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2041.outbound.protection.outlook.com [104.47.51.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr9f4c82-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UJ1MacHJp3CF2IuO3/W33FbQp7Lc/9Qlofl+w867J5kd6jToZ33yuPW3+Bw+JH8GSnZKT8kQZ3CLIy3TRw3oXW51wLZlDXtkYk420rx+2P/H3EhjiUNsNl5DfuwY5mU02bNcYHZkoSXb4A4/UI3/zO3gDvqD0jzTgxC1mppK3dzDGKUcxdRKj6njPb8bSkplpI0ztUYeXJ3UsFhKGDXIEn52ZP2H2+RCd4akLyaiVi6ia7rA07tcUlaxZBBRjgAtdsA1URjr1m0AUOGmGaJObE3CmlXLnAqNmpS6K0BZypkfypd9PEqZR2JmmfMz9anG4SZEVa2jErr43RPMDMHEqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P8JJpyrkFGlpvFAE89/qAv/NtUexUbO72vW7m8ppNt4=; b=aFpx6yS25HhJ2inMg1GVx1ytujDqdUuRU+W11RIFUIyoYybYwcg1Z12nm5Z/bMI/nleAwadJajHSyIv9FPTSpe5TCfchcft22BR05hXv3bV8Jox0G9Ns78KDFDVFu2msvyDHucB38IaI0b/E85aIUoUFrROXSk3HkzwNnNpS78YbwWeFidW1hY95fy4kbZsgbKJCPWS3+8IzuSmdnmSo+1DC3bULJcJs4r1X4pLAh7GDp1QzqUDUuCXz72CNF+60orPP7+GNQNPmCwVqFIHxnKFXmq5EDcXPCi4cp/bGFfOvaMlJKPZ/ZdZnR6QEXqxBoIxLr4dZKExYhij5IYtfmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P8JJpyrkFGlpvFAE89/qAv/NtUexUbO72vW7m8ppNt4=; b=A9EdMHIMoLqu2Bntzss1IUuuHznMKHrLKYiCRFEVPv52Tyunv/TkzcQUnG6ZB8vkEMMHgbEVDV+oexaFX6383htu0UH2zjASJeWL6sXd1IkVI5+qDO6M6OZrb9txsN319QUJiqr/+YMBkmLMQRRaWnSyjxXxeN3lKjsg9hI5YSI= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by DS7PR10MB7323.namprd10.prod.outlook.com (2603:10b6:8:ec::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22; Wed, 31 Jan 2024 10:49:15 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c%5]) with mapi id 15.20.7249.024; Wed, 31 Jan 2024 10:49:15 +0000 From: John Garry To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org, rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kbuild@vger.kernel.org, John Garry Subject: [PATCH RFC 3/4] net: ethtool: Use uts_release Date: Wed, 31 Jan 2024 10:48:50 +0000 Message-Id: <20240131104851.2311358-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com> References: <20240131104851.2311358-1-john.g.garry@oracle.com> X-ClientProxiedBy: PH0PR07CA0115.namprd07.prod.outlook.com (2603:10b6:510:4::30) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|DS7PR10MB7323:EE_ X-MS-Office365-Filtering-Correlation-Id: 52f65689-0c6b-4d40-7211-08dc224a4436 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xY9HSexY4wiCwxKL0QS9wfkLNmdOW4ZmZ+qxa9h2eZ9uV2PiOs882gm6nDDSVeCCctkTvLrxrom0Z3TDswdiFfuSmOrXlk/H0RH+D2KBF3ejY8pE+SLsVftaLwRXxitu5D36X80rYpppbFMOQ9WfQNzdmgWlzv0kg1EZ8/Ru6WyStEbmK4tFMel1T5yaK0FEWpVBkBJfivN8TIiVJYL+MK2TWvYum8ibAb1HiH3S8fV0c0/fXd/7K9qF49IgD+P6lzkisUYhwEBkT4L0KKr1S0jZtpSG3ZfsYYHc7PgaZ61AQB+6tWOGfB9xqrEskLoHsT6lhgA0SmOsXn41tNMbScdsOYYhzXUiPLi2N5r+JEoQVhPKslpC153wglCL3VrheyNUIUqRTaVB3vg7qOkdx/okqn2awh0eREg8tINUC4MAD8QwDwznC2rn+dk3w/Nv0e0WWHmtkBbnhxBvl+7yPg4fWLFKMHihHOL1CQVPzpZFgI+Qk1U41Tt1S7FqQBB+FaHMEpQpoxIO2/9bHTieJxOcmMC/OMJe7Bwbcv2DSaW+yOpRE9xEo0+85xBG7H1iSjVdzOMpELOs5/gtYNtaulpjySh7+77DOOwxopl04Es= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(921011)(26005)(2616005)(1076003)(107886003)(83380400001)(6486002)(41300700001)(478600001)(6506007)(6666004)(8676002)(6512007)(36756003)(8936002)(4326008)(316002)(66556008)(66476007)(66946007)(2906002)(7416002)(5660300002)(38100700002)(103116003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ONbzDyuDgptHtZaGC3D9Tgv7ZFrrTGtGqHaQhezSDM/yBgOqgTVg0485PM82SD0ocMqiqqkxstxzPgxwnqpt6OFnaWqycvSi5Dppm8hBVncAbEg8hn7MrDRNPoFYTGhzyswK1LZ9MHsWvJdWSbfyCVFuX/SIxZ2KJrSoyYHlKpWSDKuThSqV6IG7gaZwM1Ca/ZHEh21RS8cmkh8pGRmipCK66wN3O85H1lXYIYMRCZ+68jgR+TMKQmpICDLpa9UupB34NMlB/2FNf7ezpc0Tl1v163ugq0b9ezviSY/KJtoFghsh2CknFcZ+rpMX4pYgfHNM+fB0x5bSwhsqTcGOHbbhwMh68GxS/IwUm9UbvzXbZ2JNrvOz+ifllbKiOGLrFLkVXZhpjBcVnktFXsfsKvGz1aqo3pF3s8XvDS0lod4JApQWJsKf5f69ac5y/Rb8vyg1MyUwSNSkzYIBiYsf0iwFlGOK73Yzx5gWu/yVkupW4rIoQKIxvkOzodjoh7jiiZgGRMJ3VhYic4RNLXGJbDN910Vue6thM2AvQnSL/b5xgfIBCYeKa3IxSFlRkJq7KowwObkVwe5UAaZdKtu2JL8AonTfi1qzE5ta9FV3QngR3r0rgeAZp8jAMNAHeN0/no/uhJ1akV6aF13HVooY9H0JZVlwMJMqkwyGk9k8Wc4RvIlj6sXLfkVP/9siaJTgRKs9N1knDNo70zjSv8AM8GcSgyeW4TbuCjal537EMIfBBm3iEPc+GkHnAXPWore+j5Adnx4V81uL1F9XKz7huv8t5niaZr2Dvu6NKkQF3XMr4exYxS2a/K2kl3bSTqNeLp3wM8L/bWOhFaBE2pKaFKbEpClXZGAY3+06vxR6gU/qevAC1/P4JJJL3jOjmGGPHvB6f3auXyH4UwDT+OwFIogF1Gurc6NsagtG+oDkPAUqxj1Quan6ozw1J8UaGCyeqoL9V4uFtRH0GAyjPYTrqvo1QsOZRfsSV6PvfQ+M+5/glsyDFusRje9OQZ8NNue0rZkyslcqyxTE1xUSNZdcwfWDl2O8o4VczjlldHTA0CeqKaQtN4dJsuVmqu34/9HZ+YgaOHHCLVqsQzx979xibj/uDQejidyGf6BYxYLEU0v9gVxtWa0XpDdzdDvIlNNtYLpxNk99po0ie7pYqn7Wm55D7526BB9hRb4dBnSoPXdocs2yvcsaySMfGzdikOeZ3xjiSf9PHunRYFElfMNNCc9LaN4ryvNWinH//+HZABDwiRqDsQvLcIrT3HnAVfsfx44Nhjozo89o+LHmyGedVM7n8x0dCtb9piZXp0oqyFoWoem4d4AFGWhpqS1OyhAYnsD0496W0JmGGjI2KtgMbJSfowiQpMjkdVPpKD9QPq8v1GFo+jMU1TfWpZdLrnm7jGBvqCEtq8tgjr812UDtNKnDNVtuyryYsubRmYbKmRVI5PWuHaEM5lvSPDFoQtkJHzD11VyXNpxtFNZGE0KHFcH6/ZXvZPxEKtbuAjx78P2BYUqQTGpJUvFMg36v706KSvxAhyruttTiXj/CTuM8N5XVr53dO2s0azwecK/ifzuNN4bKKUCHBz3IJll9i48nfEmFHLFpUnMQoTrhuDQGA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Wg1gMZjCUAnl3kIBLbNa6iKZe+JR8zcogRQMzqIbYJcTqVVoUblAIeBOP+WUttGi7P6sLLKoBmFtZUspZb5ijww9VdH9IY9UwEfxqHiF8ZXzTNtMZtbZjL8L8ldCr+QJKGMp2how921HDeamUomLhBoqbeXKlKUQiN4O877G9saLGDQlIfMT9MGYQeDpf6Is/KXy+8BYFXEjYkcygJfhfVnJ+A+vcpidXx/sXcZZAgo33VfNVA5AOW8erQFPzicTvbfm7+rfEjC4JgJWi8zDcplzFXLgU5u4h/tjSyAh63R9srTg1D30O6zK3Jd2qBHunUnY+Iou9Gh6LqjlYKuxcoDnpSv8H9z4Jm9uJkibMj6sathctc+PlPVqBymEMwcZWXuIT47NBJkTZFMpDFXTD0pYhZeCkZAfIfOMR7w805tlGCrN9C2Wcmux6HpgPgPdA1whJwW5y1nvKaXkgOn5Z02AZfzNFkdc0KVLtoABA4A/YboXAuCwjFOz6AMIykSxpQZLRZDo/9aE3fDZXYBI+fMtOuJBjdd3U4Z6z/vv2kUR4YgjLB+uRINSVLxhJWFbBe9MMZzh4eH+wIbHR4/EwQWNl904RP+r2OBXM1WZ9oI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52f65689-0c6b-4d40-7211-08dc224a4436 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:14.9575 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hs+B9ccMWdY1LQ2aDnb26PHKANJss0ZAtLQUvV4fe1yN0aTt7PE5Ecb3tZeFaKMyfnA68D5T6OqjU9GjXed34A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401310082 X-Proofpoint-GUID: SC2q2pN_ztbj-AZRvtK0sws7BTUPOknF X-Proofpoint-ORIG-GUID: SC2q2pN_ztbj-AZRvtK0sws7BTUPOknF Instead of using UTS_RELEASE, use uts_release, which means that we don't need to rebuild the code just for the git head commit changing. Signed-off-by: John Garry Acked-by: Jakub Kicinski --- net/ethtool/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 7519b0818b91..81d052505f67 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "common.h" /* State held across locks and calls for commands which have devlink fallback */ @@ -713,7 +713,7 @@ ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp) struct device *parent = dev->dev.parent; rsp->info.cmd = ETHTOOL_GDRVINFO; - strscpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version)); + strscpy(rsp->info.version, uts_release, sizeof(rsp->info.version)); if (ops->get_drvinfo) { ops->get_drvinfo(dev, &rsp->info); if (!rsp->info.bus_info[0] && parent) From patchwork Wed Jan 31 10:48:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13539175 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75B2169DF9; Wed, 31 Jan 2024 10:49:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698182; cv=fail; b=rN+AAegiJqWiwFWgLRfQPKZeFl2TKMcc0MSQfVq/0xVeVXkjP/+LGTwXhAhLkUWX/Gmjv0jHl/CvgVErJHcKq8KJLdRQGagbQsFh/AyNorS+5TTntrFwd5A7yMFKEWS2emj7UdK8AaZVvjhBRRsSbfs2bL6Ug+7OvMkPmxlkPyc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698182; c=relaxed/simple; bh=0p2KECGGrDUaQ83g+ZjToufoycV8Vie5lOsLZSjamIQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fVYL4juB93gFz/9I6OPecOq+JjV51KUjNbVdBh/cOKVD/p/HDaVmbwpUUOXAgeEsrpS0ZuTM0XLNiMIU4h+NEBrYCFzJLKjXVTeAM65Y9bkfRfSBoEpYOXHX0E0C3kpqpmBtR1tjQomznmqzWGHTxIfJM/88PzlCvQOK19+09DE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=QNtS8flB; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QBIEHuxB; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="QNtS8flB"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QBIEHuxB" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9iObJ004847; Wed, 31 Jan 2024 10:49:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=9wjyPovYRNxZxlq2Qq+xUkuYPzIcWUmL5xwC1wAoWCc=; b=QNtS8flBggWhY3gelpl/e/BkfndKOGxdNoKEvEiLIuiGmpNCIDt9uMM61eeILRba66ns LmV+x2WvdrrAON/BpmINNoNfGpcwZNZOeMLn8gktZF5JoZ2o24S6knfEbhF1UDIW6OHj sXLcV3vBxNXhyhEwfpu4I8yj38U4S2mZMDIM2uclQ0LggBWTyRnt8NqmGrbKTwrBeR4V 59VO/qCeFmtFO+LKO8+P0IKjgQnd4Nxq1SSeYqJ7m29tf/Sg4CUuIxI7S9w0j1gTwbM9 1vqQO62B28UafTw5w7kdnyQBCTW7rWgDlpT3UveJpKTqBFUO4VqyWKJQAxFt2OLSvYMi mA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvre2hp56-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:20 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40V9YLkL007822; Wed, 31 Jan 2024 10:49:18 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2041.outbound.protection.outlook.com [104.47.51.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr9f4c91-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jan 2024 10:49:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YgWg+4rpaAm97kTMztBW3FwsL8MfTbLwzEoUWOOfQoFRbt2Xt0GhnkFgLKh0XIdxMAOfnaySqq+sEtbV7P2sEfS05MysXnB24v5pvN+SXMIFYr9swIHBBPqC3sOatiGFtcgEhl3r/ofxJiQpQ/3i8jlyB2YCrENcuQKvywWXsQBgxJqcBTorWAtmWcCg/+XY9W/vPQcuMYmREy5tZNpg5vx9BX6lPmSwFNtfXRv1gVFZ2emtj5YavUIcaCkQWMT58gyYYAcAlF/QPl+TRgMOEIpdBeTk/A7A9jVn6haI/QbiL/OsMeurcFiN8IdsB9RQG6KRoKe3mrBceC55DsErkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9wjyPovYRNxZxlq2Qq+xUkuYPzIcWUmL5xwC1wAoWCc=; b=M7/GKIn6a8miDms+YgXyDoiQKhea+iX7rVeOHia8HSiXPF7ARngBNcwrfHNxIJ+KvLLWWy91kTdWyaOWzrrGvZtrXV+cbZDBZKtMrnaFH6uVn9YvlLMeHVRE5zASO7kbgb8MLx3bgCzqoNXasYFzkvODsSQaAKn0A10GnK5KuW2AOX7g718n6mjNs93Grh/yr2ZWOgnVUUM6Z5LjIWllaw0LtdQvATE4o7PHWpelBYsEhXkipk/H7OdDgyxp0h3vU7WTCTbtisiKxpOUp5CJM+wCvt3VPIHJ+geK2SCrmzuG1nKQRfl3m0BsUMTWOd3JmznOeHZWyetsnuMmpMJcmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9wjyPovYRNxZxlq2Qq+xUkuYPzIcWUmL5xwC1wAoWCc=; b=QBIEHuxB3Q7nu6yX3nYUj7fR02SnDKkZtVHFS/mI2QGQWPT54krnTTYBTX64RkNA4lxMOmXxCtJklqODQjV88KTr/G9cg6Dd+AEok0vZJOQSMwA3Er6fJmHqbjllRQ+D7wV2jVGXBz21izd8PDYMpm45oAYWQNO1S0MFfuO3bxc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by DS7PR10MB7323.namprd10.prod.outlook.com (2603:10b6:8:ec::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22; Wed, 31 Jan 2024 10:49:17 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::f11:7303:66e7:286c%5]) with mapi id 15.20.7249.024; Wed, 31 Jan 2024 10:49:17 +0000 From: John Garry To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org, rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kbuild@vger.kernel.org, John Garry Subject: [PATCH RFC 4/4] firmware_loader: Use uts_release Date: Wed, 31 Jan 2024 10:48:51 +0000 Message-Id: <20240131104851.2311358-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com> References: <20240131104851.2311358-1-john.g.garry@oracle.com> X-ClientProxiedBy: PH0PR07CA0107.namprd07.prod.outlook.com (2603:10b6:510:4::22) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|DS7PR10MB7323:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d5c2554-8653-43f4-9261-08dc224a4588 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: leou84dqVaTRpQKHfghgWmartuk5yaTC4mtgSlykHqDt1IY5dAARBA6ggq+RnO45A8NjulvD9z2XKwbWC323y6pQ9ZJEiDNZ+7cd1H8RwJWydDhzomzmQzZNp9ad+B+xLJpfqDo6nkEv+e8Nn5QRZX1WgfSvVRf3clcqJfmBYK8fGRFk/w0YvtD2EYvjdZ0pKCw0XxSyNHhgWhM59C2s+eeRLsn/HcwsnnxSeLeZFlgCTKIyWUgh8xEZvl5sgsiE5g+DHCFm4Zy2ix82xfHkMXP+EljVbNG2GlfaSVkDq7h8g8u1EV2y04GVW4AphffB/3uKCBd6OPt0fmHieq9WrbXR1e6Q6A2+7xItc6jsfPsz9Lr7/h43SrWJlqqga7j8TVsAWRl5sixLNo2c//u8I/8fOVtMhy4ctVnrD7GNFRCWLhDkDCxPTpgetCFqF9trTNvoG4GPzMm0vzrg+f2ethrRShmJo9K23FTLDVLqniBTh2Pw/kBdmU9V1L2XpXYfrL1uWwaTtSw4KH6ztlc3NyUoVpfeFCrgzF5Z0Wwnt3015ZLrI/Dg5wDCK6Bha/3inFENSLsY5cHoICwYsAmSM0jQwFz/8D8AhqW0tBB3SoM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(921011)(26005)(2616005)(1076003)(107886003)(83380400001)(6486002)(41300700001)(478600001)(6506007)(6666004)(8676002)(6512007)(36756003)(8936002)(4326008)(316002)(66556008)(66476007)(66946007)(2906002)(7416002)(5660300002)(38100700002)(103116003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NTUhIGthGuMujUvVo84YYT9WK+TaLTe+EUCcw7xC5OxKJ1SE9lJa7yX7+jRoWrxM/8x4amNhnQzmLSu6CRDTXId9YsvFcvKzjONupRU26oKbeYhWSnwalgawfxA84GkXgAl4aHawtFh+k8gBXVuRYKhaf8mfaXQuaCV2Ib7HG0nIUgN65xK0oxFy694DYDmg1m7DDx1ImbD0b/+VgGPJD05Z61c7wCItcLHCZSx3SWSr7+4V09K4M4XIFHOpa75QeUkCGQAeTdS1S1/WAdCPpCrh5jxhu/Z8HvrqHRNDKguw2yvyTs6uupkmUQAqq1lg7tK0IUlKvV1d2WRLB1kb7xbmOvq72tSCUQ2OMUQi7PBEIkr4qgi8dm2sSleLy/vhU/YEQR6+5iD4nohaVu72+cvwpr5UmeoYaTgvjA+LCQlwHXv4O95fVIoPCTwcAZ9EKlJxGhUzJLEZdiKDbpq0+3r4/9iJX/nWSI7FfwQSigg9vauILbArqPguRuXiEenkqiIMD7bCahTD7Y6/sCbVtCmpwHwWYP7EIAoVCo4uepheym0qMzNIc2LWnoYut+j1EXR1vzq1P46fobCI0o7HsT0Nzp7VWJ2DYWDcVrTyALNJcHmfF3ixT31DpyemYb3zdCFEDGPMDkjiVZjZTJC4I81OFcZsQZaDbcJ7cHG5uUFmC4JzWT6HnsOJM8pkxTVQ+Gqw7Z7I+doU83i7kmFIbvVtALPwRpttzo/BwGsspNLQCxG8BwMajuX6rjU7Qk881BFsWiZvIW0Prkr+oYhWVkymrRKiENdfOr4eBYjG9GiRpfzy4wSOCKBZnbwryaY64FmqC+PcbOSWkeO3uPTV3HNGnhTgm10AAAK259ubWk5JjIgIz+FZI/s/Twlxdhs6hhsF4oBCwXqQEIG4TXAMeFjWrdemM6bbIrk7RIpSXrnTteBrsOb00RV2EnYNT8OfJDAnL97TXUSBnS0Caauk/Eb5qXIgN4nLRMsQuIlcQPt0mOSTeiGBeh5WsPtRfUlt5Nm+rLIkFUBv1PAKy9SHZi3xmTvAnjIt4/0LgNWbq2TBB53WzqpELH0OABDzQz+8Ax/62PwkX9JBto6wSV9tsETCd+K6zJsuhVRwb70EMWu1sK7KBhi2ItKfTxVHem7VjVlTGUFVE1BO3TnFMJfJL3lt3d/qP6H+Md3kE+IbhpOzXF76qT0znTtjUyVPLsEPTA/3UWeZKKaukhyG8h1bJPy1PKlI4Fp7xSuNJfnEje2Zo7YMgvlYmAPSLAyo7PmV38f0yNA8yRSYGsfWbEm/lxT3XA10i3nmujNHN1GJOSs++It0HT5ZnNg3cSEBG6K7Ueb+c2UUq6Y3dmbS7JImGnLXT0pu9JDOFmi3oeMXGb3JX9rFeUt3kta9I9I/TRMwMOUHblXgUJsFKG+UQKaiggWsUjCkhWevwM9W4S+b9RlGgEU/aavL/utqbkhytLEGfVdIvwJaMV5TYL3BJxSHB20iTKTRLdQcwItg+FqqiPiISGvLUrVQwYFpZFfuOu3CZNUh9FUMKflJXOGufxiuj0US5/uzDyxs/EQ+WioKch5M/rpIf96bWpdic+rbVXeE9ELVYBxnw49tOWuU3eiPpg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: UKdPI2zLhFS8/ZmlA9LtpLZW+CDD/fDOU58361sEQ+9HV0jHTRgRbn/TPFPVYMTSE5yqrV8zQitLW8X8Z2/ACsoR49/xpAPZ8HGDEaifmhh/WAMGeRaQnbR3PJTd7wdbxls2fOBXnC4oG8R+Hkyq78irhlw1CrFFaDoLHD6/j9zbtj2P/Oi/4G6Zprw+DDzB7qJbeQlQK5tuaR7JxjtD472Kolsgb7AyU76gS1Ol3GimEJ7rx+JCjk2LbFTb/1sOA1KTtvAh5fPF8yGJOAk3QUl4Qm0RRyKVuvSvQWatYBtSEop2B54Up9kJeRiMBvM4Ml5cyv0DgzDK2PPBDSBjQN/ltp6V+5iABV8rc4WdBmPsgdIPlDU1f6pZbUkuQAlv59ngVY/FLHKKI5JaTXJ3hJL+yQp/XfEInS4lJRzL2f0fD93JAMKHG0kNYblXyMBffHMvUPqSA0HAD/dozwwM10RIlO6IQhF7nK3+xEF5/DmjHp5Ixb5wyD8edO2wnBNhYf4Oh0RLjO5zwaKYSywzQX7hFiogrPkv00Htgz0VsA8sawjj5cWdASJThLrqKI5DRcpewZv8jqfIIyKkb9zuyuNcGyEkuzYk1Z0aSOlxF5o= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d5c2554-8653-43f4-9261-08dc224a4588 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:17.0775 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FXZqAdvGyyQiOz28QSrdeXgG3vjNn16axbUNSTln5gK+4sExkrPLdEtMN/Ns5Z14H1Pz4MRynA9MyviQ82c4OQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401310082 X-Proofpoint-GUID: MnMwAmFC07av7qcK0i4uhlvlXW7OVANc X-Proofpoint-ORIG-GUID: MnMwAmFC07av7qcK0i4uhlvlXW7OVANc Instead of using UTS_RELEASE, use uts_release, which means that we don't need to rebuild the code just for the git head commit changing. Since UTS_RELEASE was used for fw_path and this points to const data, append uts_release dynamically to an intermediate string. Signed-off-by: John Garry --- drivers/base/firmware_loader/main.c | 39 +++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index ea28102d421e..87da7be61a29 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "../base.h" #include "firmware.h" @@ -471,9 +471,9 @@ static int fw_decompress_xz(struct device *dev, struct fw_priv *fw_priv, static char fw_path_para[256]; static const char * const fw_path[] = { fw_path_para, - "/lib/firmware/updates/" UTS_RELEASE, + "/lib/firmware/updates/", /* UTS_RELEASE is appended later */ "/lib/firmware/updates", - "/lib/firmware/" UTS_RELEASE, + "/lib/firmware/", /* UTS_RELEASE is appended later */ "/lib/firmware" }; @@ -496,7 +496,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, size_t size; int i, len, maxlen = 0; int rc = -ENOENT; - char *path, *nt = NULL; + char *path, *fw_path_string, *nt = NULL; size_t msize = INT_MAX; void *buffer = NULL; @@ -510,6 +510,12 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, if (!path) return -ENOMEM; + fw_path_string = __getname(); + if (!fw_path_string) { + __putname(path); + return -ENOMEM; + } + wait_for_initramfs(); for (i = 0; i < ARRAY_SIZE(fw_path); i++) { size_t file_size = 0; @@ -519,16 +525,32 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, if (!fw_path[i][0]) continue; + len = snprintf(fw_path_string, PATH_MAX, "%s", fw_path[i]); + if (len >= PATH_MAX) { + rc = -ENAMETOOLONG; + break; + } + + /* Special handling to append UTS_RELEASE */ + if (fw_path[i][len - 1] == '/') { + len = snprintf(fw_path_string, PATH_MAX, "%s%s", + fw_path[i], uts_release); + if (len >= PATH_MAX) { + rc = -ENAMETOOLONG; + break; + } + } + /* strip off \n from customized path */ - maxlen = strlen(fw_path[i]); + maxlen = strlen(fw_path_string); if (i == 0) { - nt = strchr(fw_path[i], '\n'); + nt = strchr(fw_path_string, '\n'); if (nt) - maxlen = nt - fw_path[i]; + maxlen = nt - fw_path_string; } len = snprintf(path, PATH_MAX, "%.*s/%s%s", - maxlen, fw_path[i], + maxlen, fw_path_string, fw_priv->fw_name, suffix); if (len >= PATH_MAX) { rc = -ENAMETOOLONG; @@ -585,6 +607,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, break; } __putname(path); + __putname(fw_path_string); return rc; }