Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101858/?format=api
{ "id": 101858, "url": "http://patches.dpdk.org/api/patches/101858/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20211016064544.1048200-1-thinhtr@linux.vnet.ibm.com/", "project": { "id": 3, "url": "http://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20211016064544.1048200-1-thinhtr@linux.vnet.ibm.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20211016064544.1048200-1-thinhtr@linux.vnet.ibm.com", "date": "2021-10-16T06:45:44", "name": "[v3] Framework:fix the first numa node may not be '0'", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "46d8c2b19fd6422715013d342477f4da412a019d", "submitter": { "id": 1341, "url": "http://patches.dpdk.org/api/people/1341/?format=api", "name": "Thinh Tran", "email": "thinhtr@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20211016064544.1048200-1-thinhtr@linux.vnet.ibm.com/mbox/", "series": [ { "id": 19706, "url": "http://patches.dpdk.org/api/series/19706/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=19706", "date": "2021-10-16T06:45:44", "name": "[v3] Framework:fix the first numa node may not be '0'", "version": 3, "mbox": "http://patches.dpdk.org/series/19706/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/101858/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/101858/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 78131A0548;\n\tSat, 16 Oct 2021 08:45:57 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 433FE40040;\n\tSat, 16 Oct 2021 08:45:57 +0200 (CEST)", "from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n [148.163.156.1]) by mails.dpdk.org (Postfix) with ESMTP id 643FB4003F\n for <dts@dpdk.org>; Sat, 16 Oct 2021 08:45:55 +0200 (CEST)", "from pps.filterd (m0187473.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id\n 19G5X6VL034678;\n Sat, 16 Oct 2021 02:45:54 -0400", "from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com\n [169.55.91.170])\n by mx0a-001b2d01.pphosted.com with ESMTP id 3bqqxrhm60-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Sat, 16 Oct 2021 02:45:54 -0400", "from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1])\n by ppma02wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19G6hnoR026452;\n Sat, 16 Oct 2021 06:45:53 GMT", "from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com\n [9.57.198.29]) by ppma02wdc.us.ibm.com with ESMTP id 3bqpc99umb-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Sat, 16 Oct 2021 06:45:53 +0000", "from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com\n [9.57.199.111])\n by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 19G6jq3G32833918\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sat, 16 Oct 2021 06:45:52 GMT", "from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 7B1FFAC05B;\n Sat, 16 Oct 2021 06:45:52 +0000 (GMT)", "from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 6CC04AC05F;\n Sat, 16 Oct 2021 06:45:52 +0000 (GMT)", "from linux.vnet.ibm.com (unknown [9.114.219.126])\n by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP;\n Sat, 16 Oct 2021 06:45:52 +0000 (GMT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com;\n h=from : to : cc : subject\n : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding; s=pp1;\n bh=bs/tB1fC4ex1Ct6zBxbsdWrVXWWW6AC6dsJzhAQREZ0=;\n b=Lz4RVrM5fjUBL67fWARkJQDG0bos/07YJpf5DYm8iSAciAHMnIFjmDLNfWve5+a//Zeb\n 6BZdnIWMYT8PgFxxgIb62THZWEtH/vDknVPR00MWFlS8CbS9D9GCHHq5LwnJG1NLPadw\n 4I93dPN2Sy7epyowKnMTf2wMmmCKSguegjQFDVuqVeUp9aHFQs5BBPEA136V8wQlO7eS\n HV9baLsSCs9SCtTPj2VuSDB5O5tWpeqFZNDhqQquSq0+vTKcmN8XwzUR3XD/8NyagHkN\n Us4vaO4afayJjtiFa2NMYFAIS8Zk9bkqd9PvpTlwjOwC2/DcYoTKHSkWb02xEmBui0du hw==", "From": "Thinh Tran <thinhtr@linux.vnet.ibm.com>", "To": "dts@dpdk.org", "Cc": "weix.ling@intel.com, yux.jiang@intel.com, lijuan.tu@intel.com,\n Thinh Tran <thinhtr@linux.vnet.ibm.com>", "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", "Content-Transfer-Encoding": "8bit", "X-TM-AS-GCONF": "00", "X-Proofpoint-GUID": "N0aroyg4tYVl3CZm1CuMOoe3UyeZ_aIn", "X-Proofpoint-ORIG-GUID": "N0aroyg4tYVl3CZm1CuMOoe3UyeZ_aIn", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475\n definitions=2021-10-16_02,2021-10-14_02,2020-04-07_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n priorityscore=1501\n malwarescore=0 clxscore=1011 suspectscore=0 lowpriorityscore=0\n phishscore=0 adultscore=0 impostorscore=0 spamscore=0 mlxscore=0\n mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx\n 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 <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "On certain Virtual Machine system such as Power Virtual Machine, PowerVM,\nassigns the CPUs of its virtual machines (or Logical Partitions LPARs) to\nNUMA nodes, and so the VM (or LPARs) 's CPUs may be on different ID\nother than '0'.\nThis patch should fix that.\n\nv2: correct spelling and remove trailing whitespace\n\nv3: \n* adding a flag to check if default hugepages is already cleared\n\nSigned-off-by: Thinh Tran <thinhtr@linux.vnet.ibm.com>\n---\n framework/crb.py | 14 ++++++++------\n framework/dut.py | 40 +++++++++++++++++++++++-----------------\n 2 files changed, 31 insertions(+), 23 deletions(-)", "diff": "diff --git a/framework/crb.py b/framework/crb.py\nindex 40fe4fd1..89255f00 100644\n--- a/framework/crb.py\n+++ b/framework/crb.py\n@@ -61,6 +61,7 @@ class Crb(object):\n self.stage = 'pre-init'\n self.name = name\n self.trex_prefix = None\n+ self.default_hugepages_cleared = False\n \n self.logger = getLogger(name)\n self.session = SSHConnection(self.get_ip_address(), name,\n@@ -204,24 +205,25 @@ class Crb(object):\n else:\n return ''\n \n- def set_huge_pages(self, huge_pages, numa=-1):\n+ def set_huge_pages(self, huge_pages, numa=\"\"):\n \"\"\"\n Set numbers of huge pages\n \"\"\"\n page_size = self.send_expect(\"awk '/Hugepagesize/ {print $2}' /proc/meminfo\", \"# \")\n \n- if numa == -1:\n+ if not numa:\n self.send_expect('echo %d > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, page_size), '# ', 5)\n else:\n- # sometimes we set hugepage on kernel cmdline, so we clear all nodes' default hugepages at the first time.\n- if numa == 0:\n+ # sometimes we set hugepage on kernel cmdline, so we clear it\n+ if not self.default_hugepages_cleared:\n self.send_expect('echo 0 > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (page_size), '# ', 5)\n+ self.default_hugepages_cleared = True\n \n # some platform not support numa, example vm dut\n try:\n- self.send_expect('echo %d > /sys/devices/system/node/node%d/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, numa, page_size), '# ', 5)\n+ self.send_expect('echo %d > /sys/devices/system/node/%s/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages, numa, page_size), '# ', 5)\n except:\n- self.logger.warning(\"set %d hugepage on socket %d error\" % (huge_pages, numa))\n+ self.logger.warning(\"set %d hugepage on %s error\" % (huge_pages, numa))\n self.send_expect('echo %d > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (huge_pages. page_size), '# ', 5)\n \n def set_speedup_options(self, read_cache, skip_setup):\ndiff --git a/framework/dut.py b/framework/dut.py\nindex f5481d06..65e8d597 100644\n--- a/framework/dut.py\n+++ b/framework/dut.py\n@@ -547,16 +547,15 @@ class Dut(Crb):\n return\n hugepages_size = self.send_expect(\"awk '/Hugepagesize/ {print $2}' /proc/meminfo\", \"# \")\n total_huge_pages = self.get_total_huge_pages()\n- total_numa_nodes = self.send_expect(\"ls /sys/devices/system/node | grep node* | wc -l\", \"# \")\n- numa_service_num = self.get_def_rte_config('CONFIG_RTE_MAX_NUMA_NODES')\n- try:\n- int(total_numa_nodes)\n- except ValueError:\n+ numa_nodes = self.send_expect(\"ls /sys/devices/system/node | grep node*\", \"# \")\n+ if not numa_nodes:\n total_numa_nodes = -1\n- if numa_service_num is not None:\n- numa = min(int(total_numa_nodes), int(numa_service_num))\n else:\n- numa = total_numa_nodes\n+ numa_nodes = numa_nodes.splitlines()\n+ total_numa_nodes = len(numa_nodes)\n+ self.logger.info(numa_nodes)\n+\n+\n force_socket = False\n \n if int(hugepages_size) < (1024 * 1024):\n@@ -578,16 +577,23 @@ class Dut(Crb):\n arch_huge_pages = hugepages if hugepages > 0 else 2048\n \n if total_huge_pages != arch_huge_pages:\n- # before all hugepage average distribution by all socket,\n- # but sometimes create mbuf pool on socket 0 failed when setup testpmd,\n- # so set all huge page on socket 0\n- if force_socket:\n- self.set_huge_pages(arch_huge_pages, 0)\n+ if total_numa_nodes == -1 :\n+ self.set_huge_pages(arch_huge_pages)\n else:\n- for numa_id in range(0, int(numa)):\n- self.set_huge_pages(arch_huge_pages, numa_id)\n- if numa == -1:\n- self.set_huge_pages(arch_huge_pages)\n+ # before all hugepage average distribution by all socket,\n+ # but sometimes create mbuf pool on socket 0 failed when \n+ # setup testpmd, so set all huge page on first socket\n+ if force_socket:\n+ self.set_huge_pages(arch_huge_pages, numa_nodes[0])\n+ self.logger.info(\"force_socket on %s\" % numa_nodes[0])\n+ else:\n+ numa_service_num = self.get_def_rte_config('CONFIG_RTE_MAX_NUMA_NODES')\n+ if numa_service_num is not None:\n+ total_numa_nodes = min(total_numa_nodes, int(numa_service_num))\n+\n+ # set huge pages to configured total_numa_nodes\n+ for numa_node in numa_nodes[:total_numa_nodes]:\n+ self.set_huge_pages(arch_huge_pages, numa_node)\n \n self.mount_huge_pages()\n self.hugepage_path = self.strip_hugepage_path()\n", "prefixes": [ "v3" ] }