From patchwork Wed Jun 29 17:44:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Barbieri X-Patchwork-Id: 1650701 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IVKxGZWF; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LYbd26qHWz9s09 for ; Thu, 30 Jun 2022 21:26:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 066BE8447E; Thu, 30 Jun 2022 13:26:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="IVKxGZWF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 195C5842E2; Wed, 29 Jun 2022 19:45:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 1226E839DF for ; Wed, 29 Jun 2022 19:44:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=plb365@gmail.com Received: by mail-qv1-xf2d.google.com with SMTP id t16so25987001qvh.1 for ; Wed, 29 Jun 2022 10:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YB6ZVspRqqZw9Mk9u7KRDvkXL/DIR4UZM1TMlk1G03E=; b=IVKxGZWF0wxP81AXCKzfR/wUkDvLYyOi9gHmga2hlsuGgU8ALZBACZyJRbzszE/KA6 fMpKpeaLeS86ZkQkNOdCidakwu4veORqHg0mnAl6pvqOI5ltrwzoQBpxZh7PWNEj9VqH zzvD4FElebjV7+ucZWnuoYpbY4MjmgXATbpfyXOnnbDKjoBpDUjoXh/2jBV3STHeTJ/U 5SIquUKRaAirgW6f9ezTD632O3BgnkhiuzbE2jc2m5bsrIm3cDHFjegkHzZ8QrFlehLB ns4/BOto9XmIG6m1gv+hFOd7E2QPZi4o2efBsTCC6Oyu/GVV2ypb5shCSE7TXNFDILW4 Fk8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YB6ZVspRqqZw9Mk9u7KRDvkXL/DIR4UZM1TMlk1G03E=; b=yEMQaSKzXyd1g4zjvy5fGeUUtzg2UlIPrIWiQxMrTSxxU3nLV+N0e+mzR2xpPsUEqe z+X6fRtqe87rvz6c7fuiXzcPm+upnSDOIvIoPrU9PriZ4Xn7GUWBCJZv/v/Hu1pVBJxS icX8Xgu+4w3VbhVpn7rN2u35LCPBnmOqxbyBfUTZvUo0uea+KhCg9UBtWgyckcGMx1u+ 7XTqEmhpyoyVW8dYPNmqmlhI+dPWqZLpePEsrwjq/zSGKoszEIiaN2hIHAFlRiO2mhew 4YIzeDM1WyZBHKlNRXpeeRYdDNFwo6kKE88xMq8ijj9fmcfVgZdr47Bgp5lIYraj5JKy 5kig== X-Gm-Message-State: AJIora9XQ+SLh5GlPsRuN/X0/WJySGq6baJ3+3VTgfJVkb7c7RcA3B8J z2tz0ums/IkV5jRJWRH2mBo3y1kLKWJjHw== X-Google-Smtp-Source: AGRyM1uCE8qf5+OCzKfkmlOpn6ztwh+1fzyx4qhpuoQcjgaenFjbVLaLn7KXWs9otMlTL9nMpn2LfA== X-Received: by 2002:ad4:584d:0:b0:470:4228:176 with SMTP id de13-20020ad4584d000000b0047042280176mr7518653qvb.129.1656524695520; Wed, 29 Jun 2022 10:44:55 -0700 (PDT) Received: from barbieri-MS-7C37.xts.us.baesystems.com (pool-70-109-56-67.clppva.fios.verizon.net. [70.109.56.67]) by smtp.gmail.com with ESMTPSA id g11-20020ac8480b000000b003051ba1f8bcsm10797818qtq.15.2022.06.29.10.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 10:44:55 -0700 (PDT) From: Paul Barbieri To: u-boot@lists.denx.de Cc: Paul Barbieri , Heinrich Schuchardt , AKASHI Takahiro Subject: [PATCH v2] EFI: Fix ReadBlocks API reading incorrect sector for UCLASS_PARTITION devices Date: Wed, 29 Jun 2022 13:44:13 -0400 Message-Id: <20220629174413.2053-1-plb365@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <748f33b0-c77f-2c8f-48d1-6ca595420d0d@gmail.com> References: <748f33b0-c77f-2c8f-48d1-6ca595420d0d@gmail.com> X-Mailman-Approved-At: Thu, 30 Jun 2022 13:26:18 +0200 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.6 at phobos.denx.de X-Virus-Status: Clean The requsted partition disk sector incorrectly has the parition start sector added in twice for UCLASS_PARTITION devices. The efi_disk_rw_blocks() routine adds the diskobj->offset to the requested lba. When the device is a UCLASS_PARTITION, the dev_read() or dev_write() routine is called which adds part-gpt_part_info.start. This causes I/O to the wrong sector. Takahiro Akashi suggested removing the offset field from the efi_disk_obj structure since disk-uclass.c handles the partition start biasing. Device types other than UCLASS_PARTITION set the diskobj->offset field to zero which makes the field unnecessary. This change removes the offset field from the structure and removes all references from the code which is isolated to the lib/efi_loader/efi_disk.c module. This change also adds a test for the EFI ReadBlocks() API in the EFI selftest code. There is already a test for reading a FAT file. The new test uses ReadBlocks() to read the same "disk" block and compare it to the data read from the file system API. I verified that the test was using the correct code path by defining DEBUG in lib/efi_loader/efi_disk.c This showed that when the test was run, efi_disk_read_blocks() was executed and it called efi_disk_rw_blocks(). Adding a little extra debug, I saw that efi_disk_rw_blocks() called dev_read(). I also added a debug print in the read_blocks() routine of efi_selftest_block_device.c. One thing to note, if I moved the read_blocks test before the file system test, I would see the read_blocks() routine print in the middle of the efi_disk_rw_blocks() routine. If I put the test after the file system test, I don't see read_blocks() get called. I assume this is because dev_read() is able to get the block from the cache. Signed-Off-by: Paul Barbieri Cc: Heinrich Schuchardt Cc: AKASHI Takahiro --- lib/efi_loader/efi_disk.c | 8 +------ lib/efi_selftest/efi_selftest_block_device.c | 23 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 1e82f52dc0..1d700b2a6b 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -35,7 +35,6 @@ const efi_guid_t efi_system_partition_guid = PARTITION_SYSTEM_GUID; * @dp: device path to the block device * @part: partition * @volume: simple file system protocol of the partition - * @offset: offset into disk for simple partition * @dev: associated DM device */ struct efi_disk_obj { @@ -47,7 +46,6 @@ struct efi_disk_obj { struct efi_device_path *dp; unsigned int part; struct efi_simple_file_system_protocol *volume; - lbaint_t offset; struct udevice *dev; /* TODO: move it to efi_object */ }; @@ -117,7 +115,6 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, diskobj = container_of(this, struct efi_disk_obj, ops); blksz = diskobj->media.block_size; blocks = buffer_size / blksz; - lba += diskobj->offset; EFI_PRINT("blocks=%x lba=%llx blksz=%x dir=%d\n", blocks, lba, blksz, direction); @@ -440,13 +437,11 @@ static efi_status_t efi_disk_add_dev( diskobj->dp = efi_dp_append_node(dp_parent, node); efi_free_pool(node); - diskobj->offset = part_info->start; diskobj->media.last_block = part_info->size - 1; if (part_info->bootable & PART_EFI_SYSTEM_PARTITION) guid = &efi_system_partition_guid; } else { diskobj->dp = efi_dp_from_part(desc, part); - diskobj->offset = 0; diskobj->media.last_block = desc->lba - 1; } diskobj->part = part; @@ -501,12 +496,11 @@ static efi_status_t efi_disk_add_dev( *disk = diskobj; EFI_PRINT("BlockIO: part %u, present %d, logical %d, removable %d" - ", offset " LBAF ", last_block %llu\n", + ", last_block %llu\n", diskobj->part, diskobj->media.media_present, diskobj->media.logical_partition, diskobj->media.removable_media, - diskobj->offset, diskobj->media.last_block); /* Store first EFI system partition */ diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index 60fa655766..7b50c829ad 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -11,6 +11,7 @@ * ConnectController is used to setup partitions and to install the simple * file protocol. * A known file is read from the file system and verified. + * Test that the read_blocks API correctly reads a block from the device. */ #include @@ -312,6 +313,9 @@ static int execute(void) char buf[16] __aligned(ARCH_DMA_MINALIGN); u32 part1_size; u64 pos; + char block[2 * (1 << LB_BLOCK_SIZE)]; + char *block_io_aligned; + u32 align; /* Connect controller to virtual disk */ ret = boottime->connect_controller(disk_handle, NULL, NULL, 1); @@ -449,6 +453,25 @@ static int execute(void) return EFI_ST_FAILURE; } + /* Test read_blocks() can read same file data. */ + boottime->set_mem(block, sizeof(block), 0); + align = block_io_protocol->media->io_align; + block_io_aligned = (char *)(((uintptr_t)block + align-1) & ~(align-1)); + ret = block_io_protocol->read_blocks(block_io_protocol, + block_io_protocol->media->media_id, + (0x5000 >> LB_BLOCK_SIZE) - 1, + block_io_protocol->media->block_size, + block_io_aligned); + if (ret != EFI_SUCCESS) { + efi_st_error("ReadBlocks failed\n"); + return EFI_ST_FAILURE; + } + + if (memcmp(&block_io_aligned[1], buf, 11)) { + efi_st_error("Unexpected block content\n"); + return EFI_ST_FAILURE; + } + #ifdef CONFIG_FAT_WRITE /* Write file */ ret = root->open(root, &file, u"u-boot.txt", EFI_FILE_MODE_READ |