From patchwork Thu Jul 4 04:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13723208 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 70776C30653 for ; Thu, 4 Jul 2024 04:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C79BA6B00BA; Thu, 4 Jul 2024 00:32:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0C6E6B00BB; Thu, 4 Jul 2024 00:32:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A05276B00BC; Thu, 4 Jul 2024 00:32:31 -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 71EAB6B00BA for ; Thu, 4 Jul 2024 00:32:31 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 311521A08BE for ; Thu, 4 Jul 2024 04:32:31 +0000 (UTC) X-FDA: 82300798902.16.C1FD1C4 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf16.hostedemail.com (Postfix) with ESMTP id 420B0180008 for ; Thu, 4 Jul 2024 04:32:29 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf16.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720067522; 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; bh=ydHGdWE13xUNLo1e2WTJKQjsSMTrUxDPdYXIAbTptmg=; b=D9F+Td5Ac8Cvy82+HjJNK6L4wU6rn6DW2WBlk3Ay8Q6FkOZ9EyRjSIxbekobuEPANR77T/ ICbJt2h+4TNv9UJix7Z9J8aI0IPzJ+tgAiex2oJJQO7uPhOQ0NUqCzPMfw5tkI6B1rDXu5 GmQyIcR87zDA31syAA+WxaLeY1zzU4M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720067522; a=rsa-sha256; cv=none; b=qlEMWdd4c4j42mKUR7q/4NycUcziOIZlMMZhPeQwLyk6Yz1qiJBwo/AViFEAyLzJI8nBFT UUWAdrRxPcCqZ6NrKqHIVhoQ6PX9GpGGtXQ/tzdbaKUv/ASDNj7nztMCRkVi/S1Eu3b/+Y e/ltIk798LeGRKmVA9om+Kl2hvIoIb4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf16.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out1.suse.de (Postfix) with ESMTPS id 0FE1121C11; Thu, 4 Jul 2024 04:32:28 +0000 (UTC) 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 DDC9613889; Thu, 4 Jul 2024 04:32:26 +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 qGv2MdolhmbnDAAAD6G6ig (envelope-from ); Thu, 04 Jul 2024 04:32:26 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu , Muchun Song , David Hildenbrand , SeongJae Park , Miaohe Lin , Michal Hocko , Matthew Wilcox , Christophe Leroy , Oscar Salvador Subject: [PATCH 30/45] mm,mincore: Enable mincore_pte_range to handle hugetlb vmas Date: Thu, 4 Jul 2024 06:31:17 +0200 Message-ID: <20240704043132.28501-31-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 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 420B0180008 X-Stat-Signature: utjoqty51ab1n4jafpo7exekid5n8oze X-Rspam-User: X-HE-Tag: 1720067549-920787 X-HE-Meta: U2FsdGVkX19qaERgVt/NAh0rbfqHGmtf8nJq4Hx0ppdYowqf4/0N43IC9Pcr7He9qWQnHLZhpofGagN6ELEtq6GOLu0XWIri/XA5GSoASM+O4tSCYtQG2vNLXIUarqEs3KNyttPuqjnbMCkNWdDNuDjSi3aDY835tZuCFA5kGbJTKet+PNHm8Lyc1s0Uxpja3fSdcmUOFjOB0NbK17FlyZzJTEdolK3Qseod6JmQ6g+Lsl95VkNyENmL7pRE24RYzeSt3zJPchpGFwIYJd/2wai2Bl3EwljfNm7PTmZMPsEYUbJ95erSPVemZpXztwjRWKjehhVGt583w6//SP2PwUjD11yF13aVv+I/QkwWhBs+t1CrWTyXRi1cXbxB2B13C3kWOpbCMLUzHIifveCFW5F6BNt/84E+xbTLJ36ssqxlieA7aei2YWPQS+thzYDi60ye3aCRpVLXOibE1wcr/+9vJ4Il2xe8BQfcPtJ8yVI/fdSLQbHoFWRnMide3N3HaJEMe9bX/5hEzuo3VBadY1Mc7QceKzWBiyWz0CgyJPgxlwpT8gdq6oG/IqZlNUGxtYsIYR1J7NSQ68s59vupJ6kxuOrXQk66magYSCvFFCnbtVRLfmXBoO7apsxKXhY3sG23ckVaZyLneKLdnSDCz3eecZqyJIM425kLng1o1Y9usORGhIkwd9MJrfBGCCIlocMJOFXy5UOM5JhUVwy6JAnoyPBVnWzXH919MXOwyONqSOv/FZHGfbIUnN3ZEajblBvLjRyCsYGWpHz5GJ98UnYAanX9tIMGJ0uJbbVLZY92Gfc2vk432aaumLhxLB99MWEKZTFr04eFgF4LETRtYuVx00NOPQCMGYE+y6mPvVlzqj5m2nLcwxd2zxpwejFuOt2yePYlFmBOeo5p0dYNbJdviEQ/XlE8gN7fatbRLP5Zr64TEdxgF6hSZLBW+k4GInmmdON3MseSQxwLFYx 4rDJ0Ci/ 4BOoDAxrpuWWujdX30N1VuYsghKLNXrmQyOrgvyvMjvaO+ZXYkXY6SseHhojUS5UiNlU2ZeqpVF/9zMLk5LYZxHEAk82/6E49g8DGCDrhE3uPdIGw3YyRTUl2XsceLYVTeLIVDVtkvC+yyahdQSKkAnTNPBlgNpapJOHzg7PPNmr7MvA= 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: List-Subscribe: List-Unsubscribe: PMD-mapped hugetlb vmas will also mincore_pte_range. Add the required code so it knows how to handle those there. Signed-off-by: Oscar Salvador --- mm/mincore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/mincore.c b/mm/mincore.c index d6bd19e520fc..5154bc705f60 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "swap.h" @@ -106,8 +107,9 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, unsigned char *vec = walk->private; int nr = (end - addr) >> PAGE_SHIFT; - ptl = pmd_trans_huge_lock(pmd, vma); + ptl = pmd_huge_lock(pmd, vma); if (ptl) { + /* Better handling of hugetlb is required (pte marker etc.) */ memset(vec, 1, nr); spin_unlock(ptl); goto out;