From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iRv2Q-0000nl-6Y for mharc-grub-devel@gnu.org; Tue, 05 Nov 2019 04:22:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRv2N-0000hl-3F for grub-devel@gnu.org; Tue, 05 Nov 2019 04:22:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRv2L-0006OY-0N for grub-devel@gnu.org; Tue, 05 Nov 2019 04:22:06 -0500 Received: from m4a0041g.houston.softwaregrp.com ([15.124.2.87]:47456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRv2J-0006M9-Ur for grub-devel@gnu.org; Tue, 05 Nov 2019 04:22:04 -0500 Received: FROM m4a0041g.houston.softwaregrp.com (15.120.17.147) BY m4a0041g.houston.softwaregrp.com WITH ESMTP FOR grub-devel@gnu.org; Tue, 5 Nov 2019 09:21:09 +0000 Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 5 Nov 2019 09:20:00 +0000 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Tue, 5 Nov 2019 09:20:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MhVZCIFKIftYA17I5fKf46AZ0oRlc8Yjn0/UCKsy1ukbUSnmSV7EKuCyzoBR7dkIRhHui2dZyzLxh87y9P2RyUtMrMImL/ck7ifTNN0qo/T9Mj5XZTe58GDuzkKcWeM+nClg3Gu8aKvcD6SXeBX/W9gN+ydXX/f3S8BaQTTWx6X9aCC+aOznxq7D1sudsrK8H5q4uNsLTHWUBptKQc6LJMQeHSJTvRRR4EOr0sFSk6nZ5olwgz8S5YLQBetrHzy1L5l92BJfuGmJBvqtlQJq0CrwdpkUdhdVEr2Aq9/93h8nnNcH44vZsN+V8xW7576SP7I0EVfxhLetc7shFXhM3A== 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=C6Z2DyTOFQHVSrVl59dF2nhPcs2ucDV4bYseMnCgN2g=; b=G5GJX9yjeP3CIJG5HmpeY7hsMd6T5usIGkUPsRwZRzq8020FoKNBZoiZXhXy6IuvcLXe1oea8tv+FOZ+6wWsxgHn8WPq/kcyQPbce+ehsnG4KXDygyKq7FvcKS4bg1F/0WGtgTHo8p4UmYyQGp+FpvrRvPzzxo0onVLHav0IQSNhYkxJ3UDECb+OcEOgUjyNLoZb7FY+UukGza0QYa84S8GksRJS/tnnlTwrKBxL+faRnI/puDIiB7xvyHTkiMi4AcMaRTp6vKqkjCchaQwpLjHxyhCE5UWCdNVaX+qWaXg5xlMdUPR15WZISlbIQWa3eMBoSAF3mysWUTo0gfq1Sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from BY5PR18MB3122.namprd18.prod.outlook.com (10.255.139.11) by BY5PR18MB3249.namprd18.prod.outlook.com (10.255.138.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Tue, 5 Nov 2019 09:19:59 +0000 Received: from BY5PR18MB3122.namprd18.prod.outlook.com ([fe80::297d:fc41:ae2a:13d9]) by BY5PR18MB3122.namprd18.prod.outlook.com ([fe80::297d:fc41:ae2a:13d9%5]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:19:59 +0000 From: Michael Chang To: "grub-devel@gnu.org" Subject: [PATCH] btrfs: disable zstd support for i386-pc Thread-Topic: [PATCH] btrfs: disable zstd support for i386-pc Thread-Index: AQHVk7oyIbCUx3tbMUWvt7qXiTPxAA== Date: Tue, 5 Nov 2019 09:19:59 +0000 Message-ID: <20191105091949.29559-1-mchang@suse.com> Accept-Language: zh-TW, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR04CA0063.apcprd04.prod.outlook.com (2603:1096:202:14::31) To BY5PR18MB3122.namprd18.prod.outlook.com (2603:10b6:a03:1af::11) authentication-results: spf=none (sender IP is ) smtp.mailfrom=MChang@suse.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.16.4 x-originating-ip: [60.251.47.116] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1ceeb55b-40d4-4ce6-37b4-08d761d154cb x-ms-traffictypediagnostic: BY5PR18MB3249: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(396003)(39860400002)(376002)(136003)(366004)(346002)(199004)(189003)(99286004)(66066001)(66476007)(25786009)(66946007)(5660300002)(50226002)(52116002)(71200400001)(8936002)(71190400001)(316002)(305945005)(7736002)(2906002)(256004)(14454004)(8676002)(14444005)(81166006)(6486002)(5640700003)(81156014)(6916009)(486006)(66556008)(2351001)(6436002)(2501003)(1076003)(186003)(66446008)(6512007)(55236004)(36756003)(80792005)(86362001)(102836004)(6506007)(386003)(26005)(6306002)(64756008)(478600001)(476003)(2616005)(6116002)(3846002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY5PR18MB3249; H:BY5PR18MB3122.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TtWfywBqKniC5O8joBCYsZWnQ/oSyVJu7LwbGttUDbIL0QDutNJedDIOAX7U0S9eoXP0VDy8IYbv97Dk0xI9LFgjXlU6eMbZN098/AAcl/TqKkR346xqbwdH5Run7nX/3DKdggsx9AON39Es0KFeELg3UHNiOpa+HajwRWA/QquqcusrCHS6eUR5d483g/WbSXO0cXgn1WQoJmAfQPzLEZjevfd7JRGUER/MOOTMkpWGN8M6g7TPgLNcdPbKbJ1H1TRK22kycaAYJO9PPg8RSOtkbr1BVzvI60grbCdawUzWNtoBaccJzHKNu33+G0KyQvOv0XDyZTTFEaIZ/X24ExDFJSDn9Plz61MKrqc9h7eBwkMzd6wMcJHv9fc76/VCPoU0pK9/pR/un+TbBFG+cV6IYfRzEN6wA8NsslHHDqj5G+6NaKkvUNtDKvXjSuXXSqMfhERKIqOhWFUJaCU7q8Rhg9hU3bB/phcbLzRyfkA= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 1ceeb55b-40d4-4ce6-37b4-08d761d154cb X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:19:59.7386 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Xt0hs/tHaHt4qL8cqp1ivjM2t9HS+nQwDkea3kJ9zy/N7hzI0MXm+ScdWH4bN6Bm X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR18MB3249 X-OriginatorOrg: suse.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 15.124.2.87 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2019 09:22:09 -0000 The zstd support in btrfs has dependenciy to zstd module and core.img grows its size significantly to 75KB on my system. The resulted image cannot be installed into btrfs bootloader area in the size of 64KB and eventually fails with following message. /usr/sbin/grub-install: warning: your core.img is unusually large. It won't fit in the embedding area. /usr/sbin/grub-install: error: filesystem `btrfs' doesn't support blocklists. The patch disabled the zstd support of btrfs in pc-bios platform to avoid the regression. The resulting size is 56KB, albeit a bit too close to the 64KB but works. This is simple workaround until a proper fix landed upstream. Signed-off-by: Michael Chang --- grub-core/fs/btrfs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index 48bd3d04a..8f98892d3 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -17,6 +17,7 @@ * along with GRUB. If not, see . */ =20 +#ifndef GRUB_MACHINE_PCBIOS /* * Tell zstd to expose functions that aren't part of the stable API, which * aren't safe to use when linking against a dynamic library. We vendor in= a @@ -24,6 +25,7 @@ * functions to provide our own allocator, which uses grub_malloc(), to zs= td. */ #define ZSTD_STATIC_LINKING_ONLY +#endif =20 #include #include @@ -35,7 +37,9 @@ #include #include #include +#ifndef GRUB_MACHINE_PCBIOS #include +#endif #include #include #include @@ -56,8 +60,10 @@ GRUB_MOD_LICENSE ("GPLv3+"); #define GRUB_BTRFS_LZO_BLOCK_MAX_CSIZE (GRUB_BTRFS_LZO_BLOCK_SIZE + \ (GRUB_BTRFS_LZO_BLOCK_SIZE / 16) + 64 + 3) =20 +#ifndef GRUB_MACHINE_PCBIOS #define ZSTD_BTRFS_MAX_WINDOWLOG 17 #define ZSTD_BTRFS_MAX_INPUT (1 << ZSTD_BTRFS_MAX_WINDOWLOG) +#endif =20 typedef grub_uint8_t grub_btrfs_checksum_t[0x20]; typedef grub_uint16_t grub_btrfs_uuid_t[8]; @@ -229,7 +235,9 @@ struct grub_btrfs_extent_data #define GRUB_BTRFS_COMPRESSION_NONE 0 #define GRUB_BTRFS_COMPRESSION_ZLIB 1 #define GRUB_BTRFS_COMPRESSION_LZO 2 +#ifndef GRUB_MACHINE_PCBIOS #define GRUB_BTRFS_COMPRESSION_ZSTD 3 +#endif =20 #define GRUB_BTRFS_OBJECT_ID_CHUNK 0x100 =20 @@ -1229,6 +1237,7 @@ grub_btrfs_read_inode (struct grub_btrfs_data *data, return grub_btrfs_read_logical (data, elemaddr, inode, sizeof (*inode), = 0); } =20 +#ifndef GRUB_MACHINE_PCBIOS static void *grub_zstd_malloc (void *state __attribute__((unused)), size_t= size) { return grub_malloc (size); @@ -1318,6 +1327,7 @@ err: =20 return ret; } +#endif =20 static grub_ssize_t grub_btrfs_lzo_decompress(char *ibuf, grub_size_t isize, grub_off_t off, @@ -1494,8 +1504,12 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data= , =20 if (data->extent->compression !=3D GRUB_BTRFS_COMPRESSION_NONE && data->extent->compression !=3D GRUB_BTRFS_COMPRESSION_ZLIB +#ifndef GRUB_MACHINE_PCBIOS && data->extent->compression !=3D GRUB_BTRFS_COMPRESSION_LZO && data->extent->compression !=3D GRUB_BTRFS_COMPRESSION_ZSTD) +#else + && data->extent->compression !=3D GRUB_BTRFS_COMPRESSION_LZO) +#endif { grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "compression type 0x%x not supported", @@ -1535,6 +1549,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data, !=3D (grub_ssize_t) csize) return -1; } +#ifndef GRUB_MACHINE_PCBIOS else if (data->extent->compression =3D=3D GRUB_BTRFS_COMPRESSION_ZSTD) { if (grub_btrfs_zstd_decompress (data->extent->inl, data->extsize - @@ -1544,6 +1559,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data, !=3D (grub_ssize_t) csize) return -1; } +#endif else grub_memcpy (buf, data->extent->inl + extoff, csize); break; @@ -1581,10 +1597,12 @@ grub_btrfs_extent_read (struct grub_btrfs_data *dat= a, ret =3D grub_btrfs_lzo_decompress (tmp, zsize, extoff + grub_le_to_cpu64 (data->extent->offset), buf, csize); +#ifndef GRUB_MACHINE_PCBIOS else if (data->extent->compression =3D=3D GRUB_BTRFS_COMPRESSION_ZS= TD) ret =3D grub_btrfs_zstd_decompress (tmp, zsize, extoff + grub_le_to_cpu64 (data->extent->offset), buf, csize); +#endif else ret =3D -1; =20 --=20 2.16.4