From patchwork Fri Mar 27 17:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 11462707 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 7B898913 for ; Fri, 27 Mar 2020 17:06:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4801F2072F for ; Fri, 27 Mar 2020 17:06:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="z3j+Mugv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4801F2072F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 80EE56B006E; Fri, 27 Mar 2020 13:06:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7704D6B0070; Fri, 27 Mar 2020 13:06:07 -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 4B17C6B0071; Fri, 27 Mar 2020 13:06:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0174.hostedemail.com [216.40.44.174]) by kanga.kvack.org (Postfix) with ESMTP id 237636B006E for ; Fri, 27 Mar 2020 13:06:07 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0D3E9181AD0A4 for ; Fri, 27 Mar 2020 17:06:07 +0000 (UTC) X-FDA: 76641769974.18.balls02_6f8e160982525 X-Spam-Summary: 2,0,0,bcda6f222e0ae3b1,d41d8cd98f00b204,kirill@shutemov.name,,RULES_HIT:41:355:379:541:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3870:3872:4250:4321:5007:6261:6653:7903:8957:10004:11026:11473:11658:11914:12043:12297:12438:12517:12519:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21444:21451:21627:30054:30090,0,RBL:209.85.167.65:@shutemov.name:.lbl8.mailshell.net-66.201.201.201 62.8.0.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:26,LUA_SUMMARY:none X-HE-Tag: balls02_6f8e160982525 X-Filterd-Recvd-Size: 4287 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Fri, 27 Mar 2020 17:06:06 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id j188so8460033lfj.11 for ; Fri, 27 Mar 2020 10:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uEmPFiw3NMkf3IfRIxWgnKIkN+OrB/j1csttn5Htb5E=; b=z3j+MugvIOEV5ZTNeV8Y5iSCTsByA3McfeDK2HMga5j30TJGS1jCU2mARtvWuwgHZT wBwryyzEC9XH8i28e+3+RHU3jD6Q86e2Y7N/2LASbsk4xhgGhE/LKp0YxH614uxCaLm2 Uxb43/hP9GUS78Cz+RGLCxlp/k0xwNjWmpLM/AY1ydd0ToWnqmkTAkioJShsGdnUnmIq KDHOOiJRSvG43K61Vm4lBM4R+aHhWi5VCLrVpWl0+Xy9KMLWv5aei3nbPj/r3QC5WhNR oOxCPsb+UmkK4aAszIDPTddUV08oDFX+pDtf6D7W6u5qb88ypahuJSlTJ0irMeO6isQL UEHQ== 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=uEmPFiw3NMkf3IfRIxWgnKIkN+OrB/j1csttn5Htb5E=; b=ih1e6I6x+ESEFXIk+aGJnhSd0oIohZK4ktDr0ytdGOdOzNXZszRU6IJ/7ZOsWrTFPs JkG03JkMONN2rCxFmhfOltQYk/FWeU0tMZJAgGNMbAD3ZhwbZMWCkji8GclrTfQoa+rs Yrh65wyk4vNerQwL53qQjo8C9P3X1q9FUcqZecVTHgUqF5shAtyYZqirIJ58y3OOoF+9 dO8awO/kQlSqaU3AAN7KMXt3tfw9DY3YGP5VXKOEq9vp/SrOdCTPMGMGVZiO8lu+vsgI EbXdDzoUeGpUEwBEXnf3Fl1X6RadzaNulp96h97E4d1kW6dqwLq7LHa6euF/B/SYO06m 2SjQ== X-Gm-Message-State: AGi0PubQ+EDAEU/aLirKunMFCG/sUYTjBsIZp8iM+DE89KYj8AcEzMQK +0jtOB90ZAVN06IpnK8GQsW2sWyAc0Y= X-Google-Smtp-Source: APiQypI3S8W00hxoDxa3oFcnVq3mUYLKs3IlsAXA0vKYmfajc3bCUm9dNAKtZxa0tJ1SdtOMPJlmlg== X-Received: by 2002:a19:4f01:: with SMTP id d1mr184636lfb.182.1585328764571; Fri, 27 Mar 2020 10:06:04 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id c5sm3225046lfg.82.2020.03.27.10.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 10:06:03 -0700 (PDT) From: "Kirill A. Shutemov" X-Google-Original-From: "Kirill A. Shutemov" Received: by box.localdomain (Postfix, from userid 1000) id 699D3100D28; Fri, 27 Mar 2020 20:06:07 +0300 (+03) To: akpm@linux-foundation.org, Andrea Arcangeli Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 3/7] khugepaged: Drain LRU add pagevec to get rid of extra pins Date: Fri, 27 Mar 2020 20:05:57 +0300 Message-Id: <20200327170601.18563-4-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200327170601.18563-1-kirill.shutemov@linux.intel.com> References: <20200327170601.18563-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 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: __collapse_huge_page_isolate() may fail due to extra pin in the LRU add pagevec. It's petty common for swapin case: we swap in pages just to fail due to the extra pin. Signed-off-by: Kirill A. Shutemov Reviewed-by: Zi Yan Reviewed-by: Yang Shi --- mm/khugepaged.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 14d7afc90786..39e0994abeb8 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -585,11 +585,19 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, * The page must only be referenced by the scanned process * and page swap cache. */ + if (page_count(page) != 1 + PageSwapCache(page)) { + /* + * Drain pagevec and retry just in case we can get rid + * of the extra pin, like in swapin case. + */ + lru_add_drain(); + } if (page_count(page) != 1 + PageSwapCache(page)) { unlock_page(page); result = SCAN_PAGE_COUNT; goto out; } + if (pte_write(pteval)) { writable = true; } else {