From patchwork Wed Jun 10 06:27:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenwei Tao X-Patchwork-Id: 6576701 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69EA2C0020 for ; Wed, 10 Jun 2015 06:32:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97266203A1 for ; Wed, 10 Jun 2015 06:32:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDAEE20523 for ; Wed, 10 Jun 2015 06:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754156AbbFJGcu (ORCPT ); Wed, 10 Jun 2015 02:32:50 -0400 Received: from mail-pd0-f193.google.com ([209.85.192.193]:35581 "EHLO mail-pd0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753814AbbFJGcp (ORCPT ); Wed, 10 Jun 2015 02:32:45 -0400 Received: by pdbht2 with SMTP id ht2so7454125pdb.2; Tue, 09 Jun 2015 23:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UQpSrjTgNT5MDkwF+PXY17a0XBU1njZOxVVTdRyw0Q0=; b=ogeTCJZJq13RlvePWLbCUJo1IqET6yxupMfCQXBP82yFC1/DpfdsAiJXk/AcPOXx3q cWX+MhN0CNdIzC8RzqsmfzFcm+8huDYsDdALmyQHylMey2b8x2mayneodKS2QTLAVn8f Zq5zWurjTnWFiNBYZ5yd+PKTSa6QHwuOjWstvXqSzwT/2FlujTh7yNYEgoEdrpkiDfSB EYrCtZUkoDYyfxtFApCfTY6ARa0LKXq+ASn8p+hDydF58WuCBblppvPw69tSqlbpLkMj 9uYK+cJbczebnkSyJovELNXGhfF96FH/exx/eIcNaphF5+rJYxTorKn0aqH6HAm8rtm8 7Jgw== X-Received: by 10.68.232.164 with SMTP id tp4mr2861133pbc.101.1433917964876; Tue, 09 Jun 2015 23:32:44 -0700 (PDT) Received: from wenweitao01ubtpc.spreadtrum.com ([175.111.195.49]) by mx.google.com with ESMTPSA id ve1sm7425188pbc.52.2015.06.09.23.32.37 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 23:32:43 -0700 (PDT) From: Wenwei Tao To: izik.eidus@ravellosystems.com, aarcange@redhat.com, chrisw@sous-sol.org, hughd@google.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, viro@zeniv.linux.org.uk Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, wenweitaowenwei@gmail.com Subject: [RFC PATCH 4/6] fs/binfmt_elf.c: change the condition of identifying hugetlb vm Date: Wed, 10 Jun 2015 14:27:17 +0800 Message-Id: <1433917639-31699-5-git-send-email-wenweitaowenwei@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1433917639-31699-1-git-send-email-wenweitaowenwei@gmail.com> References: <1433917639-31699-1-git-send-email-wenweitaowenwei@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hugetlb VMAs are not mergeable, that means a VMA couldn't have VM_HUGETLB and VM_MERGEABLE been set in the same time. So we use VM_HUGETLB to indicate new mergeable VMAs. Because of that a VMA which has VM_HUGETLB been set is a hugetlb VMA only if it doesn't have VM_MERGEABLE been set in the same time. Signed-off-by: Wenwei Tao --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 995986b..f529c8e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1242,7 +1242,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, return 0; /* Hugetlb memory check */ - if (vma->vm_flags & VM_HUGETLB) { + if ((vma->vm_flags & (VM_HUGETLB | VM_MERGEABLE)) == VM_HUGETLB) { if ((vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_SHARED)) goto whole; if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE))