From patchwork Tue Sep 8 19:55:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11764211 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 E519859D for ; Tue, 8 Sep 2020 19:55:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8FEEA2137B for ; Tue, 8 Sep 2020 19:55:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fcBOZYLe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FEEA2137B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5D8526B0037; Tue, 8 Sep 2020 15:55:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 586156B0055; Tue, 8 Sep 2020 15:55:49 -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 44E9C6B005A; Tue, 8 Sep 2020 15:55:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id 2F5C96B0037 for ; Tue, 8 Sep 2020 15:55:49 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E11E0181AEF1A for ; Tue, 8 Sep 2020 19:55:48 +0000 (UTC) X-FDA: 77240949576.02.pain55_350c9ff270d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id B82D710039B57 for ; Tue, 8 Sep 2020 19:55:48 +0000 (UTC) X-Spam-Summary: 1,0,0,f8dadc25ad000a8b,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1540:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2693:2892:3138:3139:3140:3141:3142:3352:3865:3866:3867:3870:4250:4321:5007:6119:6261:6653:8603:10004:11026:11473:11658:11914:12296:12297:12438:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21990:30003:30054:30070:30075,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04y88fsa773ncf89rdbwkuzr8rm5coceosxehsietbc9amfspj156g5xarj3opb.jstp1phb83bcx1wrm4ohk1fwrn7hd3akf44e43tsd1r4jt3195r7eokzmr7sx6z.y-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: pain55_350c9ff270d7 X-Filterd-Recvd-Size: 2566 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Sep 2020 19:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Bf1EQGAqs9MypbWrc2CFJ2Yy7A7oOmyAuK2c0gMPsI0=; b=fcBOZYLen3nzichgu6nWaUdSr2 Wbi8JMNMmPYV2CeoUtDUz/AOyu73VICr8WPWixJSL9ypva2NMZ/n/OENHJ7aWADEgQLwAunf5HH2B niqPm5WICPFPg2DEi+hs6oo45egkS+jVti4eAfsSo55ss8HD5jZvcH0dOyK5z41GsU0VLZeX26B/I T3gBn8c2OY4LJYoo979oCTVEl4wVecDBEEyxFqYyJzr/y1VfDZcC4Q+1Ph8I9ZS9kjiu9pzcED/4n BUZJFTrBysnpcGCby0iuqctcFA6NMr8bcoOn00eR40f9wH+2evIBr7ogtv2+fSNtRA4Mezd01QbvO 6Hytyz6w==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFjiR-0006lH-8m; Tue, 08 Sep 2020 19:55:43 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Andrew Morton Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" , Huang Ying Subject: [PATCH 02/11] mm/memory: Remove page fault assumption of compound page size Date: Tue, 8 Sep 2020 20:55:29 +0100 Message-Id: <20200908195539.25896-3-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200908195539.25896-1-willy@infradead.org> References: <20200908195539.25896-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B82D710039B57 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: A compound page in the page cache will not necessarily be of PMD size, so check explicitly. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memory.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 602f4283122f..4b35b4e71e64 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3562,13 +3562,14 @@ static vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) unsigned long haddr = vmf->address & HPAGE_PMD_MASK; pmd_t entry; int i; - vm_fault_t ret; + vm_fault_t ret = VM_FAULT_FALLBACK; if (!transhuge_vma_suitable(vma, haddr)) - return VM_FAULT_FALLBACK; + return ret; - ret = VM_FAULT_FALLBACK; page = compound_head(page); + if (page_order(page) != HPAGE_PMD_ORDER) + return ret; /* * Archs like ppc64 need additonal space to store information