Message ID | 20240704043132.28501-16-osalvador@suse.de (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 44968C3065C for <linux-mm@archiver.kernel.org>; Thu, 4 Jul 2024 04:32:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 091A56B00A3; Thu, 4 Jul 2024 00:32:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01B6A6B00A5; Thu, 4 Jul 2024 00:32:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D12826B00A6; Thu, 4 Jul 2024 00:32:12 -0400 (EDT) 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 A9CBA6B00A3 for <linux-mm@kvack.org>; Thu, 4 Jul 2024 00:32:12 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 693EA40A22 for <linux-mm@kvack.org>; Thu, 4 Jul 2024 04:32:12 +0000 (UTC) X-FDA: 82300798104.10.5661E34 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf08.hostedemail.com (Postfix) with ESMTP id 44477160013 for <linux-mm@kvack.org>; Thu, 4 Jul 2024 04:32:09 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=reCsEU+x; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="cWSSs/Dz"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=reCsEU+x; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="cWSSs/Dz"; spf=pass (imf08.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720067518; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fM4emcZ2cxXRGcFoZk72IXVFIB/7cc45xsWWyiF4u+4=; b=uoz+eQiJF5IPTlnUlbxXTwex1JIfQdStIl/7pPa48aPa9gJ65oJYHBPlpf4mwsrLn4eSHf xtmXiJHif0iQlQNrqzJU5ykCCS9kz8qIHoZ9V4tSPilRFThIOTMKc8gUyi2TeESQ9S2Wgc 3RPQ612Gc6sqRwODvDTo+82yocM9K4A= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=reCsEU+x; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="cWSSs/Dz"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=reCsEU+x; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="cWSSs/Dz"; spf=pass (imf08.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720067518; a=rsa-sha256; cv=none; b=e+LIgyj2U9aswb5xx5VuHpn/QcMErOSRebmok94ipudUP+D8PlnJwj1yptrZAcNosPUQcJ UqtmTKAFTN+8IphRxgb1U+AfrWg2x3LBrQfvb5eduheP5jLZtYo6GwcEAHoS77z92hNmOK +p2r/j2RKkfH/tCoJAwNP7/GgC85Z28= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E2CC31FCFB; Thu, 4 Jul 2024 04:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720067528; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fM4emcZ2cxXRGcFoZk72IXVFIB/7cc45xsWWyiF4u+4=; b=reCsEU+xOf0IC135atdv1qtTW7GwE3KuG5U1k4v+SluCIY6H3D2FUi8FAWIyXYCZIx84yW 2P3PP6oHEwHguqWCpYJ2Wi1pGYR41wpaVnU4D4lDnskSWrRP5eI4/8eoAU1cZhaAgG1ovS /ddxekibmWnrHYkaVCjv2+cJtRQFDJs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720067528; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fM4emcZ2cxXRGcFoZk72IXVFIB/7cc45xsWWyiF4u+4=; b=cWSSs/Dz6GKtXty5+7bttcX9oK91QygswkqdEf4rRjRzvfkLm/fnE40h99EAYCwuc44cs1 Y9XuXXYLWDeZrCBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720067528; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fM4emcZ2cxXRGcFoZk72IXVFIB/7cc45xsWWyiF4u+4=; b=reCsEU+xOf0IC135atdv1qtTW7GwE3KuG5U1k4v+SluCIY6H3D2FUi8FAWIyXYCZIx84yW 2P3PP6oHEwHguqWCpYJ2Wi1pGYR41wpaVnU4D4lDnskSWrRP5eI4/8eoAU1cZhaAgG1ovS /ddxekibmWnrHYkaVCjv2+cJtRQFDJs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720067528; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fM4emcZ2cxXRGcFoZk72IXVFIB/7cc45xsWWyiF4u+4=; b=cWSSs/Dz6GKtXty5+7bttcX9oK91QygswkqdEf4rRjRzvfkLm/fnE40h99EAYCwuc44cs1 Y9XuXXYLWDeZrCBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A7B8713889; Thu, 4 Jul 2024 04:32:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cGPCI8clhmbnDAAAD6G6ig (envelope-from <osalvador@suse.de>); Thu, 04 Jul 2024 04:32:07 +0000 From: Oscar Salvador <osalvador@suse.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu <peterx@redhat.com>, Muchun Song <muchun.song@linux.dev>, David Hildenbrand <david@redhat.com>, SeongJae Park <sj@kernel.org>, Miaohe Lin <linmiaohe@huawei.com>, Michal Hocko <mhocko@suse.com>, Matthew Wilcox <willy@infradead.org>, Christophe Leroy <christophe.leroy@csgroup.eu>, Oscar Salvador <osalvador@suse.de> Subject: [PATCH 15/45] fs/proc: Adjust pte_to_pagemap_entry for hugetlb vmas Date: Thu, 4 Jul 2024 06:31:02 +0200 Message-ID: <20240704043132.28501-16-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240704043132.28501-1-osalvador@suse.de> References: <20240704043132.28501-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 44477160013 X-Stat-Signature: x76wj8p44bsx1h9iuthrrpurigmtyqwy X-HE-Tag: 1720067529-114597 X-HE-Meta: U2FsdGVkX19K/e1uOP3rdObeQF22mlqokmvfoyxenzN+Rev2AuYx0MF2HBSw7pTkay33xFFHdRHtAqkFLJizFzxJKj445T1DHTUC871Xia4razTJu7VbSNaFdYRzznOeCEX/ZQCO1TNFLFB+5o7TsMdqrpXnTwSmvSpykI5EnshKzW/bVzu2As074ql0er1Vuknp1zIo0mTcKnsDvHwu2IzeDpMNeNaGOv1ZMmV8n9ELggckXoUsG1VcAoO0hsAgyuRsW789wm4lSRJE/abytkF/cVTQE8i3E6cvlB/m8E6cVVPQNT+AgKE3C6EpJ5La1I/Y60ZaQBoeYoCSh0WeH+l2LDoSBYjhHpWGGARbUCKT2wGRZtl7ZDbNmCHF+Igmh8GN6N31FnInsgjzenX2EXT9gp7PVVgQf6yErQJiWcn/XhiJpJDhl7FyWc7E9Aq+6+QhYMJv/eiWCXs5zCPnx5QFDKnApyP/W3Ixof46MY2B4/RVlyHPkBmhXH8N50PbywHHAZErrmzBmBOwDokpg/6QSJYMQj5zJxEREAh0Z2SMHxxiEPRWjUhhWWxKB+Hfq4FwYZSLQNHGvM9p6dm1tLk+sa/GKEZMn76BEA/Oz1GcCsbdwE3zkO5a85jEnvfFUg9p6rbofXlO7s+e85GIvrVdKuVgg8MPC6r3i36/FIqjhX0voES8B2X1w/YXycgcwoFYl7YtaTg89YA+rxl4CNCJ4HgcKSn33xJQ8BEpz/Iw+lnVLevZrQ6v6gpQINB7oFlV4FmdfIftNUQ3C7MC82Or3oSCFONHlDZX9KcILsbyby4raaG7sk+Xv4cI5IS1CIQSs4NgbfbdwJLUScgN59UluxksW+Ntd98XlY7nYzxArdBHiKy4MypjNHJDlIbwOAMDuXCG6r8dnfjluZ7b9Gh7RL690x2l/rpLcnJ752oBnJWhV8Uie+BWTgncBfeUcbJiyKTTYKgVi/Xw+F7 nZp4lUiU Y9kS/o8ZIJ0XOhcXKTrVwLrvmsLe4SIAOVzd7QA6oj/XJWQ4jujp6MnOyD1Waqjk7d65cjM3D17PUaLWMRoHvoecs/zYHTtkvOXBzbPH+AsMLvNRPro69ISyQSHAlhbb9g3AoUG0ubN2mgszoQxezLjyhSMnu5nkr2Oc1MYjpfAKfxZNmWaQpxDgN3LeGHSY5MrAf6Y8AjtPO2mvBU0ERbZ3IGPDDJOBbtWFoyapKgfzqtiR7y+ndONr7XCC/PeCduEgno4wGL+m7+YlZpcK94/hPonu7BvnDgWtm 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
hugetlb pagewalk unification
|
expand
|
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 5965a074467e..22200018371d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1795,7 +1795,8 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, frame = swp_type(entry) | (offset << MAX_SWAPFILES_SHIFT); } - flags |= PM_SWAP; + if (!is_vm_hugetlb_page(vma)) + flags |= PM_SWAP; if (is_pfn_swap_entry(entry)) page = pfn_swap_entry_to_page(entry); if (pte_marker_entry_uffd_wp(entry))
HugeTLB pages cannot be swapped , so do not mark them as that. Signed-off-by: Oscar Salvador <osalvador@suse.de> --- fs/proc/task_mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)