From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1770211419; cv=none; d=zohomail.com; s=zohoarc; b=FFfzrdAx+JtzlsO3ulMDrci5H2Ne6FdfH9l88ceKHqAu75LCwGTZoqXL38eZyNE2ZH85aEBWDVa4ZC78a4cLVqrDhAQlzTClzd/RVNQcaPqPv1vkv1a56DGjNWeGjHVs+G7j5DSQfBClkq1GxxuncPL1PXOA/b6KeTHZe7MPpwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211419; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=sOHFS+nHwYUeV4R44SrMdq3QgCu1K9jWEI4HGNXeHUg=; b=K7mb5E7KRZsjwk+7Z1Jw52WvLNZpJd2lbPinZOxSgPzSU3Y1Fg/KWpl8CMPascUDb6LgyV38PD5cNl9lpkowfcz6c7tUNOZELnCZFpj6kGSbkftdamVAh3jQh1QJpj4ERrGhDuNjY14yxR3o3tihnvPwIWRAH/N2DkNj0wIxr1o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211419509585.380375105645; Wed, 4 Feb 2026 05:23:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqL-0003KS-NA; Wed, 04 Feb 2026 08:22:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqH-0003IM-8j; Wed, 04 Feb 2026 08:22:50 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqE-00030z-AP; Wed, 04 Feb 2026 08:22:48 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 6983481e-cb91-7f0000032729-7f000001d8e8-1 for ; Wed, 04 Feb 2026 14:22:38 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:38 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223964-15148 ; Wed, 4 Feb 2026 14:22:39 +0100 Date: Wed, 04 Feb 2026 14:22:25 +0100 Subject: [PATCH v3 1/6] hw/sd: Switch read/write primitive to buf+len MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-1-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize complete at 04.02.2026 14:22:39 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211358-B8E7371A-5E025E8A/0/0 X-purgate-type: clean X-purgate-size: 10788 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Christian Speich From: Christian Speich via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1770211420435154100 Currently, read/writes are broken down into individual bytes which result in many function calls. This is quite bad for performance and since both the layer below and above work with larger buffers, it should be corrected. This patch is the first that switches the corresponding interface over to use a buf+len instead of a single byte. However, for most cases the implementation still only reads one byte and is then called again with the remaining buffer. Optimizations taking advantage of this new interface are to follow in the next commits. Signed-off-by: Christian Speich --- hw/sd/core.c | 26 ++++++++++++++--------- hw/sd/sd.c | 62 +++++++++++++++++++++++++++++++++++---------------= ---- include/hw/sd/sd.h | 22 +++++++++++++------ 3 files changed, 71 insertions(+), 39 deletions(-) diff --git a/hw/sd/core.c b/hw/sd/core.c index 3568a81e809fe107cfd0b5cc33b8b5761b11ce04..594c5e011ba30940a33799f9032= c92494ee0ca19 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -113,21 +113,24 @@ void sdbus_write_byte(SDBus *sdbus, uint8_t value) if (card) { SDCardClass *sc =3D SDMMC_COMMON_GET_CLASS(card); =20 - sc->write_byte(card, value); + sc->write_data(card, &value, 1); } } =20 void sdbus_write_data(SDBus *sdbus, const void *buf, size_t length) { SDState *card =3D get_card(sdbus); - const uint8_t *data =3D buf; =20 if (card) { SDCardClass *sc =3D SDMMC_COMMON_GET_CLASS(card); =20 - for (size_t i =3D 0; i < length; i++) { - trace_sdbus_write(sdbus_name(sdbus), data[i]); - sc->write_byte(card, data[i]); + while (length > 0) { + size_t written =3D sc->write_data(card, buf, length); + + g_assert(written >=3D 1); + + buf +=3D written; + length -=3D written; } } } @@ -140,7 +143,7 @@ uint8_t sdbus_read_byte(SDBus *sdbus) if (card) { SDCardClass *sc =3D SDMMC_COMMON_GET_CLASS(card); =20 - value =3D sc->read_byte(card); + sc->read_data(card, &value, 1); } trace_sdbus_read(sdbus_name(sdbus), value); =20 @@ -150,14 +153,17 @@ uint8_t sdbus_read_byte(SDBus *sdbus) void sdbus_read_data(SDBus *sdbus, void *buf, size_t length) { SDState *card =3D get_card(sdbus); - uint8_t *data =3D buf; =20 if (card) { SDCardClass *sc =3D SDMMC_COMMON_GET_CLASS(card); =20 - for (size_t i =3D 0; i < length; i++) { - data[i] =3D sc->read_byte(card); - trace_sdbus_read(sdbus_name(sdbus), data[i]); + while (length > 0) { + size_t read =3D sc->read_data(card, buf, length); + + g_assert(read >=3D 1); + + buf +=3D read; + length -=3D read; } } } diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 37f6e0702b0bce85915ef727ba1ec05f02f9c32c..135113add29b5ee3cb11d9d5353= 55eba8f6cb3f7 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2638,30 +2638,37 @@ static bool sd_generic_read_byte(SDState *sd, uint8= _t *value) return false; } =20 -static void sd_write_byte(SDState *sd, uint8_t value) +static size_t sd_write_data(SDState *sd, const void *buf, size_t length) { unsigned int partition_access; int i; + const uint8_t *value =3D buf; =20 if (!sd->blk || !blk_is_inserted(sd->blk)) { - return; + return length; } =20 if (sd->state !=3D sd_receivingdata_state) { qemu_log_mask(LOG_GUEST_ERROR, "%s: not in Receiving-Data state\n", __func__); - return; + return length; } =20 if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) - return; + return length; + + /* + * Only read one byte at a time. We will be called again with the + * remaining. + */ + length =3D 1; =20 trace_sdcard_write_data(sd->proto->name, sd->last_cmd_name, - sd->current_cmd, sd->data_offset, value); + sd->current_cmd, sd->data_offset, value[0]); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ - if (sd_generic_write_byte(sd, value)) { + if (sd_generic_write_byte(sd, value[0])) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; sd_blk_write(sd, sd->data_start, sd->data_offset); @@ -2686,7 +2693,7 @@ static void sd_write_byte(SDState *sd, uint8_t value) } } } - sd->data[sd->data_offset++] =3D value; + sd->data[sd->data_offset++] =3D value[0]; if (sd->data_offset >=3D sd->blk_len) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; @@ -2716,7 +2723,7 @@ static void sd_write_byte(SDState *sd, uint8_t value) break; =20 case 26: /* CMD26: PROGRAM_CID */ - if (sd_generic_write_byte(sd, value)) { + if (sd_generic_write_byte(sd, value[0])) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; for (i =3D 0; i < sizeof(sd->cid); i ++) @@ -2734,7 +2741,7 @@ static void sd_write_byte(SDState *sd, uint8_t value) break; =20 case 27: /* CMD27: PROGRAM_CSD */ - if (sd_generic_write_byte(sd, value)) { + if (sd_generic_write_byte(sd, value[0])) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; for (i =3D 0; i < sizeof(sd->csd); i ++) @@ -2757,7 +2764,7 @@ static void sd_write_byte(SDState *sd, uint8_t value) break; =20 case 42: /* CMD42: LOCK_UNLOCK */ - if (sd_generic_write_byte(sd, value)) { + if (sd_generic_write_byte(sd, value[0])) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; sd_lock_command(sd); @@ -2767,36 +2774,47 @@ static void sd_write_byte(SDState *sd, uint8_t valu= e) break; =20 case 56: /* CMD56: GEN_CMD */ - sd_generic_write_byte(sd, value); + sd_generic_write_byte(sd, value[0]); break; =20 default: g_assert_not_reached(); } + + return length; } =20 -static uint8_t sd_read_byte(SDState *sd) +static size_t sd_read_data(SDState *sd, void *buf, size_t length) { /* TODO: Append CRCs */ const uint8_t dummy_byte =3D 0x00; unsigned int partition_access; - uint8_t ret; uint32_t io_len; + uint8_t *value =3D buf; =20 if (!sd->blk || !blk_is_inserted(sd->blk)) { - return dummy_byte; + memset(buf, dummy_byte, length); + return length; } =20 if (sd->state !=3D sd_sendingdata_state) { qemu_log_mask(LOG_GUEST_ERROR, "%s: not in Sending-Data state\n", __func__); - return dummy_byte; + memset(buf, dummy_byte, length); + return length; } =20 if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) { - return dummy_byte; + memset(buf, dummy_byte, length); + return length; } =20 + /* + * We will only read one byte at a time. We will be called again with = the + * remaining buffer. + */ + length =3D 1; + io_len =3D sd_blk_len(sd); =20 trace_sdcard_read_data(sd->proto->name, @@ -2814,7 +2832,7 @@ static uint8_t sd_read_byte(SDState *sd) case 30: /* CMD30: SEND_WRITE_PROT */ case 51: /* ACMD51: SEND_SCR */ case 56: /* CMD56: GEN_CMD */ - sd_generic_read_byte(sd, &ret); + sd_generic_read_byte(sd, value); break; =20 case 18: /* CMD18: READ_MULTIPLE_BLOCK */ @@ -2831,7 +2849,7 @@ static uint8_t sd_read_byte(SDState *sd) sd_blk_read(sd, sd->data_start, io_len); } } - ret =3D sd->data[sd->data_offset ++]; + *value =3D sd->data[sd->data_offset++]; =20 if (sd->data_offset >=3D io_len) { sd->data_start +=3D io_len; @@ -2850,10 +2868,10 @@ static uint8_t sd_read_byte(SDState *sd) default: qemu_log_mask(LOG_GUEST_ERROR, "%s: DAT read illegal for command %= s\n", __func__, sd->last_cmd_name); - return dummy_byte; + *value =3D dummy_byte; } =20 - return ret; + return length; } =20 static bool sd_receive_ready(SDState *sd) @@ -3173,8 +3191,8 @@ static void sdmmc_common_class_init(ObjectClass *klas= s, const void *data) sc->get_dat_lines =3D sd_get_dat_lines; sc->get_cmd_line =3D sd_get_cmd_line; sc->do_command =3D sd_do_command; - sc->write_byte =3D sd_write_byte; - sc->read_byte =3D sd_read_byte; + sc->write_data =3D sd_write_data; + sc->read_data =3D sd_read_data; sc->receive_ready =3D sd_receive_ready; sc->data_ready =3D sd_data_ready; sc->get_inserted =3D sd_get_inserted; diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index d12f24955a5ba3c1ba9ab851d75992e830c00608..2162fb584020110bcdaa7a92c2a= 05b6cfc041d2f 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -107,22 +107,30 @@ struct SDCardClass { size_t (*do_command)(SDState *sd, SDRequest *req, uint8_t *resp, size_t respsz); /** - * Write a byte to a SD card. + * Write data to a SD card. * @sd: card - * @value: byte to write + * @value: data to write + * @len: length of data * - * Write a byte on the data lines of a SD card. + * Write data on the data lines of a SD card. May write not all data, = in + * which case it should be called again. At least one byte must be con= sumed. + * + * Return: number of bytes actually written. >=3D 1 */ - void (*write_byte)(SDState *sd, uint8_t value); + size_t (*write_data)(SDState *sd, const void *buf, size_t len); /** * Read a byte from a SD card. * @sd: card + * @buf: buffer to receive the data + * @len: size of data to read * - * Read a byte from the data lines of a SD card. + * Read data from the data lines of a SD card. This may not read all + * requested data, in this case it should be called again with the rem= aining + * buffer. At least one byte must be read. * - * Return: byte value read + * Return: number of bytes actually read. >=3D 1 */ - uint8_t (*read_byte)(SDState *sd); + size_t (*read_data)(SDState *sd, void* buf, size_t len); bool (*receive_ready)(SDState *sd); bool (*data_ready)(SDState *sd); void (*set_voltage)(SDState *sd, uint16_t millivolts); --=20 2.43.0 From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1770211459; cv=none; d=zohomail.com; s=zohoarc; b=KIE9uSbjdFBBDOo16vG1oIKijSU44iskbKWMO7kvsZdaaYZAUAy1tMBqhhyyyLwj0KSG3FEGw6t1gbxtfOWZy+HS1UcSaoHrbC4qot/rhmlEmi7ayAA/W9V5XgqRwELVEjxNC3Sjia0/dSAd+8MiyPLAZtkgHig7YfWIeovz5Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211459; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=e01gb+A41n+7/msZcgCy5vahzD5cOFHiH/LYpgOdweg=; b=DFow5WSO0XX4Q2FT3NxfFeBQnLJzAmTUN6SuuiytNqtokKi3FbU6i5UiXMg3HiDWxxf0ne4NGP56lyR+J/zyW5FbTdJh3Cz9dzrLJlWI0k90YYE2QOLQJOUxHXRB9diPAr4nMFQfVxCDGe16hof8szogMSBi1JYrhVC3SmM/e5A= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211459450116.9906527314754; Wed, 4 Feb 2026 05:24:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqM-0003Kt-5t; Wed, 04 Feb 2026 08:22:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqI-0003Ib-Um; Wed, 04 Feb 2026 08:22:50 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqE-000311-Js; Wed, 04 Feb 2026 08:22:49 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 6983481f-cb91-7f0000032729-7f000001d8ec-1 for ; Wed, 04 Feb 2026 14:22:39 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:39 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223965-15149 ; Wed, 4 Feb 2026 14:22:39 +0100 Date: Wed, 04 Feb 2026 14:22:26 +0100 Subject: [PATCH v3 2/6] hw/sd/sd: Allow multi-byte read/write for generic paths MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-2-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize complete at 04.02.2026 14:22:39 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211359-C964C71A-CF93AFD6/0/0 X-purgate-type: clean X-purgate-size: 7006 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Christian Speich From: Christian Speich via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1770211460975154100 Paths that use sd_generic_write/read_data can now write/read multiple bytes with one call. Signed-off-by: Christian Speich --- hw/sd/sd.c | 62 +++++++++++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 135113add29b5ee3cb11d9d535355eba8f6cb3f7..2c81776df316feda75f97e15cc9= bbd1538f1a21c 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1609,7 +1609,7 @@ static sd_rsp_type_t sd_cmd_optional(SDState *sd, SDR= equest req) return sd_illegal; } =20 -/* Configure fields for following sd_generic_write_byte() calls */ +/* Configure fields for following sd_generic_write_data() calls */ static sd_rsp_type_t sd_cmd_to_receivingdata(SDState *sd, SDRequest req, uint64_t start, size_t size) { @@ -1624,7 +1624,7 @@ static sd_rsp_type_t sd_cmd_to_receivingdata(SDState = *sd, SDRequest req, return sd_r1; } =20 -/* Configure fields for following sd_generic_read_byte() calls */ +/* Configure fields for following sd_generic_read_data() calls */ static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req, uint64_t start, const void *data, size_t size) @@ -2614,11 +2614,15 @@ send_response: } =20 /* Return true if buffer is consumed. Configured by sd_cmd_to_receivingdat= a() */ -static bool sd_generic_write_byte(SDState *sd, uint8_t value) +static bool sd_generic_write_data(SDState *sd, const void *buf, size_t *le= n) { - sd->data[sd->data_offset] =3D value; + size_t to_write =3D MIN(sd->data_size - sd->data_offset, *len); =20 - if (++sd->data_offset >=3D sd->data_size) { + memcpy(sd->data, buf, to_write); + sd->data_offset +=3D to_write; + *len =3D to_write; + + if (sd->data_offset >=3D sd->data_size) { sd->state =3D sd_transfer_state; return true; } @@ -2626,11 +2630,15 @@ static bool sd_generic_write_byte(SDState *sd, uint= 8_t value) } =20 /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdat= a() */ -static bool sd_generic_read_byte(SDState *sd, uint8_t *value) +static bool sd_generic_read_data(SDState *sd, void *buf, size_t *len) { - *value =3D sd->data[sd->data_offset]; + size_t to_read =3D MIN(sd->data_size - sd->data_offset, *len); + + memcpy(buf, sd->data, to_read); + sd->data_offset +=3D to_read; + *len =3D to_read; =20 - if (++sd->data_offset >=3D sd->data_size) { + if (sd->data_offset >=3D sd->data_size) { sd->state =3D sd_transfer_state; return true; } @@ -2657,18 +2665,12 @@ static size_t sd_write_data(SDState *sd, const void= *buf, size_t length) if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) return length; =20 - /* - * Only read one byte at a time. We will be called again with the - * remaining. - */ - length =3D 1; - trace_sdcard_write_data(sd->proto->name, sd->last_cmd_name, sd->current_cmd, sd->data_offset, value[0]); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ - if (sd_generic_write_byte(sd, value[0])) { + if (sd_generic_write_data(sd, buf, &length)) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; sd_blk_write(sd, sd->data_start, sd->data_offset); @@ -2680,6 +2682,12 @@ static size_t sd_write_data(SDState *sd, const void = *buf, size_t length) break; =20 case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ + /* + * Only read one byte at a time. We will be called again with the + * remaining. + */ + length =3D 1; + if (sd->data_offset =3D=3D 0) { /* Start of the block - let's check the address is valid */ if (!address_in_range(sd, "WRITE_MULTIPLE_BLOCK", @@ -2723,7 +2731,7 @@ static size_t sd_write_data(SDState *sd, const void *= buf, size_t length) break; =20 case 26: /* CMD26: PROGRAM_CID */ - if (sd_generic_write_byte(sd, value[0])) { + if (sd_generic_write_data(sd, buf, &length)) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; for (i =3D 0; i < sizeof(sd->cid); i ++) @@ -2741,7 +2749,7 @@ static size_t sd_write_data(SDState *sd, const void *= buf, size_t length) break; =20 case 27: /* CMD27: PROGRAM_CSD */ - if (sd_generic_write_byte(sd, value[0])) { + if (sd_generic_write_data(sd, buf, &length)) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; for (i =3D 0; i < sizeof(sd->csd); i ++) @@ -2764,7 +2772,7 @@ static size_t sd_write_data(SDState *sd, const void *= buf, size_t length) break; =20 case 42: /* CMD42: LOCK_UNLOCK */ - if (sd_generic_write_byte(sd, value[0])) { + if (sd_generic_write_data(sd, buf, &length)) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; sd_lock_command(sd); @@ -2774,7 +2782,7 @@ static size_t sd_write_data(SDState *sd, const void *= buf, size_t length) break; =20 case 56: /* CMD56: GEN_CMD */ - sd_generic_write_byte(sd, value[0]); + sd_generic_write_data(sd, buf, &length); break; =20 default: @@ -2809,12 +2817,6 @@ static size_t sd_read_data(SDState *sd, void *buf, s= ize_t length) return length; } =20 - /* - * We will only read one byte at a time. We will be called again with = the - * remaining buffer. - */ - length =3D 1; - io_len =3D sd_blk_len(sd); =20 trace_sdcard_read_data(sd->proto->name, @@ -2832,10 +2834,16 @@ static size_t sd_read_data(SDState *sd, void *buf, = size_t length) case 30: /* CMD30: SEND_WRITE_PROT */ case 51: /* ACMD51: SEND_SCR */ case 56: /* CMD56: GEN_CMD */ - sd_generic_read_byte(sd, value); + sd_generic_read_data(sd, buf, &length); break; =20 case 18: /* CMD18: READ_MULTIPLE_BLOCK */ + /* + * We will only read one byte at a time. We will be called again w= ith + * the remaining buffer. + */ + length =3D 1; + if (sd->data_offset =3D=3D 0) { if (!address_in_range(sd, "READ_MULTIPLE_BLOCK", sd->data_start, io_len)) { @@ -2868,7 +2876,7 @@ static size_t sd_read_data(SDState *sd, void *buf, si= ze_t length) default: qemu_log_mask(LOG_GUEST_ERROR, "%s: DAT read illegal for command %= s\n", __func__, sd->last_cmd_name); - *value =3D dummy_byte; + memset(buf, dummy_byte, length); } =20 return length; --=20 2.43.0 From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=avm.de ARC-Seal: i=1; a=rsa-sha256; t=1770211404; cv=none; d=zohomail.com; s=zohoarc; b=VXmxANX6L0GGm38dvOdlsiUrwvOWP81pv+7y3RvSUukd5Ei7uWt0aZJp+u2ovgz68nzpmYcR6RLTjPtaI8BWiabJoqbQkM/Y2W5rUTxrN1nUIXle/OptY/FvUgB8t2wsoaFVonUNt6c9jIVB2lS0Dbq7cSIUXwlFimTg7j/WsQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211404; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B2dvpsmSMfTe4i1+gqSa5qGfY1rSphkg7QyRgJ7xjfQ=; b=RGyEihhqAijlt7Gy1c5kL3P4TkGr5MlNlfRkplFiJZ7tnH6cil32hI1TSaatlUanAMp9wie6/5FdHd6M8ouWWfuSr4pQNI20uKL5hJ14GS4WmtxImB3tMU4uIMpb136QIAhIYJqfw65qgsK/VP952FCG3ZCuDz8z/3iSbQr4iSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211404174296.4869101870088; Wed, 4 Feb 2026 05:23:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqS-0003MW-Q8; Wed, 04 Feb 2026 08:23:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqI-0003Ic-Uu; Wed, 04 Feb 2026 08:22:50 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqE-000312-Ir; Wed, 04 Feb 2026 08:22:50 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 6983481f-cb91-7f0000032729-7f000001d8f0-1 for ; Wed, 04 Feb 2026 14:22:39 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:39 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223966-15150 ; Wed, 4 Feb 2026 14:22:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1770211359; bh=IONWDgtp8jsFRwCAAGwbPfAXvUuXKmJ7rR0QYQOidao=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ClNwto4qQLH1pMIzpKKVVAU1dmDPpZpvax0RfWHaLw2y7/xZ50pNd3jug5XklfYVI XaTlruJKZXICU9bT5ae3bO/rin2UdrmVnliAQj0yM6Ah46JGt9VB60Aq1HAlkwvdy/ hSHjIihmYpa3ggAj9TeX5cenEaVna8WyEn1UFcqY= From: Christian Speich Date: Wed, 04 Feb 2026 14:22:27 +0100 Subject: [PATCH v3 3/6] hw/sd/sd: Use multi-byte/block writes for block path MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-3-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:40, Serialize complete at 04.02.2026 14:22:40 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211359-A8E1371A-C0EC6D13/0/0 X-purgate-type: clean X-purgate-size: 11818 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @avm.de) X-ZM-MESSAGEID: 1770211411447154100 When writing/reading blocks via WRITE/READ_MULTIPLE_BLOCK we try to directly pass this request down to the block layer. This can only be done for properly sized and aligned accesses, other access still use a bounce buffer but still benefit from copying as much data in one memcpy as possible. RPMB is limited to the slow path using a bounce buffer. Signed-off-by: Christian Speich --- hw/sd/sd.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 168 insertions(+), 52 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2c81776df316feda75f97e15cc9bbd1538f1a21c..c9cfd3620b563fbe7520cfe361e= 14b57cd8f7472 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1112,24 +1112,36 @@ static const VMStateDescription sd_vmstate =3D { }, }; =20 -static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) +static void sd_blk_read_direct(SDState *sd, void* buf, uint64_t addr, + uint32_t len) { trace_sdcard_read_block(addr, len); addr +=3D sd_part_offset(sd); - if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) { + if (!sd->blk || blk_pread(sd->blk, addr, len, buf, 0) < 0) { fprintf(stderr, "sd_blk_read: read error on host side\n"); } } =20 -static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) +static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) +{ + sd_blk_read_direct(sd, sd->data, addr, len); +} + +static void sd_blk_write_direct(SDState *sd, const void *buf, uint64_t add= r, + uint32_t len) { trace_sdcard_write_block(addr, len); addr +=3D sd_part_offset(sd); - if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) { + if (!sd->blk || blk_pwrite(sd->blk, addr, len, buf, 0) < 0) { fprintf(stderr, "sd_blk_write: write error on host side\n"); } } =20 +static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) +{ + sd_blk_write_direct(sd, sd->data, addr, len); +} + static bool rpmb_calc_hmac(SDState *sd, const RPMBDataFrame *frame, unsigned int num_blocks, uint8_t *mac) { @@ -2682,44 +2694,84 @@ static size_t sd_write_data(SDState *sd, const void= *buf, size_t length) break; =20 case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ - /* - * Only read one byte at a time. We will be called again with the - * remaining. - */ - length =3D 1; - - if (sd->data_offset =3D=3D 0) { - /* Start of the block - let's check the address is valid */ - if (!address_in_range(sd, "WRITE_MULTIPLE_BLOCK", - sd->data_start, sd->blk_len)) { - break; + if (!address_in_range(sd, "WRITE_MULTIPLE_BLOCK", + sd->data_start + sd->data_offset, length)) { + /* Limit writing data to our device size */ + length =3D sd->size - sd->data_start - sd->data_offset; + + /* We've read past the end, return a dummy write. */ + if (length =3D=3D 0) { + return 1; } - if (sd->size <=3D SDSC_MAX_CAPACITY) { - if (sd_wp_addr(sd, sd->data_start)) { + } + + if (sd->size <=3D SDSC_MAX_CAPACITY) { + uint64_t start =3D sd->data_start + sd->data_offset; + + /* + * Check if any covered address violates WP. If so, limit our = write + * up to the allowed address. + */ + for (uint64_t addr =3D start; addr < start + length; + addr =3D ROUND_UP(addr + 1, WPGROUP_SIZE)) { + if (sd_wp_addr(sd, addr)) { sd->card_status |=3D WP_VIOLATION; + + length =3D addr - start - 1; break; } } } - sd->data[sd->data_offset++] =3D value[0]; - if (sd->data_offset >=3D sd->blk_len) { - /* TODO: Check CRC before committing */ - sd->state =3D sd_programming_state; - partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] - & EXT_CSD_PART_CONFIG_ACC_MASK; - if (partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { - emmc_rpmb_blk_write(sd, sd->data_start, sd->data_offset); - } else { - sd_blk_write(sd, sd->data_start, sd->data_offset); + + partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_ACC_MASK; + + /* Partial write or RPMB (single block only for now) */ + if (sd->data_offset > 0 + || partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { + length =3D MIN(sd->blk_len - sd->data_offset, length); + + memcpy(sd->data + sd->data_offset, buf, length); + sd->data_offset +=3D length; + + if (sd->data_offset >=3D sd->blk_len) { + sd->state =3D sd_programming_state; + if (partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { + emmc_rpmb_blk_write(sd, sd->data_start, sd->data_offse= t); + } else { + sd_blk_write(sd, sd->data_start, sd->data_offset); + } + sd->blk_written++; + sd->data_start +=3D sd->blk_len; + sd->data_offset =3D 0; + sd->csd[14] |=3D 0x40; + + /* Bzzzzzzztt .... Operation complete. */ + if (sd->multi_blk_cnt !=3D 0) { + if (--sd->multi_blk_cnt =3D=3D 0) { + /* Stop! */ + sd->state =3D sd_transfer_state; + break; + } + } + + sd->state =3D sd_receivingdata_state; } - sd->blk_written++; - sd->data_start +=3D sd->blk_len; - sd->data_offset =3D 0; + } + /* Try to write multiple of block sizes */ + else if (length >=3D sd->blk_len) { + length =3D QEMU_ALIGN_DOWN(length, sd->blk_len); + + sd->state =3D sd_programming_state; + sd_blk_write_direct(sd, buf, sd->data_start, length); + sd->blk_written +=3D length / sd->blk_len; + sd->data_start +=3D length; sd->csd[14] |=3D 0x40; =20 - /* Bzzzzzzztt .... Operation complete. */ if (sd->multi_blk_cnt !=3D 0) { - if (--sd->multi_blk_cnt =3D=3D 0) { + sd->multi_blk_cnt -=3D length / sd->blk_len; + + if (sd->multi_blk_cnt =3D=3D 0) { /* Stop! */ sd->state =3D sd_transfer_state; break; @@ -2728,6 +2780,12 @@ static size_t sd_write_data(SDState *sd, const void = *buf, size_t length) =20 sd->state =3D sd_receivingdata_state; } + /* Partial write */ + else if (length > 0) { + memcpy(sd->data, buf, length); + sd->data_offset =3D length; + } + break; =20 case 26: /* CMD26: PROGRAM_CID */ @@ -2798,7 +2856,6 @@ static size_t sd_read_data(SDState *sd, void *buf, si= ze_t length) const uint8_t dummy_byte =3D 0x00; unsigned int partition_access; uint32_t io_len; - uint8_t *value =3D buf; =20 if (!sd->blk || !blk_is_inserted(sd->blk)) { memset(buf, dummy_byte, length); @@ -2838,36 +2895,95 @@ static size_t sd_read_data(SDState *sd, void *buf, = size_t length) break; =20 case 18: /* CMD18: READ_MULTIPLE_BLOCK */ + if (!address_in_range(sd, "READ_MULTIPLE_BLOCK", + sd->data_start + sd->data_offset, length)) { + /* Limit reading data to our device size */ + length =3D sd->size - sd->data_start - sd->data_offset; + + /* We read past the end, return a dummy read. */ + if (length =3D=3D 0) { + memset(buf, dummy_byte, 1); + return 1; + } + } + + partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_ACC_MASK; + + /* We have a partially read block. */ + if (sd->data_offset > 0) { + length =3D MIN(sd->data_size - sd->data_offset, length); + + memcpy(buf, sd->data + sd->data_offset, length); + + sd->data_offset +=3D length; + + /* Partial read is complete, clear state. */ + if (sd->data_offset >=3D sd->data_size) { + sd->data_start +=3D io_len; + sd->data_size =3D 0; + sd->data_offset =3D 0; + + if (sd->multi_blk_cnt !=3D 0) { + if (--sd->multi_blk_cnt =3D=3D 0) { + sd->state =3D sd_transfer_state; + } + } + } + } /* - * We will only read one byte at a time. We will be called again w= ith - * the remaining buffer. + * Try to read multiples of the block size directly bypassing the = local + * bounce buffer. + * Not for RPMB. */ - length =3D 1; + else if (length >=3D io_len + && partition_access !=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { + length =3D QEMU_ALIGN_DOWN(length, io_len); =20 - if (sd->data_offset =3D=3D 0) { - if (!address_in_range(sd, "READ_MULTIPLE_BLOCK", - sd->data_start, io_len)) { - return dummy_byte; + /* For limited reads, only read the requested block count. */ + if (sd->multi_blk_cnt !=3D 0) { + length =3D MIN(length, sd->multi_blk_cnt * io_len); } - partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] - & EXT_CSD_PART_CONFIG_ACC_MASK; + + sd_blk_read_direct(sd, buf, sd->data_start, + length); + + sd->data_start +=3D length; + + if (sd->multi_blk_cnt !=3D 0) { + sd->multi_blk_cnt -=3D length / io_len; + + if (sd->multi_blk_cnt =3D=3D 0) { + sd->state =3D sd_transfer_state; + } + } + } + /* Read partial at the end or sinlge-block RPMB */ + else if (length > 0) { + length =3D MIN(length, io_len); + + /* Fill the buffer */ if (partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { emmc_rpmb_blk_read(sd, sd->data_start, io_len); } else { sd_blk_read(sd, sd->data_start, io_len); } - } - *value =3D sd->data[sd->data_offset++]; =20 - if (sd->data_offset >=3D io_len) { - sd->data_start +=3D io_len; - sd->data_offset =3D 0; + memcpy(buf, sd->data, length); =20 - if (sd->multi_blk_cnt !=3D 0) { - if (--sd->multi_blk_cnt =3D=3D 0) { - /* Stop! */ - sd->state =3D sd_transfer_state; - break; + sd->data_size =3D io_len; + sd->data_offset =3D length; + + if (sd->data_offset >=3D io_len) { + sd->data_start +=3D io_len; + sd->data_offset =3D 0; + + if (sd->multi_blk_cnt !=3D 0) { + if (--sd->multi_blk_cnt =3D=3D 0) { + /* Stop! */ + sd->state =3D sd_transfer_state; + break; + } } } } --=20 2.43.0 From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=avm.de ARC-Seal: i=1; a=rsa-sha256; t=1770211459; cv=none; d=zohomail.com; s=zohoarc; b=fpcFAKLFxQpAHZPxDgum7zplw5PJXLXM5vx5BrmGa8tI0r2i+JtEvxC25I8ODiElj+LEC8pDoTltHVsv0jjuVDq1HgRICWu3UWkL5p3yCq7aRUUGSyfmwj2jwjlIRObbrbKzq13EzLESAkc1QWxk7WOvENaicUWc5ZkWLnUT1lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211459; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ARDQXecSkIWKM2jW8b1XQhbvDhHeLHKbx6hiMjGlpD8=; b=O7ZSCRTCpbRIgoy7h9o5aQdVN2MxoM2be3A7W+A9LDlCOozy97ELLCJ5HN+3MPAsForxfsGUKxbbzuJHvkFEGhWi3ReC/OxlO9uj+OwiR080oaqTak4N/bPyGCGBPuWsjIjO2RZEGv03VoUEKPTyQh7zZdntfHdTcrmL27HpPGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211459512540.290434800612; Wed, 4 Feb 2026 05:24:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqN-0003LL-DG; Wed, 04 Feb 2026 08:22:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqJ-0003JX-Rw; Wed, 04 Feb 2026 08:22:51 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqH-00031u-I9; Wed, 04 Feb 2026 08:22:51 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 69834820-cb91-7f0000032729-7f000001d936-1 for ; Wed, 04 Feb 2026 14:22:40 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:40 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223966-15151 ; Wed, 4 Feb 2026 14:22:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1770211360; bh=q4twjt2E4pRsujRgtku8JrJOS12+2byH1d3KqcJv0Gs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hx98ePk1z1z2qXnJ7JjFA5kEZbqkTslaJqE0hz42YgNsBxUl5a2HGHdSVEjxgNkDe JZ3z3ZZR+WeXHOq/JqZinWVLDWxiHyNwOGilHBrskEVcUoMgbosrFmi3ZeVaKlxodb 11k/Ax9+bRGV9mdzyJDf7BwEgXMY5byTO8MdbNiA= From: Christian Speich Date: Wed, 04 Feb 2026 14:22:28 +0100 Subject: [PATCH v3 4/6] hw/sd/sdhci: Don't use bounce buffer for ADMA MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-4-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:41, Serialize complete at 04.02.2026 14:22:41 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211360-4BE4165A-D55E3678/0/0 X-purgate-type: clean X-purgate-size: 6515 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @avm.de) X-ZM-MESSAGEID: 1770211465953158500 Currently, ADMA will temporarily store data into a local bounce buffer when transferring it. This will produce unneeded copies of the data and limit us to the bounce buffer size for each step. This patch now maps the requested DMA address and passes this buffer directly to sdbus_{read,write}_data. This allows to pass much larger buffers down to increase the performance. sdbus_{read,write}_data is already able to handle arbitrary length and alignments, so we do not need to ensure this. Signed-off-by: Christian Speich --- hw/sd/sdhci.c | 102 +++++++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 55 insertions(+), 47 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index c86dfa281f4b0218bf6dda7a38d46abfc9638450..6e07711478cb6ca046a7d371a82= e2c682ebbda00 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -775,7 +775,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) =20 static void sdhci_do_adma(SDHCIState *s) { - unsigned int begin, length; + unsigned int length; const uint16_t block_size =3D s->blksize & BLOCK_SIZE_MASK; const MemTxAttrs attrs =3D { .memory =3D true }; ADMADescr dscr =3D {}; @@ -817,66 +817,74 @@ static void sdhci_do_adma(SDHCIState *s) if (s->trnmod & SDHC_TRNS_READ) { s->prnsts |=3D SDHC_DOING_READ; while (length) { - if (s->data_count =3D=3D 0) { - sdbus_read_data(&s->sdbus, s->fifo_buffer, block_s= ize); - } - begin =3D s->data_count; - if ((length + begin) < block_size) { - s->data_count =3D length + begin; - length =3D 0; - } else { - s->data_count =3D block_size; - length -=3D block_size - begin; - } - res =3D dma_memory_write(s->dma_as, dscr.addr, - &s->fifo_buffer[begin], - s->data_count - begin, - attrs); - if (res !=3D MEMTX_OK) { + dma_addr_t dma_len =3D length; + + void *buf =3D dma_memory_map(s->dma_as, dscr.addr, &dm= a_len, + DMA_DIRECTION_FROM_DEVICE, + attrs); + + if (buf =3D=3D NULL) { + res =3D MEMTX_ERROR; break; + } else { + res =3D MEMTX_OK; } - dscr.addr +=3D s->data_count - begin; - if (s->data_count =3D=3D block_size) { - s->data_count =3D 0; - if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) { - s->blkcnt--; - if (s->blkcnt =3D=3D 0) { - break; - } + + sdbus_read_data(&s->sdbus, buf, dma_len); + length -=3D dma_len; + dscr.addr +=3D dma_len; + + dma_memory_unmap(s->dma_as, buf, dma_len, + DMA_DIRECTION_FROM_DEVICE, dma_len); + + if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) { + size_t transfered =3D s->data_count + dma_len; + + s->blkcnt -=3D transfered / block_size; + s->data_count =3D transfered % block_size; + + if (s->blkcnt =3D=3D 0) { + s->data_count =3D 0; + break; } } } } else { s->prnsts |=3D SDHC_DOING_WRITE; while (length) { - begin =3D s->data_count; - if ((length + begin) < block_size) { - s->data_count =3D length + begin; - length =3D 0; - } else { - s->data_count =3D block_size; - length -=3D block_size - begin; - } - res =3D dma_memory_read(s->dma_as, dscr.addr, - &s->fifo_buffer[begin], - s->data_count - begin, - attrs); - if (res !=3D MEMTX_OK) { + dma_addr_t dma_len =3D length; + + void *buf =3D dma_memory_map(s->dma_as, dscr.addr, &dm= a_len, + DMA_DIRECTION_TO_DEVICE, at= trs); + + if (buf =3D=3D NULL) { + res =3D MEMTX_ERROR; break; + } else { + res =3D MEMTX_OK; } - dscr.addr +=3D s->data_count - begin; - if (s->data_count =3D=3D block_size) { - sdbus_write_data(&s->sdbus, s->fifo_buffer, block_= size); - s->data_count =3D 0; - if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) { - s->blkcnt--; - if (s->blkcnt =3D=3D 0) { - break; - } + + sdbus_write_data(&s->sdbus, buf, dma_len); + length -=3D dma_len; + dscr.addr +=3D dma_len; + + dma_memory_unmap(s->dma_as, buf, dma_len, + DMA_DIRECTION_TO_DEVICE, dma_len); + + if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) { + size_t transfered =3D s->data_count + dma_len; + + s->blkcnt -=3D transfered / block_size; + s->data_count =3D transfered % block_size; + + if (s->blkcnt =3D=3D 0) { + s->data_count =3D 0; + break; } } } } + if (res !=3D MEMTX_OK) { s->data_count =3D 0; if (s->errintstsen & SDHC_EISEN_ADMAERR) { --=20 2.43.0 From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=avm.de ARC-Seal: i=1; a=rsa-sha256; t=1770211464; cv=none; d=zohomail.com; s=zohoarc; b=ENwCu6U1vlpTo7OZuqCVzDE42/z9Csx99AqnMyGZTzz889hCKlfWqKHwq/QbQMqUhfLobWRCQTdYDjG0THGGUgisIkvSisB0yE/+ZQo2OEv797t1HbIi/gu75gy8AITH/l04+Kkg1OP2ttlTDoXH77bT0NFAyoEzn/R/MCKbfo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211464; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2aXqto6s0sQNm44y2fHzGXCJlrYT04L59M3Ya9xVy5s=; b=Y8PFW3309nQNs/FFts4L0SIEFSlCJTUurNni/pMD0VYZ1FHPaBG4xOOVtjHT3n4lyeIeZiE+SXrD6zLghcCeo7m97XAGbj4UuIX7qkIXs0AEiCB4fTXPHpdur/PI0txRUgvF4sDUzGSFA6q2jYTx2k2yut6sOH8C55EwLtQGbds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211464228442.84688019663145; Wed, 4 Feb 2026 05:24:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqR-0003M5-8R; Wed, 04 Feb 2026 08:22:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqH-0003IO-TJ; Wed, 04 Feb 2026 08:22:50 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqE-000314-A8; Wed, 04 Feb 2026 08:22:49 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 6983481f-cb91-7f0000032729-7f000001d920-1 for ; Wed, 04 Feb 2026 14:22:39 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:39 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223967-15152 ; Wed, 4 Feb 2026 14:22:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1770211359; bh=2C6csFJT3Spdeb7aSSmjM7pVoPsY4btxRJ+YXAtNXoE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NOQZNzVfJSVHjnZVzHSbWuMU8hkBmcne7v3DQ5O09+SnQmA6Fc4ESgoOer/6HnZOy cBZp4hUk/zqTCbHiRMNgFp2htolKGjMvJHR6mgGs2bQoRk4ngaA/ZdEVRlEKKMdrdr gB1FTcDt8OxS1QPu+m8kwRdgcBMzSdoHWi4cBWt8= From: Christian Speich Date: Wed, 04 Feb 2026 14:22:29 +0100 Subject: [PATCH v3 5/6] hw/sd/sdcard: Add erase-blocks-as-zero option. MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-5-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:40, Serialize complete at 04.02.2026 14:22:40 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211359-AB60865A-D85EFD3D/0/0 X-purgate-type: clean X-purgate-size: 2785 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @avm.de) X-ZM-MESSAGEID: 1770211467816158500 Currently, erased blocks are filled with 0xFF. However SCR Bit 55 (DATA_STAT_AFTER_ERASE) indicates that an erase produces zeros. One of them is wrong. This patch does two things. First it fixes the reporting of DATA_STAT_AFTER_ERASE in SCR to correctly reflect the content of erased blocks. We also increase the Product Revision (REV in CID) to indicate to the guest that DATA_STAT_AFTER_ERASE is now reliable. Secondly, we introduce a erase-blocks-as-zero option, which allows the user to choose if erased blocks should contain 0xFF or 0x00. The default is still 0xFF to remain compatible with current users. Signed-off-by: Christian Speich --- hw/sd/sd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index c9cfd3620b563fbe7520cfe361e14b57cd8f7472..5ddaa08d77b6b7606005fb59f42= f107d254d6e5c 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -162,6 +162,7 @@ struct SDState { /* Static properties */ =20 uint8_t spec_version; + bool erase_blocks_as_zero; uint64_t boot_part_size; uint64_t rpmb_part_size; BlockBackend *blk; @@ -439,6 +440,9 @@ static void sd_set_scr(SDState *sd) sd->scr[0] |=3D 2; /* Spec Version 2.00 or Version 3.0X */ sd->scr[1] =3D (2 << 4) /* SDSC Card (Security Version 1.01) */ | 0b0101; /* 1-bit or 4-bit width bus modes */ + if (!sd->erase_blocks_as_zero) { + sd->scr[1] |=3D (1 << 7); /* DATA_STAT_AFTER_ERASE: Erase produces= 0xFF */ + } sd->scr[2] =3D 0x00; /* Extended Security is not supported. */ if (sd->spec_version >=3D SD_PHY_SPECv3_01_VERS) { sd->scr[2] |=3D 1 << 7; /* Spec Version 3.0X */ @@ -456,7 +460,7 @@ static void sd_set_scr(SDState *sd) #define MID 0xaa #define OID "XY" #define PNM "QEMU!" -#define PRV 0x01 +#define PRV 0x02 #define MDT_YR 2006 #define MDT_MON 2 =20 @@ -1363,7 +1367,12 @@ static void sd_erase(SDState *sd) sd->erase_end =3D INVALID_ADDRESS; sd->csd[14] |=3D 0x40; =20 - memset(sd->data, 0xff, erase_len); + if (sd->erase_blocks_as_zero) { + memset(sd->data, 0x0, erase_len); + } else { + memset(sd->data, 0xFF, erase_len); + } + for (erase_addr =3D erase_start; erase_addr <=3D erase_end; erase_addr +=3D erase_len) { if (sdsc) { @@ -3287,6 +3296,8 @@ static void emmc_realize(DeviceState *dev, Error **er= rp) =20 static const Property sdmmc_common_properties[] =3D { DEFINE_PROP_DRIVE("drive", SDState, blk), + DEFINE_PROP_BOOL("erase-blocks-as-zero", SDState, erase_blocks_as_zero, + false), }; =20 static const Property sd_properties[] =3D { --=20 2.43.0 From nobody Sat Feb 7 05:48:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=avm.de ARC-Seal: i=1; a=rsa-sha256; t=1770211466; cv=none; d=zohomail.com; s=zohoarc; b=m3TGqQCi5FnSgAqDP0oCg5n1ty5zWwqemHC1QeJvek926MQT8tcurVIJQDIfZN58ATuRaWAz5Aq7+VxMkohzeYXr9X4M0cfkdPX5xf72xDDCIuPg8JMQzbGIvR9vejgLxka+UdxMu60rLIOauCfBYFbO0Cmta5ruKOgg6ryFr3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770211466; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/aGXkTvbKCF+IVWL7kxaaBzlg7VativkOAeIcAS1flw=; b=m1On7yeu2cDxnZdy9OCriXgOK1aYqAjy3bzADsClmI/G67izonrWV6agKyPtL90UvVyBZjOsX9zh+s53CY8IF0LB2CeyOzMRBf1FQzmxKoYVDQvYsFxTcuoXkGDMUKAEAqz9gnj11X335HWUvaa9iY3+fGa4OFLTI6Xt7+Aq4ss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770211466595852.9825346478303; Wed, 4 Feb 2026 05:24:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vncqR-0003M4-8e; Wed, 04 Feb 2026 08:22:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqJ-0003Jg-TJ; Wed, 04 Feb 2026 08:22:52 -0500 Received: from mail.avm.de ([2001:bf0:244:244::120]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vncqH-00031v-If; Wed, 04 Feb 2026 08:22:50 -0500 Received: from [172.16.0.1] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.55.0) (envelope-from ) id 69834820-cb91-7f0000032729-7f000001e250-1 for ; Wed, 04 Feb 2026 14:22:40 +0100 Received: from mail-notes.avm.de (mail-notes.avm.de [172.16.0.1]) by mail.avm.de (Postfix) with ESMTP; Wed, 4 Feb 2026 14:22:40 +0100 (CET) Received: from [127.0.1.1] ([172.17.89.139]) by mail-notes.avm.de (HCL Domino Release 14.0FP4) with ESMTP id 2026020414223967-15153 ; Wed, 4 Feb 2026 14:22:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=avm.de; s=mail; t=1770211360; bh=/RihI8u1CDF18VzrgDTdBBmYo+lDolq/JxdSpafWOnc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=wvvkJa6MZxgWGU/HuGmrfY2ZYQZef7wj9cNE+B6BfJNZ6GFbCNP271Nn4dF6UVsMU Hr9m5I3ZkXZ40bOGdyQdu1Xje5eKimOKLQeRLidRflonzI+MxBjlQ4KPyqP2IjuqqI eMMJcglI0kZn/jcVdcMutmeEja/ApyEnyIF8zhsg= From: Christian Speich Date: Wed, 04 Feb 2026 14:22:30 +0100 Subject: [PATCH v3 6/6] hw/sd/sdcard: Optimize erase blocks as zero. MIME-Version: 1.0 Message-Id: <20260204-sdcard-performance-b4-v3-6-dc1cf172ee57@avm.de> References: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> In-Reply-To: <20260204-sdcard-performance-b4-v3-0-dc1cf172ee57@avm.de> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Christian Speich X-Mailer: b4 0.14.2 X-MIMETrack: Itemize by SMTP Server on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:39, Serialize by Router on ANIS1/AVM(Release 14.0FP4|March 10, 2025) at 04.02.2026 14:22:41, Serialize complete at 04.02.2026 14:22:41 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-purgate-ID: 149429::1770211360-C265E65A-0BDC057E/0/0 X-purgate-type: clean X-purgate-size: 3416 X-purgate-Ad: Categorized by eleven eXpurgate (R) https://www.eleven.de X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:bf0:244:244::120; envelope-from=c.speich@avm.de; helo=mail.avm.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @avm.de) X-ZM-MESSAGEID: 1770211469673158500 When erasing blocks as zero, we can use optimized block functions to achieve this. These allow us to request a large rage to be zeroed, possible optimizing this operation and freeing disk space for sparsesly stored images. This only is possible when erase-blocks-as-zero=3Dtrue is used and can provide a significant performance boost. The case where 0xFF is used during erase is as slow as before. Signed-off-by: Christian Speich --- hw/sd/sd.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5ddaa08d77b6b7606005fb59f42f107d254d6e5c..6e3afedbf45d59c2c9b48505ed1= 44a788bc76760 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1331,6 +1331,17 @@ exit: trace_sdcard_rpmb_write_block(req, lduw_be_p(&sd->rpmb.result.result)); } =20 +/* Requires sd->buf to be filled with 0xFF */ +static void sd_erase_ff(SDState *sd, uint64_t addr, size_t len) +{ + int erase_len =3D 1 << HWBLOCK_SHIFT; + uint64_t erase_addr; + + for (erase_addr =3D addr; erase_addr < addr + len; erase_addr +=3D era= se_len) { + sd_blk_write(sd, erase_addr, erase_len); + } +} + static void sd_erase(SDState *sd) { uint64_t erase_start =3D sd->erase_start; @@ -1338,7 +1349,6 @@ static void sd_erase(SDState *sd) bool sdsc =3D true; uint64_t wpnum; uint64_t erase_addr; - int erase_len =3D 1 << HWBLOCK_SHIFT; =20 trace_sdcard_erase(sd->erase_start, sd->erase_end); if (sd->erase_start =3D=3D INVALID_ADDRESS @@ -1367,24 +1377,38 @@ static void sd_erase(SDState *sd) sd->erase_end =3D INVALID_ADDRESS; sd->csd[14] |=3D 0x40; =20 - if (sd->erase_blocks_as_zero) { - memset(sd->data, 0x0, erase_len); - } else { - memset(sd->data, 0xFF, erase_len); + if (!sd->erase_blocks_as_zero) { + memset(sd->data, 0xFF, 1 << HWBLOCK_SHIFT); } =20 - for (erase_addr =3D erase_start; erase_addr <=3D erase_end; - erase_addr +=3D erase_len) { - if (sdsc) { - /* Only SDSC cards support write protect groups */ + /* Only SDSC cards support write protect groups */ + if (sdsc) { + for (erase_addr =3D erase_start; erase_addr <=3D erase_end; + erase_addr =3D ROUND_UP(erase_addr + 1, WPGROUP_SIZE)) { + uint64_t wp_group_end =3D ROUND_UP(erase_addr + 1, WPGROUP_SIZ= E) - 1; + size_t to_erase =3D MIN(erase_end, wp_group_end) - erase_addr; + wpnum =3D sd_addr_to_wpnum(erase_addr); assert(wpnum < sd->wp_group_bits); if (test_bit(wpnum, sd->wp_group_bmap)) { sd->card_status |=3D WP_ERASE_SKIP; continue; } + + if (sd->erase_blocks_as_zero) { + blk_pwrite_zeroes(sd->blk, erase_addr + sd_part_offset(sd), + to_erase, 0); + } else { + sd_erase_ff(sd, erase_addr, to_erase); + } + } + } else { + if (sd->erase_blocks_as_zero) { + blk_pwrite_zeroes(sd->blk, erase_start + sd_part_offset(sd), + erase_end - erase_start, 0); + } else { + sd_erase_ff(sd, erase_start, erase_end - erase_start); } - sd_blk_write(sd, erase_addr, erase_len); } } =20 --=20 2.43.0