From patchwork Sat Oct 16 06:45:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thinh Tran X-Patchwork-Id: 101858 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 78131A0548; Sat, 16 Oct 2021 08:45:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 433FE40040; Sat, 16 Oct 2021 08:45:57 +0200 (CEST) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mails.dpdk.org (Postfix) with ESMTP id 643FB4003F for ; Sat, 16 Oct 2021 08:45:55 +0200 (CEST) Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19G5X6VL034678; Sat, 16 Oct 2021 02:45:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=bs/tB1fC4ex1Ct6zBxbsdWrVXWWW6AC6dsJzhAQREZ0=; b=Lz4RVrM5fjUBL67fWARkJQDG0bos/07YJpf5DYm8iSAciAHMnIFjmDLNfWve5+a//Zeb 6BZdnIWMYT8PgFxxgIb62THZWEtH/vDknVPR00MWFlS8CbS9D9GCHHq5LwnJG1NLPadw 4I93dPN2Sy7epyowKnMTf2wMmmCKSguegjQFDVuqVeUp9aHFQs5BBPEA136V8wQlO7eS HV9baLsSCs9SCtTPj2VuSDB5O5tWpeqFZNDhqQquSq0+vTKcmN8XwzUR3XD/8NyagHkN Us4vaO4afayJjtiFa2NMYFAIS8Zk9bkqd9PvpTlwjOwC2/DcYoTKHSkWb02xEmBui0du hw== Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bqqxrhm60-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 16 Oct 2021 02:45:54 -0400 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19G6hnoR026452; Sat, 16 Oct 2021 06:45:53 GMT Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by ppma02wdc.us.ibm.com with ESMTP id 3bqpc99umb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 16 Oct 2021 06:45:53 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 19G6jq3G32833918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 16 Oct 2021 06:45:52 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7B1FFAC05B; Sat, 16 Oct 2021 06:45:52 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6CC04AC05F; Sat, 16 Oct 2021 06:45:52 +0000 (GMT) Received: from linux.vnet.ibm.com (unknown [9.114.219.126]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Sat, 16 Oct 2021 06:45:52 +0000 (GMT) From: Thinh Tran To: dts@dpdk.org Cc: weix.ling@intel.com, yux.jiang@intel.com, lijuan.tu@intel.com, Thinh Tran Date: Sat, 16 Oct 2021 06:45:44 +0000 Message-Id: <20211016064544.1048200-1-thinhtr@linux.vnet.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210930172051.683731-1-thinhtr@linux.vnet.ibm.com> References: <20210930172051.683731-1-thinhtr@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: N0aroyg4tYVl3CZm1CuMOoe3UyeZ_aIn X-Proofpoint-ORIG-GUID: N0aroyg4tYVl3CZm1CuMOoe3UyeZ_aIn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-16_02,2021-10-14_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1011 suspectscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 impostorscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110160043 Subject: [dts] [PATCH v3] Framework:fix the first numa node may not be '0' X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" On certain Virtual Machine system such as Power Virtual Machine, PowerVM, assigns the CPUs of its virtual machines (or Logical Partitions LPARs) to NUMA nodes, and so the VM (or LPARs) 's CPUs may be on different ID other than '0'. This patch should fix that. v2: correct spelling and remove trailing whitespace v3: * adding a flag to check if default hugepages is already cleared Signed-off-by: Thinh Tran --- framework/crb.py | 14 ++++++++------ framework/dut.py | 40 +++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/framework/crb.py b/framework/crb.py index 40fe4fd1..89255f00 100644 --- a/framework/crb.py +++ b/framework/crb.py @@ -61,6 +61,7 @@ class Crb(object): self.stage = 'pre-init' self.name = name self.trex_prefix = None + self.default_hugepages_cleared = False self.logger = getLogger(name) self.session = SSHConnection(self.get_ip_address(), name, @@ -204,24 +205,25 @@ class Crb(object): else: return '' - def set_huge_pages(self, huge_pages, numa=-1): + def set_huge_pages(self, huge_pages, numa=""): """ Set numbers of huge pages """ page_size = self.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ") - if numa == -1: + if not numa: self.send_expect('echo %d > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, page_size), '# ', 5) else: - # sometimes we set hugepage on kernel cmdline, so we clear all nodes' default hugepages at the first time. - if numa == 0: + # sometimes we set hugepage on kernel cmdline, so we clear it + if not self.default_hugepages_cleared: self.send_expect('echo 0 > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (page_size), '# ', 5) + self.default_hugepages_cleared = True # some platform not support numa, example vm dut try: - self.send_expect('echo %d > /sys/devices/system/node/node%d/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, numa, page_size), '# ', 5) + self.send_expect('echo %d > /sys/devices/system/node/%s/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, numa, page_size), '# ', 5) except: - self.logger.warning("set %d hugepage on socket %d error" % (huge_pages, numa)) + self.logger.warning("set %d hugepage on %s error" % (huge_pages, numa)) self.send_expect('echo %d > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages. page_size), '# ', 5) def set_speedup_options(self, read_cache, skip_setup): diff --git a/framework/dut.py b/framework/dut.py index f5481d06..65e8d597 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -547,16 +547,15 @@ class Dut(Crb): return hugepages_size = self.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ") total_huge_pages = self.get_total_huge_pages() - total_numa_nodes = self.send_expect("ls /sys/devices/system/node | grep node* | wc -l", "# ") - numa_service_num = self.get_def_rte_config('CONFIG_RTE_MAX_NUMA_NODES') - try: - int(total_numa_nodes) - except ValueError: + numa_nodes = self.send_expect("ls /sys/devices/system/node | grep node*", "# ") + if not numa_nodes: total_numa_nodes = -1 - if numa_service_num is not None: - numa = min(int(total_numa_nodes), int(numa_service_num)) else: - numa = total_numa_nodes + numa_nodes = numa_nodes.splitlines() + total_numa_nodes = len(numa_nodes) + self.logger.info(numa_nodes) + + force_socket = False if int(hugepages_size) < (1024 * 1024): @@ -578,16 +577,23 @@ class Dut(Crb): arch_huge_pages = hugepages if hugepages > 0 else 2048 if total_huge_pages != arch_huge_pages: - # before all hugepage average distribution by all socket, - # but sometimes create mbuf pool on socket 0 failed when setup testpmd, - # so set all huge page on socket 0 - if force_socket: - self.set_huge_pages(arch_huge_pages, 0) + if total_numa_nodes == -1 : + self.set_huge_pages(arch_huge_pages) else: - for numa_id in range(0, int(numa)): - self.set_huge_pages(arch_huge_pages, numa_id) - if numa == -1: - self.set_huge_pages(arch_huge_pages) + # before all hugepage average distribution by all socket, + # but sometimes create mbuf pool on socket 0 failed when + # setup testpmd, so set all huge page on first socket + if force_socket: + self.set_huge_pages(arch_huge_pages, numa_nodes[0]) + self.logger.info("force_socket on %s" % numa_nodes[0]) + else: + numa_service_num = self.get_def_rte_config('CONFIG_RTE_MAX_NUMA_NODES') + if numa_service_num is not None: + total_numa_nodes = min(total_numa_nodes, int(numa_service_num)) + + # set huge pages to configured total_numa_nodes + for numa_node in numa_nodes[:total_numa_nodes]: + self.set_huge_pages(arch_huge_pages, numa_node) self.mount_huge_pages() self.hugepage_path = self.strip_hugepage_path()