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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 D5E2FE77188 for ; Tue, 14 Jan 2025 13:57:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXhPd-00067L-35; Tue, 14 Jan 2025 08:56:57 -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 1tXhPU-00066W-NA for qemu-devel@nongnu.org; Tue, 14 Jan 2025 08:56:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tXhPS-0002F2-Nm for qemu-devel@nongnu.org; Tue, 14 Jan 2025 08:56:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736863005; 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:autocrypt:autocrypt; bh=04hdS9EdI5M8MjBOo+JHrU5DWVhAC0TRFhb0/CfLM9I=; b=L3bF0gtOq4Hlb3ub31jf6Wpo2+bNDQrBK3/TYH1aLH/KJELUArmuh64iR8PuCvdCx4uho5 jITPed57a5+LOOgHMc2dnKleJ0BjjsbyBQTBnVl5PwJYWB4sWv3qAJskcOb01nMLlTKS7Y zv5avyN/hCXKzkue0mn6nCVfqLL1Xvc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-117-HItyzQq1M9e5ePOQ-Mg-hA-1; Tue, 14 Jan 2025 08:56:43 -0500 X-MC-Unique: HItyzQq1M9e5ePOQ-Mg-hA-1 X-Mimecast-MFC-AGG-ID: HItyzQq1M9e5ePOQ-Mg-hA Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-386321c8f4bso3341338f8f.0 for ; Tue, 14 Jan 2025 05:56:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736863002; x=1737467802; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=04hdS9EdI5M8MjBOo+JHrU5DWVhAC0TRFhb0/CfLM9I=; b=NlGtch2ozRW4ZUJN/rHkhJ+AL20Y1AwEJzj+oNF4mcW5lV7l2oKKtOuQLJ7KtUqsAZ LYIw60iRVfgYJ/ae9C5lClJLb6AzADNJdgPijb30Q6NEIugakW6j+43NFfmCZJzgyTij lSJW5SQBnTHlQIR2p/zvGvTJIDpReQfuoJ7Kv1bLFxm2dJ9Af/JbwU2lBlyw/iYSXwXl 25MLaE26ImtSbqxz6hMhptdRmiuWqsrKbSdM5T7bnI0Sy19GUQAd1Ce/BH5yWGmldq3C 9F5Ltri4NomR3ON41dkOhGKeuW69JMLZjt2FD4Q48Qp35m/WI8ZNFfUzfZtXkatHndOj pE8w== X-Forwarded-Encrypted: i=1; AJvYcCU+03bmLEr80gToFYCuhb+ET/yVqEyS004fG0J7x74mWROIULZ6/N+DChBD46bCDv2v3b2MEx+jdKgb@nongnu.org X-Gm-Message-State: AOJu0YxlnUe2fb1bPzbzDRiJtIFMC/s1k2SFnlZe7DANvcogC9vZg2sm L0Lp3TlMJ4GspcRp4p5X7YbAGq/32JlOUCPtWKmi/AvcHkE7mrG364ajfQ2jvBNhcxiUC0Ti4HV ffUf6BJmsNys91a1yUqzP3Jde0jUoOeDeW7FMRjQPGYOM6pxzr3zT X-Gm-Gg: ASbGncuCDQsXRRiJoBY2PnACuYDuBJQLEenCXkcGy9z4GFqGRBj4iUSyCntbTpZiVP4 wH6qG+EYRderH8dvJxVvmEjtk0jH8UY0zdjdb+x4jgvy+wNndyixHssM7mwNIPGLl0gSj1vgCMo 2yTSlRqfgZMS+zd5bOHj9R4nAxeJlKAgp9w5b2ytxfZAyP7BIXSEmK81s/GkVnXrVZS6TYub7IN ZliAlJvCUv8n8FrY7nZXtawL9V5lNYofzh/wc5nt4OQZZ2r+a5pOgoDfUKGInJAV7WzqunbtPzD Ue+y05cVKu5ZcX3/HnM1YopRtw31YXbuClzaPTnv+KEqy4XsMPt22waNrGjzfXQ6aAvF0Fy7RJa ruJ6lcCxj X-Received: by 2002:a05:6000:1f8d:b0:385:eb85:f111 with SMTP id ffacd0b85a97d-38a87305259mr22924546f8f.14.1736863001748; Tue, 14 Jan 2025 05:56:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEeUs7O//Q6CzviBH+Gnx11JxFqaNxzMdnDmtyzbfTmXMuYjqiQ/elSkq6VtL8naR/CYpZ6Cw== X-Received: by 2002:a05:6000:1f8d:b0:385:eb85:f111 with SMTP id ffacd0b85a97d-38a87305259mr22924523f8f.14.1736863001313; Tue, 14 Jan 2025 05:56:41 -0800 (PST) Received: from ?IPV6:2003:cb:c738:3100:8133:26cf:7877:94aa? (p200300cbc7383100813326cf787794aa.dip0.t-ipconnect.de. [2003:cb:c738:3100:8133:26cf:7877:94aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4c1f2esm14966876f8f.98.2025.01.14.05.56.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 05:56:40 -0800 (PST) Message-ID: <0c3da624-aa20-4703-87a3-6b3bfabaab22@redhat.com> Date: Tue, 14 Jan 2025 14:56:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 1/7] hwpoison_page_list and qemu_ram_remap are based on pages To: William Roche , kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: peterx@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, mtosatti@redhat.com, imammedo@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, zhao1.liu@intel.com, joao.m.martins@oracle.com References: <20241214134555.440097-1-william.roche@oracle.com> <20241214134555.440097-2-william.roche@oracle.com> From: David Hildenbrand Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.063, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 10.01.25 21:56, William Roche wrote: > On 1/8/25 22:34, David Hildenbrand wrote: >> On 14.12.24 14:45, “William Roche wrote: >>> From: William Roche >> >> Subject should likely start with "system/physmem:". >> >> Maybe >> >> "system/physmem: handle hugetlb correctly in qemu_ram_remap()" > > I updated the commit title > >> >>> >>> The list of hwpoison pages used to remap the memory on reset >>> is based on the backend real page size. When dealing with >>> hugepages, we create a single entry for the entire page. >> >> Maybe add something like: >> >> "To correctly handle hugetlb, we must mmap(MAP_FIXED) a complete hugetlb >> page; hugetlb pages cannot be partially mapped." >> > > Updated into the commit message > >>> >>> Co-developed-by: David Hildenbrand >>> Signed-off-by: William Roche >>> --- >>>   accel/kvm/kvm-all.c       |  6 +++++- >>>   include/exec/cpu-common.h |  3 ++- >>>   system/physmem.c          | 32 ++++++++++++++++++++++++++------ >>>   3 files changed, 33 insertions(+), 8 deletions(-) >>> >>> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c >>> index 801cff16a5..24c0c4ce3f 100644 >>> --- a/accel/kvm/kvm-all.c >>> +++ b/accel/kvm/kvm-all.c >>> @@ -1278,7 +1278,7 @@ static void kvm_unpoison_all(void *param) >>>       QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) { >>>           QLIST_REMOVE(page, list); >>> -        qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE); >>> +        qemu_ram_remap(page->ram_addr); >>>           g_free(page); >>>       } >>>   } >>> @@ -1286,6 +1286,10 @@ static void kvm_unpoison_all(void *param) >>>   void kvm_hwpoison_page_add(ram_addr_t ram_addr) >>>   { >>>       HWPoisonPage *page; >>> +    size_t page_size = qemu_ram_pagesize_from_addr(ram_addr); >>> + >>> +    if (page_size > TARGET_PAGE_SIZE) >>> +        ram_addr = QEMU_ALIGN_DOWN(ram_addr, page_size); >> >> Is that part still required? I thought it would be sufficient (at least >> in the context of this patch) to handle it all in qemu_ram_remap(). >> >> qemu_ram_remap() will calculate the range to process based on the >> RAMBlock page size. IOW, the QEMU_ALIGN_DOWN() we do now in >> qemu_ram_remap(). >> >> Or am I missing something? >> >> (sorry if we discussed that already; if there is a good reason it might >> make sense to state it in the patch description) > > You are right, but at this patch level we still need to round up the s/round up/align_down/ > address and doing it here is small enough. Let me explain. qemu_ram_remap() in this patch here doesn't need an aligned addr. It will compute the offset into the block and align that down. The only case where we need the addr besides from that is the error_report(), where I am not 100% sure if that is actually what we want to print. We want to print something like ram_block_discard_range(). Note that ram_addr_t is a weird, separate address space. The alignment does not have any guarantees / semantics there. See ram_block_add() where we set new_block->offset = find_ram_offset(new_block->max_length); independent of any other RAMBlock properties. The only alignment we do is candidate = ROUND_UP(candidate, BITS_PER_LONG << TARGET_PAGE_BITS); There is no guarantee that new_block->offset will be aligned to 1 GiB with a 1 GiB hugetlb mapping. Note that there is another conceptual issue in this function: offset should be of type uint64_t, it's not really ram_addr_t, but an offset into the RAMBlock. > Of course, the code changes on patch 3/7 where we change both x86 and > ARM versions of the code to align the memory pointer correctly in both > cases. Thinking about it more, we should never try aligning ram_addr_t, only the offset into the memory block or the virtual address. So please remove this from this ram_addr_t alignment from this patch, and look into aligning the virtual address / offset for the other user. Again, aligning ram_addr_t is not guaranteed to work correctly. So the patch itself should probably be (- patch description): diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 801cff16a5..8a47aa7258 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1278,7 +1278,7 @@ static void kvm_unpoison_all(void *param) QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) { QLIST_REMOVE(page, list); - qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE); + qemu_ram_remap(page->ram_addr); g_free(page); } } diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 638dc806a5..50a829d31f 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -67,7 +67,7 @@ typedef uintptr_t ram_addr_t; /* memory API */ -void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); +void qemu_ram_remap(ram_addr_t addr); /* This should not be used by devices. */ ram_addr_t qemu_ram_addr_from_host(void *ptr); ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr); diff --git a/system/physmem.c b/system/physmem.c index 03d3618039..355588f5d5 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2167,17 +2167,35 @@ void qemu_ram_free(RAMBlock *block) } #ifndef _WIN32 -void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) +/* + * qemu_ram_remap - remap a single RAM page + * + * @addr: address in ram_addr_t address space. + * + * This function will try remapping a single page of guest RAM identified by + * @addr, essentially discarding memory to recover from previously poisoned + * memory (MCE). The page size depends on the RAMBlock (i.e., hugetlb). @addr + * does not have to point at the start of the page. + * + * This function is only to be used during system resets; it will kill the + * VM if remapping failed. + */ +void qemu_ram_remap(ram_addr_t addr) { RAMBlock *block; - ram_addr_t offset; + uint64_t offset; int flags; void *area, *vaddr; int prot; + size_t page_size; RAMBLOCK_FOREACH(block) { offset = addr - block->offset; if (offset < block->max_length) { + /* Respect the pagesize of our RAMBlock */ + page_size = qemu_ram_pagesize(block); + offset = QEMU_ALIGN_DOWN(offset, page_size); + vaddr = ramblock_ptr(block, offset); if (block->flags & RAM_PREALLOC) { ; @@ -2191,21 +2209,22 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) prot = PROT_READ; prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE; if (block->fd >= 0) { - area = mmap(vaddr, length, prot, flags, block->fd, + area = mmap(vaddr, page_size, prot, flags, block->fd, offset + block->fd_offset); } else { flags |= MAP_ANONYMOUS; - area = mmap(vaddr, length, prot, flags, -1, 0); + area = mmap(vaddr, page_size, prot, flags, -1, 0); } if (area != vaddr) { - error_report("Could not remap addr: " - RAM_ADDR_FMT "@" RAM_ADDR_FMT "", - length, addr); + error_report("Could not remap RAM %s:%" PRIx64 " +%zx", + block->idstr, offset, page_size); exit(1); } - memory_try_enable_merging(vaddr, length); - qemu_ram_setup_dump(vaddr, length); + memory_try_enable_merging(vaddr, page_size); + qemu_ram_setup_dump(vaddr, page_size); } + + break; } } } -- 2.47.1 -- Cheers, David / dhildenb