From patchwork Mon Dec 6 13:32:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12658465 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEF56C433F5 for ; Mon, 6 Dec 2021 13:37:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.238951.414169 (Exim 4.92) (envelope-from ) id 1muEAv-0008BC-ER; Mon, 06 Dec 2021 13:37:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238951.414169; Mon, 06 Dec 2021 13:37:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muEAv-0008Ad-9m; Mon, 06 Dec 2021 13:37:01 +0000 Received: by outflank-mailman (input) for mailman id 238951; Mon, 06 Dec 2021 13:36:59 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muE6t-0002vN-DM for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 13:32:51 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 019b8d4a-5699-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 14:32:50 +0100 (CET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-1-ckVGP_caOFCRqsyow_THQw-1; Mon, 06 Dec 2021 14:32:48 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB5741.eurprd04.prod.outlook.com (2603:10a6:803:df::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 13:32:48 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 13:32:48 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:20b:451::13) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Mon, 6 Dec 2021 13:32:47 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 019b8d4a-5699-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1638797569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=D/6tE1R+cawc9hyHcLOvREHYrRaKQ8BjnPYIpTkogf+uEDfh8GBaE9HsyAMiJ/7viitO9g oVGTFU22erumMurarkVebqnnLzrB2slo/QBJMcMeYdzuaBSSBfrJ99j3wqdUwMwF4+30iY AsPHxz/r7/Agy45IKXfp8B1zJeo4b50= X-MC-Unique: ckVGP_caOFCRqsyow_THQw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuusALwaYDo70rTqtwEigMhnhMGU3Vvh3d7lBVjX9Q10tZrOn1xr+9RL9BCE9toUlvKXSZWOwC6+wI1sbgW5T4OhalDG9woYMDTF7Qoo0E/V5oB6CVeortBtMXvyX+VNA2NVGYQ4fm69UXIgmkFzz8XIMr1U82Nkn2LfVWuiDydvJwsbz3vAiR4OXL7FdtH0ClKT+qBN/8cS7RZejGqajArztcncoOySBc3OXehbgqevhS/ArdlyM15JW1K81BmplCs98v1u4yWmzZNoj6eHIGzNVqv7Qqj8YYvAOQcc7eKta/ibKe9HJnmMZlT+YgVrTBV8nhKlRGEB0JoC2uw5Vw== 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=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=f0uVbyaYbJzew4awXtkAUJB/GXEP+g7qkTYFwiZLvhuV2a0R9OyOGEuaZs94USVdMAkaCUrFIg8xzQ80C9ajShp1i4JKNb2nbR8HsCjFQ8ZNjEsSFq2kO64JOUIaXCjEPxKQ7NUL8wdKMlNKYitl5PK4Rcx7kQ1wamDHUCjnHPopD+uaH1HTPdM9+pKXHEwcu9YAfbsIAoANv3EBuie+fMP4ZwPC3makoJSD/d2MUvU9ejepeRD35mLDqTCurwspfDhgfZJ+dVfnbdpW0X60rmNcMdkzL8Vsiicu5emVCsGteHec1v7p5GtcTBnVnmeRATRMpxovlYXqhEV3G7Y0QA== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <1fdbf442-ad2c-7348-06a1-9efa47443ce4@suse.com> Date: Mon, 6 Dec 2021 14:32:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH v2 6/7] xz: move s->lzma.len = 0 initialization to lzma_reset() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Ian Jackson , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: X-ClientProxiedBy: AS8PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:20b:451::13) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b9101cb-262b-4af4-b7a1-08d9b8bce490 X-MS-TrafficTypeDiagnostic: VI1PR04MB5741:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:113; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mjgz4oKlgb+prCkFWc30aspYNaqSwXNJvTpbRq+eKsoBQMz/4jPlp3uX7dpEF96IrsfrbVL/WnpXNPUQSNCUYTWpHmxMAvXA05bHtlZ5RZYtSU1KS8B9Fbzd2/ubxfdXWruUu0bVfDQBfWaqPFmb4pAA6QDkvSBQ1EOxkYdmyTjX1g/BWrIrmHqGbKoex0K9yvLlZvilGnhhuuGDgZkFaVb65de4QAj59z7SeH9oiZPpI9EFrcyP8p3D8Usn1NVwKDkH63WNV8h2gAZOo9cxmLvK8aIn080bVdcYVKt8DCZAnaJszOKrJF1DPFIaGM42GCDvUsRJ/uEXdRp1q5TgeGscXd/do+EczNZgH6nwDZXvnP49mRExJMNRHHjYXp0pmcUqlYRFAA715BXERUcFaHuO8gm9M5YK7NYw73bBwxFzsPL4N4khfWLGh1JiiaHz0rqsAuAMnLqXMbeyn4JZ3f+fJXJom+BpYHQGw06TMeeA16drBRFU+RO0bjsCeKoZq3lJimZpGQByndCCxOGgvGIXtM8ZQ6QFvB5CY3qGsY4iErC2LMicK7n/F/05tEs4qt+ZKF5RJ8wQAaDeLwFDiZK+Zwzd7XsIC96jseB2ArVoCNqlkLgpt0hGHE9KWdPO2AXn54PU/o8hudfw8hGx5CA32V6IGipArjx7GL5LUBUjsLqXFmX8Mv3lT8+BteAqkTZMqsDv7WZ4PIlDm0rl+i8B9dzRfgqoEwRiZ6KZWlVoodDVTCIQRZY6tNHwDcwTIxSLh6Fw3kO/IlC8/jDfvD2+4F5ZjJb7tAD16ercUbBc/bS1Xi3AGtia9jRLB74y X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(31686004)(6486002)(8676002)(956004)(186003)(26005)(4326008)(2616005)(38100700002)(86362001)(31696002)(36756003)(8936002)(66946007)(66476007)(66556008)(508600001)(316002)(2906002)(5660300002)(6916009)(54906003)(16576012)(966005)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oHoTXW62bgUaHb+0pbYZJ9x3eEAk?= =?utf-8?q?s7R/rhp20sHu5nx4lvi20f59YXy/84oXhTPn7SwNYtrMZ4PPkR2x04ZQzoljCo0TI?= =?utf-8?q?OrvvYVdE2FCs5TLbX8LsWrs3FlCdAnqtab7BrCjian6EnBKsbhI5AOgNkrGFJRi7+?= =?utf-8?q?Kk6nZ4x2MEaQ7QuT7VUYJTMzUvceL9GFs2cZyDySMsS1C2BewrG2OZrtRWUEjjy27?= =?utf-8?q?z1/jR5zw8bJnf9bwIrgN8nrodcVNNQ/cv/dsFCjQYQihCEJe2sj+CaZ77PZ10e7ra?= =?utf-8?q?rT8Du9EPh97cgwe7OonGFHaJ4zvRMqluPr3qbdNik8/8HEFPl+GTrpnUYYsWccbbe?= =?utf-8?q?sUq9KyxM9b2+rHvaMGDGAAG52PlL9Zs3KcX9vqG5qggjkJzLxiEqhjO3/sajFlEml?= =?utf-8?q?YW2QdoWAaRQmeqUOe9NV6jUnrGRilA0t/QFJ8Gj+V2wXrCL4J1zgKLG0AuJ3XsWoU?= =?utf-8?q?yil6CZ8s4Cp7k1XV5aklU3mrco2rmCEAPWaUimmzTiFdrL+JweQFf1puBf51f2WDc?= =?utf-8?q?op6wKN0skhNWJHEge50+v9H89UqanbbYOOPOl3wdyzZAo0sSHE9qJMkNGbo7vCrEO?= =?utf-8?q?UQiXGrjQ9G7Z2ObOBRvV30zNrHvXodtFLESI27s3F5WFgLuqcpDrWuAI8CvtIln2G?= =?utf-8?q?U0rZAtvPazr4tHQ2GFdOe2y3VrLlBlw2D3M5hMkSP4yMbkQ653lEXz5hPDh2Voobm?= =?utf-8?q?L1cZUJVDHYgO0gTcfK4+M5zvtSxcaTRIt5GCXgU+SqqAoS6PRPrPiQOKCfVYUdscq?= =?utf-8?q?al52T9+MmT74qZpay4pJnHWbjnZGfiD7HlTa3fmpVIA0fBZafltv6hsbQM1GvdXBo?= =?utf-8?q?AX8gJ06p594n+woYJsMoJm5YlosLOM88kpJPt1PHHDi23dySWKuy2Ipxcc35rBrTr?= =?utf-8?q?+YeytaFoTpZadhI4jrSgWCNzUAIgAQme+c2orb1mfnMfEkqe51ChDb9KszOuKWotn?= =?utf-8?q?tLZCS9zGDthDO1lcPfyL7aOcm735BUln93LVQddFkmIR2U/lt4QjR5b/VYHFADn5u?= =?utf-8?q?0PGJ4qsYefc75Bq2QKnNyOtoyMTEx4HLa1/dVMpN23vM+/nQLRAQ+EAVJ04Ej47Bs?= =?utf-8?q?Ml5H5h9FluDoE4Jl2Pzx7ksvNFZS5LfTz/35QT+BOBBk6iMXRMt3dHbAVMpnwK+jB?= =?utf-8?q?oIjn3PJO32mAQU+tgwFecndZWLfBJYDq5PVIJMcOLPICg+O/gySyZFTynugoiFIph?= =?utf-8?q?y27Ygt6LxrJtuECSbzmSYx5TiOpOrxYaRLhvwBxKmZLWm9/Ftmi8T9ZO2qm1QJD+u?= =?utf-8?q?gEvX6TkerBPiHp6Mkr16bho6amZhAviO2rHqoqFrNT2Z1z5Lp65iufLHf09ltUcvB?= =?utf-8?q?KP97zkVzWuaf3L/i2+7KfOrSlk9hAyXxJQGWgxf1qbJ5U8MklzLkMpME4kUvetF8f?= =?utf-8?q?djqP6dvy572+G09SEoxgxqWHcK5a3O1Hy4d60TZGqnUK24M2tSG78/rPI8muQWe2m?= =?utf-8?q?uazmX4E53nCov4OCWTCY+C1pxICygrGDmc812Eq1HxB3Te7xNkXH9kcPdctXTREV7?= =?utf-8?q?R97beDyd4h73USCI4Rvtkcon1xz8m70DuUpcRBEdbMbH1y05WaxaQNc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b9101cb-262b-4af4-b7a1-08d9b8bce490 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 13:32:47.9206 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hrqb7I+fJYfinTvMr48BzkjUJNEpRAYF+uyCKIxI1nBYRgI+BoPqaA3wyEVY36hT90nVyCeuys/H8+UQ8jBI/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5741 From: Lasse Collin It's a more logical place even if the resetting needs to be done only once per LZMA2 stream (if lzma_reset() called in the middle of an LZMA2 stream, .len will already be 0). Link: https://lore.kernel.org/r/20211010213145.17462-4-xiang@kernel.org Signed-off-by: Lasse Collin Signed-off-by: Gao Xiang [Linux commit: a98a25408b0e9b0264abcc3dabfafd9ff2ea1046] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu --- v2: Retain one more S-o-b. --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -791,6 +791,7 @@ static void __init lzma_reset(struct xz_ s->lzma.rep1 = 0; s->lzma.rep2 = 0; s->lzma.rep3 = 0; + s->lzma.len = 0; /* * All probabilities are initialized to the same value. This hack @@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma } } - s->lzma.len = 0; - s->lzma2.sequence = SEQ_CONTROL; s->lzma2.need_dict_reset = true;