From patchwork Sat Feb 18 00:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13145382 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 2DF37C636D6 for ; Sat, 18 Feb 2023 00:29:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 211CA28000C; Fri, 17 Feb 2023 19:29:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1760D280002; Fri, 17 Feb 2023 19:29:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0623028000C; Fri, 17 Feb 2023 19:29:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E5CA2280002 for ; Fri, 17 Feb 2023 19:29:01 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BFBAF80956 for ; Sat, 18 Feb 2023 00:29:01 +0000 (UTC) X-FDA: 80478527682.10.C5D1239 Received: from mail-ua1-f74.google.com (mail-ua1-f74.google.com [209.85.222.74]) by imf11.hostedemail.com (Postfix) with ESMTP id 0071A40019 for ; Sat, 18 Feb 2023 00:28:59 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rK+w++ej; spf=pass (imf11.hostedemail.com: domain of 3yxvwYwoKCOgTdRYeQRdYXQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jthoughton.bounces.google.com designates 209.85.222.74 as permitted sender) smtp.mailfrom=3yxvwYwoKCOgTdRYeQRdYXQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676680140; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iq/7jaT5OFDRS9NrMnKt72E+h6CEDJFDrueWaD5zQ0Y=; b=mLXRjLXdAm0vv6n2ExNKZ3FO1oqCWZFC2IWplRaNH6QqCI52vyTjjP2MSBbJeQqjbuLvhk vs0RvdqaWXejYyJq4wOb59olFNK5hKWM5Yl8FNt3l9DMg/vvQ4gZQ6W7I0IxtrBLnnwch1 RTEDf2hgEcoZA36ZE2YfE4EWq7YmUjQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rK+w++ej; spf=pass (imf11.hostedemail.com: domain of 3yxvwYwoKCOgTdRYeQRdYXQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jthoughton.bounces.google.com designates 209.85.222.74 as permitted sender) smtp.mailfrom=3yxvwYwoKCOgTdRYeQRdYXQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676680140; a=rsa-sha256; cv=none; b=5o4jL2FcI7Nq0vk1VXsqtHPLiibXnIMIH2hm1QSLSx347nc76bjlcPdkXgQZdt6YNrbai4 C3XY/3xHOmWB0mO+LCMgG7C1Arc6qe3sCxZMZHLucARfEdd26G/s+eDABlsTWsq2rFJuRk AmujTRkUayClTjNh2DbVgj1PhU4nm5w= Received: by mail-ua1-f74.google.com with SMTP id f48-20020ab014f3000000b006001ac8d2efso498111uae.11 for ; Fri, 17 Feb 2023 16:28:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1676680139; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iq/7jaT5OFDRS9NrMnKt72E+h6CEDJFDrueWaD5zQ0Y=; b=rK+w++ejfSj9Z8KdDCJh6qsGzcDORRUZ3hQ92A+AEldYRxu0DZCJLjDAFmiCmrVA6B Na6Pptp7zGpST0zHRT4GdkbtZvivNmOwM/uu3+mymM3QGH+eXzsM6/DmTDcrdLZCk2uG zau9emovV4r2ySgAVzctF5VlGsHtjYqeBgKZNZgPBZ1SLSfsxBHt+SiZ1vbcgJ/wESBP CZOUK3DDa9LZUS5lOm6XD268od69L3dM1qEzdes7zX+Xw17tkhZQQ2+9B8qvRwzQK+cC k0aoIctvmcgulQSnvyH15+EvIXO4nbINf3tkMBSYU/g3dwiCcRGViRIyK+goTDWkP3/w +3Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676680139; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iq/7jaT5OFDRS9NrMnKt72E+h6CEDJFDrueWaD5zQ0Y=; b=8MLylPTolYIm40G81zMoosexk11QlKVXm6ro9vqJDxXAqqwmajmYEhQqnpCg3UEt41 ElbY29A64/4ys1AHTzFek8RJnYXXFJmS9Sr8MQwdxBrSrj7bxIUr0jjIrNXi7zL9qYU4 dgLXR8zHIVbeb0vwgn6G9vMhWIaHUk+Rnnzt1NFqDRQa1IIIfs8axEeSTj8TDdNbvAR4 +FNXjHial6nCCmPr6ogpvaGDcpf9TO4RfHSxFMVbdnh7aOr/iIT9Puc8GmwS+bXIQzAp g/mQR9Ih4JQFHcyEhxprbicjXBhCK9kaPB/MUj7r5/RVytF2pc6C/AGk0NXA5k9eczBW GoFw== X-Gm-Message-State: AO0yUKWjiMsu2ZeZR4otzdeRuLl2ukJt+KzQTvnMdddITfqqI/NKjWE7 DRT9D9akUFUQCqa5r/SIfLDAHGAE4Y2jTpAm X-Google-Smtp-Source: AK7set8EhVlNCK9IccPiC1WcAxl/BD8tBcWSdj7osxR3aU5m9A2R/pd4W9j1Bya2QmGiWMHJAKk9Wk9ZzEwHF/MA X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a67:f1c6:0:b0:3ec:ab8:a571 with SMTP id v6-20020a67f1c6000000b003ec0ab8a571mr271401vsm.55.1676680139239; Fri, 17 Feb 2023 16:28:59 -0800 (PST) Date: Sat, 18 Feb 2023 00:27:49 +0000 In-Reply-To: <20230218002819.1486479-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230218002819.1486479-17-jthoughton@google.com> Subject: [PATCH v2 16/46] hugetlb: make default arch_make_huge_pte understand small mappings From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu , Andrew Morton Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Frank van der Linden , Jiaqi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0071A40019 X-Stat-Signature: 8q83p36hna69x4ypy6iszjrz1bm4eb4m X-Rspam-User: X-HE-Tag: 1676680139-398436 X-HE-Meta: U2FsdGVkX18CNgAnQjyxFBDmSwF0pucVsm663Ks11Gr+evegKYyj/pm5kKZFrLjI0qqLbDzMG6pc+l10t4zga946kyEq38qbLuNA85vn4M0nZiEAHvuaHZ4wmx/jBxmfGPU3wqVoXk4SBFO3DJPHOKMrC0SksUYGGwNQcqyYz07vIapf+jEsqiEBAwjfsfb/qXalAQN2bOgPBjKP05XgZW2KEC6cdbji/f2G9JOBHgv6byIQ0QCtXKU0MH9gfKaVc75sVm6BBbCmGzpDi3YOpug7zw6vg2wyt4rPsIHaqdG8v5qGqdonw/tJXG7B3liz+loZxqdw44Tpk0HD2u5kOMbv8GlrRpB+WqkBfOhVKH4Mzy1VCjjhIepfT8EbLdhJIlyIrpWvgTAY1auNwKBvzfTC1pe6/xkkC4zmVvGJtBm1HvylWsnWHunk1KdQ7CWBPcfJw0422ASoguArgMO1RrG/PP8PvoOuSxAZ1ihbkUvpdpW+4sXs37MyPozMI+7w72ujGUETqV55zuRDx48hJElu4S4Ko4lTstKKHxoBbfPJWk9RHamG3FfkaZPL7lOdL5omsZ2LlZ9infMnIvvLzCb+R1vuJP1HNRShN9bZNtjR/uX5ya/gYnZQLQXf45xjek+ZEpuj8l6ueb72US91pgAN+aEjgxSGBGvwQhk/xXWmWKe5Vthf84JbTPd8JnewWJ/jPpGZCqpv46TclyxVr3Z28QihAGb8La3NXwJEpDgIA6Q3AYdm1Tcr6/WXDO1BNwB3ccGKpdW0O2P9jzPGS9fha7dxy6+SEuLpRzJmD3BNW6mLdDQhbCfozCAwW3jAGXHKMCvmvBg8F7ajuYyHmDFfMJ02+Bv1/SxgyvChfCr6Kfyvw92HaxMYP+rxAAtlUEH6vdCmX0nuS2aLBZ8TEz8itI2OgwMCMT0Y99MsVdHzQPO4t+8XsOHCDaQli3maLh2IGmk2ZT3Hijeq0ub rl9qTtdO i1wn9HPp9gp4fWFdc54WmuZ0yTXXPAP6xbdsOyBgC62hBlLRQVKfRpJ9XKdpCzP2EbZ4PNA1dXxWVjJYdHSKe4deWhkA4jjmiRXjzJo8Qq0QkkeH4XDKpEgps0Mq8F+ZQ8IoI8akTyzLxVZWtGihbVSKlk5hl2sAd/b86zuX5FjXphD1s1P3OCvzi2CZ0AMrgvG9+C/42S1EIBpEC74YllZzvTf3Gm6DA30pj97KcpXnZKhsxlYerSTokiOyv/9T8NyAOuaLe3Uv5JG/1xRNV5+aWA87QWKy2ezsJyXBNXEkwWw5hpZ0mDxnA0LeCGfbjF8477sADv+vQgfCft9tNOIAWaS31X0hTgs+d/0g1DhYuHObjyUShm+OjoGKxfLJ+mj/8oiTIdmbu5yVdtOnfsTeRXoMA8/mrhvfbWYCRTLFagOwMwqs6hpO2HMQsZhV3wO2bEiqMQJQgDFgfW92MWSBD0NI0x0PM+SsPzq+opQzZ4UqU/r87DyP9Z8I+xy4zzgRMgmbHIcL+X7sOA0FMTpNKkyDNVbXDexkoiZHhivz7VwD4IwpWbDmc48BLH3s9/63lO5q3RhSviuv0xqv+64N7xQZV1qZiVJSaUJrPshZcKOQ/x2KUmw8vxJZSlUFSFdtLIYLngWUWOVgZmeAFuopevUVl7RzmTutOoWrAal2l3cjZ1NJ+hBKeoGLCFTPL6mu3dM3XnocTDJM= 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: This is a simple change: don't create a "huge" PTE if we are making a regular, PAGE_SIZE PTE. All architectures that want to implement HGM likely need to be changed in a similar way if they implement their own version of arch_make_huge_pte. Signed-off-by: James Houghton Reviewed-by: Mike Kravetz diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 726d581158b1..b767b6889dea 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -899,7 +899,7 @@ static inline void arch_clear_hugepage_flags(struct page *page) { } static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) { - return pte_mkhuge(entry); + return shift > PAGE_SHIFT ? pte_mkhuge(entry) : entry; } #endif