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 9DF14C7115B for ; Mon, 23 Jun 2025 12:37:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D2636B00AB; Mon, 23 Jun 2025 08:37:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A96A6B00AC; Mon, 23 Jun 2025 08:37:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E6EF6B00AD; Mon, 23 Jun 2025 08:37:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 12B506B00AB for ; Mon, 23 Jun 2025 08:37:18 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B50818025C for ; Mon, 23 Jun 2025 12:37:17 +0000 (UTC) X-FDA: 83586615714.26.53CA919 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf09.hostedemail.com (Postfix) with ESMTP id B62D614000F for ; Mon, 23 Jun 2025 12:37:14 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750682235; a=rsa-sha256; cv=none; b=S0cA4S6WH5hRWIFVYR0m16YPwG41uXPXE+BVU19X737IQJwR0s+adefRWiyo70eLYS6/wf Et95i9xWPk5PFuBr3AdPBdMQ1WJQeRFSGoXDrN/AZ6Wc5/NnnQRQe7u9DHJ5mamicFwkXU EgU1Ihi1ILowJlfa52XVxK2xYkrNDtw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750682235; 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; bh=Invp6L67eg67lIbqUPvU2d7iQlg/HW5sBvsCqMBsEbI=; b=xvA4Hv2w4O0NfC87yd1VPqR1ZVWRh+5zz3ZstNRxq6yOsVc/dnlfQ4Nv4rvy0HQMHJW6v4 2fyY75pWa6cER5NQhb0xNQsshT55VqOddU7MPig3h8icKp8PEpNbwZgR3DngTvJDav+GQy z0ki582h23t/Whj0Cny0w4ScWDZTDdg= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9E20B113E; Mon, 23 Jun 2025 05:36:55 -0700 (PDT) Received: from [10.1.29.169] (XHFQ2J9959.cambridge.arm.com [10.1.29.169]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F129F3F58B; Mon, 23 Jun 2025 05:37:12 -0700 (PDT) Message-ID: <107bfdb7-c8f5-45fa-872e-3e6928dc8025@arm.com> Date: Mon, 23 Jun 2025 13:37:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/vmalloc: leave lazy MMU mode on PTE mapping error Content-Language: en-GB To: Alexander Gordeev , Dan Carpenter , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250623075721.2817094-1-agordeev@linux.ibm.com> From: Ryan Roberts In-Reply-To: <20250623075721.2817094-1-agordeev@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B62D614000F X-Stat-Signature: zdtrt1pajiaetksr6nh7kihhh9tgz3iy X-Rspam-User: X-HE-Tag: 1750682234-38216 X-HE-Meta: U2FsdGVkX19s+ir48Ap3IAU4mtC6LLM43oFYbwz81yEKEV8dUP82wSnsg6FRshpSUau+bkvav9SM96vnN4Ainal/YGnQ1KFsZLsDmdf9usIdcc5cEvPZwQlkOnWtElY5hftKvLDu4t9ldNCfYcFG7WtYXEEOZQg3hjjk144qMZ5SuRPKqHmvuwxSFuvy2PQUoLSoSL5NRO3BNqHPa728PgIgw6dLCj6xWMPuRRA4NY4nkoqWdG8sLJ/xmLbYFPKqRMzsZ5qWkXL5RdF74va6+wj7VbusMuMXfvEuYYvMnEQ8H4SmPhiQeP60vpDhY1UBnPsQ5qTg22UQfHSNa1c/55RPCrktGpw/TQI0/WTaQxSxW3r+bkMUT6FMZCN6m2M0s5NAZlk//bSpSXx2pQjPNElUF08LARKBj8ddRNtCIpsuC5pOrjvJ7cdQSElLxo6wulAm9Gt56ah4ttCcvA6V8ME8His7sJGKmxmoVJYEwof+P75YUOtOYdHBRarfwpD+nTtZBR76Dwpxv46jiNH/7u6EDyFmA4voRbvGjAorEs+9E49qLp3LkFlHpdouBm0pIrmHGx+urGgFVEoq+KDrWuVqon3/e+XrMQUCJqyViWzAdZcYPNG3VoFjs6Je1tI7bvFjBRzowaFeIhchThiX4qPYbhEoGkgn/PIG+/D1k025DuPKjO4M+ZQNtfzMmeFl8IAAVh4YbSDsqJLGr8DatkMZPTWEfiTFquCbOaROrl8g4Q35H8ByoX7pCRpWMySqGLfCQONEteyRhLXGAmRqu4/cJx3t6mPKe3bf3X14s1hE+dXTUup66rVUEmFuw/Di++DYe5squz3ITDgab8t16JAcZgXKJUSyc8NCuWZ91LmuY0ZHzopot8pxpvGae7L+AC79wn9i71dWzCAkbhvymIkl+ehrINHZuLPLOMI1sA4Iu5HCYrBAQnpZj+YN8QzYbfyx5NafM5askpdnDzC ItIzjkgP LZVdlDDGJp7lxRfgYKrfIomhWwEHhnpy34hvugtHcDIflDiWMKbzPqweMYMt+h9gR61+dbMlCeadkI9BONRmZbT0LLmoU69rFsWlgRLGnYDcfyVPQCsJsNvUel1hJQ9vTEpkgJfcl/FnT7ZLqfUR9ND8qKOf26nRL50CeGKDi/jQGeXzumbKwcP1r886K7YPadRfLS7Kee5vVE6Wpy/LKOV3h78P0VqZA1mecQT1rQLOUWiC4nbZbdvW0OVCXpuQ1pvYvsYmbmT0zNzrmDso6wFdFngAVEPh5z58GbrVupdT1oGHhYLjV3p9Rb3xbnjjR/l4VJVbLGXFR6PQ= 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: On 23/06/2025 08:57, Alexander Gordeev wrote: > Function vmap_pages_pte_range() enters the lazy MMU mode, > but fails to leave it in case an error is encountered. > > Reported-by: kernel test robot > Reported-by: Dan Carpenter > Closes: https://lore.kernel.org/r/202506132017.T1l1l6ME-lkp@intel.com/ > Fixes: 44562c71e2cf ("mm/vmalloc: Enter lazy mmu mode while manipulating vmalloc ptes") > Signed-off-by: Alexander Gordeev Ouch, sorry about that! The patch looks good to me so: Reviewed-by: Ryan Roberts I wonder an aditional Fixes: should be added for Commit 2ba3e6947aed ("mm/vmalloc: track which page-table levels were modified") though? That's the one that added the "*mask |= PGTBL_PTE_MODIFIED;" which would have also been skipped if an error occured before this patch. Thanks, Ryan > --- > mm/vmalloc.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index ab986dd09b6a..6dbcdceecae1 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -514,6 +514,7 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, > unsigned long end, pgprot_t prot, struct page **pages, int *nr, > pgtbl_mod_mask *mask) > { > + int err = 0; > pte_t *pte; > > /* > @@ -530,12 +531,18 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, > do { > struct page *page = pages[*nr]; > > - if (WARN_ON(!pte_none(ptep_get(pte)))) > - return -EBUSY; > - if (WARN_ON(!page)) > - return -ENOMEM; > - if (WARN_ON(!pfn_valid(page_to_pfn(page)))) > - return -EINVAL; > + if (WARN_ON(!pte_none(ptep_get(pte)))) { > + err = -EBUSY; > + break; > + } > + if (WARN_ON(!page)) { > + err = -ENOMEM; > + break; > + } > + if (WARN_ON(!pfn_valid(page_to_pfn(page)))) { > + err = -EINVAL; > + break; > + } > > set_pte_at(&init_mm, addr, pte, mk_pte(page, prot)); > (*nr)++; > @@ -543,7 +550,8 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, > > arch_leave_lazy_mmu_mode(); > *mask |= PGTBL_PTE_MODIFIED; > - return 0; > + > + return err; > } > > static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr,