Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp364068ybp; Thu, 10 Oct 2019 20:00:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkxOE5oHFBkonZYa/W6/h8i89CFBDugq0BpSbLLq1KFYfN2UwwTQwjBrAPqgdnVushEHdF X-Received: by 2002:aa7:d90d:: with SMTP id a13mr11363003edr.2.1570762825594; Thu, 10 Oct 2019 20:00:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570762825; cv=none; d=google.com; s=arc-20160816; b=ymNDvZuLQ3p+jCXaJvetA7qhuCs0GsKREQ5cXtO+7yTl++tGg4CeBA/ZE9HDv3MHDN WF+8NG6PeP+4VuRVrshW+r8fcFFgQVcXxOEHv383RTCj9dHWU7igYi4Ufig6Tl3oJvZO y1hk7EhVi2ylSScEiD8GcEB8yuLmPUO6thWIDKKd4xj6w4yfpL1YXQ/4uppf8CDZ++48 FKyYF7eHqTx9iHbGnDmIDDRBf2yiCNzy+L7bKNuUCC1AvjhVAfPFRMQi0AtLsmVUB/Bw QYAXLijlLuW7BVtx7oh1BPQkkV50/y3HZIousqpmMrmvC+vIheguIDNcUGXVfQY2C56d QHQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=2aoMVFsdFZKmg/1W6Fxq9Av4/tBdjN7+6gu9b/vMJic=; b=Gr6Ev8i9qQcGb1/956tVhCuNugrZo+eHNb2LmAIHEVF+JpJnRs8/oqtq7mAF6/siGy +HW3j6YZ6zzx6MpIjloy2djhYgwWuc/Lly/i4lcFJs9wW40NDI1YQv1Ap2nxwJlNciQy VzxFfmbyy6ubzRrVdJZqtgWebuU52eXGL5phFLCdAmu/KJUyEVANs8UAUoPDKCqJkgF/ Lt4CAImYKebWS70eEztjpiObPPy9arOZ31BQGcvoAaJ2hI1Cukl7GSTXTaBxQU/OwSdQ OgWjwwwctdzHjee+eTuhqOg6dVrPSwpmu00nYKa4XeYEK+Kt3ZMkIcKOpQpvnHhkcu8D gWLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p3si4358114ejj.347.2019.10.10.20.00.02; Thu, 10 Oct 2019 20:00:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726423AbfJKC7O (ORCPT + 99 others); Thu, 10 Oct 2019 22:59:14 -0400 Received: from mga04.intel.com ([192.55.52.120]:57151 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726116AbfJKC7O (ORCPT ); Thu, 10 Oct 2019 22:59:14 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Oct 2019 19:59:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,282,1566889200"; d="scan'208";a="200658765" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 10 Oct 2019 19:59:11 -0700 From: Wei Yang To: akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, jglisse@redhat.com, mike.kravetz@oracle.com, riel@surriel.com, khlebnikov@yandex-team.ru, cai@lca.pw, shakeelb@google.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [Patch v3 1/2] mm/rmap.c: don't reuse anon_vma if we just want a copy Date: Fri, 11 Oct 2019 10:58:40 +0800 Message-Id: <20191011025841.16801-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before commit 7a3ef208e662 ("mm: prevent endless growth of anon_vma hierarchy"), anon_vma_clone() doesn't change dst->anon_vma. While after this commit, anon_vma_clone() will try to reuse an exist one on forking. But this commit go a little bit further for the case not forking. anon_vma_clone() is called from __vma_split(), __split_vma(), copy_vma() and anon_vma_fork(). For the first three places, the purpose here is get a copy of src and we don't expect to touch dst->anon_vma even it is NULL. While after that commit, it is possible to reuse an anon_vma when dst->anon_vma is NULL. This is not we intend to have. This patch stop reuse anon_vma for non-fork cases. Fix commit 7a3ef208e662 ("mm: prevent endless growth of anon_vma hierarchy") Signed-off-by: Wei Yang --- v3: * use dst->anon_vma and src->anon_vma to get reuse state pointed by Konstantin Khlebnikov --- mm/rmap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index d9a23bb773bf..fc0aba7fb9b9 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -250,7 +250,13 @@ static inline void unlock_anon_vma_root(struct anon_vma *root) * Attach the anon_vmas from src to dst. * Returns 0 on success, -ENOMEM on failure. * - * If dst->anon_vma is NULL this function tries to find and reuse existing + * anon_vma_clone() is called by __vma_split(), __split_vma(), copy_vma() and + * anon_vma_fork(). The first three want an exact copy of src, while the last + * one, anon_vma_fork(), may try to reuse an existing anon_vma to prevent + * endless growth of anon_vma. Since dst->anon_vma is set to NULL before call, + * we can identify this case by (reuse = !dst->anon_vma && src->anon_vma). + * + * If reuse is true, this function tries to find and reuse existing * anon_vma which has no vmas and only one child anon_vma. This prevents * degradation of anon_vma hierarchy to endless linear chain in case of * constantly forking task. On the other hand, an anon_vma with more than one @@ -262,6 +268,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src) { struct anon_vma_chain *avc, *pavc; struct anon_vma *root = NULL; + bool reuse = !dst->anon_vma && src->anon_vma; list_for_each_entry_reverse(pavc, &src->anon_vma_chain, same_vma) { struct anon_vma *anon_vma; @@ -286,8 +293,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src) * will always reuse it. Root anon_vma is never reused: * it has self-parent reference and at least one child. */ - if (!dst->anon_vma && anon_vma != src->anon_vma && - anon_vma->degree < 2) + if (reuse && anon_vma != src->anon_vma && anon_vma->degree < 2) dst->anon_vma = anon_vma; } if (dst->anon_vma) -- 2.17.1