From patchwork Fri Aug 21 04:44:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11728111 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 13BFE722 for ; Fri, 21 Aug 2020 04:44:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D58292075E for ; Fri, 21 Aug 2020 04:44:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pCPdkWR+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D58292075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0D2568D0014; Fri, 21 Aug 2020 00:44:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 05F368D0005; Fri, 21 Aug 2020 00:44:48 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3DBE8D0014; Fri, 21 Aug 2020 00:44:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id C94CF8D0005 for ; Fri, 21 Aug 2020 00:44:47 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 88317180AD81D for ; Fri, 21 Aug 2020 04:44:47 +0000 (UTC) X-FDA: 77173335414.12.magic71_201676e27036 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 5BD551801EDA1 for ; Fri, 21 Aug 2020 04:44:47 +0000 (UTC) X-Spam-Summary: 1,0,0,59895342a286454e,d41d8cd98f00b204,npiggin@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1515:1535:1542:1711:1730:1747:1777:1792:2393:2559:2562:2898:3138:3139:3140:3141:3142:3354:3876:3877:4321:5007:6114:6119:6261:6642:6653:7514:9413:10004:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12683:12895:12986:13255:13894:14096:14110:14181:14394:14687:14721:21080:21444:21451:21627:21666:21990:30054:30070,0,RBL:209.85.215.196:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100;04ygndcm5kjhoz7b3ooza5ntm5f9syc8ha73weafrcdj8f1an8pmb7rddtuhwaf.mtrcedn96h53dqjjmd51asrhr4b6bke8qzhcsgttjw738robuwdfjzmmw19tdmr.o-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: magic71_201676e27036 X-Filterd-Recvd-Size: 5952 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Aug 2020 04:44:46 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id g33so428517pgb.4 for ; Thu, 20 Aug 2020 21:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r93I4AuViyvI3WFmm3zsFVOEd/ZSp6PAmt6HmvThDqM=; b=pCPdkWR+/c3zGQZvbI+yxPmJYiJKpXbInrdYKkqIhWmlE9TYC6j5Mf11xaW0biltIw OpEeh+fCH9qvFzH6jX5Lv3RtfHciH9iJpqSE5g2ZeBEhuEqYyTLS1C33+HGi7/0UHE3e XRi13Mvm7jZFBeh7aoSMNJgBAAR//QM0MiuA0mJUwYqzKpKXxvSVOg5RGBmfC53y0ZmG O8Mj2Wa7adwTYJ+v8cuTZwIbAVljHSCvjsq2/l6Iz3h9e0jeVS4gFdtofpkMYPzIOwSe QBzadfNfLEd+vu9GWevuLRVwbiTvNZO2gQ1OuXxvFaJ2bjkrLNyu8oi/X7lcwoXY0FUG aT9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r93I4AuViyvI3WFmm3zsFVOEd/ZSp6PAmt6HmvThDqM=; b=VPWGoAcQW5dR8HcapqciMU47BwUg0mYGyKsEBvPwOxjqOg7ZPYFK9vZT2MoTA3YlO6 Dz2nLgPvm1KGKMDSVb5oTZvUKnAXpNquciSo83fweSe0XfGW7Q9PPFW8xr91lLVhkf33 /3IDJBSSKfghz673Z5/K6wtzqusEaa8iepad505cnvn5qHpOI51SGUd2p5XdmFWUiuCo lZaoFRQGztOmUbgCyNXEPK+Pe/Kw59uPpIXButW2+sFiwPsNZ5udFG4+lb/ZICHyDY6Z 9Kvl3ZvYP3EtT/UAlst1POE6yZHFCQOq2IV4qV1QURzoVBlmRW9R3hUyHWg0kkElrGfW v/qw== X-Gm-Message-State: AOAM530jf/LY4PpwIjDZgaDovXELBBlTeQmoawc1vgvIMtRMWd7A92ZR Kzow3QapmocSjT/eWI3AFsbDkSnj+zE= X-Google-Smtp-Source: ABdhPJxcErdb6DHl7wNZg2CJKi37fhm5Y8ORf9S2133r96TOuyrJSJsmNCzKB7cRJeog1G9Yvb/4EQ== X-Received: by 2002:a62:9254:: with SMTP id o81mr988198pfd.73.1597985085951; Thu, 20 Aug 2020 21:44:45 -0700 (PDT) Received: from bobo.ibm.com (61-68-212-105.tpgi.com.au. [61.68.212.105]) by smtp.gmail.com with ESMTPSA id l9sm683374pgg.29.2020.08.20.21.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 21:44:45 -0700 (PDT) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Zefan Li , Jonathan Cameron Subject: [PATCH v5 2/8] mm: apply_to_pte_range warn and fail if a large pte is encountered Date: Fri, 21 Aug 2020 14:44:21 +1000 Message-Id: <20200821044427.736424-3-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200821044427.736424-1-npiggin@gmail.com> References: <20200821044427.736424-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5BD551801EDA1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: Signed-off-by: Nicholas Piggin Reported-by: kernel test robot --- mm/memory.c | 60 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index f95edbb77326..19986af291e0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2261,13 +2261,20 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, } do { next = pmd_addr_end(addr, end); - if (create || !pmd_none_or_clear_bad(pmd)) { - err = apply_to_pte_range(mm, pmd, addr, next, fn, data, - create); - if (err) - break; + if (pmd_none(*pmd) && !create) + continue; + if (WARN_ON_ONCE(pmd_leaf(*pmd))) + return -EINVAL; + if (WARN_ON_ONCE(pmd_bad(*pmd))) { + if (!create) + continue; + pmd_clear_bad(pmd); } + err = apply_to_pte_range(mm, pmd, addr, next, fn, data, create); + if (err) + break; } while (pmd++, addr = next, addr != end); + return err; } @@ -2288,13 +2295,20 @@ static int apply_to_pud_range(struct mm_struct *mm, p4d_t *p4d, } do { next = pud_addr_end(addr, end); - if (create || !pud_none_or_clear_bad(pud)) { - err = apply_to_pmd_range(mm, pud, addr, next, fn, data, - create); - if (err) - break; + if (pud_none(*pud) && !create) + continue; + if (WARN_ON_ONCE(pud_leaf(*pud))) + return -EINVAL; + if (WARN_ON_ONCE(pud_bad(*pud))) { + if (!create) + continue; + pud_clear_bad(pud); } + err = apply_to_pmd_range(mm, pud, addr, next, fn, data, create); + if (err) + break; } while (pud++, addr = next, addr != end); + return err; } @@ -2315,13 +2329,20 @@ static int apply_to_p4d_range(struct mm_struct *mm, pgd_t *pgd, } do { next = p4d_addr_end(addr, end); - if (create || !p4d_none_or_clear_bad(p4d)) { - err = apply_to_pud_range(mm, p4d, addr, next, fn, data, - create); - if (err) - break; + if (p4d_none(*p4d) && !create) + continue; + if (WARN_ON_ONCE(p4d_leaf(*p4d))) + return -EINVAL; + if (WARN_ON_ONCE(p4d_bad(*p4d))) { + if (!create) + continue; + p4d_clear_bad(p4d); } + err = apply_to_pud_range(mm, p4d, addr, next, fn, data, create); + if (err) + break; } while (p4d++, addr = next, addr != end); + return err; } @@ -2340,8 +2361,15 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr, pgd = pgd_offset(mm, addr); do { next = pgd_addr_end(addr, end); - if (!create && pgd_none_or_clear_bad(pgd)) + if (pgd_none(*pgd) && !create) continue; + if (WARN_ON_ONCE(pgd_leaf(*pgd))) + return -EINVAL; + if (WARN_ON_ONCE(pgd_bad(*pgd))) { + if (!create) + continue; + pgd_clear_bad(pgd); + } err = apply_to_p4d_range(mm, pgd, addr, next, fn, data, create); if (err) break;