From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755675AbcFTPuh (ORCPT ); Mon, 20 Jun 2016 11:50:37 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:37136 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755609AbcFTPtF (ORCPT ); Mon, 20 Jun 2016 11:49:05 -0400 From: Yannick Brosseau To: , , CC: , Yannick Brosseau Subject: [PATCH] selftests/vm: write strlen length instead of sizeof to nr_hugepages Date: Mon, 20 Jun 2016 08:07:21 -0700 Message-ID: <1466435241-7954-1-git-send-email-scientist@fb.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c090:180::1:d16e] X-ClientProxiedBy: BY1PR18CA0026.namprd18.prod.outlook.com (10.162.126.36) To BY1PR15MB0120.namprd15.prod.outlook.com (10.161.97.24) X-MS-Office365-Filtering-Correlation-Id: dc5254fb-0460-45de-8713-08d3991c9c87 X-Microsoft-Exchange-Diagnostics: 1;BY1PR15MB0120;2:tGIvls71xfJFFSRAOSN2Lx69vcgUR5vMHQI71Gc/SMWIHnpVITqE6xFjiJoemCnJdXqThX7MxoyiQYd/5zexhPJa1meUrGCSQwJeGXYNrNP8ZOih/ZPJRwCmMyArT01q0yLpMU6uDC3yYxgD5syZQ+yEPRidftkkyI+JmMITiPzLq9PEAMjaTbeNfjwC73m2;3:1k5GjPI5NQ3oNmJvwH8RmKDlgOtHxvzk7dQqUhWdMMNwunap9IvlhqxoLvAdpxlKDxj7oKOZ34iEAutQk8Zno19Eg/6cgAAvY9AELmlPLa7ik1elsJSbitKrw2KEcayy X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR15MB0120; X-Microsoft-Exchange-Diagnostics: 1;BY1PR15MB0120;25:pYucTvTyb3o2blGdMmUoX9CgYWFC3o/qb4sP4RJUCxbDFS8aebuQBHgLoDbw7m9P9Q72BF4MZXqWQ2UHmLxD1+1DufjtsozGw8tpD9QusZ/99quT00qA/nyQGT0fSWvKTGQF9jbS0t2y6eydwO9s6/cCYWkCMwZc3lATREL0LCsCwUqV2BubeuvX9AuZRqohwHNmfk2TovT0ebPjyIqGV4xmxWFbaIdwKj0dN1ab0aa9PpML+e289aChmUP3OjtYwe2ViUa095ySij7g+LeCrSsN4zGaMhT8GNaECqWmBhlQwCjQyHTVzlbTuUbhzwiNvvDaj+axvFr0wnqjkXw2RuGRfipFa8A6AWMVOm3C22w7K5nZvcwx+RVLGoYjyzZBbQY11b3sMmjusnkk6Nt7S5ptGKuqAk6d0MH3xHgBiLr9glAPlqVJf1i0aoNCTIHWer2qXtKEPjiCq+A4k+f+DY2qnrUt7AToSU3Isp5fzfv3P/wGQd/zr5l5nPhqvoSJsW4+Q2/T8D0/xBUzTDfZAc3xg+E9Q6GoKybz3NoBvYhkNbB3Lxa08YYAI6+72o8a3OKr2ww3w9K4AEM8YU9LfC2igHh2mC/oNPZ7QT66OPAkK01q21L5YLJCXxjEqVuxTcPM9SfWg7ZB0xYuW9dwzPtQkXUnJAPMcDl6cZ21WpgHhQGb8OpnLeCKsEzkvIq49EHlTflBPD83y/oQl5cWPHzYbcqp73SVmy+Psfu82fk=;20:F36yGfw0+96vsvNAP79e8AwJ9zuKo0I9QBXrT7Q4+46n7xBexq1PagSGRkwkQwAi5etxCecTq/es6a4+y1MVYYfQNsPGzmj/j0HxSLLkpWDgbWY61+FYEY4urkCHT/zaXtXpgXVs88Sdx4KAxmQHxb+l9x1/KwVyGabl+N/YT+c= X-LD-Processed: 8ae927fe-1255-47a7-a2af-5f3a069daaa2,ExtAddr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001);SRVR:BY1PR15MB0120;BCL:0;PCL:0;RULEID:;SRVR:BY1PR15MB0120; X-Microsoft-Exchange-Diagnostics: 1;BY1PR15MB0120;4:1avGfbWs2TqI7CFNrZ9D+eQ7e+vN6KIBwquvmtstJFEr+uNEO0l6HnU17/rXiu9joFzfMwTxAA4qgPULsLWHMMMt/RjGNwuvmD/y3xtZy/24sh+18QHEIi7wFBimvM3ggxQ2h8kyZ6wW1AOaA93rLOeR2zBRqLXZ2Lkh7AZMfAGdv39EpMiGmR9Sf3Qbga0G4JVYKb6XuPgL57rea+YYAvkUJiPzx/DLIcRBW6swfxu0Gggrhp4brR0HAW9YUE8HNRs9rU6fjcEPzrDM2AK1g75Hwu51ltL45WJcjbMFdx8MBGYCx59Wqv81BvmDiggUbR0SgZOw08M5dDps765XW0SBQGqH6FplsIikJhUNv6zNadgQJePt1KHZYS/SwNc3MAAq1XOGjSOxju0KdvDDiEHcnteCaX4TVAkhy+ma5OA= X-Forefront-PRVS: 09796A1B83 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(189998001)(101416001)(19580395003)(47776003)(5001770100001)(2201001)(106356001)(8676002)(229853001)(7736002)(97736004)(105586002)(7846002)(6116002)(81156014)(586003)(81166006)(50986999)(50226002)(42186005)(36756003)(4326007)(77096005)(2906002)(5003940100001)(33646002)(21086003)(92566002)(48376002)(68736007)(50466002)(19580405001)(51496004)(44646005)(3826002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR15MB0120;H:fb.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;CAT:NONE;LANG:en;CAT:NONE; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR15MB0120;23:sWRNg27X8TjN7DUNeUJCpXq8y+OCYEk7tBxC67Joa?= =?us-ascii?Q?lOQKANdGYsFP7KbT7cxeuo41YYqY1g3iZZbj1OBGhvis51oCAsfXIHxS+YEd?= =?us-ascii?Q?2bHVkN3toww4WcqJgT3oCVtlxyWGBc0niK1BozXRXcBxR7bYp3ma2AVWCVGe?= =?us-ascii?Q?i0aWkCjMkNZ7dh4MD7pYFxZxLIEkmlGYVVwf3Qk7GixnnBLesvEyAGfSOgjP?= =?us-ascii?Q?VE41ZotT1InxsZj6GpgumgrxPdxkHCiga6vF0bCt/Ph2oAtlDyM3f0X75m95?= =?us-ascii?Q?UHwxM9MoLpBeJB98c3jFZ5iPp4HKLmCfa9gPwTeE7IkSDU+4VFIE8FjOZEES?= =?us-ascii?Q?k6D1igmm+JTdIvQF/h1A1Cu/pU2l6VnyyrPRLlFsKsuKZI+s0QmHfOUJYRCo?= =?us-ascii?Q?j2NIJ/mQ02Vqje/CUSbY8x5WOkl06Q1j5uXwIFVAStHgtrmxXLZvPqDLoF+u?= =?us-ascii?Q?uD1zme+Anr8xdBGZIMNUgDk5TUxGLVeOT+rX88jhm4fkTs0Vpjg4xLTZPalM?= =?us-ascii?Q?T4UB/RiINR7ltdM5UlmgSacuhQaM/obN0v09SZQG7vhR52ULfGeoaIKRyIqP?= =?us-ascii?Q?AIjCjMHvkjzxoO8N1AyfTG1i2zoXvoMYnJ5Fx0yFvDZmV9U7HQ0Np738qBAR?= =?us-ascii?Q?xBXkD3UlpzaeNMhg4Ch1Kjlzh85dKk8okJ8YYlDny8cDPo/ShVdCaoBR2q0F?= =?us-ascii?Q?YAXIzbMV7s30u7kW1FbtQquGKxldb39W1VwFeeN6MEuKSXkDWlCRTQTJcqZ7?= =?us-ascii?Q?JvvkqWb/5S4LBgxeHsQibyXcXb/xgmLcJVotJ65kDXRvJSbDxyqZLVzFrLjY?= =?us-ascii?Q?LHwxdxGhELma9CFPv02T5OcpcoGTVw8Wkf9xYXIsb/cF49XdKrkF3pWvNE08?= =?us-ascii?Q?DkXyPywOmNtuKNUN1Fduym260u+64C0uS5wu5jvpBy6/zd8kgBr7j48Fwm5N?= =?us-ascii?Q?NtUtURO/dTadbyO4rMosX0BYWYSwvndoXUbdaJ7klDQkmxf6WVyegQEvNuyr?= =?us-ascii?Q?txB+Xp4c9hW9ywY2tycStfZuYqKiUXfXWQgNjrw2Mt/jhtvTs9w3Ets+w/q7?= =?us-ascii?Q?LGyY+8=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR15MB0120;6:uISqoz94ao64XNGDPxxJt/fMIy839NC5iEjPh0OY7eYyp2Csn4mVS4ssbW9Wl2sAW7kROG26Kh59xE9oPVw+ukNXaIfGhJn+6B19yGFHJ/Dz1n80vIgJnQGd7J/MNLUxWDXjguJzXmaJXeW+vBVTdH1Vf/B0ukak6v9gEg7PBvQhwMZrF+wJ1Ww2PV7RFC/4eAH68tYU3gpUc3UxhHrb1zeSnkYULLhlbObaVf2hWGq+krwTNBQwowwKt90DJLMDKTNhJKxn3J2nEnJ+jfV16GyxvXh2q/vniCBC0DGsuug=;5:4sGnvVmAiJEDoklSkUAt6xs09ZDCbOVYm8E670m57RQxbWdxXdp9EolQUFagAD0x/p5PMPmWgM+r3ralFnzXSDhgawKK7X+5zq9As9fjzD0a0Wa26fuob1qfUUuzNb//Z77Am7QszFxl2bYZKfUhNA==;24:fO1+rt5P8KlYTCiLhByjDe4qctaod4mCMcI2+24hwEGPiJk9HDs/ZZQIP3VIZRzhW0rmgHi8bGj9Abl5+JMb76IYUiC5Bbk1e9bkq4MPMdA=;7:XlLGRUvuBcJcYoaa3NgJF88+h5f+7bWLbi4aIohcDlXgRbaJNJG3O1VNlGQLa+MOHOo1ZNHVib1E6Z1mzTHDU04F8Ui0AL56ualTAkZjh4lNqZqlj8K0Ph+Guk8Oude5MI+CdXf/2pZuuhq2s7faB3WCqdvJllT+P0xgb/OvMZogCPEuvxGQpNQOnnqqjl+uZOEODCyl9yZITKpYpLrMUg==;20:/FfcxlzPWgdoBUawY2treORdg9GVDnUN6rrvDeQEx0ZyWxiAbVtz8kkopLe0ln3NVkiAkZrUu6OQqa8+QWUytA6dwwE4E/HTOKuxLy/HYz4DACyM2p8/4We+2t35pz3G9NEiqOgtKb/cUp+whgWZMrqJuZlXrPzJvvsIoAGQ/xA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2016 15:07:34.5977 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR15MB0120 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-20_08:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When setting back the initial value to nr_hugepages, the test was writing a length sizeof of the string and checking that strlen was writen. Since those values are not the same, use strlen in both place instead. Also make the error messages more explicit to help in future debugging. Signed-off-by: Yannick Brosseau --- tools/testing/selftests/vm/compaction_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/vm/compaction_test.c b/tools/testing/selftests/vm/compaction_test.c index 932ff57..6d1437f 100644 --- a/tools/testing/selftests/vm/compaction_test.c +++ b/tools/testing/selftests/vm/compaction_test.c @@ -101,7 +101,7 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) /* Start with the initial condition of 0 huge pages*/ if (write(fd, "0", sizeof(char)) != sizeof(char)) { - perror("Failed to write to /proc/sys/vm/nr_hugepages\n"); + perror("Failed to write 0 to /proc/sys/vm/nr_hugepages\n"); goto close_fd; } @@ -110,14 +110,14 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) /* Request a large number of huge pages. The Kernel will allocate as much as it can */ if (write(fd, "100000", (6*sizeof(char))) != (6*sizeof(char))) { - perror("Failed to write to /proc/sys/vm/nr_hugepages\n"); + perror("Failed to write 100000 to /proc/sys/vm/nr_hugepages\n"); goto close_fd; } lseek(fd, 0, SEEK_SET); if (read(fd, nr_hugepages, sizeof(nr_hugepages)) <= 0) { - perror("Failed to read from /proc/sys/vm/nr_hugepages\n"); + perror("Failed to re-read from /proc/sys/vm/nr_hugepages\n"); goto close_fd; } @@ -136,9 +136,9 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) printf("No of huge pages allocated = %d\n", (atoi(nr_hugepages))); - if (write(fd, initial_nr_hugepages, sizeof(initial_nr_hugepages)) + if (write(fd, initial_nr_hugepages, strlen(initial_nr_hugepages)) != strlen(initial_nr_hugepages)) { - perror("Failed to write to /proc/sys/vm/nr_hugepages\n"); + perror("Failed to write value to /proc/sys/vm/nr_hugepages\n"); goto close_fd; } -- 2.8.1