From patchwork Thu Jan 5 10:18:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13089639 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 90E1DC54EBD for ; Thu, 5 Jan 2023 10:18:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1AAA900003; Thu, 5 Jan 2023 05:18:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A07168E0001; Thu, 5 Jan 2023 05:18:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 859A7900003; Thu, 5 Jan 2023 05:18:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6CF8C8E0001 for ; Thu, 5 Jan 2023 05:18:58 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 429B8120D0B for ; Thu, 5 Jan 2023 10:18:58 +0000 (UTC) X-FDA: 80320347156.17.D9F7EAC Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf09.hostedemail.com (Postfix) with ESMTP id AC68514000E for ; Thu, 5 Jan 2023 10:18:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=pqyC2Khn; spf=pass (imf09.hostedemail.com: domain of 3D6S2YwoKCFY7H5CI45HCB4CC492.0CA96BIL-AA8Jy08.CF4@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3D6S2YwoKCFY7H5CI45HCB4CC492.0CA96BIL-AA8Jy08.CF4@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=1672913936; 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=6/ywzp+1XO7/Q8q0gmg2VRvRHujBF/Iur/xAcCpSChk=; b=y09sP9MQDEwJs3JUS2rqOAh8lu0DSkjpwjVNVRUq5TXQpQ3k84BOj1lIaiWylWDfBuaYH8 ZMBJvKP1MF3TAO/4knkYgA2bC0Kd5AH1tL4MLp9GivK3XRwgLDLyLYLcxAo94DvZ75Q0VV TL01+Of1ROgIaIk0ZMCE5t7+UrZChPI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=pqyC2Khn; spf=pass (imf09.hostedemail.com: domain of 3D6S2YwoKCFY7H5CI45HCB4CC492.0CA96BIL-AA8Jy08.CF4@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3D6S2YwoKCFY7H5CI45HCB4CC492.0CA96BIL-AA8Jy08.CF4@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913936; a=rsa-sha256; cv=none; b=C+n0uvixj1+9RHJkIpbTw4tm88qB6Vsl59qkV7Y/A6iEdjJQpSTgWCLn6g/Zn7dGqMHUuI s17NJD9f/nieHj0JgKrXP9Z1CLzJc36IkZjH7FW7sUlIlh8pSL63lR7wyzmsyMYgSpjjff i0hCgsdFoFOXDYoR4Kj6cQcrgxDd2EU= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-46a518991cfso343220437b3.18 for ; Thu, 05 Jan 2023 02:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6/ywzp+1XO7/Q8q0gmg2VRvRHujBF/Iur/xAcCpSChk=; b=pqyC2KhnurZ2BnxaxGpvFtfxzpkkxexWo/NsKpGJkrtsdVnOn9JsTznF5L8T10dpT9 AAb47kUzRLKe5zL54ZIpCmLTz4iG0qnBDPnnSJAcX0pnE6+rQ5/lLGGtdmK63OoTnblo GF3eU42h4BBDQ+ilspuDnsLoOBvix+ESeq+eoZdNGcZsD8QY/hbtyL1dR+g501YZ67Fz z9RZ/NbRSQRm1YcmxGoEQ2uIv7H63+AOQO1vX0XPbnZjLlUJSXkLGIr1Ih39qo/E4CRT MtdnGWeT9yFYs2+Gmn78g91Y+8+cLHMNidVLgMRBi0PWC2oIxVrguFCrpF8qXSNrN1Aj N+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6/ywzp+1XO7/Q8q0gmg2VRvRHujBF/Iur/xAcCpSChk=; b=2Ddlc/0VNgE6JxRlAuNKWLABGQ3kj5zeQVYXVGK0pOkRMau5gkCCjMsTBOgspovOoq npKAqfR6el/dEHlpvCLcW4xfgDWAVNYfEsmPKg4obT0fnhipsXjnyrD0g+YWmTfqMow4 1JgMS2s7lsHygtxJzrsWwk/k8N+ud2AluvY9ACQXyks62YbJGp0MM2fv157HY2Ix2SCE 8bP2Y8BD0mFFvhpLK2lgntB2CgwFoNe7U9b8n723YG8A4UE0LJwbiHcJMZbr79Vik0jW HamS2k+Mx4NCf4fe527CyR1422umcMasrh22huemd8rF+T3X8IQfuxDgXTX/5VP0ZAUa jr9Q== X-Gm-Message-State: AFqh2kppB9L1hm1RkuFwW4dN7vySK9ik4fQ1UiG70L91OzHWuvcRdG5g 0p/S25/pOdYU/AT/1ALdaGpZJUg8yHDRtQ+0 X-Google-Smtp-Source: AMrXdXttj0DV8I+dROfy27Xg3A4VmdnnuZWQjLlZFwNJGVFmulN/HFoUXOpheTies8pt4M5XCaM5PllEMoSoJYup X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:bc8c:0:b0:79c:8a57:64ed with SMTP id e12-20020a25bc8c000000b0079c8a5764edmr1722191ybk.16.1672913935908; Thu, 05 Jan 2023 02:18:55 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:01 +0000 In-Reply-To: <20230105101844.1893104-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230105101844.1893104-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230105101844.1893104-4-jthoughton@google.com> Subject: [PATCH 03/46] hugetlb: remove redundant pte_mkhuge in migration path From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu 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 , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton X-Rspamd-Queue-Id: AC68514000E X-Stat-Signature: b85ens6terqt19j664ttaf5c9prhj36d X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672913936-490849 X-HE-Meta: U2FsdGVkX1/NMGnPINGLlvggpA9NXZ5VI0MoKGroFp3RIUkFU99x/qf6m2Q9qelW7kXUzt/gRSWSsS68gwz/h1nTrwiUmQsOdOCWxmWF+mFv7dGD6tCJ6G2eJnSuhoEr7aclBZxtKHbLo43CCo2fDestUrvge7yKFALvbgiHB58QawtQ9/DHch9q2wICwJvOm9W+fdUpTkOlhXV9Qo9sUZyTTjtZrXp3FOY11iCnDTrImsMg/m/4Glq/I/Owph4ZfLfkjKdn+Vjo9gqH5JXuefqrsGB6P+lKwrfj0FdyLLaESKcugpo9khpS1ib2g1q1vgyrcJOJ9ymc/2F+Tb6x2tKvMH5StFRtBU9k8MGugvdS4hxtIjCKqOFuf/ZAxKkSqjZBDRPQHhwhFYFjIiAgPSy5swqN/BZLqO+ohQEj/wuTpo96RWhAp/6cT+YbntaUw2CSvH0jKyQiwOROa3KLunhML+EJUIjLYAkzuIdOOThP0oP7zdY984QpmOcHDNYHOIUtNOktitvN5sGqvE4ezrR/9IJVTBpZcUEa1JsNq3aRwe9F+TXsZC8LqaCefUexl3Hg3zaM+VDcDVqB5O5yapSpDsjSskFBMYis99xewvnn9shLf45GHqzq86E9w+PJFQhTE9gAYUYHVNiWWyerCXGxzuuknBUvidPwa+OVjOd0foWffNQ77HJM9KF8P7RD/VLj3bh1SeUgitPZuxUBFZiCdVZd036e317NAzSjwEepUHsV3eyu50FEkWxJXC+hgw0Jo00DsibRcGOF1V3lYHaj90nBIDLYZ6VIgwG9RWDLsZHHfSP7Fgio1x7HkVOvqieq3gs/tYOQtCorNRG+GAD/FzY/prj67D5aoGV7cmMV9amgjQmSOahjFMjAqwuznKld7MRXjNbsj8iMz/aV4T6KDi5b57iE1/HcgHxv7ZeLH+CPM9S1gHODCDoHd0gswzZMXvEdQEzjMrCWFF4 taRNsRuh YqQfh3QyPKPBNs8v0D7tot0srKbsPMxWoKfW5ysJnfnTzxDbe5wvDr+eg5tNypM0pTksj50Arfz17gE7akX3AHXERzQkRehprkwg52daMIMvpDdI7wWOUsxy+Ung5eLY0XPTJXERMBtoZGTdRxMqlT0+kdbTj/n8/oE0ggm8FNGm+pzDUVGm/fRenz7bC7RpNKwSOT66aZqjvr1THPdVL0FM8lCCHC991cISxeqotUcRknkG9384USEkVmOND8PlYq3pu5Ve/Wp4TVJzpsZMu+E0ATDuTu8bzi3uw6WXAhu9jGsherWl3PAk6ZFobzpk+H252YZ9KsGTSlS/eZAI3PO8Iw9Piw/bjqzh3b+GFLJyzJI5BLWIz4qIX5DmqExP1pkR+sAlRI6AOoTIB+yx3PQY/McZ1BXUDTOH38wPkcZ5npkg1f9dWpTN2nZdjLvFoXR93 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: arch_make_huge_pte, which is called immediately following pte_mkhuge, already makes the necessary changes to the PTE that pte_mkhuge would have. The generic implementation of arch_make_huge_pte simply calls pte_mkhuge. Acked-by: Peter Xu Acked-by: Mina Almasry Reviewed-by: Mike Kravetz Signed-off-by: James Houghton --- mm/migrate.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index 494b3753fda9..b5032c3e940a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -246,7 +246,6 @@ static bool remove_migration_pte(struct folio *folio, if (folio_test_hugetlb(folio)) { unsigned int shift = huge_page_shift(hstate_vma(vma)); - pte = pte_mkhuge(pte); pte = arch_make_huge_pte(pte, shift, vma->vm_flags); if (folio_test_anon(folio)) hugepage_add_anon_rmap(new, vma, pvmw.address,