From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B216DEB64D9 for ; Fri, 7 Jul 2023 08:13:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7CEF863C9; Fri, 7 Jul 2023 10:13:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20221208.gappssmtp.com header.i=@baylibre-com.20221208.gappssmtp.com header.b="pANO78Km"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8550A863C9; Fri, 7 Jul 2023 10:13:41 +0200 (CEST) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D5DB7863C2 for ; Fri, 7 Jul 2023 10:13:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31427ddd3fbso1631852f8f.0 for ; Fri, 07 Jul 2023 01:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1688717618; x=1691309618; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=pKKvgyNNwrIvZ+mOtYzz3SDKoas8rqORMU4ZSXhMMYQ=; b=pANO78KmpFNRzvaEKJZ9HL4QanQvuIX91Zw74XT0u2XhC5a6pakSKdJs/aN4D5V9tM k6fzbW16/+BQt+mh+zJ+6t5MMt4849BnTUtx1gpctwIwLyR2JgP7c26A8vkn4D7IC4ww vFkbTViLyGAXosg1lYACvFwROWzvYgH6rCJV51DyaAMPPXDpmSLZf85MPqBQWu+A4ngH pg7WaYe6MvU8+HV38dEPRiafRBdrttKnrj+hrfTfA6A7RnzuyCXa/Ukkbql90U/KIFkM W7ZZ3aqgMWaz7EuQPVWitcU9zJS5WM0zh6bv3bI3nt8n8HlVbpVWBUkXVRDmsf5xyjTF X+XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688717618; x=1691309618; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pKKvgyNNwrIvZ+mOtYzz3SDKoas8rqORMU4ZSXhMMYQ=; b=BPJWK/+Rz3kEZU5/znBV5AOfePbZIuguuyK2RJ3KmCWtPEk/u/NMTGXrmFCnWdtAio ehAnn/HqyhMSAvjoujeliFjf1zpaCJ1sUwyhMrqkHVSle1Kiq6LtY1KVHdQr8rb7eqoF GGqpUfkIzSBG5iCrS4hyW0B9QfW0o1buD7F6gPq5+tgenx8spatI8A7KbcxtnmvCFfJc vjo+mgVYC+T27966VzTAA08OyT7g0XsIn4uAiUnETNR4c6UmKCKz5zz15H3Q/PiyNyKZ ysjepTebelSrOR+3ebg5/qJPveZxCbSoZq04IYj6Al/r5/27TBX3pou+UxkuXK4k1Gp/ BnpA== X-Gm-Message-State: ABy/qLbfATzflOmi1bdk/3CC41uj3ObX0t4mfO9PCS+kTn9wuVefFAP3 mlvtwBoKMsxiV+A8B9rLb93YrvJVhPRXY+mIl4i4yA== X-Google-Smtp-Source: APBJJlFkgxlcVYOlyn84N/4tW3iLCyN/RHNIIlooZzN79jG/qI8vQP2zIPqKLpf1xOx53h8K9ZpTGA== X-Received: by 2002:a5d:4d4f:0:b0:313:ebf3:f817 with SMTP id a15-20020a5d4d4f000000b00313ebf3f817mr3560702wru.22.1688717618263; Fri, 07 Jul 2023 01:13:38 -0700 (PDT) Received: from [192.168.1.20] ([2a01:cb19:85e6:1900:2bf7:7388:731d:c4e1]) by smtp.gmail.com with ESMTPSA id d5-20020adfe885000000b003143ba62cf4sm3801531wrm.86.2023.07.07.01.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 01:13:37 -0700 (PDT) From: Mattijs Korpershoek Date: Fri, 07 Jul 2023 10:13:34 +0200 Subject: [PATCH v2] lib: sparse: allocate FASTBOOT_MAX_BLK_WRITE instead of small number MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230616-sparse-flash-fix-v2-1-25717e6cbb27@baylibre.com> X-B4-Tracking: v=1; b=H4sIAC3Jp2QC/32NSw6CMBCGr0K6dgytoaIr72FYTMtgm/DKDGkkh LtbOIDL73/k25QQRxL1LDbFlKLEacxgLoXyAccPQWwzK1OaW2m1BZmRhaDrUQJ08QsPb+rKINa ttirfHObaMY4+HMcBZSE+ipkp70/Xu8kcoiwTr6c66SP9Y0kaNFiHHaH3lb27l8O1j47p6qdBN fu+/wAhLYzwzAAAAA== To: qianfan Zhao , Sean Anderson Cc: Guillaume La Roque , Gary Bisson , Troy Kisky , u-boot@lists.denx.de, Mattijs Korpershoek X-Mailer: b4 0.12.2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Commit 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") fixed cache alignment for systems with a D-CACHE. However it introduced some performance regressions [1] on system flashing huge images, such as Android. On AM62x SK EVM, we also observe such performance penalty: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.954s] Writing 'super' OKAY [ 75.926s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.641s] Writing 'super' OKAY [ 62.849s] Finished. Total time: 182.474s The reason for this is that we use an arbitrary small buffer (info->blksz * 100) for transferring. Fix it by using a bigger buffer (info->blksz * FASTBOOT_MAX_BLK_WRITE) as suggested in the original's patch review [2]. With this patch, performance impact is mitigated: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.912s] Writing 'super' OKAY [ 15.780s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.581s] Writing 'super' OKAY [ 17.192s] Finished. Total time: 76.569s [1] https://lore.kernel.org/r/20221118121323.4009193-1-gary.bisson@boundarydevices.com [2] https://lore.kernel.org/r/all/43e4c17c-4483-ec8e-f843-9b4c5569bd18@seco.com/ Fixes: 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") Signed-off-by: Mattijs Korpershoek --- Changes in v2: - Use FASTBOOT_MAX_BLK_WRITE instead of blkcnt (Qianfan) - Link to v1: https://lore.kernel.org/r/20230616-sparse-flash-fix-v1-1-6bafeacc567b@baylibre.com --- drivers/fastboot/fb_mmc.c | 2 -- include/image-sparse.h | 2 ++ lib/image-sparse.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 9d25c402028a..060918e49109 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -19,8 +19,6 @@ #include #include -#define FASTBOOT_MAX_BLK_WRITE 16384 - #define BOOT_PARTITION_NAME "boot" struct fb_mmc_sparse { diff --git a/include/image-sparse.h b/include/image-sparse.h index 0572dbd0a283..282a0b256498 100644 --- a/include/image-sparse.h +++ b/include/image-sparse.h @@ -7,6 +7,8 @@ #include #include +#define FASTBOOT_MAX_BLK_WRITE 16384 + #define ROUNDUP(x, y) (((x) + ((y) - 1)) & ~((y) - 1)) struct sparse_storage { diff --git a/lib/image-sparse.c b/lib/image-sparse.c index 5ec0f94ab3eb..8f8a67e15804 100644 --- a/lib/image-sparse.c +++ b/lib/image-sparse.c @@ -55,7 +55,8 @@ static lbaint_t write_sparse_chunk_raw(struct sparse_storage *info, void *data, char *response) { - lbaint_t n = blkcnt, write_blks, blks = 0, aligned_buf_blks = 100; + lbaint_t n = blkcnt, write_blks, blks = 0; + lbaint_t aligned_buf_blks = FASTBOOT_MAX_BLK_WRITE; uint32_t *aligned_buf = NULL; if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) { --- base-commit: 923de765ee1a5b26310f02cb42dcbad9e2b011c5 change-id: 20230616-sparse-flash-fix-9c2852aa8d16 Best regards, -- Mattijs Korpershoek