From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.5850.1623739749220886181 for ; Mon, 14 Jun 2021 23:49:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=kWQHS0uK; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 8u/EIGgBnactSs5o6T3atkzcBLT+C/J3deNXrW6udJvXfgBwZjZVS6iBG/9esItQxkMowH/HBO pxfhCo5KBchQ== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="193051645" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="193051645" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 23:49:05 -0700 IronPort-SDR: oysc7xCVkGH+4mY3RTvUDv3NyQ5pH7oqu1f/fJl5BliNNwN228JxqyxkzgNEYM7/DyNOpkysyh izTaHcz58dCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="403884080" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga006.jf.intel.com with ESMTP; 14 Jun 2021 23:49:04 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Mon, 14 Jun 2021 23:49:04 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Mon, 14 Jun 2021 23:49:03 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Mon, 14 Jun 2021 23:49:03 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Mon, 14 Jun 2021 23:49:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cZlNZNkzln93X93sMGhKbglkVYb8sKX6LPmQ3nFbGZM80c3VTdYnjMqdw603fH+9NZOA/PJLBW3UfzEEfoKfkF9lt01nc4SgTLUW5GDDN/69uH+poC8nuwI7edzuyxKGNiwUL/gW+9bZ5AwOPk+Bhb/Jl+ZfbWz+fUe5YuyqH48FZ27suaJgLg7nAti7TZsp7i2/6dA8ahZcRjuM97d4S0G0kgBJlrvIruWHuGzRw4Ob+Kny4v1gqe8Uuq0/i14yscuJYhYBpCfoHii102PhWKwr84JWZp9KK0Z4L8B/bhhJm7NX41awxzH9RvHv0ycIZWzauYei55gPVd7iW7wy2Q== 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-SenderADCheck; bh=D3fLIrXQ9v2DbvTOCdmtZ5k25kdBhMw68g2o9pfhRGk=; b=SB2qsGkn7OTKjxOizhJpOoNv+UV0hmUmL7Zo0VKnug7wYZR0fNBFRndR+IyJBzAPpYch7+oyo1m5MPIpri9frMenX8yvdaMSTifdbgrUiHlugm9Hr0+/4DboKmZ1Ho0LNDzrdg06JMRwRIGEx3eSH2xr7u7hvLXeSZyw+x0jPagyx2znu+WbICEANGVPWLLEGZrzg7qTqtRQxkDUqEw9XYDpXd5kGoZy0CqVsoUBQCljU3GzvVDfUwtiiMX0MJu5a4K9q7KbNCwyIaUKdUf9EMTQPUSSVb3ybqaNEBl/O4Q43jpOuGSJhsPalcoVhQrxpGyLxZ+FPFXkcU27NsDPwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D3fLIrXQ9v2DbvTOCdmtZ5k25kdBhMw68g2o9pfhRGk=; b=kWQHS0uKYypPMtmhgR0oTw0YT6ZInhrXCUyilgw91Y/Sas0N9U6iaPFUGEkFtqU39s8le39n1vidEyuG8yF7aASbkyzMFSS1V19sMk8bUG+t21PE+deK9J68gfSCOX2sNBZxJUrt+kTDqCVdghaNi/vF95DxDUxzEAtFIiHUc/o= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB4297.namprd11.prod.outlook.com (2603:10b6:5:14e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Tue, 15 Jun 2021 06:48:59 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::585b:8bbc:602e:fb36]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::585b:8bbc:602e:fb36%5]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 06:48:58 +0000 From: "Bob Feng" To: Liming Gao , "devel@edk2.groups.io" CC: "Ni, Ray" Subject: Re: [PATCH 1/1] BaseTools GenFw: Keep read only alloc section as text section when convert ELF Thread-Topic: [PATCH 1/1] BaseTools GenFw: Keep read only alloc section as text section when convert ELF Thread-Index: AQHXXRc3Hyf7+yrmzkqP1jtUecwL1asUqsKw Date: Tue, 15 Jun 2021 06:48:58 +0000 Message-ID: References: <20210609100628.1072-1-gaoliming@byosoft.com.cn> In-Reply-To: <20210609100628.1072-1-gaoliming@byosoft.com.cn> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: byosoft.com.cn; dkim=none (message not signed) header.d=none;byosoft.com.cn; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.52] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 45e1b27d-b105-4b37-99bb-08d92fc9a727 x-ms-traffictypediagnostic: DM6PR11MB4297: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1360; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CgjUts4ONiMkLvC4X3SyS6KZs++GGz+m9IJcBXky7qXSaSUmfMaIQDbxLYox3OmocjCbZqpLiR9p84GzSQQSUFAeeXK3N7CK5WLeKjlyG1uYsEE5iWi6vGt88ZAD9it8JnTB9g8vwty2waCcUJ61NkfHCEW97u0JMcOV8ud56xQYaFx/+g05kKJUt/W3oswNKp0o09R3aEFaY61kPpMWyfZHmDk8bmjW7OdHftG9A//KATaFmkSW3APrDhq38PHXZP5Af4OXNpBr1kGmQXKE8JjPCg815rnfDCh+onhnMAWkbNJ0rOKFsJfkzslFxnhaoRtqmOmT8Pc19McOabBJU5C5G088alaJmBlWbGES/ycz5q7BZ73dV9HtEbjsOTxlLHIc48p+vpeRYzmRyjmju4M9ARDxV+m2lNGU6vt4FTY+g4hUax7L6iktZHkwyPjknCduPiokdJI64qnuvyrTB5FDtxyIOXaLcVyJM6ddG39cGMNADjyyw9LgiR4oMuMGXM8MHoZQf/nrSvc7ieQhIJJeWJKlxIisBRf8vvV5aMN/V4GcIWDzJGzVnw2kIuU0bjWix3sVl1XWmbKrBwMokvuwpdPwswS2yK3i/jYy5eE= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(136003)(376002)(396003)(39860400002)(346002)(83380400001)(8936002)(316002)(107886003)(110136005)(2906002)(52536014)(8676002)(5660300002)(122000001)(7696005)(33656002)(26005)(64756008)(6506007)(66476007)(66946007)(4326008)(66446008)(478600001)(9686003)(55016002)(71200400001)(66556008)(76116006)(53546011)(186003)(86362001)(38100700002)(19627235002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Z5mWuj3v0IpfXvn9+xVTA02wOwpxnwf9wVBjIfGTP3mdolWpFp/5fewpOWz/?= =?us-ascii?Q?7+sokXtuKpFlG8BXsRCmVWcmrn5MGndrbb3bB1j0J9H7TTPoS6oq6H3BFcer?= =?us-ascii?Q?NUy+6H3fhrI/mmmYC9wCN5qhDyAHKbjmOq2Zghu/ZHyhUNlYPag/ENDbCBDU?= =?us-ascii?Q?vKtWuKG6gEwtu2H15yBQQ1jkIMz7i3DwONOaOwpze8DFsE3bL59mJUCeoy0X?= =?us-ascii?Q?8QKQrWm8PYNx3tphIYFcG9hVf30PIvlQrB8Q6YY1ypZSDaVBiv+c1eK6QHQ3?= =?us-ascii?Q?pHGWXMT9bIdgSeBK0j6RcqltJGxvHVW34fNhw0NIvueC0E5pp1QLb7GjT+ha?= =?us-ascii?Q?CZvavBnqB2JgMBC+hzJtdkmBe1SOd1RuyINXeIC8hsnkBa08xImJEW9upoCJ?= =?us-ascii?Q?8NudC1q35r5Wci5hLEy3lx8vTn1G+H7AuTp31T79vFO6NBgYMdhR9xfDoGai?= =?us-ascii?Q?g+Ez/swXzABI4vrgio76FN+8LPab36EZ9uN0dzxiqoThhxTkkpEtdqMSrAkl?= =?us-ascii?Q?pKSZZgUowRCcBRO9eBxaQoJjonYNbneWUGtEQ6CW0nErTK940yiz9zX4nG2f?= =?us-ascii?Q?RE6jibm/GXaa3xx3YvbByLU0qHvFvWs+szWYesxBKmRU+UAZvrCcl9gY/7bA?= =?us-ascii?Q?sPoAfuki3ejyO6yMQHtdv1FV4qJ2OmZbInR17fu3he/am5xqZ7MJTsVHs2Hi?= =?us-ascii?Q?Ll/slrCqjYYmXI5H9hU04nlypYSwLWcmAwL66BLHDBj0o5HMIdbOblFBM0xd?= =?us-ascii?Q?cjJjHyOynYXOcI+CtfpAq0xZoykkYzIUWiOwN4ePTSoBdCqq++AWunrwSNx0?= =?us-ascii?Q?4LNs2g3c/rrFBYal1h1+qQY8P1C6FwdmN47ZsclCB7kmYs6d25AgCiEv5Hv+?= =?us-ascii?Q?CivoRNkgifPpVwX/WJwH30rWoOK+qZIgLr6zLTUgYFmp2YZWexbPvjAfr6gU?= =?us-ascii?Q?S+1O4PYeDa+d6Ywer2uTrN2CFbhSEiLUxu+glKvb5XtbHP2kwbnRbB5K3L8+?= =?us-ascii?Q?SmGnMv4xa4LsUOhKEAIVzIHni7FfbLSZS4IJHxhp9TW8PiDnOnHNPC30UHCO?= =?us-ascii?Q?/gi9At/WnB1etcoVTurUuBu5N5CXRMgs1UBPYo8VLiCj8d0TKBK7z0yeyR7u?= =?us-ascii?Q?kx5X+jVdhL68Tx1nMG4/Yrvb/gJqLb+IGn1Ms0LYmhdMETl5+8w5/F2qfuXU?= =?us-ascii?Q?d4tJQxcyv5l+OD5jyIn1E4+mDUTq914yLrzK4oM83NINsauGEw2Y6hj7QMbN?= =?us-ascii?Q?vFzWQV7HAVHRX3SBKl2lJArNVOz5zHPo66ceBhMGx6fHbOfbxIay0dyw7TXg?= =?us-ascii?Q?qxDzZHJvFGjebkkzDirr26Kg?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45e1b27d-b105-4b37-99bb-08d92fc9a727 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2021 06:48:58.8108 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: V8siEzoGTktYrvWnwqOiVOJDWOdEcZ9/1xuL2cdTaaIkxp2YvQJQ3hT5+rlbUngmaUp4mDdmPFgQXEUT1jKfPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4297 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Liming Gao =20 Sent: Wednesday, June 9, 2021 6:06 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Ni, Ray Subject: [PATCH 1/1] BaseTools GenFw: Keep read only alloc section as text = section when convert ELF This is the fix of the regression issue at c6b872c6. Based on ELF spec, readonly alloc section is .rodata section. It is requrie= d. This fix is to add back original check logic for ELF section. Now, the read= only alloc section and execute alloc section are regarded as .text section. Signed-off-by: Liming Gao Cc: Bob Feng Cc: Ray Ni --- With this fix, previous fix commit ec1cffd9 is not required. But, the chec= ker added by commit ec1cffd9 is correct for ACPI data conversion. So, I do= n't plan to revert it. BaseTools/Source/C/GenFw/Elf32Convert.c | 3 ++- BaseTools/Source/C/GenFw/= Elf64Convert.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/G= enFw/Elf32Convert.c index 314f8233234d..d917a444c82d 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -238,7 +238,8 @@ IsTextShdr ( Elf_Shdr *Shdr ) { - return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D = (SHF_EXECINSTR | SHF_ALLOC)); + return (BOOLEAN) (((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D= (SHF_EXECINSTR | SHF_ALLOC)) || + ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D=20 + SHF_ALLOC)); } =20 STATIC diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/G= enFw/Elf64Convert.c index 8b09db7b690b..33031ec8f6e7 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -246,7 +246,8 @@ IsTextShdr ( Elf_Shdr *Shdr ) { - return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D = (SHF_EXECINSTR | SHF_ALLOC)); + return (BOOLEAN) (((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D= (SHF_EXECINSTR | SHF_ALLOC)) || + ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D=20 + SHF_ALLOC)); } =20 STATIC -- 2.27.0.windows.1