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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0682BC0015E for ; Tue, 15 Aug 2023 07:41:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82D01900023; Tue, 15 Aug 2023 03:41:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DBFE90000B; Tue, 15 Aug 2023 03:41:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A34A900023; Tue, 15 Aug 2023 03:41:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 566C790000B for ; Tue, 15 Aug 2023 03:41:06 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1C726160B36 for ; Tue, 15 Aug 2023 07:41:06 +0000 (UTC) X-FDA: 81125542932.02.A2C261B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 1B4474000B for ; Tue, 15 Aug 2023 07:41:02 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="c7QvJwn/"; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692085264; h=from:from:sender: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:dkim-signature; bh=VMWcbMD7dCDauI4c941mIOz5QiUyfMWfolSH1guXv34=; b=XAdi0lKlSYyAJn3NyGhDhnJ55DbUkb69yK3EvjCoA10+yTgxi89TYwcjyCaRDx6Ip/qq04 4o/AZaOCvTn1uh/X7e4i039lP0uDr9xJwKngN8WALwE5oh7R9cVQjGLjaemIvKE9xzNBia NUwl3Epe8MvHypFi2jxlYMMix81YkOE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692085264; a=rsa-sha256; cv=none; b=ujJ/88TCJKK7FDuJwAejn4iLQCF+VRBixE3X93CjhICpkyqfW48+CceSNciVnGz1fUhyTz fufR054qQvp0qlC5HBMRWypWMK5IQv3H1/YxiEdNKat4eCeSdl5dFw9lOQRDmXa2hR4ZFy 11995QXumerLshE5ksDGgDD2A3jYk7c= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="c7QvJwn/"; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692085263; 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; bh=VMWcbMD7dCDauI4c941mIOz5QiUyfMWfolSH1guXv34=; b=c7QvJwn/ocjbMX++15Ed+n+VeVKaacQVBnOyD/CbQHWU1NYlKC2kVUJBYFqGMvZtCV/uZZ mp1/G/sB/ze+EhC1mlaY5YFS6oDiAhUgHwBp4ykymc5m8ZWC+JTm0LqJ/RvXGbFV6eg6Ba XXTwRhqMsIYntQ8jTTm85JUXoAQtWtg= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-WlNl06jQOvCbU1G16p5n9A-1; Tue, 15 Aug 2023 03:41:01 -0400 X-MC-Unique: WlNl06jQOvCbU1G16p5n9A-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-4fe4aaa6dacso5033562e87.2 for ; Tue, 15 Aug 2023 00:41:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692085260; x=1692690060; h=content-transfer-encoding:in-reply-to:organization: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=VMWcbMD7dCDauI4c941mIOz5QiUyfMWfolSH1guXv34=; b=ZVuJj0Bkf/sQopzzdRfiyh4lvV+kDhxBmdWhck8i8Dbkx8Na8dI3OoKsRtNo/qdKlY lMKtwUH3cuAAKLVfp3Sls7XQP8Is5uSI0Q/vorHkuk+YzQRMcezfKA85cfJozB1W/xoy Oy+l52g/638FtgE6o7f2+dbcS8QN58DaOaggqQ3626ZdevUc4koTtp9X0A03v4Sko+ol GCmcrkUyJ1JHvC0GKMY7+Pcaascw6QKDTA6Cur5OvL4y7Zzvxa6L6Lr8f1rEjnxiHaNg LTF+EVBWBGtJKlDpQIfvk6cr3uBMv6zGTueqjAqVg3nknBAAIplOkMulCqjlr2bIE5w6 RiGA== X-Gm-Message-State: AOJu0Yx8urTbmM79NNX4ZHiMrT5Ken0GbM1JMp4aGIu1fQYor3fcvNZO u6G4+uAm8AGG2OBwsd3LcOG0fV5+2i48s9rS7xrHND0ksCmL7RV7zlCGb8brjOCxET3VaM9DHs2 JrjolRYi+AtE= X-Received: by 2002:a05:6512:110d:b0:4f8:770f:1b01 with SMTP id l13-20020a056512110d00b004f8770f1b01mr9383122lfg.19.1692085259849; Tue, 15 Aug 2023 00:40:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjheDo758qMjd4Sp+jKLUMoXw3IW6sNphJ76PGIWLOUqSx+5exN5WWHYW/K9+fIzg2UpuQpQ== X-Received: by 2002:a05:6512:110d:b0:4f8:770f:1b01 with SMTP id l13-20020a056512110d00b004f8770f1b01mr9383107lfg.19.1692085259456; Tue, 15 Aug 2023 00:40:59 -0700 (PDT) Received: from ?IPV6:2003:cb:c701:3100:c642:ba83:8c37:b0e? (p200300cbc7013100c642ba838c370b0e.dip0.t-ipconnect.de. [2003:cb:c701:3100:c642:ba83:8c37:b0e]) by smtp.gmail.com with ESMTPSA id l10-20020a7bc44a000000b003fc06169ab3sm19546694wmi.20.2023.08.15.00.40.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Aug 2023 00:40:58 -0700 (PDT) Message-ID: <075a00b7-1e92-1709-5ac6-371eec9b1459@redhat.com> Date: Tue, 15 Aug 2023 09:40:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 3/9] mm: Call free_transhuge_folio() directly from destroy_large_folio() To: "Matthew Wilcox (Oracle)" , Andrew Morton Cc: Jens Axboe , io-uring@vger.kernel.org, linux-mm@kvack.org References: <20230815032645.1393700-1-willy@infradead.org> <20230815032645.1393700-4-willy@infradead.org> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230815032645.1393700-4-willy@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: ogd89gyaidhbys317jmmgarpcm7oo5ah X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 1B4474000B X-Rspam-User: X-HE-Tag: 1692085262-170038 X-HE-Meta: U2FsdGVkX1+wvoU8bRjHsQQokMfCH+jOl3IT21wnoCmO79u4xrCG/gafWGcqYvAVqUuo0jgFxMJjALc9nwDKxLSyVqVwO4oLJdx9amRWqfngOwUNDE60bFgcqOcQjBfZNvzVtjA7QTyvyxOWjousQfLh28P0vrK6z5Qu/fiF5gA09l08dRxPWuOw788Gl02/14dd1ypEFzx9hRxzy1XFilkKCsn2i6mJuqDTsgs6+Cw8YHudq3fLyKaDc0qcNPe3YY0qdUJlAe8O6Pz/6nWmN+A/j/jbM7NVTzoWYR3Xx4oCX9UzBJ7NAmQckVIULW0r3dKUewID0V9/BZFCbSqc1XRT1EgfTNXStZGCzUpiG7Qogv6TYVjG+pFb9WEOtl+F2Shksp7JTnmO/gkfLj8fItVtXh43h5BwNlxoF0HrzWi7kjH6ToBlo/7BW4cODUp69CcB44vVvEWClTmP1lY6EE5GgDScYKaBw6xoUBiQRwrQF2qQS84IJRIVGPsAXGVCTYQoLcGBLR+kCWWEks1E/E6jRIJDgcKMjf28OnspqefEaa/He5kw2g1s+tOJF9XjvfBCQYbyHUOSxAg/PO0FEOcbr+OP7j+lVL9AlywWOeqbU1mC430kHudqbVAsLnc5+N+lYqSgxsXHsQALYBwOvXCvQyULv7ms2aE6YkS7PPsVn6+qudif58gM4pHlxsuqEWSSzTRSRNwtr30q9Uk8lsGUEa9q6q0swW99OnWs7S5klK+Yy5VpxtSoMuWlYvY+VtesXUpl0fKL4UgmgX4eUxbpCzDwEoAg94EwdMoP7eLWyc7Yo4QAgwg1k/ePExw0O8XqCKYrZN47cjXX4xWvXdiyRoIGtovWVdDXZQ3cPjOS5uzzNNrGcEnfTo8eDzhafUqfpiUz0nnjL/D3upPe/lU9/ctbIzeu3nmo5TbH8dAokGsnmapAN+ZYVjzuR3r+/NNd/LrD6GEqezGopSY h7oOZYHu 9aXBb1KskhX/hZ9MKmOjnlGBr+6q5VOEFkx0dsWjquUo3rDNpOF0bvsu72902aT/0kSkNlkk2kzkwTqh16pLe/7hXavK4RmyvB76EHH1YGhGonnP1OSXyuJY5E5oZAA3jeJhJcNAVIEyl2E6/X56gEAi/0xYxU9A7uMc+vHKPfxH+NUQnLGEzPi7OWZ7MMEZqqvuqvzqkFd0iJVTOmDugOzqK8+EMdLeSnTU5bxDt849IJyAbjUUeluSC5G6kmuXtIo1Wjsvgkqs9lFb88MeBeMYUKs4dvsKvdYtEoIjGeDXKoUEK7trLk3qArvkvrVs6+ih9cRj/agKmirEwS0S8UGa9e+l5rSTRXpz8X07FytGLhn4sV5cSkrkY3zj+m3cogwy7nUwY6jmCc3B+SX3wb9ttJMoJUdhvTqi5rj0LbZlJ4Vz5fD2qMdaHKGXyPBpY3+46j6SpqXXP/WS+Wwmd9eqqLY0n88dLbZN6B4yX6bQ+hAI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 15.08.23 05:26, Matthew Wilcox (Oracle) wrote: > Indirect calls are expensive, thanks to Spectre. Convert this one to > a direct call, and pass a folio instead of the head page for type safety. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > include/linux/huge_mm.h | 2 +- > mm/huge_memory.c | 5 ++--- > mm/page_alloc.c | 8 +++++--- > 3 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 20284387b841..24aee49a581a 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -144,7 +144,7 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, > unsigned long len, unsigned long pgoff, unsigned long flags); > > void prep_transhuge_page(struct page *page); > -void free_transhuge_page(struct page *page); > +void free_transhuge_folio(struct folio *folio); > > bool can_split_folio(struct folio *folio, int *pextra_pins); > int split_huge_page_to_list(struct page *page, struct list_head *list); > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 8480728fa220..516fe3c26ef3 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2779,9 +2779,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > return ret; > } > > -void free_transhuge_page(struct page *page) > +void free_transhuge_folio(struct folio *folio) > { > - struct folio *folio = (struct folio *)page; > struct deferred_split *ds_queue = get_deferred_split_queue(folio); > unsigned long flags; > > @@ -2798,7 +2797,7 @@ void free_transhuge_page(struct page *page) > } > spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); > } > - free_compound_page(page); > + free_compound_page(&folio->page); > } > > void deferred_split_folio(struct folio *folio) > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 1f67d4968590..feb2e95cf021 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -287,9 +287,6 @@ const char * const migratetype_names[MIGRATE_TYPES] = { > static compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS] = { > [NULL_COMPOUND_DTOR] = NULL, > [COMPOUND_PAGE_DTOR] = free_compound_page, > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > - [TRANSHUGE_PAGE_DTOR] = free_transhuge_page, > -#endif > }; > > int min_free_kbytes = 1024; > @@ -624,6 +621,11 @@ void destroy_large_folio(struct folio *folio) > return; > } > > + if (folio_test_transhuge(folio) && dtor == TRANSHUGE_PAGE_DTOR) { > + free_transhuge_folio(folio); I really wonder if folio_test_transhuge() should be written similar to folio_test_hugetlb() instead, such that the dtor check is implicit. Any good reasons not to do that? -- Cheers, David / dhildenb