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 21871C46CD2 for ; Tue, 9 Jan 2024 14:03:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNCge-0004m4-3L; Tue, 09 Jan 2024 09:02:36 -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 1rNCgM-0004dz-RN for qemu-devel@nongnu.org; Tue, 09 Jan 2024 09:02:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNCgH-0005Yx-Js for qemu-devel@nongnu.org; Tue, 09 Jan 2024 09:02:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704808931; 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=u3FCvid9/obNIe6IZJFmYr/DDzuiytHzNlPDW+KZ7Nc=; b=REKM8MtJmthNh1OuUq/mI8x7+5FmA6d0Oy+WLEGAqw3+l+PGTzl3t0gl5D7qByrIB1v5rL aqUOAXYNYKLO7p0H9GnZsbtzG/zKIBcA+/hjTo1d6yaP1BkYRFrmPZ4tSzO18wztGujUfq R2eTBLIsF1xYKiTt3DrnAbi43urutzQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-vHM3nuS6MXScIO5CII4VLQ-1; Tue, 09 Jan 2024 09:02:03 -0500 X-MC-Unique: vHM3nuS6MXScIO5CII4VLQ-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33666ece1c6so1911567f8f.2 for ; Tue, 09 Jan 2024 06:02:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704808922; x=1705413722; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=u3FCvid9/obNIe6IZJFmYr/DDzuiytHzNlPDW+KZ7Nc=; b=lZVznI7yocZrs4DaWhsG6uxjMz99e5zTp+253jo1TbsndVT8pXqUoCfse3B1oSc5kT bGTruzbO+rgAJwzX4n46hOLJZ3SdH0SS/w6P679nUhdi4S5qeMr6gn+2svCqpsoLrAeE XW5kTibFXulsQGdJ8g49HW1zDk2p7NHfFqitJN8TrP600W2vA9P2rwNtCEr1ift5SAIY esS49+i7v8NaP8g69M/6AZXu0ZWxz29xodqpSyrc8UjtL1QhrVqtSkX+9uMVJQiD0pxF y5qwNXe6VqqnEDIbLIcvQoC21AF/qB0lltw/jXpqrOKToUcug2kTeoG9bZUMJrWyMqY3 yYdw== X-Gm-Message-State: AOJu0Yw0r2AaD7pKOMrZcVKXEukapz+FFj3bcbdjjOuPBwMk0z8P5tOh pb2X+1v0JuodPnPr7fXivexvpI0D4zGHbQuaMZcDgOrQvkybK0N7m2q68LgPMgfBIdM/plEM6Bi sJtgf86NhSMLBQuorhmvIUmoaP9WDDDI= X-Received: by 2002:adf:f602:0:b0:336:801f:e719 with SMTP id t2-20020adff602000000b00336801fe719mr331336wrp.188.1704808922598; Tue, 09 Jan 2024 06:02:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPu5yKXq5KiL6+R2nMp5IzKo+DVPiVIJFpQnFuvu6ZxXoYGMW/vuVFCoHzMZ788EgqekamHg== X-Received: by 2002:adf:f602:0:b0:336:801f:e719 with SMTP id t2-20020adff602000000b00336801fe719mr331322wrp.188.1704808922112; Tue, 09 Jan 2024 06:02:02 -0800 (PST) Received: from ?IPV6:2003:cb:c735:9800:9ff6:a15:cd3e:2d4? (p200300cbc73598009ff60a15cd3e02d4.dip0.t-ipconnect.de. [2003:cb:c735:9800:9ff6:a15:cd3e:2d4]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b003368849129dsm2496824wro.15.2024.01.09.06.02.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jan 2024 06:02:01 -0800 (PST) Message-ID: <02801117-4408-4069-b0ba-b54f4d050fc4@redhat.com> Date: Tue, 9 Jan 2024 15:02:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 1/2] oslib-posix: refactor memory prealloc threads Content-Language: en-US To: Mark Kanda , qemu-devel@nongnu.org Cc: pbonzini@redhat.com References: <20240108151041.529716-1-mark.kanda@oracle.com> <20240108151041.529716-2-mark.kanda@oracle.com> <2be78fc2-f76a-44de-8db7-fbc1bbdc0d2b@redhat.com> <1854ecdd-88d8-462d-aa0f-990c2bbe57ff@oracle.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= xsFNBFXLn5EBEAC+zYvAFJxCBY9Tr1xZgcESmxVNI/0ffzE/ZQOiHJl6mGkmA1R7/uUpiCjJ dBrn+lhhOYjjNefFQou6478faXE6o2AhmebqT4KiQoUQFV4R7y1KMEKoSyy8hQaK1umALTdL QZLQMzNE74ap+GDK0wnacPQFpcG1AE9RMq3aeErY5tujekBS32jfC/7AnH7I0v1v1TbbK3Gp XNeiN4QroO+5qaSr0ID2sz5jtBLRb15RMre27E1ImpaIv2Jw8NJgW0k/D1RyKCwaTsgRdwuK Kx/Y91XuSBdz0uOyU/S8kM1+ag0wvsGlpBVxRR/xw/E8M7TEwuCZQArqqTCmkG6HGcXFT0V9 PXFNNgV5jXMQRwU0O/ztJIQqsE5LsUomE//bLwzj9IVsaQpKDqW6TAPjcdBDPLHvriq7kGjt WhVhdl0qEYB8lkBEU7V2Yb+SYhmhpDrti9Fq1EsmhiHSkxJcGREoMK/63r9WLZYI3+4W2rAc UucZa4OT27U5ZISjNg3Ev0rxU5UH2/pT4wJCfxwocmqaRr6UYmrtZmND89X0KigoFD/XSeVv jwBRNjPAubK9/k5NoRrYqztM9W6sJqrH8+UWZ1Idd/DdmogJh0gNC0+N42Za9yBRURfIdKSb B3JfpUqcWwE7vUaYrHG1nw54pLUoPG6sAA7Mehl3nd4pZUALHwARAQABzSREYXZpZCBIaWxk ZW5icmFuZCA8ZGF2aWRAcmVkaGF0LmNvbT7CwZgEEwEIAEICGwMGCwkIBwMCBhUIAgkKCwQW AgMBAh4BAheAAhkBFiEEG9nKrXNcTDpGDfzKTd4Q9wD/g1oFAl8Ox4kFCRKpKXgACgkQTd4Q 9wD/g1oHcA//a6Tj7SBNjFNM1iNhWUo1lxAja0lpSodSnB2g4FCZ4R61SBR4l/psBL73xktp rDHrx4aSpwkRP6Epu6mLvhlfjmkRG4OynJ5HG1gfv7RJJfnUdUM1z5kdS8JBrOhMJS2c/gPf wv1TGRq2XdMPnfY2o0CxRqpcLkx4vBODvJGl2mQyJF/gPepdDfcT8/PY9BJ7FL6Hrq1gnAo4 3Iv9qV0JiT2wmZciNyYQhmA1V6dyTRiQ4YAc31zOo2IM+xisPzeSHgw3ONY/XhYvfZ9r7W1l pNQdc2G+o4Di9NPFHQQhDw3YTRR1opJaTlRDzxYxzU6ZnUUBghxt9cwUWTpfCktkMZiPSDGd KgQBjnweV2jw9UOTxjb4LXqDjmSNkjDdQUOU69jGMUXgihvo4zhYcMX8F5gWdRtMR7DzW/YE BgVcyxNkMIXoY1aYj6npHYiNQesQlqjU6azjbH70/SXKM5tNRplgW8TNprMDuntdvV9wNkFs 9TyM02V5aWxFfI42+aivc4KEw69SE9KXwC7FSf5wXzuTot97N9Phj/Z3+jx443jo2NR34XgF 89cct7wJMjOF7bBefo0fPPZQuIma0Zym71cP61OP/i11ahNye6HGKfxGCOcs5wW9kRQEk8P9 M/k2wt3mt/fCQnuP/mWutNPt95w9wSsUyATLmtNrwccz63XOwU0EVcufkQEQAOfX3n0g0fZz Bgm/S2zF/kxQKCEKP8ID+Vz8sy2GpDvveBq4H2Y34XWsT1zLJdvqPI4af4ZSMxuerWjXbVWb T6d4odQIG0fKx4F8NccDqbgHeZRNajXeeJ3R7gAzvWvQNLz4piHrO/B4tf8svmRBL0ZB5P5A 2uhdwLU3NZuK22zpNn4is87BPWF8HhY0L5fafgDMOqnf4guJVJPYNPhUFzXUbPqOKOkL8ojk CXxkOFHAbjstSK5Ca3fKquY3rdX3DNo+EL7FvAiw1mUtS+5GeYE+RMnDCsVFm/C7kY8c2d0G NWkB9pJM5+mnIoFNxy7YBcldYATVeOHoY4LyaUWNnAvFYWp08dHWfZo9WCiJMuTfgtH9tc75 7QanMVdPt6fDK8UUXIBLQ2TWr/sQKE9xtFuEmoQGlE1l6bGaDnnMLcYu+Asp3kDT0w4zYGsx 5r6XQVRH4+5N6eHZiaeYtFOujp5n+pjBaQK7wUUjDilPQ5QMzIuCL4YjVoylWiBNknvQWBXS lQCWmavOT9sttGQXdPCC5ynI+1ymZC1ORZKANLnRAb0NH/UCzcsstw2TAkFnMEbo9Zu9w7Kv AxBQXWeXhJI9XQssfrf4Gusdqx8nPEpfOqCtbbwJMATbHyqLt7/oz/5deGuwxgb65pWIzufa N7eop7uh+6bezi+rugUI+w6DABEBAAHCwXwEGAEIACYCGwwWIQQb2cqtc1xMOkYN/MpN3hD3 AP+DWgUCXw7HsgUJEqkpoQAKCRBN3hD3AP+DWrrpD/4qS3dyVRxDcDHIlmguXjC1Q5tZTwNB boaBTPHSy/Nksu0eY7x6HfQJ3xajVH32Ms6t1trDQmPx2iP5+7iDsb7OKAb5eOS8h+BEBDeq 3ecsQDv0fFJOA9ag5O3LLNk+3x3q7e0uo06XMaY7UHS341ozXUUI7wC7iKfoUTv03iO9El5f XpNMx/YrIMduZ2+nd9Di7o5+KIwlb2mAB9sTNHdMrXesX8eBL6T9b+MZJk+mZuPxKNVfEQMQ a5SxUEADIPQTPNvBewdeI80yeOCrN+Zzwy/Mrx9EPeu59Y5vSJOx/z6OUImD/GhX7Xvkt3kq Er5KTrJz3++B6SH9pum9PuoE/k+nntJkNMmQpR4MCBaV/J9gIOPGodDKnjdng+mXliF3Ptu6 3oxc2RCyGzTlxyMwuc2U5Q7KtUNTdDe8T0uE+9b8BLMVQDDfJjqY0VVqSUwImzTDLX9S4g/8 kC4HRcclk8hpyhY2jKGluZO0awwTIMgVEzmTyBphDg/Gx7dZU1Xf8HFuE+UZ5UDHDTnwgv7E th6RC9+WrhDNspZ9fJjKWRbveQgUFCpe1sa77LAw+XFrKmBHXp9ZVIe90RMe2tRL06BGiRZr jPrnvUsUUsjRoRNJjKKA/REq+sAnhkNPPZ/NNMjaZ5b8Tovi8C0tmxiCHaQYqj7G2rgnT0kt WNyWQQ== Organization: Red Hat In-Reply-To: <1854ecdd-88d8-462d-aa0f-990c2bbe57ff@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.493, 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_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 08.01.24 19:40, Mark Kanda wrote: > On 1/8/24 9:40 AM, David Hildenbrand wrote: >> On 08.01.24 16:10, Mark Kanda wrote: >>> Refactor the memory prealloc threads support: >>> - Make memset context a global qlist >>> - Move the memset thread join/cleanup code to a separate routine >>> >>> This is functionally equivalent and facilitates multiple memset contexts >>> (used in a subsequent patch). >>> >>> Signed-off-by: Mark Kanda >>> --- >>>   util/oslib-posix.c | 104 +++++++++++++++++++++++++++++---------------- >>>   1 file changed, 68 insertions(+), 36 deletions(-) >>> >>> diff --git a/util/oslib-posix.c b/util/oslib-posix.c >>> index e86fd64e09..293297ac6c 100644 >>> --- a/util/oslib-posix.c >>> +++ b/util/oslib-posix.c >>> @@ -63,11 +63,15 @@ >>>     struct MemsetThread; >>>   +static QLIST_HEAD(, MemsetContext) memset_contexts = >>> +    QLIST_HEAD_INITIALIZER(memset_contexts); >>> + >>>   typedef struct MemsetContext { >>>       bool all_threads_created; >>>       bool any_thread_failed; >>>       struct MemsetThread *threads; >>>       int num_threads; >>> +    QLIST_ENTRY(MemsetContext) next; >>>   } MemsetContext; >>>     struct MemsetThread { >>> @@ -81,7 +85,7 @@ struct MemsetThread { >>>   typedef struct MemsetThread MemsetThread; >>>     /* used by sigbus_handler() */ >>> -static MemsetContext *sigbus_memset_context; >>> +static bool sigbus_memset_context; >>>   struct sigaction sigbus_oldact; >>>   static QemuMutex sigbus_mutex; >>>   @@ -295,13 +299,16 @@ static void sigbus_handler(int signal) >>>   #endif /* CONFIG_LINUX */ >>>   { >>>       int i; >>> +    MemsetContext *context; >>>         if (sigbus_memset_context) { >>> -        for (i = 0; i < sigbus_memset_context->num_threads; i++) { >>> -            MemsetThread *thread = &sigbus_memset_context->threads[i]; >>> +        QLIST_FOREACH(context, &memset_contexts, next) { >>> +            for (i = 0; i < context->num_threads; i++) { >>> +                MemsetThread *thread = &context->threads[i]; >>>   -            if (qemu_thread_is_self(&thread->pgthread)) { >>> -                siglongjmp(thread->env, 1); >>> +                if (qemu_thread_is_self(&thread->pgthread)) { >>> +                    siglongjmp(thread->env, 1); >>> +                } >>>               } >>>           } >>>       } >>> @@ -417,14 +424,15 @@ static int touch_all_pages(char *area, size_t >>> hpagesize, size_t numpages, >>>                              bool use_madv_populate_write) >>>   { >>>       static gsize initialized = 0; >>> -    MemsetContext context = { >>> -        .num_threads = get_memset_num_threads(hpagesize, numpages, >>> max_threads), >>> -    }; >>> +    MemsetContext *context = g_malloc0(sizeof(MemsetContext)); >>>       size_t numpages_per_thread, leftover; >>>       void *(*touch_fn)(void *); >>> -    int ret = 0, i = 0; >>> +    int i = 0; >>>       char *addr = area; >>>   +    context->num_threads = >>> +        get_memset_num_threads(hpagesize, numpages, max_threads); >>> + >>>       if (g_once_init_enter(&initialized)) { >>>           qemu_mutex_init(&page_mutex); >>>           qemu_cond_init(&page_cond); >>> @@ -433,7 +441,7 @@ static int touch_all_pages(char *area, size_t >>> hpagesize, size_t numpages, >>>         if (use_madv_populate_write) { >>>           /* Avoid creating a single thread for MADV_POPULATE_WRITE */ >>> -        if (context.num_threads == 1) { >>> +        if (context->num_threads == 1) { >>>               if (qemu_madvise(area, hpagesize * numpages, >>>                                QEMU_MADV_POPULATE_WRITE)) { >>>                   return -errno; >>> @@ -445,49 +453,74 @@ static int touch_all_pages(char *area, size_t >>> hpagesize, size_t numpages, >>>           touch_fn = do_touch_pages; >>>       } >>>   -    context.threads = g_new0(MemsetThread, context.num_threads); >>> -    numpages_per_thread = numpages / context.num_threads; >>> -    leftover = numpages % context.num_threads; >>> -    for (i = 0; i < context.num_threads; i++) { >>> -        context.threads[i].addr = addr; >>> -        context.threads[i].numpages = numpages_per_thread + (i < >>> leftover); >>> -        context.threads[i].hpagesize = hpagesize; >>> -        context.threads[i].context = &context; >>> +    context->threads = g_new0(MemsetThread, context->num_threads); >>> +    numpages_per_thread = numpages / context->num_threads; >>> +    leftover = numpages % context->num_threads; >>> +    for (i = 0; i < context->num_threads; i++) { >>> +        context->threads[i].addr = addr; >>> +        context->threads[i].numpages = numpages_per_thread + (i < >>> leftover); >>> +        context->threads[i].hpagesize = hpagesize; >>> +        context->threads[i].context = context; >>>           if (tc) { >>> -            thread_context_create_thread(tc, >>> &context.threads[i].pgthread, >>> +            thread_context_create_thread(tc, >>> &context->threads[i].pgthread, >>>                                            "touch_pages", >>> -                                         touch_fn, &context.threads[i], >>> +                                         touch_fn, >>> &context->threads[i], >>> QEMU_THREAD_JOINABLE); >>>           } else { >>> - qemu_thread_create(&context.threads[i].pgthread, "touch_pages", >>> -                               touch_fn, &context.threads[i], >>> + qemu_thread_create(&context->threads[i].pgthread, "touch_pages", >>> +                               touch_fn, &context->threads[i], >>>                                  QEMU_THREAD_JOINABLE); >>>           } >>> -        addr += context.threads[i].numpages * hpagesize; >>> +        addr += context->threads[i].numpages * hpagesize; >>>       } >>>   +    QLIST_INSERT_HEAD(&memset_contexts, context, next); >>> + >>>       if (!use_madv_populate_write) { >>> -        sigbus_memset_context = &context; >>> +        sigbus_memset_context = true; >> > Thanks David, > >> Could we just use the sigbus handling alone and support parallel init >> only when using MADV_POPULATE_WRITE where we don't have to mess with >> signal handlers? >> > > Ideally, we're hoping to support this with earlier kernels which don't > support MADV_POPULATE _WRITE. But, I will check to see if we really need it. That's around since Linux 5.14, so please try simplifying. > >> Further, how do you changes interact with other callers of >> qemu_prealloc_mem(), like virtio-mem? >> > > I'm not familiar with the intricacies of virtio-mem, but the basic idea > of this series is to *only* allow parallel init during the start up > phase (while prealloc_init == false). Once we have parsed all the > command line args, we set prealloc_init = true > (wait_mem_prealloc_init()) which causes all subsequent calls to > qemu_prealloc_mem() to perform initialization synchronously. So, I > *think* this covers the virtio-mem use case. Am I missing something? Good, so this should likely not affect virtio-mem (which also ends up preallocating memory when loading from a vmstate). To make this all a bit clearer, what about the following to make this: * Optimize for MADV_POPULATE_WRITE. If we really need support for !MADV_POPULATE_WRITE, this is better added on top later. * Pass in via a parameter that the caller requests async handling. "bool async" should be good enough. Then, pass that only from the memory backend call, while QEMU is still initializing (we can find a way to make that work). * Provide a function that waits for any remaining async os-mem-prealloc activity. That is essentially "wait_mem_prealloc_init", but without the special internal flag handling. Further, I do wonder if we want to make that behavior configurable. For example, one might want to initialize backends sequentially using 16 threads max, instead of consuming multiple times 16 threads concurrently. Could either be a machine option or a memory backend option (async-prealloc=on). Once hotplugging such backends, we would disable it for now, but could allow it in the future. -- Cheers, David / dhildenb