Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Nick Terrell <terrelln@fb.com>
To:     Paul Cercueil <paul@crapouillou.net>
CC:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
        "linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>,
        "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
        "od@zcrc.me" <od@zcrc.me>
Subject: Re: [PATCH 2/2] MIPS: Add support for ZSTD-compressed kernels
Thread-Topic: [PATCH 2/2] MIPS: Add support for ZSTD-compressed kernels
Thread-Index: AQHWd9hubhseyyY4wEOiGjoaqbo/sqlHsDKA
Date:   Mon, 24 Aug 2020 19:51:23 +0000
Message-ID: <41742AA6-8BC0-46E5-8735-9B3D6E83FA2D@fb.com>
References: <20200821162948.146947-1-paul@crapouillou.net>
 <20200821162948.146947-2-paul@crapouillou.net>
In-Reply-To: <20200821162948.146947-2-paul@crapouillou.net>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <9954655BC1F5E54D81A0886D832C3C0D@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 77c139c5-4f8b-4d0b-7608-08d84867147f
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2020 19:51:23.3995
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 0HbAqiJQJPB/dVq1xXRMBY09zn4MvOsG37pmx0i8Y9BBrL7EsYI6R4TYbxdK+hJ9
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB4085
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687
 definitions=2020-08-24_12:2020-08-24,2020-08-24 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501
 clxscore=1011 lowpriorityscore=0 adultscore=0 phishscore=0 spamscore=0
 bulkscore=0 malwarescore=0 mlxlogscore=999 impostorscore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2006250000 definitions=main-2008240157
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Aug 21, 2020, at 9:29 AM, Paul Cercueil <paul@crapouillou.net> wrote:
>=20
> Add support for self-extracting kernels with a ZSTD compression.
>=20
> Tested on a kernel for the GCW-Zero, it allows to reduce the size of the
> kernel file from 4.1 MiB with gzip to 3.5 MiB with ZSTD, and boots just
> as fast.
>=20
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> arch/mips/Kconfig                      |  1 +
> arch/mips/boot/compressed/Makefile     |  1 +
> arch/mips/boot/compressed/decompress.c |  4 ++++
> arch/mips/boot/compressed/string.c     | 16 ++++++++++++++++
> 4 files changed, 22 insertions(+)
>=20
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index c95fa3a2484c..b9d7c4249dc9 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -1890,6 +1890,7 @@ config SYS_SUPPORTS_ZBOOT
> 	select HAVE_KERNEL_LZMA
> 	select HAVE_KERNEL_LZO
> 	select HAVE_KERNEL_XZ
> +	select HAVE_KERNEL_ZSTD
>=20
> config SYS_SUPPORTS_ZBOOT_UART16550
> 	bool
> diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compress=
ed/Makefile
> index 6e56caef69f0..86ddc6fc16f4 100644
> --- a/arch/mips/boot/compressed/Makefile
> +++ b/arch/mips/boot/compressed/Makefile
> @@ -70,6 +70,7 @@ tool_$(CONFIG_KERNEL_LZ4)     =3D lz4
> tool_$(CONFIG_KERNEL_LZMA)    =3D lzma
> tool_$(CONFIG_KERNEL_LZO)     =3D lzo
> tool_$(CONFIG_KERNEL_XZ)      =3D xzkern
> +tool_$(CONFIG_KERNEL_ZSTD)    =3D zstd

You can use zstd22 here. It will give you slightly better compression
without any additional memory usage. Also, you should add
-D__DISABLE_EXPORTS to the KBUILD_CFLAGS like x86 does [1].

[1] https://github.com/torvalds/linux/blob/master/arch/x86/boot/compressed/=
Makefile

-Nick

> targets +=3D vmlinux.bin.z
> $(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE
> diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/comp=
ressed/decompress.c
> index 88f5d637b1c4..c61c641674e6 100644
> --- a/arch/mips/boot/compressed/decompress.c
> +++ b/arch/mips/boot/compressed/decompress.c
> @@ -72,6 +72,10 @@ void error(char *x)
> #include "../../../../lib/decompress_unxz.c"
> #endif
>=20
> +#ifdef CONFIG_KERNEL_ZSTD
> +#include "../../../../lib/decompress_unzstd.c"
> +#endif
> +
> const unsigned long __stack_chk_guard =3D 0x000a0dff;
>=20
> void __stack_chk_fail(void)
> diff --git a/arch/mips/boot/compressed/string.c b/arch/mips/boot/compress=
ed/string.c
> index 43beecc3587c..ab95722ec0c9 100644
> --- a/arch/mips/boot/compressed/string.c
> +++ b/arch/mips/boot/compressed/string.c
> @@ -27,3 +27,19 @@ void *memset(void *s, int c, size_t n)
> 		ss[i] =3D c;
> 	return s;
> }
> +
> +void *memmove(void *dest, const void *src, size_t n)
> +{
> +	unsigned int i;
> +	const char *s =3D src;
> +	char *d =3D dest;
> +
> +	if ((uintptr_t)dest < (uintptr_t)src) {
> +		for (i =3D 0; i < n; i++)
> +			d[i] =3D s[i];
> +	} else {
> +		for (i =3D n; i > 0; i--)
> +			d[i - 1] =3D s[i - 1];
> +	}
> +	return dest;
> +}
> --=20
> 2.28.0
>=20