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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34D68C433E2 for ; Fri, 29 May 2020 02:58:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E4A352075F for ; Fri, 29 May 2020 02:58:44 +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="Qd/YWzTp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4A352075F 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 2DC29800BA; Thu, 28 May 2020 22:58:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87C7E80010; Thu, 28 May 2020 22:58:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FC0E80010; Thu, 28 May 2020 22:58:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id E4CDA80010 for ; Thu, 28 May 2020 22:58:28 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 9619A2C78 for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-FDA: 76868248296.28.shoe40_fc03fefbd11a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 7B2766C26 for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-HE-Tag: shoe40_fc03fefbd11a X-Filterd-Recvd-Size: 2930 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=YKb3NpGTsiuUGhpc+X61UYaJ3Rs5k3/gbVypi/+l+Vk=; b=Qd/YWzTpP/lyUCX/Mc1tVy3C08 n+Zpjb5Jh6UV14RkiERLFn5JhzyGo2VGvztybwOued6PCAp71n6oHv/SLPH2b791Ijl2JOtvks2Xl 9yP+Xsi8euRfYd3NbVsvNs6/cFUsCuHF8ZpdwPVLcz/QkbgW+0sHFH3JImrjpsQO18bC6spiVj8MW dOETWMduENRJyCPPLnZBPwrqdpDfrf/vWe6uYGHwgg++TvgbDvQiJMmtV2Xzx19Lx8v2QeBX5PAio qhCYkepa5RM9hAqcFlBypd54GrCupOh418gcSJyQxQNt7KnAIa77miYcpBk7ofqcmn1DJE0ty/Qgl wGHJoX2g==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE3-0008RD-4g; Fri, 29 May 2020 02:58:27 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 15/39] iomap: Support large pages in invalidatepage Date: Thu, 28 May 2020 19:58:00 -0700 Message-Id: <20200529025824.32296-16-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7B2766C26 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable 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: From: "Matthew Wilcox (Oracle)" If we're punching a hole in a large page, we need to remove the per-page iomap data, but not clear the dirty bit from the page, so separate the two conditions. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 423ffc9d4a97..23eaaf1de906 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -493,17 +493,21 @@ EXPORT_SYMBOL_GPL(iomap_releasepage); void iomap_invalidatepage(struct page *page, unsigned int offset, unsigned in= t len) { + bool full_page =3D (offset =3D=3D 0) && (len =3D=3D thp_size(page)); trace_iomap_invalidatepage(page->mapping->host, offset, len); =20 /* * If we are invalidating the entire page, clear the dirty state from i= t * and release it to avoid unnecessary buildup of the LRU. */ - if (offset =3D=3D 0 && len =3D=3D PAGE_SIZE) { + if (full_page) { WARN_ON_ONCE(PageWriteback(page)); cancel_dirty_page(page); - iomap_page_release(page); } + + /* Punching a hole in a THP requires releasing the iop */ + if (full_page || thp_order(page) > 0) + iomap_page_release(page); } EXPORT_SYMBOL_GPL(iomap_invalidatepage); =20 --=20 2.26.2