From patchwork Thu Nov 15 18:09:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmed Abd El Mawgood X-Patchwork-Id: 10684813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C11421759 for ; Thu, 15 Nov 2018 18:09:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05EE2CE21 for ; Thu, 15 Nov 2018 18:09:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A45572CE37; Thu, 15 Nov 2018 18:09:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 380C72CE21 for ; Thu, 15 Nov 2018 18:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388844AbeKPESd (ORCPT ); Thu, 15 Nov 2018 23:18:33 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37530 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726453AbeKPESc (ORCPT ); Thu, 15 Nov 2018 23:18:32 -0500 Received: by mail-wr1-f65.google.com with SMTP id j10so8002391wru.4 for ; Thu, 15 Nov 2018 10:09:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mena-vt-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=eUb/ykbiDjRSxMeS2lRjQnFObTv9jCzDJK38qhNOr3Y=; b=DK5gbKhia9qRJTHZtkzxnlvs0UmYDkX3DLhm8mh1/vXrV5M7xkU8xhjqrntMKtmwZA 5aI+BdDv95IjvCwOuB0TFqZDPG6jz0F822BgHmFUgbw97HVUKifCpPaSbBkq892FEZgl Ps7wudFZdo+GvKp6VUXegb35QOm1BMxs7qdygWLeLLVllAlvQ5R89IlYkb9SKs0OQoAI nyqR5mwzHuTozSr11EET9jxpJeIdIHUvuDLgej22uWjmAHZ5IvH4NDMrMDOyYxV/BVaF /K9jDbDodwnWxl6tni17/sTjIxCrHFXtHZa/kJxwE14cLrcoSeHqTGtaWANSC+fRMfDU 5BMw== 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; bh=eUb/ykbiDjRSxMeS2lRjQnFObTv9jCzDJK38qhNOr3Y=; b=d1XA4Y4P1wH2ZcXF/lQnQLntI98umMS2Pcv40satMIv5rQqmDSsbjvBi1igh/9XOrr mnO9t6D7bQ6LOS3Bre5f0scvdxPV3oJbAnHPVwCt5jC6QFkOhV2owMdQXu7hOOOBB6br /wWKa/2QVlUhtKcxLn8Z5B/yGAZTrJoTHvr4vnJyktuxlZrDRE8ru6XOK91VnABvnpwu WLgPFvTyIDhNZ0kmyPOSgBDygc2UbP/rSuwBJvhBmsLJ/Dlx9wfZJ/XmmMxJ4jyPEfgU 1e54nwg4Ksrj9hR0Tur+xB0ewVkYw5KqpqwA1kLOwivXeipxZrIOR6jrcDXtf8IET5BR wFDA== X-Gm-Message-State: AGRZ1gILUnqabuJA1YpDkGtZq2W+/V91heTW0gUgZboetRxuFJC1/mPg PjpPbcRbPELb7eOD5XAsvE2/NA== X-Google-Smtp-Source: AJdET5eOLOANa5+P4GTahN1zAQ4iX9hQ4Q5KPTXWV4iDSHxv0HhRLzbLGbkU/em2GbAYxqX0FK7a0g== X-Received: by 2002:a5d:6091:: with SMTP id w17-v6mr6555678wrt.193.1542305379747; Thu, 15 Nov 2018 10:09:39 -0800 (PST) Received: from localhost.localdomain ([156.212.35.176]) by smtp.gmail.com with ESMTPSA id e7-v6sm21959888wra.10.2018.11.15.10.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 10:09:39 -0800 (PST) From: Ahmed Abd El Mawgood X-Google-Original-From: Ahmed Abd El Mawgood To: Shuah Khan , Paolo Bonzini , Andrew Jones , Peter Xu , Colin Ian King , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hossam Hassan <7ossam9063@gmail.com>, Ahmed Lotfy , Vitaly Kuznetsov , Anders Roxell Cc: Ahmed Abd El Mawgood Subject: [PATCH] SelfTest: KVM: Drop Asserts for madvise failures Date: Thu, 15 Nov 2018 20:09:07 +0200 Message-Id: <20181115180907.13974-1-ahmedsoliman0x666@gmail.com> X-Mailer: git-send-email 2.18.1 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ahmed Abd El Mawgood madvise() returns -1 without CONFIG_TRANSPARENT_HUGEPAGE=y. That would trigger asserts when checking for return value of madvice. Following similar decision to [1]. I thought it is ok to assume that madvise() failures implies that THP is not supported by host kernel. Other options were to check for Transparent Huge Page support in /sys/kernel/mm/transparent_hugepage/enabled. -- links -- [1] https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04514.html Signed-off-by: Ahmed Abd El Mawgood --- tools/testing/selftests/kvm/lib/kvm_util.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 1b41e71283d5..7725cfdf1b79 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -586,14 +586,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1); /* As needed perform madvise */ - if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) { - ret = madvise(region->host_mem, npages * vm->page_size, - src_type == VM_MEM_SRC_ANONYMOUS ? MADV_NOHUGEPAGE : MADV_HUGEPAGE); - TEST_ASSERT(ret == 0, "madvise failed,\n" - " addr: %p\n" - " length: 0x%lx\n" - " src_type: %x", - region->host_mem, npages * vm->page_size, src_type); + if (src_type == VM_MEM_SRC_ANONYMOUS) { + madvise(region->host_mem, npages * vm->page_size, + MADV_NOHUGEPAGE); + } else if (src_type == VM_MEM_SRC_ANONYMOUS_THP) { + madvise(region->host_mem, npages * vm->page_size, + MADV_HUGEPAGE); } region->unused_phy_pages = sparsebit_alloc();