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 435E6C4332F for ; Mon, 7 Nov 2022 12:42:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEF8A6B0072; Mon, 7 Nov 2022 07:42:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B9FFF6B0073; Mon, 7 Nov 2022 07:42:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A67C16B0074; Mon, 7 Nov 2022 07:42:26 -0500 (EST) 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 9812E6B0072 for ; Mon, 7 Nov 2022 07:42:26 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 61EF6801F1 for ; Mon, 7 Nov 2022 12:42:26 +0000 (UTC) X-FDA: 80106609492.10.3AC416A Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf11.hostedemail.com (Postfix) with ESMTP id A38FC4000B for ; Mon, 7 Nov 2022 12:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667824945; x=1699360945; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=BX7eo7H9OERqmqXuT+A61UmoX2D5HQEHW51CjFYURsA=; b=KJAXvsqN3YURxSFSyYN47jXbG4hxWmiNGgVMxnUiOIRxHB3SUVG+FEMf 7rPubZp3PRL13/18NnvHHZZ07TiOkvXlcAi16fWBK5OlJ2jdda8RjHdzq r7rJFSiyZyolK4vdAMtkGcsD3r6mbXb2xoBfBKrNsxZstlg/nekbcPt9O gbjx3Uq01ECUim069NPcysuJutyXhlN18Dw8z/IDeGB1E8AxTS0hsdEEl cEsdVpeoQbeqHtCuDzhnh3EHVlPLjUR40cnHkLqQCPoT3Ev87oPpqNxrX 800hMNu1zp0/n8kyXOlD8zEgaNx+3gszhuFBIsqx1XCRrSqEj2zwcThdo Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="311533915" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="311533915" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 04:42:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="586956156" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="586956156" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.191]) by orsmga003.jf.intel.com with SMTP; 07 Nov 2022 04:42:19 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 07 Nov 2022 14:42:18 +0200 Date: Mon, 7 Nov 2022 14:42:18 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Naoya Horiguchi Cc: linux-mm@kvack.org, Andrew Morton , David Hildenbrand , Mike Kravetz , Miaohe Lin , Liu Shixin , Yang Shi , Oscar Salvador , Muchun Song , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: Re: [PATCH v1] arch/x86/mm/hugetlbpage.c: pud_huge() returns 0 when using 2-level paging Message-ID: References: <20221107021010.2449306-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221107021010.2449306-1-naoya.horiguchi@linux.dev> X-Patchwork-Hint: comment ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667824946; 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:dkim-signature; bh=GTEPRhASPJTkM+xCx5RwGl3A+Spf1Gx4Sd+qk0WfbYk=; b=6VMExyISoLFcZrKzGxUGrQ0Iem38CySLYR/blSFBd0TES87wf7rW3Hwp2nP9CGXy8cazQV 28GEJZJ1sUSymMp/9neXKBJgcRY7+7oCeS29XtWFfIiSwERg80h8So7ohlb3Glar2whcGZ vWj2hucxpxW3Obt5FPjSrrYF296Nvpg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=KJAXvsqN; spf=none (imf11.hostedemail.com: domain of ville.syrjala@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=ville.syrjala@linux.intel.com; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667824946; a=rsa-sha256; cv=none; b=vswCn0cWQU2VIa00Vzg+WhjDRYbwouCV3rKKiyR9/2qo6olZnVH1PLArc8fN3FISx39pdl HghwWcdemUJnlIcWNpEd/poFdj5lx0BOROuvkOnxffknhU0RaUXDj49JHhvJdyAKV15GLZ sUOBhiWtjWgMFidCYlFrQp9UbEZflA0= X-Rspamd-Queue-Id: A38FC4000B Authentication-Results: imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=KJAXvsqN; spf=none (imf11.hostedemail.com: domain of ville.syrjala@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=ville.syrjala@linux.intel.com; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none) X-Rspamd-Server: rspam10 X-Rspam-User: X-Stat-Signature: x8pwb3xd5tiaxotjwp95ekrf541is7hm X-HE-Tag: 1667824945-617486 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: On Mon, Nov 07, 2022 at 11:10:10AM +0900, Naoya Horiguchi wrote: > From: Naoya Horiguchi > > The following bug is reported to be triggered when starting X on x86-32 > system with i915: > > [ 225.777375] kernel BUG at mm/memory.c:2664! > [ 225.777391] invalid opcode: 0000 [#1] PREEMPT SMP > [ 225.777405] CPU: 0 PID: 2402 Comm: Xorg Not tainted 6.1.0-rc3-bdg+ #86 > [ 225.777415] Hardware name: /8I865G775-G, BIOS F1 08/29/2006 > [ 225.777421] EIP: __apply_to_page_range+0x24d/0x31c > [ 225.777437] Code: ff ff 8b 55 e8 8b 45 cc e8 0a 11 ec ff 89 d8 83 c4 28 5b 5e 5f 5d c3 81 7d e0 a0 ef 96 c1 74 ad 8b 45 d0 e8 2d 83 49 00 eb a3 <0f> 0b 25 00 f0 ff ff 81 eb 00 00 00 40 01 c3 8b 45 ec 8b 00 e8 76 > [ 225.777446] EAX: 00000001 EBX: c53a3b58 ECX: b5c00000 EDX: c258aa00 > [ 225.777454] ESI: b5c00000 EDI: b5900000 EBP: c4b0fdb4 ESP: c4b0fd80 > [ 225.777462] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 EFLAGS: 00010202 > [ 225.777470] CR0: 80050033 CR2: b5900000 CR3: 053a3000 CR4: 000006d0 > [ 225.777479] Call Trace: > [ 225.777486] ? i915_memcpy_init_early+0x63/0x63 [i915] > [ 225.777684] apply_to_page_range+0x21/0x27 > [ 225.777694] ? i915_memcpy_init_early+0x63/0x63 [i915] > [ 225.777870] remap_io_mapping+0x49/0x75 [i915] > [ 225.778046] ? i915_memcpy_init_early+0x63/0x63 [i915] > [ 225.778220] ? mutex_unlock+0xb/0xd > [ 225.778231] ? i915_vma_pin_fence+0x6d/0xf7 [i915] > [ 225.778420] vm_fault_gtt+0x2a9/0x8f1 [i915] > [ 225.778644] ? lock_is_held_type+0x56/0xe7 > [ 225.778655] ? lock_is_held_type+0x7a/0xe7 > [ 225.778663] ? 0xc1000000 > [ 225.778670] __do_fault+0x21/0x6a > [ 225.778679] handle_mm_fault+0x708/0xb21 > [ 225.778686] ? mt_find+0x21e/0x5ae > [ 225.778696] exc_page_fault+0x185/0x705 > [ 225.778704] ? doublefault_shim+0x127/0x127 > [ 225.778715] handle_exception+0x130/0x130 > [ 225.778723] EIP: 0xb700468a > > Recently pud_huge() got aware of non-present entry by commit 3a194f3f8ad0 > ("mm/hugetlb: make pud_huge() and follow_huge_pud() aware of non-present > pud entry") to handle some special states of gigantic page. However, it's > overlooked that pud_none() always returns false when running with 2-level > paging, and as a result pmd_huge() can return true pointlessly. > > Introduce "#if CONFIG_PGTABLE_LEVELS > 2" to pud_huge() to deal with this. > > Fixes: 3a194f3f8ad0 ("mm/hugetlb: make pud_huge() and follow_huge_pud() aware of non-present pud entry") > Reported-by: Ville Syrjälä > Signed-off-by: Naoya Horiguchi > Cc: Works for me. Tested-by: Ville Syrjälä > --- > arch/x86/mm/hugetlbpage.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c > index 6b3033845c6d..5804bbae4f01 100644 > --- a/arch/x86/mm/hugetlbpage.c > +++ b/arch/x86/mm/hugetlbpage.c > @@ -37,8 +37,12 @@ int pmd_huge(pmd_t pmd) > */ > int pud_huge(pud_t pud) > { > +#if CONFIG_PGTABLE_LEVELS > 2 > return !pud_none(pud) && > (pud_val(pud) & (_PAGE_PRESENT|_PAGE_PSE)) != _PAGE_PRESENT; > +#else > + return 0; > +#endif > } > > #ifdef CONFIG_HUGETLB_PAGE > -- > 2.25.1 -- Ville Syrjälä Intel