1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367
|
powerpc-utils-1.3.12
=====================================================================
commit 15cdce114295d5e7d8cdcab06b38095c474e521b
Author: Michal Suchanek <msuchanek@suse.de>
Date: Mon Apr 8 16:05:39 2024 +0200
ppc64_cpu: Clean up sysfs smt/control error handling
When the kernel does not support the sysfs interface do not report an
error, fall back to the old method silently.
Suggested-by: Nathan Lynch<nathanl@linux.ibm.com>
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b0816b404e021e620843c9f0b6107a53f6fd64f6
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Aug 10 11:29:55 2023 +0200
ppc64_cpu: Support partial SMT level through SYS FS smt/control files
The next kernel release will support partial SMT level [1] though the SYS
FS file "devices/system/cpu/smt/control". This allows the SMT level to be
recorded in the kernel. With the current SMT level stored in the kernel,
when a new CPU is added, only the necessary threads are brought online.
The legacy way to active threads through the SYS FS files
'devices/system/cpu/cpu<n>/online', is still used in the case the new SYS
FS API is not available. This allows compatibility with the previous kernel
versions.
[1] https://lore.kernel.org/linuxppc-dev/20230705145143.40545-1-ldufour@linux.ibm.com/
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit bb766caa49f4aef036208023290f16ce7b1cf05d
Author: Haren Myneni <haren@linux.ibm.com>
Date: Tue Aug 13 14:40:26 2024 -0700
drmgr/SLOT: Add kernel interface support for device tree update
Use the following kernel interfaces for SLOT device type to update
the device tree if this feature is enabled in the kernel.
dt add index <DRC index> --> for IO add
dt remove index <DRC index> --> for IO remove
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a2d1b70cbc90ba41f16281c48e973309469f5d02
Author: Haren Myneni <haren@linux.ibm.com>
Date: Tue Aug 13 14:40:25 2024 -0700
drmgr/pci: Add kernel interface support for device tree update
Use the following kernel interfaces for PCI device type to update
the device tree if this feature is enabled in the kernel.
dt add index <DRC index> --> for IO add
dt remove index <DRC index> --> for IO remove
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9aaa1a625da9de1ca758c4eb8442589b46927acb
Author: Haren Myneni <haren@linux.ibm.com>
Date: Tue Aug 13 14:40:24 2024 -0700
drmgr/phb: Add kernel interface support for device tree update
Use the following kernel interfaces for PHB device type to update
the device tree if this feature is enabled in the kernel.
dt add index <DRC index> --> for IO add
dt remove index <DRC index> --> for IO remove
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9ea191d15f4b279923a4c83a94b83436c79e3482
Author: Haren Myneni <haren@linux.ibm.com>
Date: Tue Aug 13 14:40:23 2024 -0700
drmgr/pci: Enable in-kernel functionality to update device tree
drmgr updates the device tree by writing to /proc/ppc64/ofdt. Also
invokes configure_connector RTAS call to retrieve new device nodes
for IO ADD. But this functionality need /dev/mem access which is
restricted under system lockdown.
The kernel updates provided a sysfs file (/sys/kernel/dlpar) that
will allow drmgr command invoke the following interfaces to update
the device tree.
dt add index <DRC index> ---> To add new device nodes to the device
tree which is used for IO ADD.
dt remove index <DRC index> ---> To remove device nodes for IO
REMOVE
This patch checks the kernel interface for the availability of
device tree update feature and adds do_dt_kernel_dlpar() to invoke
the above kernel interfaces.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit dcaf1a2dea57738f197719452ee0c332998bf167
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Sep 18 16:11:01 2024 -0700
CI: update artifact actions to v4
GitHub has deprecated v1 and v2 of the artifact actions. As such update
the CI to the latest artifact version.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 06c9922a774a6c096acbc69664646386c9e185b5
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Aug 2 18:39:06 2024 -0700
drmgr/pci: Do not add partner device if exists in the device tree
For PCI hotplug interface, the partner device will be added or
removed if configured with the primary device add / remove.
Whereas for PHB interface, drmgr notifies the user to add / remove
partner device if configured with the primary device. So there is
a possibility of partner PCI node exists in the device tree when
PCI interface for ADD is executed. The current ADD code in
drslot_chrp_pci.c does not check whether the partner device node
is present and may add / enable partner device again which may give
EEH errors.
See the following sequence to get this scenario:
drmgr -r -c phb -s "PHB 1336" --> Remove primary PHB node
drmgr -r -c pci -s "U50EE.001.WZS000E-P3-C24-R2" --> Remove
partner PCI node
drmgr -a -c phb -s "PHB 1336" --> Add primary PHB node
drmgr -a -c pci -s "U50EE.001.WZS000E-P3-C24-R2" --> Add partner
PCI node and can try to add primary PCI node again. In this case
"U50EE.001.WZS000E-P3-C24-R1".
This patch fixes the issue by checking the device node in the
device tree and add the device if does not present and remove
only if the corresponding device node exists.
Fixes: 4e6670df0da2b92 ("drmgr/pci: Add multipath partner device support for hotplug add")
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
[tyreld: fixed up white space and replace/remove phrasing]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a56028561ad9c01b5d3a767e50455c561e09191c
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Fri Jul 26 16:17:47 2024 -0700
ofpathname: skip devices with no devspec when coorelating FC OF paths
When using ofpathname to find the logical device associated to a Fibre
Channel or Virtual Fibre Channel OF path an ERR_NO_SYSFS_DEVINFO error
can be returned if a device with no devspec attribute is in the list of
devices to cross reference.
If a device with no devspec is found simply skip it an continue the
for-loop device search.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a67eb56089ede9abc19ccc287bd4117967e76164
Author: Shrikanth Hegde <sshegde@linux.ibm.com>
Date: Mon Apr 15 23:21:36 2024 +0530
lparstat: Rename getter for processor type
Processor type in lparstat shows whether its in Dedicated Mode or in Shared
Mode. Getter function for the same has been defined as get_smt_state. That's
the wrong name for it. Rename it to get_processor_type().
No Function change.
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
[tyreld: reword commit message]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9572f8c2022fed9783f0f606cbe778ffe0d93fef
Author: Shrikanth Hegde <sshegde@linux.ibm.com>
Date: Tue May 14 20:46:44 2024 +0530
lparstat: Use CLOCK_BOOTTIME for get_time interface and Deprecate get_sys_upttime
"time" is used in lparstat.c to find the time elapsed either since boot
or between two intervals. But it is using gettimeofday which returns the
time elapsed since Epoch. This works for intervals calculations but it
doesn't work for since boot reports.
Instead use the CLOCK_BOOTTIME interface to get the elapsed time. This
fixes physc, utilization based on purr being wrong since boot.
Remove "uptime" interface since there are no users of it. One can get
the system uptime by calling "time" itself.
=============================== ::Test:: ==========================
reboot
stress-ng --cpu=$(nproc) -t 600
sleep 600
Results::
==================== Shared LPAR ==================================
System Configuration
type=Shared mode=Uncapped smt=8 lcpu=12 mem=15573440 kB cpus=37 ent=12.00
lparstat -E <-- Observe utilization values
====== 6.9-rc1 and lparstat 1.3.10 =============
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.00 0.00 3.87GHz[106%] 0.00 0.00
==== With this patch and patch 2/3 =============
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
38.72 0.11 3.87GHz[106%] 41.04 0.12
lparstat <-- Observe physc values
====== 6.9-rc1 and lparstat 1.3.10 ===================================
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
47.48 0.01 0.00 52.51 0.00 0.00 47.49 69099.72 541547 21
=== With this patch and this patch ================================ ===
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
47.48 0.01 0.00 52.51 5.73 47.75 47.49 31.21 541753 21
==================== Dedicated LPAR ==================================
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=12 mem=15573248 kB cpus=0 ent=12.00
::lparstat -E:: <-- Observe utilization values.
======= 6.9-rc1 and lparstat 1.3.10 =============
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.00 0.00 3.87GHz[106%] 0.00 0.00
=== With this patch and powerpc-utils patch to do the above equation ===
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
48.87 51.51 3.87GHz[106%] 51.81 54.60
::lparstat:: <-- Observe physc values.
======= 6.9-rc1 and lparstat 1.3.10 =============
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
48.38 0.01 0.00 51.61 0.03 0.25 48.39 0.00 344661 8
=== With this patch and powerpc-utils patch to do the above equation ===
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
48.38 0.01 0.00 51.61 12.05 100.42 48.39 0.00 344877 8
=============================================================================
Interval based lparstat values are same. With this patch the physc and
busy purr/idle purr values show correctly for since boot reports.
Note: this patch doesn't fix the idle purr being incorrect. That is
currently being investigated.
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 81c51b59aacaa66d90d571ee19a2deeda1d45271
Author: Shrikanth Hegde <sshegde@linux.ibm.com>
Date: Tue May 14 20:46:43 2024 +0530
lparstat: app: Use pic value at boot for accurate boot time reporting
When there are no options specified for lparstat, it is expected to
give reports since LPAR(Logical Partition) boot. APP(Available Physical
Processors) is an indicator for available cores in an Shared Processor
LPAR(SPLPAR). APP is derived using pool_idle_time which is obtained
using H_PIC call.
The interval based reports show correct APP value while since boot
report shows very high APP values. This happens because in that case APP
is obtained by dividing pool idle time by LPAR uptime. Since pool idle
time is reported by the PowerVM hypervisor since its boot, it need not
align with LPAR boot.
To fix that use the boot pool idle time added newly in the lparcfg as
below.
APP = (pool idle time - boot pool idle time) / (uptime * timebase)
*This depends on "powerpc/pseries: Add pool idle time at LPAR boot" be
merged into kernel*
Results: (Observe APP values)
========================================================================
lparstat
System Configuration
type=Shared mode=Uncapped smt=8 lcpu=12 mem=15573440 kB cpus=37 ent=12.00
reboot
stress-ng --cpu=$(nproc) -t 600
sleep 600
So in this case app is expected to close to 37-6=31.
====== 6.9-rc1 and lparstat 1.3.10 =============
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
47.48 0.01 0.00 52.51 0.00 0.00 47.49 69099.72 541547 21
=== With this patch and this patch to do the above equation ===
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
47.48 0.01 0.00 52.51 5.73 47.75 47.49 31.21 541753 21
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 2af8c0b9a285e8a6104560d0f482819e56060443
Author: Saket Kumar Bhaskar <skb99@linux.ibm.com>
Date: Thu Jul 18 00:39:24 2024 +0530
lparstat: Fix Idle and busy PURR/SPURR
lparstat -E gives %busy and %idle for actual(PURR based) and normalized
(SPURR based).Idle and busy PURR/SPURR values are not adding upto 100%
in case of dedicated-donate and shared partitions, with the present
formula. Because of this, users might get a false impression of resource
utilisation. This is expected because a core can be in either
idle or busy state out of total of 100(core's shared resource can
either be consumed or be left idle). When lpar is in dedicated-donate
or shared,the purr values are not being counted when the CPU is ceded.
The idle_purr is calculated by taking snapshots of purr values at
every idle entry and idle exit. So, when a CPU is ceded, the calculation
for idle_purr will be wrong as purr is not being counted.
Before Change:
|-----------------------------------------------------------------|
| Dedicated-donate (8 cores) : |
|----------------------|---------------------|--------------------|
| | Actual | Normalized |
| Stress-ng threads |---------------------|--------------------|
| | %busy | %idle | %busy | %idle |
|----------------------|----------|----------|---------|----------|
| 0 threads | 0.02 | 0.05 | 0.02 | 0.05 |
|----------------------|----------|----------|---------|----------|
| 8 threads | 32.64 | 17.37 | 35.25 | 18.77 |
|----------------------|----------|----------|---------|----------|
| 16 threads | 58.61 | 16.42 | 63.29 | 17.74 |
|----------------------|----------|----------|---------|----------|
| 24 threads | 78.14 | 21.86 | 84.39 | 23.61 |
|----------------------|----------|----------|---------|----------|
| 32 threads | 83.60 | 16.40 | 90.30 | 17.71 |
|----------------------|----------|----------|---------|----------|
| 40 threads | 91.90 | 6.94 | 98.31 | 7.46 |
|----------------------|----------|----------|---------|----------|
| 48 threads | 96.08 | 3.92 | 102.79 | 4.21 |
|----------------------|----------|----------|---------|----------|
| 56 threads | 98.42 | 1.57 | 105.31 | 1.69 |
|----------------------|----------|----------|---------|----------|
| 64 threads | 100.00 | 0.00 | 106.00 | 0.00 |
|----------------------|----------|----------|---------|----------|
|-----------------------------------------------------------------|
| Shared Capped (8 VP / 4 EC) : |
|----------------------|---------------------|--------------------|
| | Actual | Normalized |
| Stress-ng threads |---------------------|--------------------|
| | %busy | %idle | %busy | %idle |
|----------------------|----------|----------|---------|----------|
| 0 threads | 0.04 | 0.18 | 0.03 | 0.19 |
|----------------------|----------|----------|---------|----------|
| 8 threads | 35.90 | 14.09 | 38.77 | 15.21 |
|----------------------|----------|----------|---------|----------|
| 16 threads | 35.25 | 14.84 | 38.08 | 16.02 |
|----------------------|----------|----------|---------|----------|
| 24 threads | 40.13 | 9.73 | 42.93 | 10.43 |
|----------------------|----------|----------|---------|----------|
| 32 threads | 44.13 | 5.73 | 47.22 | 6.14 |
|----------------------|----------|----------|---------|----------|
| 40 threads | 46.47 | 3.42 | 50.18 | 3.69 |
|----------------------|----------|----------|---------|----------|
| 48 threads | 48.03 | 1.83 | 51.39 | 1.96 |
|----------------------|----------|----------|---------|----------|
| 56 threads | 49.04 | 0.86 | 52.47 | 0.93 |
|----------------------|----------|----------|---------|----------|
| 64 threads | 49.87 | 0.00 | 53.36 | 0.00 |
|----------------------|----------|----------|---------|----------|
This commit, rather than considering delta_idle_purr for calculation of
idle ticks, takes (delta_tb - delta_purr + delta_idle_purr) as total
ticks for which the CPUs were idle. Here, since delta_idle_purr will
also contain some idle ticks, thats why it is added to the formula.
Since, the output was correct for dedicated capped mode, changes has
been made only for shared and dedicated-donate mode.
Further, no changes has been made for calculation of %busy.
Similar changes has been done for SPURR.
After Change:
|-----------------------------------------------------------------|
| Dedicated-donate (8 cores) : |
|----------------------|---------------------|--------------------|
| | Actual | Normalized |
| Stress-ng threads |---------------------|--------------------|
| | %busy | %idle | %busy | %idle |
|----------------------|----------|----------|---------|----------|
| 0 threads | 0.02 | 99.98 | 0.02 | 100.04 |
|----------------------|----------|----------|---------|----------|
| 8 threads | 35.97 | 64.03 | 38.84 | 61.51 |
|----------------------|----------|----------|---------|----------|
| 16 threads | 58.60 | 41.40 | 63.28 | 37.08 |
|----------------------|----------|----------|---------|----------|
| 24 threads | 78.14 | 21.86 | 84.39 | 23.61 |
|----------------------|----------|----------|---------|----------|
| 32 threads | 83.60 | 16.41 | 90.29 | 17.71 |
|----------------------|----------|----------|---------|----------|
| 40 threads | 92.96 | 7.04 | 100.39 | 7.61 |
|----------------------|----------|----------|---------|----------|
| 48 threads | 96.08 | 3.92 | 103.77 | 4.24 |
|----------------------|----------|----------|---------|----------|
| 56 threads | 98.42 | 1.58 | 105.31 | 1.68 |
|----------------------|----------|----------|---------|----------|
| 64 threads | 100.00 | 0.00 | 107.00 | 0.00 |
|----------------------|----------|----------|---------|----------|
|-----------------------------------------------------------------|
| Shared Capped (8 VP / 4 EC) : |
|----------------------|---------------------|--------------------|
| | Actual | Normalized |
| Stress-ng threads |---------------------|--------------------|
| | %busy | %idle | %busy | %idle |
|----------------------|----------|----------|---------|----------|
| 0 threads | 0.03 | 99.97 | 0.19 | 99.44 |
|----------------------|----------|----------|---------|----------|
| 8 threads | 35.91 | 64.09 | 38.78 | 61.58 |
|----------------------|----------|----------|---------|----------|
| 16 threads | 36.83 | 63.17 | 39.78 | 60.55 |
|----------------------|----------|----------|---------|----------|
| 24 threads | 40.16 | 59.84 | 43.37 | 56.95 |
|----------------------|----------|----------|---------|----------|
| 32 threads | 44.47 | 55.53 | 48.02 | 52.38 |
|----------------------|----------|----------|---------|----------|
| 40 threads | 46.55 | 53.45 | 50.27 | 50.04 |
|----------------------|----------|----------|---------|----------|
| 48 threads | 48.13 | 51.87 | 52.48 | 47.82 |
|----------------------|----------|----------|---------|----------|
| 56 threads | 49.01 | 50.99 | 52.93 | 47.41 |
|----------------------|----------|----------|---------|----------|
| 64 threads | 49.90 | 50.10 | 53.40 | 46.19 |
|----------------------|----------|----------|---------|----------|
Before Change:
%idle = delta_idle_purr / delta_tb * 100
After Change:
%idle = (delta_tb - delta_purr + delta_idle_purr) / delta_tb * 100
Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5db2df531f9c242b13ef6520814c99685144c6d4
Author: Haren Myneni <haren@linux.ibm.com>
Date: Sat Jun 29 14:14:10 2024 -0700
drmgr: Free nodes returned from configure_connector
of_nodes returned from configure_connector should be freed after
updating the device tree and is missing in acquire_hp_resource()
and add_work(). This patch calls free_of_node() in these functions.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d4ff349fbfdffe2d82c618b40131954cd70de4a3
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Fri Jul 26 15:19:32 2024 -0700
ci: update checkout@v3 action to checkout@v4
Node.js 16 actions are deprecated. Update checkout action to v4 which
uses Node.js 20. In response to the following warning:
The following actions uses Node.js version which is deprecated and will
be forced to run on node20: actions/checkout@v3. For more info:
https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f40a63b15c5639df93405b925a4dde740d9bfa23
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:45:58 2024 -0700
drmgr/pci: Add multipath partner device support for hotplug replace
If the PCI device has multipath partner device, its device node
contains "ibm,multipath-partner-drc" property which gives the DRC
index of the partner device.
So for the replace operation, the following steps will be executed:
- Find the device based on the partner DRC index of the requested
device
- Remove the requested device
- Remove the partner path
- Add the new device based on user input
- Find the device based on the partner DRC index of the new device
- Add the partner path of the new device
Since both paths will be using the same slot, LED indicators and
the slot identification will be done only for the primary device
in both removal and add operations.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4e6670df0da2b92a33dd880ce987823358f298bf
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:45:20 2024 -0700
drmgr/pci: Add multipath partner device support for hotplug add
If the PCI device has multipath partner device, the firmware
provides partner DRC index in "ibm,multipath-partner-drc"
property and this property is available in the PCI device node.
So when the PCI device add is initiated, both paths will be
added if the partner path is also configured and enabled with
the following steps:
- Identify slot and notify user to add the device
- Add the path and enable for the specified device
- Find the partner path DRC index from "ibm,multipath-partner-drc"
property for the specified device
- Add the partner path if it is also configured
- Notify user about adding partner path
Since both paths will be using the same slot, LED indicators and
the slot identification will be done only for the primary device.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1f8b5ef8092a8466bdcb29604939ae7193b79ba0
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:44:36 2024 -0700
drmgr/pci: Add multipath partner device support for hotplug remove
If the PCI device has multipath partner device, its device node
contains "ibm,multipath-partner-drc" property which gives the
DRC index of the partner device. For the hotplug removal, if
the partner path is also configured, both paths must be
removed before instructing the user to remove the device from
identified slot.
So the following steps will be executed for the removal:
- Find the partner path DRC index from "ibm,multipath-partner-drc"
property
- Remove the primary path
- Remove the partner path if it is configured.
- Notify user to remove PCI card from the specified slot.
Since both paths will be using the same slot, LED indicators and
the slot identification will be done only for the primary device.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit fe0c826464620fde9124f903d97102bb4237afa7
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:43:24 2024 -0700
drmgr/phb: Add multipath partner device support for hotplug add
The PHB node can have "ibm,multipath-partner-drc" property
which means the device can be also configured with multipath
partner path. This property provides the DRC index of the
partner device. So for the hotplug add, both paths should be
added and the following steps will be executed for the PHB add:
- Add the specified PHB device
- Find the partner path DRC index from "ibm,multipath-partner-drc"
property for the specified device
- If the node has this property and the partner path is
already added, notify user about the partner device.
- If the node has this property and the partner path can be
configured, notify user to configure and add the partner
device.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 8751abf3cf0eb2733162931a6b38db4431699ebd
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:42:45 2024 -0700
drmgr/phb: Add multipath partner device support for remove
The PHB node can have "ibm,multipath-partner-drc" property
which means the device can be also configured with multipath
partner path. This property provides the DRC index of the
partner device. For the hotplug removal, both paths should
be removed and the following steps will be executed:
- Find the partner path DRC index from "ibm,multipath-partner-drc"
property for the specified device
- If the partner path is configured, notify user about the
removal of partner path if available. Then the user should issue
issue separate drmgr command to remove the partner path.
- Remove the primary path
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit aa5feef7c7657fb764d732e831c9f7c7b9820498
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:41:46 2024 -0700
drmgr: Introduce get_my_partner_drc_index()
get_my_partner_drc_index() is called to retrieve DRC index from the
"ibm,multipath-partner-drc" property. This property is available
in the parent device node if the device has miltipath partner device.
"ibm,multipath-partner-drc" has the DRC index of the partner device.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3a7e77497d2dcf84b5d6525cdfb6e59dfea7ffbb
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:40:56 2024 -0700
drmgr: Retrieve dr_connector with the specified DRC index
search_drc_list() provides the search based on the key type such
as DRC_NAME, DRC_TYPE, DRC_INDEX or DRC_POWERDOMAIN. But the
current code has get_drc_by_index() which looks in to the DRC list
passed to this function instead of all DRC lists and is not used
right now.
This patch modifies get_drc_by_index() and the corresponding
changes such that it retrieves dr_connector with the specified DRC
index as does in the case of get_drc_by_name().
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1dc1ecf7dce7825d352b045c98aa51711b58aaca
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Jun 21 15:39:42 2024 -0700
drmgr: Return from get_node_by_name() if matched DRC index
get_node_by_name() should return dr_node if the DRC name or DRC
index is matched. But the current code returns only if the DRC
name is matched. This patch fixes this issue and returns dr_node
if the index is matched.
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.12
=====================================================================
commit 2f0bdb051fe70fbd6cb608ea1b63a75223dc44a4
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Feb 6 16:58:12 2024 -0800
lsslot: fix reporting of L3 caches with -b option
Currently if a L2 cache has an associated dependent L3 cache the lsslot
command for cpu connector types will fail to report the L3 cache when
using the -b option. This is due to a typo such that the check is made
between the the L2 caches l2-cache property value and its own
ibm,phandle property. The check should be against the L3 caches
ibm,phandle property as the l2-cache property contains the phandle of
the dependent cache.
Without patch:
./src/drmgr/lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
CPU 1 PowerPC,POWER8@0 10000000 0 1 2 3 4 5 6 7 l2-cache@200a N/A
With patch:
./src/drmgr/lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
CPU 1 PowerPC,POWER8@0 10000000 0 1 2 3 4 5 6 7 l2-cache@200a l3-cache@310a
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a63f08289611e3c76814a3b9fbb7ef7c56d13ff5
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu Feb 1 07:19:58 2024 +0530
lsslot: fix and unify formatting of cpu slots
When listing cpu slots with and without the -b option the formatting is
inconsistent and some column headers and associated data are not aligned.
Adjusted format strings accordingly.
Without patch:
localhost:~/powerpc-utils # ./src/drmgr/lsslot -c cpu
drc-name OFDT-node drc_index thread id(s)
CPU 41 PowerPC,POWER10@28 10000028 28 29 2a 2b 2c 2d 2e 2f
CPU 33 PowerPC,POWER10@20 10000020 20 21 22 23 24 25 26 27
CPU 25 PowerPC,POWER10@18 10000018 18 19 1a 1b 1c 1d 1e 1f
CPU 17 PowerPC,POWER10@10 10000010 10 11 12 13 14 15 16 17
CPU 9 PowerPC,POWER10@8 10000008 8 9 a b c d e f
CPU 1 PowerPC,POWER10@0 10000000 0 1 2 3 4 5 6 7
localhost:~/powerpc-utils # ./src/drmgr/lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
CPU 41 PowerPC,POWER10@28 10000028 28 29 2a 2b 2c 2d 2e 2f N/A N/A
CPU 33 PowerPC,POWER10@20 10000020 20 21 22 23 24 25 26 27 N/A N/A
CPU 25 PowerPC,POWER10@18 10000018 18 19 1a 1b 1c 1d 1e 1f N/A N/A
CPU 17 PowerPC,POWER10@10 10000010 10 11 12 13 14 15 16 17 N/A N/A
CPU 9 PowerPC,POWER10@8 10000008 8 9 a b c d e f N/A N/A
CPU 1 PowerPC,POWER10@0 10000000 0 1 2 3 4 5 6 7 N/A N/A
With patch:
localhost:~/powerpc-utils # ./src/drmgr/lsslot -c cpu
drc-name OFDT-node drc_index thread id(s)
CPU 41 PowerPC,POWER10@28 10000028 28 29 2a 2b 2c 2d 2e 2f
CPU 33 PowerPC,POWER10@20 10000020 20 21 22 23 24 25 26 27
CPU 25 PowerPC,POWER10@18 10000018 18 19 1a 1b 1c 1d 1e 1f
CPU 17 PowerPC,POWER10@10 10000010 10 11 12 13 14 15 16 17
CPU 9 PowerPC,POWER10@8 10000008 8 9 a b c d e f
CPU 1 PowerPC,POWER10@0 10000000 0 1 2 3 4 5 6 7
localhost:~/powerpc-utils # ./src/drmgr/lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
CPU 41 PowerPC,POWER10@28 10000028 28 29 2a 2b 2c 2d 2e 2f N/A N/A
CPU 33 PowerPC,POWER10@20 10000020 20 21 22 23 24 25 26 27 N/A N/A
CPU 25 PowerPC,POWER10@18 10000018 18 19 1a 1b 1c 1d 1e 1f N/A N/A
CPU 17 PowerPC,POWER10@10 10000010 10 11 12 13 14 15 16 17 N/A N/A
CPU 9 PowerPC,POWER10@8 10000008 8 9 a b c d e f N/A N/A
CPU 1 PowerPC,POWER10@0 10000000 0 1 2 3 4 5 6 7 N/A N/A
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 01bc16de40385467cd32440da43ff02b0f0e856c
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu Feb 1 07:02:49 2024 +0530
lsslot: fix displaying cpu slots and caches with -b option
The format string for printing the drc-name, OFDT-node, and drc-index in
list_cpus_and_caches() contains a spurious '%' qualifier at the end of
the string. Historically, this was ignored by compilers and the string
populated anyways. However, we since observed lsslot built on SLES 15
SP6 where the string is not populated.
Removing the spurious '%' fixes the issue.
Without patch:
localhost:~ # lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
28 29 2a 2b 2c 2d 2e 2f N/A N/A
20 21 22 23 24 25 26 27 N/A N/A
18 19 1a 1b 1c 1d 1e 1f N/A N/A
10 11 12 13 14 15 16 17 N/A N/A
8 9 a b c d e f N/A N/A
0 1 2 3 4 5 6 7 N/A N/A
With patch:
localhost:~/powerpc-utils # ./src/drmgr/lsslot -c cpu -b
drc-name OFDT-node drc_index thread id(s) l2-cache l3-cache
CPU 41 PowerPC,POWER10@28 10000028 28 29 2a 2b 2c 2d 2e 2f N/A N/A
CPU 33 PowerPC,POWER10@20 10000020 20 21 22 23 24 25 26 27 N/A N/A
CPU 25 PowerPC,POWER10@18 10000018 18 19 1a 1b 1c 1d 1e 1f N/A N/A
CPU 17 PowerPC,POWER10@10 10000010 10 11 12 13 14 15 16 17 N/A N/A
CPU 9 PowerPC,POWER10@8 10000008 8 9 a b c d e f N/A N/A
CPU 1 PowerPC,POWER10@0 10000000 0 1 2 3 4 5 6 7 N/A N/A
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5f825c75c6dfc2a95af1eebb6e364587d178deee
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jul 21 12:38:16 2022 +0200
hcn-init: Split services per connection manager.
The universal service using network.service alias does not work
reliably.
Use one service per supported connection manager.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f1a8ed892e18b83cb0483e8f8f8cbc512fa8510c
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Aug 10 11:47:07 2023 +0200
ppc64_cpu/info: fix bad report when non continuous CPU ids
When CPU ids are not continuous, let say that the kernel didn't reuse a set
of CPU ids already used on a different nodes, the output of ppc64_cpu
--info is not correct.
For instance, in the example below the CPU id 48 to 55 haven't been reused
by the kernel when a CPU has been added after a LPM operation.
Note that the system is running in SMT=4.
The numactl -H command is providing the correct set of CPU:
ltczep3-lp4:~ # numactl -H
available: 2 nodes (0-1)
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 64 65 66 67 68 69 70 71
node 0 size: 7177 MB
node 0 free: 4235 MB
node 1 cpus: 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
node 1 size: 24508 MB
node 1 free: 23539 MB
node distances:
node 0 1
0: 10 40
1: 40 10
But ppc64_cpu --info is reporting the CPUs 48 to 55 offlined while not
reporting at all the CPU 65 to 71:
ltczep3-lp4:~ # ppc64_cpu --info
Core 0: 0* 1* 2* 3* 4* 5* 6* 7*
Core 1: 8* 9* 10* 11* 12* 13* 14* 15*
Core 2: 16* 17* 18* 19* 20* 21* 22* 23*
Core 3: 24* 25* 26* 27* 28* 29* 30* 31*
Core 4: 32* 33* 34* 35* 36* 37* 38* 39*
Core 5: 40* 41* 42* 43* 44* 45* 46* 47*
Core 6: 48 49 50 51 52 53 54 55
This is because it is considering that the CPU id are continuous which is
not the case here.
To prevent that, when looking for a core, it is now first checking that the
physical_id of the first thread in that core is defined (not -1). If that
the case this means that CPU/core is present.
With that patch applied, ppc64_cpu --info is reporting:
ltczep3-lp4:~ # pc64_cpu --info
Core 0: 0* 1* 2* 3* 4 5 6 7
Core 1: 8* 9* 10* 11* 12 13 14 15
Core 2: 16* 17* 18* 19* 20 21 22 23
Core 3: 24* 25* 26* 27* 28 29 30 31
Core 4: 32* 33* 34* 35* 36 37 38 39
Core 5: 40* 41* 42* 43* 44 45 46 47
Core 6: 64* 65* 66* 67* 68 69 70 71
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d604cc779741c29cbdc8da97cbfc1512fd21fc1b
Author: Likhitha Korrapati <likhitha@linux.ibm.com>
Date: Fri Aug 11 00:41:14 2023 -0500
nvram man page and --help output are not in sync
The nvram man page and the output from --help option are not in
sync and few of the options are missing in man page.
The options that are missing are ascii, dump, nvram-size, zero.
These options are added through the commit ids [1], [2].
This patch adds the above missing options to the nvram.
[1] https://github.com/ibm-power-utilities/powerpc-utils/commit/0e09f4e2898e7dea556479b018a7f4bf12108099
[2] https://github.com/ibm-power-utilities/powerpc-utils/commit/976dbe9bb7b01b135cac3e7bbd1dce0cdc88636a
Signed-off-by: Likhitha Korrapati <likhitha@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 882335a30d04032d2684e165f70646b368a788b4
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Tue Jan 30 10:49:13 2024 -0600
bootlist: Support multiple dev paths for a nvme boot device
Multipath splitter drawer is going to support two physical paths for
each nvme device.
This patch adds the support for multiple device/of paths for a nvme boot
device.
For example,
#lsslot -c pci
U50EE.001.WZS000E-P3-C1-R1 U.2 PCI-E capable, Rev 4, 4x lanes with 2x
lanes connected 0581:10:00.0
U50EE.001.WZS000E-P3-C1-R2 U.2 PCI-E capable, Rev 4, 4x lanes with 2x
lanes connected 0521:10:00.0
#nvme list-subsys
nvme-subsys1 -
NQN=nqn.1994-11.com.samsung:nvme:PM1735a:2.5-inch:S6RUNE0R900042
hostnqn=nqn.2014-08.org.nvmexpress:uuid:3c6c1ace-e9b1-4a17-8ff0-6a84d3dd15f4
iopolicy=numa
\
+- nvme1 pcie 0523:20:00.0 live
+- nvme0 pcie 0583:20:00.0 live
# bootlist -m normal nvme1n1
# bootlist -m normal -o
nvme0
nvme1n1
#bootlist -m normal -r
/pci@800000020000583/pci1014,6bc@0/namespace@1
/pci@800000020000523/pci1014,6bc@0/namespace@1
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
[tyreld: fixup whitespace errors]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a6d31caf4eaa453d3ec879f02163b3a515789b85
Author: Likhitha Korrapati <likhitha@linux.ibm.com>
Date: Mon Sep 11 05:23:37 2023 -0500
powerpc/nvram: Fix Segmentation fault issue in nvram-size.
nvram-size option results in segmentation fault when the user
specifies value larger than the default nvram size
Without the patch:
[root@xxx ~]# nvram --nvram-size 1048592
nvram: WARNING: expected 1048592 bytes, but only read 15360!
Segmentation fault (core dumped)
Segmentation fault is caused because the phead->length is becoming 0.
And because of this the p_start doesn't get updated which makes the
while loop run infinitely resulting in segmentation fault.
This patch adds a condition check for phead->length to avoid infinite
while loop.
With the patch:
[root@xxx src]# ./nvram --nvram-size 1048592
./nvram: WARNING: expected 1048592 bytes, but only read 15360!
[root@xxx src]# ./nvram --nvram-size 268435456
./nvram: WARNING: expected 268435456 bytes, but only read 15360!
[root@xxx src]#
Reported-by: Shirisha Ganta <shirisha@linux.ibm.com>
Signed-off-by: Likhitha Korrapati <likhitha@linux.ibm.com>
[tyreld: fixed up else block]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3f72b8326a2fc9a9dffb4b31d0ce3abf12e24751
Author: Likhitha Korrapati <likhitha@linux.ibm.com>
Date: Thu Jan 25 15:44:02 2024 +0530
powerpc/nvram: fix segmentation fault issue in print-config
print-config option in nvram results in segmentation fault when the
user provides a very large value.
without the patch:
[root@xxx powerpc-utils]# nvram --print-config=real-mode?
true
[root@xxx powerpc-utils]# nvram --print-config=$(perl -e 'p
rint "A"x1000000')
Segmentation fault (core dumped)
The Segmentation fault occurs because the code tries to access memory
beyond the bounds of the data at index varlen. varlen is the length of
the string provided by the user.
This patch adds a condition to check whether the length of the data is
greater than varlen to prevent accessing out of bounds.
with the patch:
[root@xxx powerpc-utils]# ./src/nvram --print-config=real-m
ode?
true
[root@xxx powerpc-utils]# ./src/nvram --print-config=$(perl
-e 'print "A"x1000000')
Reported-by: Shirisha Ganta <shirisha@linux.ibm.com>
Signed-off-by: Likhitha Korrapati <likhitha@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 8a7aa61c5f520df03e53e6f7e1d63b7d5c432376
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Wed Nov 15 14:37:43 2023 -0600
powerpc-utils/scripts/ofpathname: handle nsid of nvme device as hex number
Installation fails if nsid of nvme device is greater than 10.
The patch fixes the issue and handle nsid of nvme ad a hex number.
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9caa77e4477a73064a6deea253fd3faea32648fb
Author: Likhitha Korrapati <likhitha@linux.ibm.com>
Date: Fri Nov 17 01:42:29 2023 -0500
rtas_dbg: Fix the large negative values in rtas_dbg
without the patch:
[root@xxx powerpc-utils]# rtas_dbg -l ibm,rks-hcalls
Could not get rtas token for ibm,indicator-0002
Could not get rtas token for ibm,integrated-stop-self
Could not get rtas token for ibm,indicator-9005
Could not get rtas token for ibm,extended-os-term
Could not get rtas token for ibm,indicator-0001
Could not get rtas token for ibm,sensor-0009
Could not get rtas token for ibm,recoverable-epow3
Could not get rtas token for ibm,sensor-9005
Could not get rtas token for ibm,change-msix-capable
Could not get rtas token for ibm,sensor-0005
Could not get rtas token for ibm,sensor-0001
ibm,rks-hcalls -536870912
The large negatives values are due to incompatible format(%d).
The data type of the token variable is uint32_t.This patch
modifies the format(%u) to align with its data type(uint32_t).
with the patch:
[root@xxx powerpc-utils]# ./src/rtas_dbg -l ibm,rks-hcalls
Could not get rtas token for ibm,indicator-0002
Could not get rtas token for ibm,integrated-stop-self
Could not get rtas token for ibm,indicator-9005
Could not get rtas token for ibm,extended-os-term
Could not get rtas token for ibm,indicator-0001
Could not get rtas token for ibm,sensor-0009
Could not get rtas token for ibm,recoverable-epow3
Could not get rtas token for ibm,sensor-9005
Could not get rtas token for ibm,change-msix-capable
Could not get rtas token for ibm,sensor-0005
Could not get rtas token for ibm,sensor-0001
ibm,rks-hcalls 3758096384
Reported-by: Shirisha Ganta <shirisha@linux.ibm.com>
Signed-off-by: Likhitha Korrapati <likhitha@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c1d6a1473211e4e470aee8256d613f16a75897d6
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Apr 5 17:49:23 2023 +0200
drmgr: Add CPU hook in the man page
Also fixing few minor typos.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d23e7ad0ed939dcd33f97839e0551707c78af77a
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Apr 5 17:49:22 2023 +0200
drmgr/cpu: add CPU add and remove operation's hooks
Call drmgr's hooks before and after a CPU add or remove operation is done.
At the PRE phase, the DRC_COUNT hook parameter is set to the desired number
of CPU to add or remove. At the POST phase, it is set to the actual number
of CPU added or removed.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 24500fe33ceb84423730cb1ed654efbdc43deba8
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Apr 5 17:49:21 2023 +0200
drmgr/common: add a DRC_COUNT parameter to the hooks
The new DRC_COUNT will be set when running operation on countable items,
like adding or removing CPUs.
For the migration operation, this doesn't make sense and it is set to 0.
Using a signed integer so we can pass signed values, if needed in the
future.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 35a7487f0ec039bf8ea9e3c87f3b176ca1580145
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Apr 5 17:49:20 2023 +0200
drmgr/common: drmgr: Add action parameter to the hook mechanism
The user action is now exported to the hook ran by drmgr.
It is exported in the environment variable ACTION.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c2922361b9bb2647b862056aa40095cdbfefee2f
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Apr 5 17:49:19 2023 +0200
drmgr/common: make drc_type_str and hook_phase_name const
The drc_type_str and hook_phase_name should be declared as const.
No functional changes.
Fixes: 372599ed28d6 ("drmgr: introduce a DRC type name table")
Fixes: e0928dc5e537 ("drmgr: introducing the hook framework")
Suggested-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit dee15756bcb287ccf39a904be07c90107b13844b
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed May 3 10:50:15 2023 +0200
lparstat: Fix offline threads uninitialized entries
When some threads are offline, lparstat -E is failing like that:
$ ppc64_cpu --info # CPU 20 is offline
Core 0: 0* 1* 2* 3* 4* 5* 6* 7*
Core 1: 8* 9* 10* 11* 12* 13* 14* 15*
Core 2: 16* 17* 18* 19* 20 21* 22* 23*
Core 3: 24* 25* 26* 27* 28* 29* 30* 31*
Core 4: 32* 33* 34* 35* 36* 37* 38* 39*
Core 5: 40* 41* 42* 43* 44* 45* 46* 47*
$ lparstat -E
Failed to read /sys/devices/system/cpu/cpu0/spurr
The message is complaining about CPU0 but the real issue is that in
parse_sysfs_values() the test cpu_sysfs_fds[i].spurr >= 0 is valid even if
the entry has not been initialized (cpu_sysfs_fds is alloc cleared). So
if the number of threads online seen in assign_cpu_sysfs_fds is lower than
threads_in_system, the loop in parse_sysfs_values() will read uninitialized
entry, where .cpu=0.
To prevent that, unset entries in the cpu_sysfs_fds should have the spurr
fd set to -1.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b2672fa3d462217ccd057a2cd307af2448e78757
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed May 3 10:50:14 2023 +0200
lparstat: report mixed SMT state
when SMT state is mixed like this one (CPU 4 is offline):
$ ppc64_cpu --info
Core 0: 0* 1* 2* 3* 4 5* 6* 7*
Core 1: 8* 9* 10* 11* 12* 13* 14* 15*
Core 2: 16* 17* 18* 19* 20* 21* 22* 23*
Core 3: 24* 25* 26* 27* 28* 29* 30* 31*
Core 4: 32* 33* 34* 35* 36* 37* 38* 39*
Core 5: 40* 41* 42* 43* 44* 45* 46* 47*
$ ppc64_cpu --smt
SMT=7: 0
SMT=8: 1-5
ppc64_cpu --smt is handling that nicely but lparstat failed reporting the
SMT state:
$ /usr/sbin/lparstat
Failed to get smt state
System Configuration
type=Dedicated mode=Capped smt=Capped lcpu=6 mem=65969728 kB cpus=0 ent=6.00
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
0.02 0.01 0.00 99.97 3.41 56.83 0.02 0.00 4061778 156
Makes lparstat reporting "smt=mixed" in that case.
__do_smt is now returning 0 when the SMT state is mixed instead of -1 which
is also reported when an error is detected.
This doesn't change the call made by ppc64_cpu which is using
print_smt_state=true and so is expecting a returned value equal to 0 or -1.
With that patch applied, lparstat print that in the above case:
$lparstat
System Configuration
type=Dedicated mode=Capped smt=Mixed lcpu=6 mem=65969728 kB cpus=0 ent=6.00
%user %sys %wait %idle physc %entc lbusy app vcsw phint
----- ----- ----- ----- ----- ----- ----- ----- ----- -----
0.01 0.01 0.00 99.97 3.43 57.17 0.02 0.00 4105654 156
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 73ba26c1240a25e7699449e82cfc09dad10fed80
Author: Sathvika Vasireddy <sv@linux.ibm.com>
Date: Fri Dec 9 15:26:46 2022 +0530
lparstat: Fix negative values seen while running lparstat with -E option
Negative values are seen while running lparstat with -E option.
This is because delta_purr value is less than delta_idle_purr.
Given that these values are read from different sources, a
small variation in the values is possible. So, in such cases,
round down delta_idle_purr to delta_purr.
Without this patch:
=====
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=240 mem=67033290112 kB cpus=0
ent=240.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
-0.03 100.02 3.93GHz[111%] 0.01 110.97
0.00 100.00 3.93GHz[111%] 0.01 110.99
-0.04 100.03 3.93GHz[111%] 0.01 110.98
0.06 99.95 3.93GHz[111%] 0.01 110.99
0.02 99.98 3.93GHz[111%] 0.01 110.99
=====
With this patch:
=====
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=240 mem=67033290112 kB cpus=0
ent=240.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.03 99.96 3.93GHz[111%] 0.01 110.98
0.00 100.00 3.93GHz[111%] 0.01 110.99
0.03 99.97 3.93GHz[111%] 0.01 110.99
0.00 100.00 3.93GHz[111%] 0.01 110.99
0.09 99.90 3.93GHz[111%] 0.01 110.99
=====
Reported-by: Shirisha Ganta <shirisha.ganta1@ibm.com>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.11
=====================================================================
commit fc3b6044401e5625bc825d594f8b89fda49b6596
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Jan 17 17:32:10 2023 -0800
ci: rev Ubuntu action runner from 20.04 -> 22.04
Move the CI runner from previous LTS release to the current LTS release.
This as the added benefit of moving the gcc-toolchain from gcc-9 to
gcc-11.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 72b1a6e9b739382716b4c06829d3f99555be398e
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jan 18 16:19:48 2023 -0800
errinjct: use PATH_MAX instead of BUFSZ
The arbitary BUFSZ macro of 4000 is less than that of PATH_MAX defined
by Linux. BUFSZ is only used for pathname buffer allocations. As such
remove BUFSZ macro and use PATH_MAX instead.
Suggested-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 21b6e512edd651c1297794c1eb4c70f8adb143fc
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jan 18 15:46:27 2023 -0800
errinjct: pass full device reg path to get_config_addr_from_reg()
The following string truncation error is reported by gcc-11 and gcc-12
toolchains:
In file included from /usr/powerpc-linux-gnu/include/string.h:535,
from src/errinjct/ioa_bus_error.c:34:
In function ‘strncpy’,
inlined from ‘get_config_addr_from_reg’ at src/errinjct/ioa_bus_error.c:207:2,
inlined from ‘hunt_loc_code’ at src/errinjct/ioa_bus_error.c:415:9:
Warning: /usr/powerpc-linux-gnu/include/bits/string_fortified.h:95:10: warning: ‘__builtin_strncpy’ output may be truncated copying 3995 bytes from a string of length 3999 [-Wstringop-truncation]
This is the result of the caller defining a buffer of BUFSZ, but the
callee only copying BUFSZ-5 of data into a new string so that there is
room to strcat "/reg" to the resulting pathname. We can save a strncpy
and static buffer allocation by doing the strcat of "/reg" to the
pathname before calling get_conig_addr_from_reg() which in general
appears to be inlined anyways.
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a540ff88416413b080e572c074e57aad362c3e50
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jan 18 15:28:13 2023 -0800
serv_config: cast param to correct size before byte swap
The first two bytes of the param buffer returned by the
ibm,get-system-parameter RTAS call contain the the length of the
remaining data in the buffer. However, param is a char buffer and
as such the current code attempts to use be16toh which only gets one
byte of data. Type cast param to (uint16_t *) before the dereference to
ensure we get both bytes of data. This fixes the following string
truncation error with gcc-11 and gcc-12 toolchains:
In file included from /usr/powerpc-linux-gnu/include/string.h:535,
from src/serv_config.c:50:
In function ‘strncpy’,
inlined from ‘retrieve_value’ at src/serv_config.c:710:5:
Error: /usr/powerpc-linux-gnu/include/bits/string_fortified.h:95:10: error: ‘__builtin_strncpy’ output may be truncated copying between 0 and 255 bytes from a string of length 4997 [-Werror=stringop-truncation]
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 73b1bdf7452e1825c797dcf708fd1b9e6b518ca5
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jan 4 16:20:55 2023 -0800
configure.ac: replace deprecated AC_HELP_STRING macro
AC_HELP_STRING has been deprecated in favor of AS_HELP_STRING.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b661a2e221232c7064efa6779ac82c6f1399d0b4
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jan 4 16:16:51 2023 -0800
ci: update checkout@v2 action to checkout@v3
Node.js 12 actions are deprecated. Update checkout action to v3 which
uses Node.js 16. In response to the following CI warning:
Node.js 12 actions are deprecated. For more information see:
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.
Please update the following actions to use Node.js 16: actions/checkout@v2
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 52df81cc1b937b235f7dbdc1dd92e38b99def1c7
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Wed Jan 4 14:02:52 2023 -0600
configure.ac: disable -Werror by default
Enabling -Werror should be opt-in and done only in known
environments (e.g. a seldom-changing build configuration in
CI). Making -Werror the default for our build configuration causes
more pain for downstream projects than it's worth. It remains enabled
in the project CI (see previous commit).
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 57a8c1c4de7c5de7606b15b58691d0f81aa1158b
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Wed Jan 4 14:02:51 2023 -0600
CI: enable -Werror for builds
The CI builds all seem to be warning-free. Ensure we fail runs when
new warnings are introduced.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3607e6dabdef641c363233eddd3a1cf8c2e5c6d8
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Mon Dec 26 10:54:38 2022 +0100
drmgr/drslot_chrp_hea: Prefer strlen() to check for valid string length
This fixes the following warning when building with gcc-12 that is
the result of sysfs_dev_path being a fixed-sized array which means
that (char *)sysfs_dev_path never be NULL:
src/drmgr/drslot_chrp_hea.c: In function 'hotplug_port':
src/drmgr/drslot_chrp_hea.c:124:13: error: the comparison will always evaluate as 'true' for the address of 'sysfs_dev_path' will never be NULL [-Werror=address]
124 | if (! hea->sysfs_dev_path) {
| ^
In file included from src/drmgr/drpci.h:25,
from src/drmgr/rtas_calls.h:25,
from src/drmgr/dr.h:30,
from src/drmgr/drslot_chrp_hea.c:31:
src/drmgr/ofdt.h:84:25: note: 'sysfs_dev_path' declared here
84 | char sysfs_dev_path[DR_PATH_MAX];
| ^~~~~~~~~~~~~~
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5de0a4a070981b5ee005f2242b31db5422be297a
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Mon Dec 26 10:54:37 2022 +0100
drmgr/common_pci: Prefer strlen() to check for valid string length
This fixes the following warning when building with gcc-12 that is
the result of ofdt_path being a fixed-sized array which means that
(char *)ofdt_path never be NULL:
src/drmgr/common_pci.c: In function 'devspec_check_node':
src/drmgr/common_pci.c:465:29: error: the comparison will always evaluate as 'false' for the address of 'ofdt_path' will never be NULL [-Werror=address]
465 | if (node->ofdt_path == NULL)
| ^~
In file included from src/drmgr/drpci.h:25,
from src/drmgr/rtas_calls.h:25,
from src/drmgr/dr.h:30,
from src/drmgr/common_pci.c:31:
src/drmgr/ofdt.h:78:25: note: 'ofdt_path' declared here
78 | char ofdt_path[DR_PATH_MAX];
|
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit aef8f14ed8b241ab66d88fb9a5aeefe47a847267
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Mon Dec 26 10:54:36 2022 +0100
vcpustat: Add missing field initialization to quell compiler warning
This fixes the following compiler warning when building with gcc-12:
In file included from /usr/include/stdio.h:906,
from src/vcpustat.c:26:
In function 'printf',
inlined from 'print_stats' at src/vcpustat.c:182:4:
/usr/include/powerpc64-linux-gnu/bits/stdio2.h:86:10: error: 'stat.far_numa_node' may be used uninitialized [-Werror=maybe-uninitialized]
86 | return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/vcpustat.c: In function 'print_stats':
src/vcpustat.c:144:34: note: 'stat.far_numa_node' was declared here
144 | struct vcpudispatch_stat stat;
| ^~~~
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 04e5c9646296e1f12048723bba4cee663c3f74ed
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Thu Dec 1 05:22:37 2022 -0600
ofpathname: Handle nsid as hex in nvmf boot/install support
Didn't handle nsid correctly in nvmf boot/install support.
Need to handle it as hexadecimal number
For example,
/pci@800000020000132/fibre-channel@0,1/nvme-of/controller@50050768101935e5,ffff
:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@26c
26c should be a hexadecimal number.
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3847a1c25a640394c4afd2b8938ad21190bf5dbe
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Fri Oct 28 09:20:38 2022 -0500
Support multiple dev paths for a nvmf boot device
This patch adds the support for multiple dev/of paths with a nvmf boot dev
# bootlist -m normal -o nvme1n4
nvme1n4
nvme3n4
nvme5n4
nvme6n4
# bootlist -m normal -o
nvme1n4
nvme3n4
nvme5n4
nvme6n4
# bootlist -m normal -r
/pci@800000020000017/fibre-channel@0/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
/pci@800000020000017/fibre-channel@0/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
/pci@800000020000017/fibre-channel@0,1/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
/pci@800000020000017/fibre-channel@0,1/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit acaf9c45a340f9bb49d6b21ba7ad60c21326ea73
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Mon Nov 7 14:39:02 2022 -0800
hcnmgr: Fix setting primary slave across reboots
Using nmcli to set bonding of primary slave so that is set correctly
across reboots.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: Reworded commit log]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b6bd4ddd0c0a24cce97c220ab0cadfd004dd58c4
Author: Sathvika Vasireddy <sv@linux.ibm.com>
Date: Fri Jul 15 14:35:13 2022 +0530
lparstat: Fix array overflow issue
lparstat is trying to read from out of bound file descriptors. Fix
this by making sure array overflow does not occur.
Without this patch:
===================================================================
ltcden8-lp7:/home/sathvika/powerpc-utils # lparstat -E 1 1
Failed to /sys/devices/system/cpu/cpu1162167776/spurr
===================================================================
With this patch:
===================================================================
ltcden8-lp7:/home/sathvika/powerpc-utils # ./src/lparstat -E 1 1
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=6 mem=81341376 kB cpus=0 ent=6.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.01 99.99 4.00GHz[116%] 0.02 115.98
====================================================================
Reported-by: Sachin Sant <sachinp@linux.ibm.com>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b1b9e76de0f3ab1dfcd9426779fa20fd77cd5625
Author: Luciano Chavez <lnx1138@linux.ibm.com>
Date: Wed Aug 24 21:11:32 2022 -0500
lsslot: Fix lsslot -c mem output when using 4GB LMB size
When using a LMB size of 4GB, the output of lsslot -c mem would get
reported incorrectly as:
Dynamic Reconfiguration Memory (LMB size 0x0)
:
DRC Index: 80000001 Address: 100000000
Removable: No Associativity: (index: 1) 0 1 4 9
Section(s):
This patch changes the declaration of the _node_u._smem._lmb_size from
a uint32_t to uint64_t to store the value properly. Any variables that
store the lmb_size are also declared as uint64_t. In addition, we
use the PRIx64 macro in printf statements to properly print the
lmb_size value.
The patch also includes a necessary change to declare the global
variable block_sz_bytes as a uint64_t to fix an infinite loop in
the function get_mem_scns() when the above changes were introduced.
Signed-off-by: Luciano Chavez <lnx1138@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e1f1deb06d9168a95a381a2236e1d8c693d3d229
Author: Luciano Chavez <lnx1138@linux.ibm.com>
Date: Wed Aug 24 21:17:54 2022 -0500
lsslot: Explicity declare that lmb_address be displayed in hexadecimal
A printf statement used is lsslot.c was specifying the macro PRIu64 to
display the lmb_address. Depending on the compilation, this would
either display as a hexadecimal or decimal value.
This patch replaces PRIu64 with PRIx64 to explicitly declare to print
the value as hexadecimal as that was is normally expected of an address.
Signed-off-by: Luciano Chavez <lnx1138@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f4c2b0d142f623e7dd28a5d685e446d41be75601
Author: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Date: Thu Aug 25 12:19:27 2022 +0530
lparstat: Fix display of mode for dedicated-donating partition
From the lparstat man page:
mode
Indicates whether the partition processor capacity is capped or uncapped
allowing it to consume idle cycles from the shared pool. Dedicated LPAR
is capped or donating.
However, on a dedicated partition, lparstat always displays the mode as
'Capped' today. Fix this by using 'DedDonMode' field from lparcfg for
determining the cycle donation status of a dedicated partition.
On a dedicated-donating partition:
$ grep -e shared -e DedDonMode -e capped /proc/powerpc/lparcfg
DedDonMode=1
capped=1
shared_processor_mode=0
Before this patch:
$ lparstat
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=1 mem=3335424 kB cpus=0 ent=1.00
After this patch:
$ lparstat
System Configuration
type=Dedicated mode=Donating smt=8 lcpu=1 mem=3335424 kB cpus=0 ent=1.00
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7698adc945372e901c2bc3f7066a5a1c219bf1d8
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:18 2022 +0200
drmgr: add the drmgr-hooks man file.
This man page describe the various drmgr's hooks.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d0bc79aedaf76eff09a5d1f399da09561a4d4d7d
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:17 2022 +0200
drmgr: introducing the LPM hooks
There are 3 hooks run when an LPM is performed:
1. check before the LPM is really initiated
1 bis. undocheck if check failed.
2. pre just before entering the switch over
3. post at the end of the LPM operation
Only the check hook's return status is taken in account. If the check hook
return value is different from 0, the LPM is aborted and the outputs of the
check hook are reported to the end user through the HMC.
In the case at least one check hook returned a non zero status, the
undocheck event is run (for all the hooks), and the pre and post events are
not triggered.
The post event is triggered even if the LPM operation has failed.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e0928dc5e5375591a4cff6ffabc6063771288f59
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:16 2022 +0200
drmgr: introducing the hook framework
The hook framework run in a sequence any executable file found in the
relevant directory (/etc/drmgr.d/<DRC TYPE NAME>/)
The hook are run according to the versionsort()'s output order.
The hook inherits from drmgr its standard I/O streams. All others file
descriptor should have the close on exec flag set to ensure they will be
closed when executing an hook.
The hooks are run with no arguments, arguments are passed through
environment variable.
The inherited environment is cleaned and 2 environment variables
are set:
- DRC_TYPE containing the DRC type string
- PHASE containing the current phase
There are 4 known phases: check, undocheck, pre and post.
The hook's run is recorded in the drmgr's log, so blocking hook could be
identified.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 372599ed28d65a79d4c3b3405a8e04034eb58e09
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:15 2022 +0200
drmgr: introduce a DRC type name table
So that there is only one place to convert the name of the drc to the type
of drc and vice versa.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f2a4619ef6be747f53e5f631f8b23b5edb9bb023
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:14 2022 +0200
drmgr: prevent file descriptor to be inherited when execing a child
When a file descriptor is opened and remain opened, the O_CLOEXEC should be
set so execed children are not inheriting it.
There is no need for file descriptor opened and closed immediately, like in
probe_cpu().
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1ac96f8ab7c27095be90eb2e69ae57e8b43eccbe
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:13 2022 +0200
drmgr/pmig: remove deprecated call to refrsrc IBM.ManagementServer
As Nathan reported while reviewing this series:
This RSCT doc indicates that the IBM.ManagementServer resource class has
been superseded:
https://www.ibm.com/docs/en/rsct/3.2?topic=security-management-domain-configuration
Removing that deprecated call in this series because it is conflicting with
a following patch. The system returned value is stored in rc to prevent
compilation error (due to warning if system returned value is not read).
Suggested-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c3ce3040ea9ed49345756136d61eb402e32402e8
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Sep 16 18:39:12 2022 +0200
drmgr/pmig: remove unused code
The original system id is read but never used, so remove that useless code.
Remove also an unjustified sleep(5) call.
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 2fbd7c1ff428e534d80f60e03501d625ab594eca
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Wed Jun 15 13:05:51 2022 -0500
ofpathname: Fix several issues in nvmf boot/install support
This patch fixes several issues in boot/install over nvme-over-fc
device support.
- change cntlid to ffff
- add devnisd from sysfs
- add subsysnqn
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c015807d5bef0ebdeaf99883793173f2b636e740
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Wed Jun 15 13:05:18 2022 -0500
bootlist: Add install/boot support for nvmf devices
This patch adds the boot/installation support for nvme-over-fc devices.
It can set nvmf device as boot device in both of logical device name
and open firmware device path name.
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.10
=====================================================================
commit 8eb14d62d6b3bb14391679bd3e1b4538be9b382c
Author: Pratik R. Sampat <psampat@linux.ibm.com>
Date: Tue Jun 8 13:10:43 2021 +0530
ppc64_cpu: Add support to parse PAPR information for energy and frequency
H_GET_EM_PARMS H_CALL was previously responsible for exporting energy,
frequency related information in the "/proc/ppc64/lparcfg", when the
--frequency option was invoked, however the H_GET_EM_PARMS H_CALL will
be deprecated P10 onwards.
The information within lparcfg was encoded and was needed to be parsed
in order to extract the state.
The new "H_GET_ENERGY_SCALE_INFO" H_CALL has the ability to export
information in plain-text and userspace programs can simply parse this
from a sysfs interface, with just the knowledge of the ids of the
attributes and without the need for interpretation of the values.
The new interface exports information as follows:
/sys/firmware/papr/energy_scale_info/
|-- <id>/
|-- desc
|-- value
|-- value_desc (if exists)
|-- <id>/
|-- desc
|-- value
|-- value_desc (if exists)
The commit adds capability to parse this information from the new
interface and in case of faliure it rolls back to the lparcfg parse to
report this information.
The frequency information computation has been kept intact and a the
frequencies reported from the platform is displayed in a different
header.
Sample output from the powerpc-utils tool is as follows:
Power and Performance Mode: XXXX
Idle Power Saver Status : XXXX
Processor Folding Status : XXXX --> Printed if Idle power save status is supported
Platform reported frequencies --> Frequencies reported from the platform's H_CALL i.e PAPR interface
min : NNNN GHz
max : NNNN GHz
static : NNNN GHz
Tool Computed frequencies
min : NNNN GHz (cpu XX)
max : NNNN GHz (cpu XX)
avg : NNNN GHz
Signed-off-by: Pratik R. Sampat <psampat@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 0255a7b2bc62a8b41b79e3fe446361e1278cf374
Author: Pratik R. Sampat <psampat@linux.ibm.com>
Date: Tue Jun 8 19:22:25 2021 +0530
ppc64_cpu: Variable maybe unitilized at the time of return
Variable "rc" maybe unitilized, as rc's value is assigned within a loop
with no guarantee the loop will execute and can return undefined values.
Therefore, fix the bug by initializing the return code to zero.
Fixes: 49ad3ef26883 ("This is really more of a re-write than an update")
Signed-off-by: Pratik R. Sampat <psampat@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c57b66c62d96f50f3e94d17a770a4954f526a06b
Author: Sathvika Vasireddy <sv@linux.ibm.com>
Date: Mon May 9 13:48:10 2022 +0530
lparstat: Fix error message
This patch displays proper error message in case pread() fails.
Suggested-by: Paul A. Clarke <pc@us.ibm.com>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
Reviewed-by: Paul A. Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 89c2efa11a22bd7d2b1647b854e3bcc73a5eb9f6
Author: Sathvika Vasireddy <sv@linux.ibm.com>
Date: Sat May 14 13:33:39 2022 +0530
powerpc-utils: Enhance error message when lparstat -E fails on max config systems
Report clear error indicating what caused lparstat -E
option to fail on max config systems.
Without this patch:
=====================================================
# lparstat -E
Failed to open /sys/devices/system/cpu/cpu340/idle_purr
=====================================================
With this patch:
=====================================================
# lparstat -E
Failed to open /sys/devices/system/cpu/cpu340/idle_purr: Too many open files
=====================================================
Reported-by: Pavithra Prakash <pavrampu@linux.vnet.ibm.com>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 82c89b17e00b872a18b486375a688a4fec804527
Author: Haren Myneni <haren@linux.ibm.com>
Date: Sat May 28 18:15:35 2022 -0700
drmgr: Add support for 'acc' command
Using HMC interface, the user can change the quality of service
credits (QoS) dynamically for NX GZIP accelerator. This interface
invokes drmgr command which writes the new QoS credit value to
sysfs file. So to support NX accelerator, 'acc' command is
introduced and the drmgr is executed with following arguments.
drmgr -c acc -t <accelType> -q <qos_count> -w <timeout> -d <detail level>
accelType: Only GZIP accelerator type is supported now
qos_count: New total QoS credits
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit aff2dcf4276f19aef7b499148b4d421456851e21
Author: Michal Suchanek <msuchanek@suse.de>
Date: Mon May 2 18:44:02 2022 +0200
hcn-init.service: Add RemainAfterExit=yes
This is consistent with other services provided by powerpc-utils.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 09846b0346273deed7b85b3f93dbd42ff9f268ef
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Fri Apr 15 11:13:08 2022 +0200
man/drmgr: fix multiple typos
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b46743ca68b6a06a2c82de4048d94d3d5191717f
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun Nov 8 16:08:22 2020 +0100
Fix format specifiers in printf() and sprintf() calls
There are various warnings reported on ppc32 builds for mismatched
printf format specifiers like the following:
src/errinjct/ioa_bus_error.c:449:32: error: format ‘%lx’ expects argument of type ‘long unsigned int’,
but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]
449 | printf("ADDR MASK:\t\t%.16lx\n", mask);
| ~~~~~^ ~~~~
| | |
| | uint64_t {aka long long unsigned int}
| long unsigned int
| %.16llx
src/errinjct/ioa_bus_error.c:451:31: error: format ‘%lx’ expects argument of type ‘long unsigned int’,
but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]
451 | printf("ADDR MASK:\t\t%.8lx\n", mask);
| ~~~~^ ~~~~
| | |
| | uint64_t {aka long long unsigned int}
| long unsigned int
| %.8llx
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
[tyreld: added commit log description]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 61c22ea0e37c8851d17f7d878978b8764169437c
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Fri Mar 4 15:01:14 2022 -0800
hcnmgr: Add new feature "wicked" in HNV FEATURE list
After support wicked in HNV, now add it in the FEATURE list.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ff2d61b49c48fcb98716cc696864b2cb0987c43b
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Feb 24 12:22:11 2022 -0800
hcnmgr: Update Makefile and powerpc-utils spec file to support HNV and wicked
Add installation of new functions.suse for wicked HNV
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5c2d5e838e8a9e2e744b89fa42724118e1cccded
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Feb 24 09:02:05 2022 -0800
hcnmgr: Fix NM HNV setting primary slave
Fix incorrect usage active_slave attribute instead of primary.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f4eb928b0935f0e2afcb7e776c8fea46d171e108
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Wed Feb 16 01:09:05 2022 -0800
hcnmgr: Add hcn-init.service.suse
Add SuSE specific hcn-init service.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 38d329ff98c0bd2fc80042b4aed6a0b6d4930319
Author: Marius Tomaschewski <mt@suse.de>
Date: Wed Feb 16 19:20:27 2022 +0100
hcnmgr: maintain hcnid state for later cleanup
When the LPAR has been shut down and the configuration changes then,
there is still previous bonding config (e.g. bond<old HCNID>), that
needs to be cleaned up while in hcn-init.service start (hcnmgr -s).
Signed-off-by: Marius Tomaschewski <mt@suse.com>
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4be90c732c465cf3b21191c6860767b3cdb3c7cb
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Wed Feb 16 00:31:23 2022 -0800
hcnmgr: Support wicked HNV using new wicked functions for bonding
first: Add wicked support hnv command functions
second: fixed offline remove HNV
Added scanhcn_wicked() to be able to reconfigure HNV at the end of scan.
When lpar has been shut down, and an old HNV can be removed, the virtual
device can be added to a new HNV, the configration
changes then. This requires to reconfigure all bonds.
third: udev renaming racing with hcncfg and wicked ifup, here we improved
wicked cfghcn function by always waiting for udev events complete before
search for device to get the device-ready device names
last: post LPM migration the new sr_iov should be set as primary, it
currently calling wicked ifup after the ifcfg file modified to make the
sr_iov as primary device. However the kernel is not noticed, we added a
workaround here to directly update via sysfs
Signed-off-by: Marius Tomaschewski <mt@suse.com>
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5b50974f3545cdacfd5bf541394e544684f3a82a
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Wed Feb 16 00:16:52 2022 -0800
hcnmgr: Add new wicked functions for SuSE to manage bonding
SuSE specific hcnmgr utilities to manipulate SuSE ifcfg files
as supported by yast2 network.
Signed-off-by: Marius Tomaschewski <mt@suse.com>
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 39c2bf7279df0a8d87ecfb215513eef69fdf15c8
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Tue Feb 15 23:59:43 2022 -0800
hcnmgr: Factor out NetworkManager nmcli code
Move nmcli code to corresponding hcn command/functions for networkmanager
Signed-off-by: Marius Tomaschewski <mt@suse.com>
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit cb9ccfd774d7af00c2e97dab085339473dcfa4bb
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Tue Feb 15 23:29:12 2022 -0800
hcnmgr: Validate connection manager and add tracing option
Check and validate what OS is on the system and what type
of connection manager is used: Wicked or NetworkManager
This patch also add -x option to trace hcnmgr script execution
Last, check platform/service after getopts parsing
Signed-off-by: Marius Tomaschewski <mt@suse.com>
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: removed lsmod check prior to modprobe]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d512169a87cc146bcd3844f266abef903d8d3c54
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Sat Mar 5 15:34:06 2022 -0600
bootlist: fix invalid hex number message
In dm_to_part() when kpartx returns no partitions tmajor and tminor are
empty. As a result the $(printf %d:%d 0x$tmajor 0x$tminor) command
subsititution reports the following error:
/usr/sbin/bootlist: line 277: printf: 0x: invalid hex number
Fix this by redirecting stderr to /dev/null.
Suggested-by: Than Ngo <than@redhat.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c44313686e69123c00406727ea44e52873a1e2c4
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Sat Mar 5 15:31:25 2022 -0600
bootlist: fix passing -l flag to kpartx as -p delimiter value
When $delim is empty in dm_to_part() the kpartx command will wrongly use
the -l option flag as the delimiter input for the -p flag. Fix this be
quoting $delim.
The variable delim is NULL (empty) in this case and it shows wrong
partitions.
kpartx -p -l /dev/mapper/mpatha
mpatha-l1 : 0 8192 /dev/mapper/mpatha 8192
mpatha-l2 : 0 2097152 /dev/mapper/mpatha 16384
mpatha-l3 : 0 14663680 /dev/mapper/mpatha 2113536
With quotation it shows correct correct.
kpartx -p "" -l /dev/mapper/mpatha
mpatha1 : 0 8192 /dev/mapper/mpatha 8192
mpatha2 : 0 2097152 /dev/mapper/mpatha 16384
mpatha3 : 0 14663680 /dev/mapper/mpatha 2113536
Suggested-by: Than Ngo <than@redhat.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1c71116c7fc504d13e091f36781c368de4eeab56
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu Feb 24 14:45:27 2022 -0600
ci: add GitHub Actions build tests
GitHub's hosted x86 Ubuntu runners have cross toolchains suitable for
building powerpc-utils and its various library dependencies (librtas,
zlib, and libnuma) for its targeted architectures. Add a matrix build
including these (32- and 64-bit big-endian, 64-bit little-endian) powerpc
platforms which perform a basic build and distcheck.
Also perform a native x86 build since it "works": it produces nothing you
would want to run, but the build succeeds. If we are to add tests in the
future, running them as native code on the build host may be the best
option. So it's in our interest to keep the x86 build working.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 313bb6fdc145c6df401050e414bf0bf925fd46c1
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Feb 23 17:56:08 2022 -0600
lsslot: fix memory leak when listing IO slots
Valgring reports the following leak when listing IO slots.
==2102767== Command: src/drmgr/lsslot -c slot
==2102767==
U9040.MR9.132944X-V16-C0 Virtual I/O Slot 30000000 vty
U9040.MR9.132944X-V16-C11 Virtual I/O Slot 3000000b l-lan
U9040.MR9.132944X-V16-C101 Virtual I/O Slot 30000065 v-scsi
U9040.MR9.132944X-V16-C312 Virtual I/O Slot 30000138 vfc-client
U9040.MR9.132944X-V16-C313 Virtual I/O Slot 30000139 vfc-client
==2102767==
==2102767== HEAP SUMMARY:
==2102767== in use at exit: 64 bytes in 2 blocks
==2102767== total heap usage: 5,203 allocs, 5,201 frees, 203,943,832 bytes allocated
==2102767==
==2102767== 26 bytes in 1 blocks are definitely lost in loss record 1 of 2
==2102767== at 0x40A53B8: malloc (vg_replace_malloc.c:381)
==2102767== by 0x429F2F3: strdup (in /usr/lib64/libc.so.6)
==2102767== by 0x1000F3A3: of_to_full_path (common_ofdt.c:456)
==2102767== by 0x1000F5CF: get_drc_info (common_ofdt.c:499)
==2102767== by 0x1000BEBF: add_pci_vio_node (common_pci.c:632)
==2102767== by 0x1000D307: get_dlpar_nodes (common_pci.c:856)
==2102767== by 0x10003083: lsslot_chrp_pci (lsslot.c:568)
==2102767== by 0x100047DF: main (lsslot.c:965)
==2102767==
==2102767== 38 bytes in 1 blocks are definitely lost in loss record 2 of 2
==2102767== at 0x40A53B8: malloc (vg_replace_malloc.c:381)
==2102767== by 0x429F2F3: strdup (in /usr/lib64/libc.so.6)
==2102767== by 0x1000F3A3: of_to_full_path (common_ofdt.c:456)
==2102767== by 0x1000F5CF: get_drc_info (common_ofdt.c:499)
==2102767== by 0x1000BEBF: add_pci_vio_node (common_pci.c:632)
==2102767== by 0x1000D337: get_dlpar_nodes (common_pci.c:859)
==2102767== by 0x10003083: lsslot_chrp_pci (lsslot.c:568)
==2102767== by 0x100047DF: main (lsslot.c:965)
==2102767==
==2102767== LEAK SUMMARY:
==2102767== definitely lost: 64 bytes in 2 blocks
Fix by freeing full_path in get_drc_info() regardless of success of
drc_info_connector_vX() call.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit fe7c23df64d5679a01dfe52eeaae2cfec8cdead1
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Feb 23 12:39:37 2022 -0800
lsslot: Add new DRC type description strings for latest PCIe slot types
The following Rev 4 and Rev 5 type PCIe slots can be reported by
firmware on machines with such capable slots.
DRC-TYPE Description
45 A U.2 PCI Express Rev 4 4x lane slot with 2x lanes connected
46 A PCI Express Rev 5 8x lane slot with 1 lane connected
47 A PCI Express Rev 5 8x lane slot with 4x lanes connected
48 A PCI Express Rev 5 8x lane slot with 8x lanes connected
49 A PCI Express Rev 5 16x lane slot with 1 lane connected
50 A PCI Express Rev 5 16x lane slot with 4x lanes connected
51 A PCI Express Rev 5 16x lane slot with 8x lanes connected
52 A U.2 PCI Express Rev 5 4x lane slot with 2x lanes connected
53 A U.2 PCI Express Rev 5 4x lane slot with 4x lanes connected
Currently, the lsslot utility reports "Unknown" for the description of
these pci devices. Update the php_slot_type_msg[] with these new slot
descriptions so that lsslot correctly reports them.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 615e8a4d003b4aba46bcf2103a7fa9e26b16169b
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Wed Dec 1 20:09:27 2021 +0100
lparstat: report LPAR name from lparcfg
If the kernel is reporting the LPAR name in /proc/powerpc/lparcfg, report
that value instead of the one found in the Device Tree which is not updated
when the user change the LPAR in the HMC.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d8408b429ff022ff446ac2607bc26eaf60627658
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Mon Jan 10 16:55:58 2022 -0500
errinjct: sanitize devspec output of a newline if one is present
Linux Kernel Commit: 14c19b2a40b6 ("PCI/sysfs: Add 'devspec' newline")
introduced a newline character at the end of the devspec result which
historically did not have one before. When a newline is present the
errinjct utility constructs an invalid pathname for a PCI devices /reg
property in the device tree. As a result the tool fails to provide a
valid config address to RTAS resulting in a (-3) Parameter Error.
errinjct eeh -v -f 6 -s net/eth1 -a 0xe0800000 -m 0xff800000
errinjct: Could not open file /proc/device-tree//pci@800000020000154/ethernet@0,1
/reg, No such file or directory
Injecting an ioa-bus-error with the following data:
BUS ADDR: e0800000
ADDR MASK: ff800000
CONFIG ADDR: 1
PHB UNIT_ID: 800000020000154
FUNCTION: 6
Store to PCI Memory Address Space - inject an Address Parity Error
errinjct: RTAS error injection failed!
errinjct: RTAS: ioa-bus-error: Argument error (-3)
Fix this issue by nul terminating the devspec output string at the newline
if present.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c73206b62d6d827cbc37a10f0195b5d2cf3f2fbb
Author: Fabian Groffen <grobian@gentoo.org>
Date: Fri May 21 11:25:21 2021 +0200
add includes/defines for musl libc support
- add some missing includes to get proper definitions for beXXtoh and
PATH_MAX
- guard backtrace() from execinfo.h usage for it is glibc only
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5d2d0a0b50ff386b7d9416e122d05214846573b6
Author: Thomas Abraham <tabraham@suse.com>
Date: Tue Oct 12 09:21:38 2021 -0400
lparstat: Fix reported online memory in legacy format
On systems with more than 2TB of online memory, legacy mode
will calculate and report a negative value due to exceeding
the maximum value for a signed 32-bit integer:
$ lparstat -i | grep "Online Memory"
Online Memory : 3771084032 kB
$ lparstat -il | grep "Online Memory"
Online Memory : -511604 MB
Signed-off-by: Thomas Abraham <tabraham@suse.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 8a10a623a781ed3e56d0e7fecec7a035bb9e9755
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Thu Sep 30 08:53:14 2021 -0500
ofpathname: Add support for NVMf devices
To support boot/installtion over nvme-over-fc devices.
This patch converts a NVMf device name between open firmware device path
and logical device.
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Reviewed-by: Brian King <brking@linux.ibm.com>
[tyreld: removed trailing whitespace]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 98c8519b832ddb93021c3eeb8eee0f5e51c49197
Author: Wen Xiong <wenxiong@linux.ibm.com>
Date: Thu Sep 30 08:53:13 2021 -0500
ofpathname: Fix nvme support in ANA mode
nvme_core.multipath is Y by defaut in the latest rhel
and sles linux release. The patch fixes the issue when
nvme_core.multipath=Y
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1e23f0265608f49679a462072d3a4f17139edfc0
Author: Michal Suchanek <msuchanek@suse.de>
Date: Tue Nov 30 12:04:37 2021 +0100
hcnmgr: Remove some dead code
There is VNIC_SPT which enables support for vnic as beckup device which
is set based on value of VERSION variable which is hardcoded in the
script and does not correspond the actual HNV support level on the LPAR.
Remove all this. We do support vnic backend so enable it
unconditionally.
It is the job of HMC to decide if vnic backup device is supported and
can be configured. When it is configured by HMC make use of it.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Tested-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 6951f22553e646ae88b78103427f2f52e846e538
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Tue Nov 9 15:45:44 2021 -0800
hcnmgr: Support vNIC as backup device
HNV version 1.0 supports ibmveth as backup device for HNV.
As ibmvnic is more stablized, enable support for vnic as backup
vdevice for HNV in new version 1.1
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4d56ac27688743ff707966255cfe958f19eb5b6d
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Oct 28 11:11:27 2021 +0200
hcnmgr: Avoid hexdump squeezing consecutive identical bytes.
When the file contains multiple consecutive bytes of the same value
hexdump squeezes them replacing all but first with *
Use the -v argument to avoid this problem.
Also put the hexdump invocation into a function.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4c6dc50d8de1a8b171675ee6b742c9f0250c28a1
Author: Scott Cheloha <cheloha@linux.ibm.com>
Date: Tue Jul 27 11:30:58 2021 -0500
lsdevinfo: optimize criteria filtering
lsdevinfo is significantly slower when a criteria filter is set with the
-q flag.
There are two culprits:
1. The criteria string given on the command line is parsed every time
we call check_criteria(). We're forking two sed(1) processes whenever
we hit that function. We hit it a lot.
2. Criteria checking runs in constant time. We call check_criteria() and
do the parsing in (1) for every relevant attribute, even if we already
have a match from a prior check_criteria() invocation.
We can fix issue (1) by parsing the criteria string once at the start
of the script. I have added a function, parse_criteria(), that parses
the $criteria string and selects an appropriate matching function.
This approach also fixes problem (2), but we first need to check
whether the user's criteria is relevant to the attributes the script
cares about before calling the matching function. We do this with
criteria_is_relevant().
The speed improvement is nice. Consider my test machine with around
thirty devices. On this machine, lsdevinfo without any options runs
in 1.35s, but with the "status=1" criteria it runs in 2.12s:
$ /usr/sbin/lsdevinfo | fgrep -c device:
29
$ command time -p /usr/sbin/lsdevinfo > /dev/null
real 1.35
user 1.42
sys 0.16
$ command time -p /usr/sbin/lsdevinfo -q status=1 > /dev/null
real 2.12
user 2.22
sys 0.30
With this patch, lsdevinfo with the "status=1" criteria now runs in
1.35s:
$ command time -p /usr/sbin/lsdevinfo -q status=1 > /dev/null
real 1.35
user 1.41
sys 0.18
This patch eliminates nearly all of the criteria-checking overhead in
the current code.
Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 43d1d1011ee57c98fd7a3f8a6d2ebf8b441d1b57
Author: Scott Cheloha <cheloha@linux.ibm.com>
Date: Wed Aug 4 14:17:29 2021 -0500
pseries_platform: read /proc/cpuinfo once
We only need to read /proc/cpuinfo once to determine which platform
we're running on.
Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.9
=====================================================================
commit 88ebfd97d1c4f9868e1ef2839bd0c375fcbf0153
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Fri May 21 15:28:28 2021 -0700
drmgr: increase log size to 1MB
The current log threshold is currently a skant 25000 bytes. The resulting log
rotations from higher verbosity detail levels (eg. -d 15 to get rtas debug
output) can hinder problem determination.
Raise the log rotation threshold to 1MB so that more history is preserved.
Suggested-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ef7d286e3d56c186a9a95ff38847a0cfc7f22915
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Jul 15 15:50:10 2021 -0700
Fix checking HCNID array size at boot time
In commit 0b59d4a372aa ("hcnmgr: Avoid cleanup of bond interface at boot time
when no HNV exists") it checks whether the HCNID array is empty to avoid
cleanup of non-HNV related network profiles after reboot. The hcnmgr scan run
log shows checking the number of HCNID array elements has not been done
properly.
hcnmgr[905]: [DEBUG]:search ibmveth device with ibm,hcn-id propterty......
hcnmgr[905]: /usr/sbin/hcnmgr: line 585: ${HcnIds[[@]}: bad substitution
Fixes: 0b59d4a372aa ("hcnmgr: Avoid cleanup of bond interface at boot time when no HNV exists")
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: fixed up commit log, added Fixes tag]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 2a6726509b21c36feb54ed4f0607ea5d8d860665
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jul 15 15:41:57 2021 -0700
hcnmgr: Set autoconnect-slaves on HNV connections.
When not set bringing up the HNV connection does not bring up network
connectivity.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c87b25f928d2311ebd640a78c17e14431c68c551
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jul 15 15:41:56 2021 -0700
hcnmgr: When trying to detect HNV bond list all connections, not only active ones.
When NM is starting up the HNV connection is not active when hcnmgr
looks for it and it is recreated.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 29c725495181203e10c75cb946ae08a402476221
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jul 15 15:41:55 2021 -0700
hcnmgr: Use hexdump from util-linux rather than xxd from vim
xxd is part of vim which may not be installed in minimal environments or
on systems using other text editor. hexdump is part of util-linux which
is likely to be available.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b27b3bd624b7bc68835d6c39f9f1870393c11445
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jul 15 15:41:54 2021 -0700
hcn-init.service: Start together with NetworkManager.
hcn-init uses NetworkManager so it does not make sense to run it when
different connection manager is in use. Also when NetworkManager is in
use it should be started automatically.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9375e34aa02b73a81209112f0ee9e1489793d626
Author: Brian King <brking@linux.vnet.ibm.com>
Date: Mon Jun 28 17:15:37 2021 -0500
ofpathname: Fix OF to logical FC lookup for multipath
If a FC target has multiple initiator ports that can see
the same target ports, attempting to do an OF to logical
lookup will return the wrong value sometimes. Fix this
by checking to ensure we are using the correct initiator
port.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9be8e8b7cffb293bf8bc928134ad076efde42606
Author: Brian King <brking@linux.vnet.ibm.com>
Date: Mon Jun 28 17:15:36 2021 -0500
ofpathname: Fix OF to logical lookup with partitions
If the OF pathname has the disk partition specified with a :1,
for example, we currently fail to find the logical device name.
Fix this by stripping it and reapplying it after we find the
device.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9f741349064153bef4d710db19b9e50a5c732301
Author: Brian King <brking@linux.vnet.ibm.com>
Date: Mon Jun 28 17:15:35 2021 -0500
bootlist: Fix for multipath devices with > 5 paths
Only five entries can be added to the bootlist. If more than that
are specified, the script flags this as an error and aborts.
However, if a multipath device with more than 5 paths is
specified, this is also failing. Rather than failing to set
any boot entries in this case, we should simply truncate the
boot list to the first 5 paths, which is what this patch does.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9104167a0ee93989757326136b94daad585cd87c
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun Apr 18 10:05:49 2021 +0200
ofpathname: Add missing substring extraction of devpart in l2of_vd()
l2of_vd() contains the necessary bits to append the partition number
to the resulting OFPATH, but it does not actually extract the partition
number from the logical device path in the first place. This adds the
missing substring extraction of the partition number from the logical
device path so that the partition number is appended to OFPATH when
the logical device is a partition.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4336877347adfd799881ad6bde5ee2dd9ca5acd5
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:05 2021 +0200
Introducing lparnumascore
This command is computing the LPAR NUMA score for CPU and memory.
After a LPM, resources like CPU and memory could be reassigned to a
different NUMA node. But the Linux kernel is not able to replicate these
changes and since the kernel commit bb7c3d36e3b1 ("powerpc/pseries: remove
prrn special case from DT update path"), PRRN event are only updating the
device tree, but not the resource's assignement the kernel is managing.
This new command detects CPU and memory resources the kernel keep binded to
the NUMA node topology of the departure node. It computes a ratio, and
print it to the standard output.
The ratio is between 0 (worst) and 100 (best).
For instance when half of the CPUs have been reassigned to a new NUMA node,
the score would be 50. If all the CPUs are on the right node, the score
would be 100.
The command can compute the CPU and memory score or only one if specified
through the -c option.
Example of output:
$ ./lparnumascore -h
Usage: lparnumascore [-d detail_level] [-c {mem | cpu}]
$ ./lparnumascore
CPU score: 80
MEM score: 45
$ ./lparnumascore -c mem
MEM score: 45
$ ./lparnumascore -c cpu
CPU score: 80
The command is not locking /var/lock/dr_config_lock so user should ensure
that there is not ongoing command impacting the computed scores. This
allows the command to be run without special privileges.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit fb5feb0da8fa7295e623741776e81ba85411ab3c
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:04 2021 +0200
drmgr: export block_sz_bytes
Callers of get_lmb() could be interested in knowing the block size.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 66b91615ed94ae7253f72f66572976a3a82d97f3
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:03 2021 +0200
drmgr: introduce of_associativity_to_node
This device tree related function reads the ibm,associativity propertie of
a node and, using the specified min_common_deth, is returning the NUMA node
id.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 13e8b81a1d0e4c104aa70c06f9205c09c7233d96
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:02 2021 +0200
drmgr: rename is_lsslot_cmd into read_dynamic_memory_v2
is_lsslot_cmd is used to decide if ibm,dynamic-memory-v2 should be read or
not.
Rename it as read_dynamic_memory_v2 so it would be used by command other
than lsslot.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 6cef0ada83248fd804d04a6577af3ab3c5e7278c
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:01 2021 +0200
drmgr: move associativity lookup arrays management to common-ofdt.c
This is related to the DT reading so should reside to common-ofdt.c.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 8ac3aca62371c250f55254a0c369ce0385cadebb
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 18:00:00 2021 +0200
drmgr: move some code to common_ofdt.c
alloc_dr_node() and free_node() should be put in common_ofdt.c instead of
common_pci.c.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 00312816661accf9bbf090572fbf22b71cac3682
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 17:59:59 2021 +0200
rpm: fix rpmbuild error
rpmbuild is reporting the following error:
Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/laurent/rpmbuild/BUILDROOT/powerpc-utils-1.3.8-1.ppc64le
error: Installed (but unpackaged) file(s) found:
/usr/share/man/man8/drmgr.8.gz
This is because the file is not mentioned in the RPM specification file.
Fixes: bd8dd36b33cd ("man: add manpage for the drmgr utility")
Cc: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b0d65380dc02377f09c06bd51dc07ad7d86646f5
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Apr 29 17:59:58 2021 +0200
rpm: fix bogus date in the changelog
rmbuild is complaining because Tue December 7th didn't exist, this was a
Wednesday:
$ rpmbuild SPECS/powerpc-utils.spec
warning: bogus date in %changelog: Tue Dec 7 2011 Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 07c4ee28b2c93279e25534a16600baad5c0331a7
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Mon Apr 19 10:40:15 2021 +0200
drmgr: fix remove by index operation
The commit e9f06531356f ("drmgr: introduce NUMA based LMB removal")
introduce a special processing when NUMA is on and the remove by count
operation is done.
Unfortunately, that code is also triggered when doing a remove by index
operation (-s argument) becauses usr_drc_count is set to 1. As a
consequence the index constraint is not respected and any LMB can be
removed.
Add a check agains usr_drc_index which is set when a remove by index
operation is done to ensure the numa removal code is not triggered in that
case.
Fixes: e9f06531356f ("drmgr: introduce NUMA based LMB removal")
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 67e974dbb8e4462c69c9c0e3a3b0c3a7219a2d45
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Tue Feb 9 01:10:01 2021 +0100
ofpathname: Move definition of SYS_PATH from l2of_vs() to l2of_scsi()
SYS_PATH, which is required to calculate the plug ID of a SCSI/SATA
host in l2of_scsi(), is actually never set in this function but in
l2of_vd() where it is not used at all. Thus, move the definition of
SYS_PATH from l2of_vd() to l2of_scsi() to fix the calculation of the
plug ID in l2of_scsi().
Fixes: 3fb2c44e22 ("ofpathname: Add support for the plug ID of a SCSI/SATA host")
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 97269d301797e23b75d0c7a5cb63ce280783f615
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Mar 4 14:51:38 2021 +0100
lpartstat: add -x option for the security flavor
This allows user to get the security flavor settings fer the LPAR.
The output is :
$ lparstat -x
Speculative Execution Mode : 1
Where the output number means
0 = Speculative execution fully enabled
1 = Speculative execution controls to mitigate user-to-kernel side-channel
attacks
2 = Speculative execution controls to mitigate user-to-kernel and
user-to-user side-channel attacks
In the case the running kernel is not exposing the security flavor in
/proc/powerpc/lparcfg, the output is:
$ lparstat -x
Speculative Execution Mode : -
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 70c15669607885aa358a566006224d0acd345f90
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Mar 4 14:51:37 2021 +0100
man lparstat: fix nroff warnings and errors
Fix errors and warning reported by mandoc for the lparstat.8 file
$ mandoc -W base man/lparstat.8 1>/dev/null
mandoc: man/lparstat.8:7:4: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:20:72: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:26:168: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:32:37: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:35:24: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:38:50: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:46:117: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:73:50: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:76:94: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:81:243: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:84:117: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:90:104: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:94:106: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:101:47: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:104:34: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:107:171: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:119:173: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:122:69: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:125:46: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:131:51: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:134:51: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:137:71: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:140:35: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:143:55: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:152:156: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:155:132: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:158:132: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:161:122: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:164:83: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:167:79: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:170:91: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:173:98: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:176:351: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:179:317: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:182:100: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:188:40: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:193:57: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:199:60: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:202:52: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:205:76: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:208:49: STYLE: whitespace at end of input line
mandoc: man/lparstat.8:209:2: WARNING: line scope broken: SH breaks TP
mandoc: man/lparstat.8:210:2: WARNING: line scope broken: TP breaks SH
mandoc: man/lparstat.8:220:2: WARNING: line scope broken: SH breaks TP
mandoc: man/lparstat.8:221:2: WARNING: line scope broken: TP breaks SH
mandoc: man/lparstat.8:239:2: WARNING: line scope broken: RS breaks TP
mandoc: man/lparstat.8:241:2: WARNING: line scope broken: TP breaks SH
mandoc: man/lparstat.8:246:2: WARNING: line scope broken: TP breaks SH
mandoc: man/lparstat.8:251:2: WARNING: line scope broken: TP breaks SH
mandoc: man/lparstat.8:257:2: WARNING: line scope broken: SH breaks TP
mandoc: man/lparstat.8:263:2: WARNING: line scope broken: EOF breaks TP
mandoc: man/lparstat.8:8:16: WARNING: cannot parse date, using it verbatim: May 2011
mandoc: man/lparstat.8:217:2: WARNING: empty block: RS
mandoc: man/lparstat.8:228:2: WARNING: empty block: RS
mandoc: man/lparstat.8:234:2: WARNING: empty block: RS
mandoc: man/lparstat.8:240:2: WARNING: empty block: RS
mandoc: man/lparstat.8:245:2: WARNING: empty block: RS
mandoc: man/lparstat.8:250:2: WARNING: empty block: RS
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e9f06531356f88ffcf046af336ee4303dac0954d
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Jan 7 17:49:26 2021 +0100
drmgr: introduce NUMA based LMB removal
When the NUMA topology can be read, all the LMBs found in the Device Tree
are linked the corresponding node. LMB not associated to node are
considered as not used.
LMB associated to CPU less node are accounted separately because they will
be targeted first to be remove. The LMB are removed from the CPU less nodes
to reach an average number LMBs per CPU less node.
Node with CPU have a ration indexed on their number of CPUs. The higher a
node have CPU the lower number LMB will be removed. This way node with a
high number of CPU will get a higher amount of memory.
When a LMB can't be removed (because its memory can't be offlined by the
kernel), the LMB count for node is decremented and the LMB is removed from
the node's LMB list. This way, it is no more accounted as 'active' and the
removal operation will continue without taking it in account anymore.
The removal is done through the remove by DRC index API, allowing to remove
a LMB at a time. One futur optimization would be to extend that API to
remove a linear range of LMB each time.
When the requested amount of LMB could not be removed a partial status is
reported. This is a major difference since currently the kernel is adding back
again the removed LMBs in case the requested amount to remove cannot be reached.
That's odd and reporting a partial status is better when user want to remove as
much as memory as possible.
If the NUMA topology can't be read, we fallback using the legacy remove
way.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
[tyreld: fixed up some pedantic coding style issues]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 80cc3ff6de0bcbaae1103bd449e0072f8ca96004
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Mon Mar 22 18:52:56 2021 +0100
Travis: add libnuma-dev dependency for numa.h
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e9cb06ba3165d9da6c8997b0a7cf620296604953
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Jan 7 17:49:25 2021 +0100
drmgr: read the CPU NUMA topology
This will be used in the next commit to compute LMB removal based on the
NUMA topology.
The NUMA topology is read using the libnuma, so a dependency against it is
added in the configure file.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4b2c9a3c850353c7a61fc29834c8916184abea72
Author: Laurent Dufour <ldufour@linux.ibm.com>
Date: Thu Jan 7 17:49:24 2021 +0100
drmgr: don't open sysfs file for each command
The new do_kernel_dlpar_common() API will be used in later commit to remove
by DRC Index LMB per LMB. This will avoiding opennig and closing the fd
each time.
The fd closing will now be done at the process exit time.
In addition add an optinal parameter to silently ignore some error.
Also, change the log level of the "success" message to debug to match
the previous one saying "Trying.."
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 344bb3238ee6d671979d279368230ef7c8bdb87c
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Sun Mar 14 07:16:23 2021 -0700
hcnmgr: Fix ofpathname race with udev rename
When hcncfgdrc is called to configure an sr-iov or a backend vdevice, drmgr
has already returned from DR add. However sometimes the two commands happens too
fast that the OS has not completed its work to get the device ready. There is
still a small race window between udev rename and ofpathname lookup. This leads
to ofpathname grabbing a stale devname as a result of udev renaming a device to
something else. This causes hcncfgdrc failure to enslave the sr-iov or backend
vdevice silently, and later causes Live Parition Migration failure due to
missing backend slave for primary sr-iov device
Fix by catching the failure of enslave vdevice at the time of calling
do_config_vdevice to enslave the device, and in the case of failure wait for
udev settle to complete udev events before repeating enslave attempt.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: reworded change log]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 628ed06de76d40ce8ee74b055a3004e3cfc2aa0b
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Mon Oct 5 13:03:45 2020 -0700
ofpathname: Use NVMe controller physical nsid
Linux creates logical block devices of the the form nvmeXnYpZ such that X = the
controller, Y = namepsace, and Z = partition. For example:
/dev/nvme0n1p1
The Linux namespace numbering scheme for namespaces always starts at 1 and
increases monotonically regardless of the actual numbering scheme of the
namespaces as seen by the physical NVMe controller. Accordingly, the Open
firmware path binding utilizes the namespace id as seen by the controller and
not the necessarily the one given in the logical block device name.
As such we need to use the "nsid" attribute in the sysfs entry for the logical
device to properly map back and forth from OP pathnames.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1cb8bd89d6386c60e75c47d4a4452d3f130d5138
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Fri Mar 12 14:18:18 2021 -0800
hcnmgr: Avoid using xargs to process NM show connections
When removing HNV bonding connections xargs can fail to process the output of
nmcli show propererly.
Instead of piping into xargs fix this by using a loop to check for all related
bonding connections and remove them explicitly one by one.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: fixed up commit log]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e25d71be411b610e5e889f8efaaf04b38c2d9ecb
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Fri Mar 12 13:50:33 2021 -0800
hcnmgr: Avoid using ifcfg file for checking bonding interface status
When configuring migratable sr_iov into hybrid network, it checks if
there is an existing HNV using the presense of ifcfg file location. This
is not preferred as the location can be different on distros.
This patch fixes this by using NetworkManager nmcli.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: fixed spelling]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d9bcb21179ccfea122f326aca4690afe0f7de0c6
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Mon Mar 1 21:34:34 2021 -0800
hcnmgr: Wait for sysfs device ready when looking up device name
At the time of calling ofpathname to look up for devicename, wait
for sysfs device ready. Otherwise, the OS may be in the middle of device
renaming.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: fixed up commit log]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 0b59d4a372aa266caa75f3b6a253b8f5aeaf3802
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Mon Mar 1 19:34:29 2021 -0800
hcnmgr: Avoid cleanup of bond interface at boot time when no HNV exists
At boot time, hcn scans the device tree and discovers if there was a new
HNV being added while lpar was inactive. It also cleans up the old hnv
interfaces. This patch avoids cleaning up bonding interface when no HNV
network devices exists.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
[tyreld: fixup commit log]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 366e17553ed647613668678c2d301d369038f41b
Author: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
Date: Thu Nov 12 19:00:47 2020 +0530
Update ppc64-cpu usage
'ppc64_cpu --help' doesn't list '--version' as an option. This patch
adds the option in the usage information of ppc64-cpu command.
Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 2d5ee16db487c0e4886c8ba9edc237242e5357fc
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Mon Oct 5 11:54:20 2020 +0530
sys_ident: Skip length field from search
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
[tyreld: fixed up missing space after + operator]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e51995667279164a6c8ce4c3ba0217fffda22d6d
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Nov 19 21:41:31 2020 -0800
Clean up dead network config interface after inactive migration
With inactive parition migration, we found there are
dead network interface asscoiated with the SR_IOV from
source LPAR that still exist.
We need to cleanup the old network interface
related to this devname from source LPAR. Normally
in the active parition migration case, this was done
when HMC issue commands to OS remove the
VF from hybrid network. Because of the inactive
migration, the OS was not notified before migration
that the VF was removed, thus leaves the dead network
interface belongs on the original MVF on source lpar
not cleaned up. This cause the confusion of the network
manager to bring up the bondings with new MVFs at destination
LPAR.
After inactive parition migration the same devname
could possiblily used at the destination LPAR.
It can be assigned to a different hybrid
network (different hcnid). At the OS boot time,
the same devname but with different hcnid will
be configured. However the old network work interface
associated with the same devname from the source LPAR
has not been cleaned up yet.
This patch fix this by during the boot time scan and
if found an VFs has more than two bonding interfaces,
or has old VF ifcfg, removed the expired one.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4b2d10942e2d964ecc1fe58c9460c34993ff10be
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Nov 19 21:38:24 2020 -0800
Disable vnic as backup vdevice for migratable SR_IOV
In version 1.0 we only allow configure ibmveth as
migritable SR_IOV backup vdevice. When ibmvnic become
more stablized we will enable vnic as backup.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f1ec5f04fdac3e87c3c85c2d85f79339d916e864
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Thu Nov 19 21:30:40 2020 -0800
HNV fixes for qrydev and remove lsdevinfo
This patch fixes a few issues found during testing:
1) Fix qrydev checking for active interface error
2) Skip collecting lsdevinfo right before migration
When the LPARs has large number of devices, this can
take quite a long time and flood the log message.
3) Wait for OS ready to lookup device name for configure
HNV device. We need give OS longer time to prepare pci
device after DLPAR to show up for ofpathname(). We have
run into several issues HNV issues the hcncfgdrc command
to configure the vdevices before ofpathname able
to find the device name yet.
4) Currently the hybrid network virtualization is only
supported on PowerVM LPAR. We should allow exit the hcnmgr
gracefully on other power platform instead of return error.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.8
=====================================================================
commit ed7f7c84ba320fac543f88b766587328b5ede63b
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Tue Aug 11 16:19:49 2020 -0700
Do not use automatic method (DHCP, PPP, etc) when bond interface is setup
When creating bond, by default the ipv4.method is auto, set to dhcp
In the case of mutiple HNV interfaces, this can case bond interfaces deactive and
active again and again.
So here Set default ipv4 method to disable. Bond is created without IP .
User can configure static IP manually with
nmcli con mod id <bond-name> ipv4.method manual ipv4.address 192.168.2.203/24
As long as each interface is on a different network, then they should be able to
all use dhcp, but the dhcp server would need to support all these different
networks and hand out ips on the different subnets
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9a4a4a2ec9bb8e9d4e69bd2c482d904bc3b27d7f
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Mon Jul 27 21:37:38 2020 -0700
Allow hcnqrydev return success when sr-iov VFs are not active
When the sr-iov VF nextwork interfact in the bond is not up, that means
it is failover to the backup virtual network device already. We should
allow hcnqrydev return success in this case, in other words, means it is
safe to dlpar remove sr-iov VFs.
Also add more system and network status info in show_hcnstatus() and move it to
the end of main function.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 6bd1f8acdbef807738e2270e3974ceb3b892666d
Author: David Michael <fedora.dm0@gmail.com>
Date: Fri Aug 7 14:14:57 2020 -0400
ofpathname: Remove the dependency on bc
The only use of bc is to convert between decimal and hexadecimal
integers, but this functionality is supported by POSIX shell
arithmetic expansion and a POSIX-compatible printf program. Since
this script uses #!/bin/bash, the printf utility is a bash builtin,
so it won't even add a dependency on an external printf program
(which is provided by the required coreutils package anyway).
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit bd8dd36b33cda0d0a72111a9a53fc5fb9a73cdb4
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu Jul 16 15:36:25 2020 -0700
man: add manpage for the drmgr utility
Historically we have discouraged users from invoking drmgr from the commandline
outside of PCI hotplug, and as such provided no documentation. However, for the
sake of those brave powerusers willing to risk putting their system in a state
inconsistent from that of theassociated managment interface lets add a manpage
with the basic documentation of the various usage options for each of the
dynamic reconfiguration connector types.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1b27e043f00f8f636bdbc6853d7058ee0a63abf3
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Wed Jun 17 21:28:38 2020 +0530
lparstat: Update man page with -E option
lparstat -E option reports the actual and normalized system utilization
based on the PURR/SPURR registers. Update the lparstat man page too with
the -E option details.
Reported-by: Pavithra Prakash <pavrampu@in.ibm.com>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 0a9b1f2309291c82e68eeb866174aeb676329ed4
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Mon Jun 15 19:51:30 2020 -0500
drmgr: use in-kernel dlpar facility for CPU's when available
The helper kernel_dlpar_exists() now queries whether the kernel supports
dlpar based on connector/drc_type. As such allow dlpar of cpu's via the
kernel interface when available by default.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 267474a488d1a957e7704feb2910cdea2310c8b7
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Mon Jun 15 19:51:29 2020 -0500
drmgr: query in-kernel dlpar support by DRC connector type
Support to initiate kernel facilitated dlpar for CPU and MEM was
introduced into drmgr back in 2016 with commit bbc5fc0 however, this
proved problematic for CPU as most distros didn't have in kernel CPU
dlpar support yet. As a result CPU support was disabled with commit
a97c566.
The main issue is that drmgr blindly tests for the existence of
/sys/kernel/dlpar to identify in kernel dlpar support. This test doesn't
reveal if support goes beyond MEM and includes CPU. This further
complicates adding new connector types such as PHB, PCI, and SLOT down
the road, and backwards compatability of newer drmgr on older kernels.
The /sys/kernel/dlpar attribute was extended by the following kernel
commit torvalds/linux@673bc43 that introduced a comma separated list of
device support.
Update drmgr utility to use this mechanism to determine which
device/connector/drc_types are supported by in kernel dlpar.
1.) For the case where /sys/kernel/dlpar does not exist use legacy dlpar
facilities.
2.) For the case where /sys/kernel/dlpar exists but does not
reading we assume only memory support for in kernel and use legacy
all other types.
3.) For the case where /sys/kernel/dlpar exists and is readable we parse
the returned list for supported devices and fall back to legacy
facilities for anything not in the list.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 871646f79bdd6c119c87561952dcf5b528419f67
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Sun Jun 28 09:41:51 2020 -0600
Add hcnmgr init systemd service hcn-init.service
After LPAR back online, add service automatically
configure hybrid network created at inactive time.
Update the build process to include the service in build.
configure --with-systemd
OR
rpmbuild -ba powerpc-utils.spec --with systemd
Enable this service after reboot.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ae08f34eb8197dee7489fc73dc2e29aa5bbe84bc
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Sat Jun 27 08:38:13 2020 -0600
Support inactive migration with migratable SR_IOV
HMC supports adding migratable sr-iov when LPAR is inactive.
This allows inactive LPAR migrates with SR_IOV VFs. HMC will
generate unique HCNID and PHYP the migratable sr-iov device
and it's backup virtual device vnic or veth with same ibm
property ibm,hcn-id. This is done while the partion is inactive.
When LPAR backs online, the OS is responsible to find out the
new migritable SR_IOV configured during LPAR was inactive. This
makes the new SR_IOV added eligible for migration, or able to
re-configure SR_IOV with HCN post migration.
Added function in hcnmgr to scan the device-tree, find
migratable SR_IOV that has no hybrid network being configured,
setting up the active-back bonding with backup matching vnic or
veth. Add new SR_IOV and its backing devices as slave. Skip the HCN
has already been configured online before.
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ed574ffb81e23169d3327e1f8f22fdfb9ad74390
Author: Mingming Cao <mmc@linux.vnet.ibm.com>
Date: Fri Jun 26 17:02:00 2020 -0600
Tools to support migrtable SR_IOV hybrid virtual network
A LPAR that utilizes an SR-IOV logical port (physical device) cannot be
migrated. To allow SR_IOV eligiable for live partition migration, HMC can
configures a virtual device (virtual ethernet or virtual NIC) as a backup
for each SR-IOV logical port and performs failover network operations to
the virtual device before migration. After migration, then performs
failover network operations again to the SR-IOV logical ports.
When HMC configure an migratiable SR_IOV device, the hypervisor will set
unique hybrid network ID (HCN ID) propterty for the SR_IOV and backup
virtual device. And instruct Guest OS to configre hybrid network.
Guest OS will able to recoganize them and configure hybrid
network. This patch introduces new commands from HMC to linux to configure an
active-backup bonding with the SR-IOV logical port as the primary device and
a virtual device such as a virtual Ethernet device or vNIC device as the
backup device.
hcncfrdrc -- configure migratable SR_IOV hybrid virtual network (HCN) before
or right after migration
hcnqrydev -- pre-migration, query SR_IOV device has active backup virtual device
hcnrmdev -- remove migritable SR_IOV device from HCN right before migration
hcnrmhcn -- clean up hybrid virtual network when remove migratable SR_IOV
hcnversion -- returns current HCN support version back to HMC
Signed-off-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b289196aa9d9cd02c5d1b7e46cfa6403ea4fbbad
Author: Joel Stanley <joel@jms.id.au>
Date: Mon Jul 13 13:20:25 2020 -0700
Update smt snooze delay documentation
Mostly remove it now that it is not used. A mention is left in the
readme so archaeologists can work out where it went.
Signed-off-by: Joel Stanley <joel@jms.id.au>
[tyreld: fixed type of setting in README]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c788e4802205265e653a884e2f0d2dce17e03d2c
Author: Joel Stanley <joel@jms.id.au>
Date: Mon Jul 13 13:20:24 2020 -0700
ppc64_cpu: Remove smt_snooze_delay
The kernel has not supported setting the snooze delay through this API
since at least 2014 (v3.14). The sysfs file is present for
compatibility, but it has no effect.
The lack of this sysfs file means we must use a different method for
ppc64_cpu to detect the smt state of the box. It now uses the
threads_per_cpu count from the device tree.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3a4617187b300b8c369ca0e30deeb22143dfc2c8
Author: Joel Stanley <joel@jms.id.au>
Date: Mon Jul 13 13:20:23 2020 -0700
Modify is_smt_capable to not use smt_snooze_delay
The sysfs file is present for compatibility, but it has no effect. Use
the presence of more than one thread per cpu, which comes from the device
tree, to determine SMT capability.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7289eb429e293e33418cc68c922e9c2f61ffd82f
Author: Joel Stanley <joel@jms.id.au>
Date: Thu Jul 9 17:20:34 2020 -0700
travis: Add basic CI configuration
This builds the applications on ppc64le with librtas.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ab1462b9c5644e8dbf75b42e69ffa13b1b7c2370
Author: Joel Stanley <joel@jms.id.au>
Date: Thu Jul 9 17:20:33 2020 -0700
gitignore: don't ignore .*
This includes files such as .travis.yml file that will be part of the
repository.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 937780a5fcbd887352e458f32a860c67164a2c14
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Wed Jun 24 17:25:35 2020 -0500
ofpathname: make goto_dir canonicalize directory argument
Commit c97fe35b5b6d "ofpathname: speed up l2of_scsi()" attempted to
optimize the look up of scsi devices by restricting the base directory
input of the 'find' command to /sys/class/block instead of /sys. This
works as intended for raw scsi disks such as sda, but broke for scsi disk
partitions such as sda1.
(0) root @ linux-td1r: /root/powerpc-utils
$ ./scripts/ofpathname /dev/sda1
: Logical device "/dev/sda1" does not appear
to be configured.
(1) root @ linux-td1r: /root/powerpc-utils
$ ./scripts/ofpathname /dev/sda
/vdevice/v-scsi@30000066/disk@8100000000000000
The differences in looking up sda1 via /sys/class/block vs /sys:
(0) root @ linux-td1r: /root/powerpc-utils
$ find /sys/class/block -name sda1
/sys/class/block/sda1
(0) root @ linux-td1r: /root/powerpc-utils
$ find /sys -name sda1
/sys/devices/vio/30000066/host0/target0:0:1/0:0:1:0/block/sda/sda1
/sys/class/block/sda1
In the end /sys/class/block/sda1 is just a symlink to sda1 under /sys/devices/vio/...
(0) root @ linux-td1r: /root/powerpc-utils
$ ll /sys/class/block/sda1
lrwxrwxrwx 1 root root 0 Jun 22 18:56 /sys/class/block/sda1 ->
../../devices/vio/30000066/host0/target0:0:1/0:0:1:0/block/sda/sda1
However, ofpathname assumes that by moving up to the parent we will
eventually find the raw disk device, in the above example sda, and this
will only happen for paths under /sys/devices in the case of scsi disk
partitions.
Fix this regression by using readlink in goto_dir() to canonicalize the
path name of the device while following all symlinks.
Fixes: c97fe35b5b6d ("ofpathname: speed up l2of_scsi()")
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 60d9f54b13b75feee3fd7b25a92b24d0d97ea984
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Jun 9 12:48:38 2020 -0700
drmgr: don't bother with hp children for non PCI slots
Only PCI devices have hotpluggable children. So, there is no need to call
disable_hp_children() or release_hp_children() for non-PCI devices. In
particular this causes messages for VIO slots, that while harmless, could lead a
user to misinterpret as actual errors.
linux-xej6:~/powerpc-utils # drmgr -c slot -r -s U8408.E8E.10A7ACV-V1-C3
Validating I/O DLPAR capability...yes.
failed to open /sys/bus/pci/slots/U8408.E8E.10A7ACV-V1-C3/power: No such file or directory
failed to disable hotplug children
In remove_slot() check that the device type is PCI_DLPAR_DEV before calling
(disable|release)_hp_children().
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit cac0e6b68136d9e18eecb3321b9141f98c819b97
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Jun 9 12:34:41 2020 -0700
README: add Subscribe link and updated ppc64-diag repo link
Added a mailing list subscribe link. This is helpful for users/developers tyring
to subscribe to the list who may want to use an email address other than a gmail
address. The list is hosted through googlegroups and there is no obvious way
to subscribe using a non-gmail address through their web interface.
The ppc64-diag package has since been migrate from Sourceforge to Github. So the
repository location link has been updated accordingly.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f8f2f09c413838fe9f0b30478de5d08bdb3e95aa
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun Apr 19 11:35:08 2020 +0200
ofpathname: Add support for Mac-compatible OF pathnames
On Macintosh systems, OpenFirmware path follow a slightly
different syntax as compared to other OF systems. In particular,
the disk ID is not preceeded by the string "disk" and - on
SATA systems - the path does not contain the BUS ID as
"scsi@ID" but rather the plug ID in the form "@ID".
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3fb2c44e220c3051b2593f27105a94208266775d
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun Apr 19 11:35:07 2020 +0200
ofpathname: Add support for the plug ID of a SCSI/SATA host
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewd-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a3555d297e963c86b0b9e0e266c5aa8ae6827d87
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun Apr 19 11:35:06 2020 +0200
ofpathname: Add partition support to l2of_ide() and l2of_scsi()
Currently, only l2of_nvme() supports handling of partitions which
will print the partition number at the end of an OF path. However,
this feature is also useful for IDE and SCSI targets as well and
mandatory for Macintosh systems.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b38076f3022dd0ec9c86df7c792285686b049b2a
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Fri May 29 18:08:04 2020 -0500
drmgr: don't treat pmig as unsupported when -m is omitted
If drmgr is invoked for the pmig connector type but the -m option is
not specified get_command() treats the connector type as unsupported.
(1) root @ linux-td1r: /root/powerpc-utils
Dynamic reconfiguration is not supported for connector type "8" on this system
At least one action must be specified
Add a case block to catch DRC_TYPE_MIGRATION connector type.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit bbfe5fac8bad092221768291936932142527bd41
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu May 21 15:56:56 2020 -0500
drmgr: fix segfault on unsupported connector type
% drmgr -c pmig
Received signal 11, attempting to cleanup and exit
Reading symbols from /usr/sbin/drmgr...
Reading symbols from /usr/lib/debug/usr/sbin/drmgr-1.3.7.1-3.12.1.ppc64le.debug...
(gdb) set args -c pmig
(gdb) r
Starting program: /usr/sbin/drmgr -c pmig
Missing separate debuginfos, use: zypper install glibc-debuginfo-2.26-13.45.1.ppc64le
Program received signal SIGSEGV, Segmentation fault.
0x00007fffb7d742d4 in __strlen_power8 () from /lib64/libc.so.6
(gdb) bt
at /usr/include/bits/stdio2.h:77
The default switch section of get_command() is meant to catch defined
connector types that currently have no support. However, the error
messages passes usr_drc_type (an integral value) to a %s conversion
modifier resulting in a bad address dereference.
Fix up to use a %d conversion modifier instead.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1a611c866010792e31a33e2d520f19418af70855
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Thu May 28 18:22:41 2020 -0500
powerpc-utils.spec: configure with --disable-werror
Generally we're not interested in halting the build for compiler
warnings when producing RPMs.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3d8a7f5e2e3b735570ab99bb3a340ff7e0c14841
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Thu May 28 18:22:40 2020 -0500
add option --disable-werror to configure
Commit a6929691fd25 ("treat compiler warnings as errors") imposed
-Werror unconditionally in Makefile.am, in order to prevent the
addition of new warnings to the build. While it's important to keep
the project reasonably warning-clean, it's also necessary to provide
downstream packagers and users in a variety of environments more
flexibility in this area.
Keep -Werror by default but make it configurable. The user may specify
--disable-werror at configure time to prevent compiler warnings from
halting the build. This is a reasonably common way to deal with
this (examples include glibc, gdb, json-c).
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 0f7abc7f08e088bbc9448b3a77def7c6da61c507
Author: Michal Suchanek <msuchanek@suse.de>
Date: Wed May 27 09:52:07 2020 -0700
ofpathname: Fix udevadm location
The canonical location for udevadm is /usr/bin.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3c5a57b5e4dcc661f14a2c6bd11d2203922b66c7
Author: Michal Suchanek <msuchanek@suse.de>
Date: Wed May 27 09:52:06 2020 -0700
bootlist: Fix redirection of error messages.
The redirection added in commit 73839d6bab4d ("powerpc-utils: Suppress
errors reading kernel files") does nothing for echo. I assume the intent
was to print the error messages to stderr.
Fixes: 73839d6bab4d ("powerpc-utils: Suppress errors reading kernel files")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5a1e57363554fb609c27e18e9163956580f6632c
Author: Michal Suchanek <msuchanek@suse.de>
Date: Wed May 27 09:52:05 2020 -0700
Fix ofpathname: Could not retrieve logical device name for Open Firmware path
With commit 73839d6bab4d ("powerpc-utils: Suppress errors reading kernel files")
the return status of tr rather than ofpathname is tested.
Fixes: 73839d6bab4d ("powerpc-utils: Suppress errors reading kernel files")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 85fe6bf04463ea1dc85d8108f068c1cd1b3609cf
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:58 2020 -0500
add generated smtstate files to .gitignore
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a6929691fd2578f3049877d2e54a60dd86f07957
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:57 2020 -0500
treat compiler warnings as errors
In order to keep the project warning-clean, add -Werror to AM_CFLAGS.
If needed, this can be inhibited at build time by specifying
-Wno-error:
$ make CFLAGS=-Wno-error
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 9d851ad2e44da07775b9ea3a547488ce04b11027
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:56 2020 -0500
drmgr/common_ofdt: correct stringop-truncation warning
With -Wall -Werror GCC 9.3.1 emits:
In file included from /usr/include/string.h:495,
from src/drmgr/common_ofdt.c:24:
In function ‘strncpy’,
inlined from ‘drc_info_connectors_v2’ at src/drmgr/common_ofdt.c:338:4,
inlined from ‘get_drc_info’ at src/drmgr/common_ofdt.c:431:8:
/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 48 equals destination size [-Werror=stringop-truncation]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
The GCC manual's documentation for -Wstringop-truncation suggests
correcting this case by specifying 'sizeof buf - 1' for the strncpy
bound and setting the last element of the buffer to 'NUL', which is
sufficient.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 6def5726b1785195121219b1af46c3270270ff9e
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:55 2020 -0500
cpu_info_helpers: fix format-truncation warning
GCC 9.3.1 warns:
In file included from src/common/cpu_info_helpers.c:34:
src/common/cpu_info_helpers.c: In function ‘get_cpu_info’:
src/common/cpu_info_helpers.h:29:25: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 105 [-Wformat-truncation=]
29 | #define INTSERV_PATH "/proc/device-tree/cpus/%s/ibm,ppc-interrupt-server#s"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/common/cpu_info_helpers.h:29:25: note: in definition of macro ‘INTSERV_PATH’
29 | #define INTSERV_PATH "/proc/device-tree/cpus/%s/ibm,ppc-interrupt-server#s"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/common/cpu_info_helpers.h:29:49: note: format string is defined here
29 | #define INTSERV_PATH "/proc/device-tree/cpus/%s/ibm,ppc-interrupt-server#s"
| ^~
src/common/cpu_info_helpers.c:140:5: note: ‘snprintf’ output between 51 and 306 bytes into a destination of size 128
140 | snprintf(path, sizeof(path), INTSERV_PATH, de->d_name);
It's unlikely that any known device tree would have CPU nodes with
names long enough too result in the overrun this is warning about, but
it's easy enough to address by enlarging the on-stack path buffer.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5f253c8a04734501822ca77bbace48ca38e14d5d
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:54 2020 -0500
drmgr/drslot_chrp_phb: fix format-overflow warnings (part 2)
GCC 9.3.1 warns:
src/drmgr/drslot_chrp_phb.c: In function ‘drslot_chrp_phb’:
src/drmgr/drslot_chrp_phb.c:172:33: warning: ‘%s’ directive writing up to 255 bytes into a region of size 235 [-Wformat-overflow=]
172 | rc = sprintf(hpdev->path, "%s/%s", SYSFS_PCI_DEV_PATH,
Address this by dynamically allocating struct hpdev->path using
asprintf.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1ec98d4168511af85217404d2a6167185c430a5f
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:53 2020 -0500
drmgr/drslot_chrp_phb: fix format-overflow warnings (part 1)
GCC 9.3.1 warns:
src/drmgr/drslot_chrp_phb.c: In function ‘disable_os_hp_children_recurse’:
src/drmgr/drslot_chrp_phb.c:244:26: warning: ‘__builtin___sprintf_chk’ may write a terminating nul past the end of the destination [-Wformat-overflow=]
244 | sprintf(devspec, "%s/%s", ofpath + strlen(OFDT_BASE),
| ^
src/drmgr/drslot_chrp_phb.c:203:20: warning: ‘%s’ directive writing 6 bytes into a region of size between 0 and 255 [-Wformat-overflow=]
203 | sprintf(path, "%s/%s", hpdev->path, "remove");
| ^~ ~~~~~~~~
Address these by simply enlarging the too-small on-stack buffers.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e1ff85745e76346c7df00f5e1e981de78feed4a6
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:52 2020 -0500
drmgr/drslot_chrp_mem: fix format-overflow warnings
GCC 9.3.1 warns:
src/drmgr/drslot_chrp_mem.c: In function ‘get_mem_scn_state’:
src/drmgr/drslot_chrp_mem.c:950:19: warning: ‘/state’ directive writing 6 bytes into a region of size between 1 and 1024 [-Wformat-overflow=]
950 | sprintf(path, "%s/state", mem_scn->sysfs_path);
| ^~~~~~
In file included from /usr/include/stdio.h:867,
from src/drmgr/drslot_chrp_mem.c:21:
/usr/include/bits/stdio2.h:36:10: note: ‘__builtin___sprintf_chk’ output between 7 and 1030 bytes into a destination of size 1024
36 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37 | __bos (__s), __fmt, __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/drmgr/drslot_chrp_mem.c: In function ‘set_mem_scn_state’:
src/drmgr/drslot_chrp_mem.c:993:19: warning: ‘/state’ directive writing 6 bytes into a region of size between 1 and 1024 [-Wformat-overflow=]
993 | sprintf(path, "%s/state", mem_scn->sysfs_path);
| ^~~~~~
In file included from /usr/include/stdio.h:867,
from src/drmgr/drslot_chrp_mem.c:21:
/usr/include/bits/stdio2.h:36:10: note: ‘__builtin___sprintf_chk’ output between 7 and 1030 bytes into a destination of size 1024
36 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37 | __bos (__s), __fmt, __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In these cases simply enlarging the on-stack buffer suffices.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7823f5b4d0b8c48d620a68418df77b4eba785151
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:51 2020 -0500
drmgr/drslot_chrp_hea: fix format-overflow warning
GCC 9.3.1 warns:
src/drmgr/drslot_chrp_hea.c: In function ‘hotplug_port’:
src/drmgr/drslot_chrp_hea.c:136:18: warning: ‘%s’ directive writing up to 1023 bytes into a region of size 128 [-Wformat-overflow=]
136 | sprintf(fname, "%s/%s", hea->sysfs_dev_path,
| ^~
In file included from /usr/include/stdio.h:867,
from src/drmgr/drslot_chrp_hea.c:24:
/usr/include/bits/stdio2.h:36:10: note: ‘__builtin___sprintf_chk’ output between 12 and 1036 bytes into a destination of size 128
In this case just enlarge the on-stack buffer.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit a209e103b3cd43163da8a05157371e0e22a9f4fb
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:50 2020 -0500
drmgr/common_pci: fix format-overflow warnings
GCC 9.3.1 warns:
src/drmgr/common_pci.c: In function ‘init_node’:
src/drmgr/common_pci.c:350:27: warning: ‘%s’ directive writing up to 255 bytes into a region of size between 0 and 1023 [-Wformat-overflow=]
350 | sprintf(child_path, "%s/%s", node->ofdt_path, de->d_name);
| ^~
In file included from /usr/include/stdio.h:867,
from src/drmgr/common_pci.c:25:
/usr/include/bits/stdio2.h:36:10: note: ‘__builtin___sprintf_chk’ output between 2 and 1280 bytes into a destination of size 1024
36 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37 | __bos (__s), __fmt, __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/drmgr/common_pci.c: In function ‘pci_remove_device’:
src/drmgr/common_pci.c:1288:20: warning: ‘%s’ directive writing 6 bytes into a region of size between 0 and 1023 [-Wformat-overflow=]
1288 | sprintf(path, "%s/%s", node->sysfs_dev_path, "remove");
| ^~ ~~~~~~~~
In file included from /usr/include/stdio.h:867,
from src/drmgr/common_pci.c:25:
/usr/include/bits/stdio2.h:36:10: note: ‘__builtin___sprintf_chk’ output between 8 and 1031 bytes into a destination of size 1024
Avoid these by replacing fixed length stack buffers with dynamic
allocations.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7a5d2cfcdbc6d9f7a757e10a408dd11d0abdbd3c
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:49 2020 -0500
drmgr/common_cpu: dynamicallly allocate cache_info->path
GCC 9.3.1 warns:
src/drmgr/common_cpu.c: In function ‘init_cache_info.isra.0’:
src/drmgr/common_cpu.c:556:38: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 256 [-Wformat-truncation=]
556 | snprintf(cache->path, DR_BUF_SZ, "%s", path);
| ^~ ~~~~
In file included from /usr/include/stdio.h:867,
from src/drmgr/common_cpu.c:22:
/usr/include/bits/stdio2.h:67:10: note: ‘__builtin_snprintf’ output
between 1 and 1024 bytes into a destination of size 256
Instead of bloating the cache_info structure to accommodate longer
path strings and avoid this (legitimate) warning, dynamically allocate
them.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 39441c4b53245496d61680386628e689c38b4a34
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:48 2020 -0500
drmgr/common: add const to char * function parameters
Add const qualifier in a couple of places where it's plain that the
argument is a path string that isn't altered by the function through
that pointer. This will facilitate changes to come.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 456a96cbb511ef2b0424e1649b82594c27d0df27
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:47 2020 -0500
rtas_dbg: address string format truncation warning
GCC 9.3.1 warns:
src/rtas_dbg.c: In function ‘get_rtas_tokens’:
src/rtas_dbg.c:137:26: error: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 105 [-Werror=format-truncation=]
137 | snprintf(dir, 128, "%s/%s", OFDT_RTAS_PATH, dp->d_name);
| ^~
In file included from /usr/include/stdio.h:867,
from src/rtas_dbg.c:30:
/usr/include/bits/stdio2.h:67:10: note: ‘__builtin___snprintf_chk’ output between 24 and 279 bytes into a destination of size 128
The lazy but least risky change to make here is to simply enlarge the
(oddly named) on-stack buffer to accommodate the longest possible
result.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7a65ca0551b387a228c70e224b1db3626a603e92
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:46 2020 -0500
serv_config: ensure nul-termination of parameter strings
GCC 9.3.1 warns:
In file included from /usr/include/string.h:495,
from src/serv_config.c:50:
In function ‘strncpy’,
inlined from ‘update_value’ at src/serv_config.c:861:4:
/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ specified bound 4998 equals destination size [-Wstringop-truncation]
This means that a value string with length 4998 or greater not
including a terminating nul byte would result in this copy leaving the
destination buffer unterminated, which violates the specification for
ibm,set-system-parameter.
In this case we need only reduce the bound by 1.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 7ecf9ebc3a2f18670cf11b1020e1cbe9def96d26
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:45 2020 -0500
serv_config: use correct length for system parameter string data
"val" here is a character string; sizeof(val) yields the size of the
pointer. The ibm,set-system-parameter call expects the prepended
length field to reflect the string length including the terminating
NUL byte.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f00392a9ae2c43b2c061674a10a4eb28141672ba
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:44 2020 -0500
lparstat: ensure nul-termination of sysentry->value strings
GCC 9.3.1 warns:
In function ‘strncpy’,
inlined from ‘parse_lparcfg’ at src/lparstat.c:273:4:
/usr/include/bits/string_fortified.h:106:10: warning:
‘__builtin_strncpy’ specified bound 64 equals destination size
[-Wstringop-truncation]
This means that parsed value strings of length SYSDATA_VALUE_SZ or
more are not truncated and nul-terminated after copying into the
sysentry data structure, which violates assumptions made elsewhere in
this file (e.g. get_sysdata()).
Correct this by zeroing the value buffer and copying at most
SYSDATA_VALUE_SZ - 1 characters.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3a9cf1c525d3489a739b30340f44d9bbc1ecce37
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:43 2020 -0500
nvram: suppress stringop-truncation warning
GCC 9.3.1 warns:
In function ‘strncpy’,
inlined from ‘update_of_config_var’ at src/nvram.c:1376:2:
/usr/include/bits/string_fortified.h:106:10: warning:
‘__builtin_strncpy’ output truncated before terminating nul copying as
many bytes from a string as its length [-Wstringop-truncation]
The code does take care to nul-terminate the copied string; in this
case the GCC manual suggests using memcpy instead of strncpy. No
functional change intended.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 05b83d51943997e04c94cae3d132ee7951345a07
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:42 2020 -0500
define _GNU_SOURCE project-wide
This project uses several nonstandard GNU-specific extensions which
are exposed only when _GNU_SOURCE is defined. Examples include
CPU_SET(3) and related APIs by necessity and asprintf(3) for
convenience.
Currently _GNU_SOURCE is used in a piecemeal fashion, meaning you have
to add it to the source file when you introduce a use of asprintf, for
example. Also, note that it is used incorrectly in a couple of places:
it must appear before any headers are included for it to work reliably.
There's not much justification for the code duplication and lack of
uniformity here. Put '-D _GNU_SOURCE' in AM_CPPFLAGS for a more
consistent experience across the project's C code.
This will cause all C code to be built with _GNU_SOURCE.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 65b8e5af04bed31846c1462c48ac940822d70789
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon May 18 00:05:41 2020 -0500
place preprocessor flags in AM_CPPFLAGS
Setting the include path belongs in AM_CPPFLAGS, not AM_CFLAGS.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c97fe35b5b6d767b88419fa2084a59e986ac3da0
Author: Nathan Lynch <nathanl@linux.ibm.com>
Date: Mon Apr 27 20:48:04 2020 -0500
ofpathname: speed up l2of_scsi()
There is no need to search the entire /sys hierarchy for kernel device
names like "sda". We know that if it is present it will be in
/sys/class/block.
In an environment with more than 800 scsi devices, this brings the
execution time for a command like "lsdevinfo -F name -c -q
parent=host1" from over 20 minutes to under two minutes.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit c6c0a86c41d81e85a2e68587ce280bdcff40d079
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:11 2020 +0530
lparstat: Use get_delta_value() helper
Use get_delta_value(), helper, to calculate the delta of interested
values instead of duplicating it in various functions. This reduces
the amount of duplication and makes code more readable.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit fc785bea981598948a9a8f94e926f52f2ee3c6a4
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:10 2020 +0530
lparstat: Add support for cpu-hotplug
For optimizing the read of sysfs file, the file descriptors are
assigned at the beginning of the run but they do not change dynamically
in event of a cpu hotplug, resulting under-estimated load average in
case of new cpus onlined or error in case of cpu removed. This can be
solved by checking for the online cpus every interval and re-assign
the file descriptors again with new set of cpu on hotplug event.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit f3ac228ff410bca41a544032dc597df030f6c95f
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:09 2020 +0530
lparstat: Add switch to print Scaled metrics
Add '-E' command line switch to print scaled version of meterics, this
switch prints CPU utilization/Idle based on Actual (PURR) and Scaled
(SPURR) values along with the current effective frequency of the system.
output:
~ # lparstat -E 1 3
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=2 mem=4324928 kB cpus=0 ent=2.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.10 99.90 2.13GHz[ 70%] 0.10 69.91
0.07 99.92 2.10GHz[ 69%] 0.05 68.95
0.08 99.92 2.10GHz[ 69%] 0.05 68.95
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 0ed656ae4a268569fec68df6f2ca860ea57b9026
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:08 2020 +0530
lparstat: Move displaying system configuration details to new func
System configuration details is required while displaying the
scaled metrics too. Move it to a new function, to be called by both
default, scaled metrics too.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4120f4426d38a8bfa158ad0ab0dfa9282ebf76e6
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:07 2020 +0530
lparstat: Add helpers to derive PURR/SPURR values
For every interval specified by the user, the PURR/SPURR delta values
are needed to be calculated. Add helpers to derive them.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 59b77efef68c42cd623399e80b42d6bc4df1279c
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:06 2020 +0530
lparstat: Add helper to calculate scaled timebase
Timebase is used to derive system wide CPU utilization, scale it to
the number of online cores too like the PURR/SPURR registers values
accumulated across all online CPU cores. This helper also scales the
timebase register value to the interval passed.
Timebase = (Timebase * Elapsed Time) * online cores
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1b298478da4df562fcb42bbef88693203175fe64
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:05 2020 +0530
lparstat: Derive effective frequency
Effective/current operating frequency is derived by following:
Effective frequency = (delta SPURR / delta PURR) * nominal frequency
it required to calculate the scaled variants using SPURR, whereas
the currently computed values based on the PURR.
performed.
Effective frequency is derived from PURR/SPURR values, hence call
get_frequency() after function updating sysfs values.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 30231beaba58a175e776597a1f07b35bc26fcfce
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:04 2020 +0530
lparstat: Add helper function to calculate delta
Add a helper function for one of the most often used arithmetics of
calculating delta of a sysentry.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit cdbf3d5ae2414ad0475a4b2a8120b6514148fb9f
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:03 2020 +0530
lparstat: Read SPURR, Idle_{PURR, SPURR} values
Parse per-cpu
/sys/devices/system/cpu/cpu/{spurr, idle_purr, idle_spurr} files to
accumulate system wide SPURR, Idle PURR, Idle SPURR values like
PURR value captured in /proc/powerpc/lparcfg. Calculating scaled
utilization metrics, need them.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit b0a3cb2dfd5ee772525feaa5a6a6d58426008a19
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:02 2020 +0530
lparstat: Assign file descriptors to speed up read
For every sampling interval, three per-cpu sysfs files is read to
capture spurr, idle_purr and idle_spurr values. Every read takes
three file operation such as open, read, close, future this scales
with number of CPUs in the system. To reduce the latency involved
in open and close, assign a permanent file descriptors per online cpu.
without caching file descriptors
---------------------------------
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=4 mem=8302464 kB cpus=0 ent=4.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.04 99.95 3.16GHz[100%] 0.04 99.95 1.1003219
0.15 99.85 3.16GHz[100%] 0.15 99.85 1.1003222
0.04 99.96 3.16GHz[100%] 0.04 99.96 1.1003179
0.03 99.97 3.16GHz[100%] 0.03 99.97 1.1003183
0.03 99.97 3.16GHz[100%] 0.03 99.97 1.1003166
with caching file descriptors
------------------------------
System Configuration
type=Dedicated mode=Capped smt=8 lcpu=4 mem=8302464 kB cpus=0 ent=4.00
---Actual--- -Normalized-
%busy %idle Frequency %busy %idle
------ ------ ------------- ------ ------
0.03 99.96 3.16GHz[100%] 0.03 99.97 1.1001793
0.03 99.97 3.16GHz[100%] 0.03 99.97 1.1001775
0.03 99.97 3.16GHz[100%] 0.03 99.97 1.1001775
0.02 99.98 3.16GHz[100%] 0.02 99.98 1.1001766
0.02 99.98 3.16GHz[100%] 0.02 99.98 1.1001762
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 182301acd44afe1ca5a813f80f5e1d0427295b26
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:01 2020 +0530
lparstat: Capture nominal frequency
Capture the nominal frequency/clock from the /proc/cpuinfo. This value
will be used later to calculate the effective/current frequency at which
the processor is running.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3182b2a1e97c631430b37eb85cb203223ff836c8
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:13:00 2020 +0530
lparstat: Read the online cores
The accumulation of PURR/SPURR values are total of all online CPU in
the system, hence the timebase also needs to be scaled to the number
of cores. Add a helper to read the online cores.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 95737c3ebb5884ddb516f0958bb7521ff0bf6014
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:12:59 2020 +0530
lparstat: Remove ppc64_cpu tool dependency
get_smt_mode(), calls ppc64_cpu tool to get the current SMT mode, this
method of probing has its disadvantages like tightly coupling lparstat
with ppc64_cpu to mention one. Use, the internal library to fetch this
information.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 35dddf079a8fdcde5ada145b67702545041f6f22
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri May 15 11:12:58 2020 +0530
common/cpu_info_helpers: library to capture CPU information
ppc64_cpu tool does a lots of heavy lifting in finding the information
about the underlying CPU topology and various other details. These
details might be required by other tools, probing the underlying
platform for similar details. Moving such functions to a common
library, allows sharing across ppc64_cpu and others tools, instead of
multiple implementation of functions capturing same information.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e517954a4caa66f321c4cd7a1481c5024c931a75
Author: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Date: Thu Mar 26 13:09:04 2020 +0530
powerpc-utils: Add vcpustat utility
Add a new command 'vcpustat' to display virtual cpu dispatch statistics
for Shared Processor LPARs. The vcpu dispatch statistics are enabled and
read through /proc/powerpc/vcpudispatch_stats interface from the kernel.
The statistics made available through this interface includes
information on vcpu dispatch dispersions relative to the previous
dispatch, as well as relative to the vcpu's home node/chip as indicated
by the Power hypervisor.
'vcpustat' enables monitoring this statistic at customizable intervals.
By default, the statistics are presented as a percentage of the total
dispatches in each monitoring interval. In addition, '-n' option can be
used to display numeric values, while '-r' allows displaying the raw
values from the kernel.
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 1643ac6026d8aca4c774f4f6aa396bf5a06f3049
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Thu Mar 19 00:48:07 2020 -0300
Include smtstate.service and smtstate in the build system
The new feature provided by smtstate and smtstate.service are not
built by default. During the build phase, it's required to use:
configure --with-systemd
OR
rpmbuild -ba powerpc-utils.spec --with systemd
to have it shipped in.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5cc433a8ec611c967a2defceef4d52863a326d43
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Thu Mar 19 00:48:05 2020 -0300
Add smtstate script to persist SMT changes
This patch introduces smtstate script responsible to save and restore
the current SMT state into /var/lib/powerpc-utils/smt.state.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d055ccead0baf8a92eb50317029077b1cb3b923b
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Thu Mar 19 00:48:06 2020 -0300
Add a systemd service to persist SMT state across reboots
The service smtstate.service exists to persist the SMT state across reboots
by using the smtstate script. It is disabled by default.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit e3ab5276c51a2128d4816ac1ed75ca8262d99b3c
Author: Michael W. Bringmann <mwb@linux.ibm.com>
Date: Tue Mar 24 15:36:01 2020 -0700
lsdevinfo: Fix bash command substitution warning
This patch is to remove the warning,
/usr/sbin/lsdevinfo: line 278: warning: command substitution: ignored null
byte in input.
observed in some shells. This warning appears to be a new feature
in Bash-4.4.
Signed-off-by: Michael W. Bringmann <mwb@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d1eefb4a449b4b8a5044f27a9fe273e980b78951
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Mon Feb 24 20:04:08 2020 +0530
update_flash: Fix warning
With recent bash `update_flash -v -f <image>` is throwing below warning.
update_flash_nv: line 316: warning: command substitution: ignored null byte in input
bash enhancement: https://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
This patch fixes above issue.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 4413de5d9d4af1e4cb0cb4d05e2b2bbbf24702e6
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Mar 24 16:33:15 2020 -0500
Revert "Add smtd script, state file, and man page"
This reverts commit fbf513cf2200bd41174e9761166cc74dc61ccfa8.
Reverted all 4 original patches for persisting SMT state across reboots in
preperation for merging a new and different implmentation.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 3df4e19af0f4e1ee6df3e984639c7dc79c787bf9
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Mar 24 16:32:58 2020 -0500
Revert "Add services to save and restore SMT state"
This reverts commit bf58a942041f7d77e58ca64f494395e20e350fb5.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit ea47b5235bf890dd0def29bd346ee227bd7242f3
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Mar 24 16:31:59 2020 -0500
Revert "Include smtd feature in the build system"
This reverts commit 77052b18673306227f05d4ac88bf23ade3299e39.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit 5d1c575fcb0f3ffb61f9b60146ce8d9c7e95f44e
Author: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Tue Mar 24 16:30:39 2020 -0500
Revert "Include smtd feature in RPM package"
This reverts commit d6a939cb6c1ff87aec1498a67620666ec5116510.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
commit d6a939cb6c1ff87aec1498a67620666ec5116510
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Tue Nov 12 14:13:51 2019 -0300
Include smtd feature in RPM package
Assuming that all RPM distros that support PowerPC uses systemd, this
patch includes the new smtd script and services in the package.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 77052b18673306227f05d4ac88bf23ade3299e39
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Tue Nov 12 14:13:50 2019 -0300
Include smtd feature in the build system
This patch adds smtd, smt.state, and systemd services in the build
system. Argument --with-systemd is required to enable the feature.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit bf58a942041f7d77e58ca64f494395e20e350fb5
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Tue Nov 12 14:13:49 2019 -0300
Add services to save and restore SMT state
Two systemd services are included:
[1] smt_init runs smtd script to set SMT based on smt.state file.
It's configured to run in an early stage of the systemd init process
aiming to perform before user workloads.
...
[ OK ] Started SMT automatic initialization service.
[ OK ] Reached target Basic System.
...
[2] smtd will daemonize pyinotify, provided by python-inotify package,
which will listen to cpu0/online changes and trigger /sbin/smtd to save
its current state.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit fbf513cf2200bd41174e9761166cc74dc61ccfa8
Author: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Date: Tue Nov 12 14:13:48 2019 -0300
Add smtd script, state file, and man page
The main goal is to provide a mechanism to save/restore current SMT
state across system reboots. The script has two functions:
* set SMT: read from /var/lib/powerpc-utils/smt.state and set SMT using
ppc64_cpu.
* save SMT: save current ppc64_cpu --smt value in smt.state file.
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 73839d6bab4da24350a60105b7b2c3a6cc7d3a15
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Fri Jul 26 09:10:51 2019 -0500
powerpc-utils: Suppress errors reading kernel files
A problem was observed with the evaluation of the '${devspec} by
the script 'ofpathname'. The problem occurred during installation
to an nvme device as follows:
02:29:41,669 INF program: Running... ofpathname /dev/nvme0n1p1
02:29:41,922 INF program: /sbin/ofpathname: line 684: warning: command substitution: ignored null byte in input
Detailed examination showed that instances of the device-tree
property "/namespace/name" within one or more of the PCI devices
contained null bytes which were echoed along with the value e.g.
[root device-tree]# cat /proc/device-tree/pci@800000020000029/pci1014,637@0/namespace/name | hexdump -C
00000000 6e 61 6d 65 73 70 61 63 65 00 |namespace.|
0000000a
[root device-tree]#
This patch provides improves handling of errors within that script,
and by some of the follow-on uses of the tool by the 'bootlist' script.
* Deal with error messages returned sometimes by evaluation
of ${devspec} in 'ofpathname'.
* Strip embedded nulls from values provided by kernel files.
* Redirect more error messages to /dev/null
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit ea4db66e941720313af2c6b1afb32a74f3e360f4
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Tue Sep 10 14:31:42 2019 -0500
Safe bootlist update
This patch is intended to prevent problems with identifying or parsing
the bootlist devices from propagating into the system NVRAM configuration.
A number of such problems have been observed when processing USB devices.
* If 'bootlist' encounters an invalid OF_DEVPATH entry, it will print
an notice, but still continue on to write invalid data to nvram.
Changed to abort the script before writing bad data to nvram.
* When 'ofpathname' encounters an invalid 'devspec' file or invalid
value in a 'devspec' file, while trying to find the logical pathname
for a scsi device, it may continue to return the invalid 'devspec'
value to the caller/invoking script.
Changed to abort with an error message instead of returning that
invalid value to a caller like 'bootlist'.
Example:
# bootlist -m normal sdb
# bootlist -m normal -o
Could not translate (null)/scsi@0/sd@0,0 to logical device name
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit b0586b5938e9d371e55671422b2f0a5d2cd10c54
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Wed Oct 2 16:54:52 2019 -0500
powerpc-utils/devtree: Parse 'ibm,drc-info' property
Parse new DRC Info: Define data structures to support parsing
the new "ibm,drc-info" device tree property. Integrate the new
property information into the existing search mechanisms of the
userspace 'drmgr' driver.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
powerpc-utils-1.3.7
=====================================================================
commit 1d4147370a148b3a2ebadcf02abd4a6c9a763e6d
Author: Sourabh Jain <sourabhjain@linux.ibm.com>
Date: Sat Apr 27 10:18:32 2019 +0530
lparstat: add an option to print the lparstat report similar to legacy lparstat tool
This patch adds a new command line option (-l, --legacy) to allow
users to print the report similar to legacy lprastat tool without
affecting existing report format.
Changes done to make the current report format similar to legacy
report format are listed below:
1) The memory attribute will be printed in MB instead of KB.
2) cpus attribute will be referred as psize in legacy report format
and only printed in shared lpar environment.
3) On legacy lparstat tool the lcpu attribute is a combination of
two attributes, smt and number of online processor. Formula used
to calculate the lcpu is given below.
lcpu = smt * number of online processors
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit dd6da6b329bac2743d1c80b5556b494c923c11ad
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Mon Apr 29 11:25:18 2019 -0500
scripts: Improve handling of errors from subsidiary scripts
This patch is to fix the handling of errors by 'lsdevinfo' from
invocations of 'ofpathname' that also encounter errors. Error
messages from 'ofpathname' were being sent through 'stdout', and
interpreted as valid data by a number of script instructions in
'lsdevinfo'. Following is an example of such a failure when the
error results were forwarded to an associated HMC.
2019-02-19 22:05:38.212 [TID-5f68--72195] VIOS_CACHE: CacheVios.<-> saveCacheData 3*9080-M9S*130A068 cmd=lsdevinfo -c -q physloc=U78CD.001.FZH0128-P1-C1-T3-S4 -F status
2019-02-19 22:05:38.212 [TID-5f68--72195] RMC_VIOS: PIRmcViosClient.stdErr=/bin/ls: cannot access /sys/class/net/ofpathname:: No such file or directory
/bin/ls: cannot access Could: No such file or directory
/bin/ls: cannot access not: No such file or directory
/bin/ls: cannot access retrieve: No such file or directory
/bin/ls: cannot access logical: No such file or directory
/bin/ls: cannot access device: No such file or directory
/bin/ls: cannot access name: No such file or directory
/bin/ls: cannot access for: No such file or directory
/bin/ls: cannot access Open: No such file or directory
/bin/ls: cannot access Firmware: No such file or directory
/bin/ls: cannot access path: No such file or directory
/bin/ls: cannot access "/pci@800000029008004/ethernet@0"./device/driver: No such file or directory
This patch makes the following changes:
* Redirects the error messages from 'ofpathname' to stderr
* Adds more checks to 'lsdevinfo' to filter out stderr text
from input to various parsing commands.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 8b7978b114e5df89218daa9b4b48cc0e918ba917
Author: Sourabh Jain <sourabhjain@linux.ibm.com>
Date: Mon Feb 4 16:15:14 2019 +0530
lparstat: introduce the help command line option to print lparstat usage
This patch adds a function to print the usage of lparstat. Also,
a new element is added to structure option to handle long command
line argument for help.
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit bc928b06605371b72c7fe8ec7e81886114a9e9d4
Author: Sourabh Jain <sourabhjain@linux.ibm.com>
Date: Thu Jan 31 14:25:21 2019 +0530
lparstat: restrict the physc and entc attribute values to two decimal places
Print format of physical processors consumed (physc) and percentage of
the entitled capacity consumed (entc) attributes has changed from six
decimal places to two.
The least possible value allowed for processor entitlement to a LPAR
is 0.05 so printing physc and entc values with such a high precision
is incorrect.
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit b5fea40ac98d1c9a685d98c011e88180c31ca0be
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Wed Feb 20 15:44:17 2019 +0530
man/update_flash: Add details to extract rpm format image
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit f567bdb8b2a3effdb4af06e2cf935b0350f2f881
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Wed Feb 20 15:44:09 2019 +0530
man/update_flash: Fix man page
Add heading to NOTES section.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
powerpc-utils-1.3.6
=====================================================================
commit 01c9cbcf4face809cb6953bc3cd2a30cd075ed16
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Thu Dec 6 17:30:38 2018 -0600
lparstat: correct calculation of physc to use tbr
Currently phsyc is calculated using the sampled PURR values from lparcfg and
a derived timebase that lparstat itself calculates. However, both the Timer
Facilities section in Book III of the ISA and PAPR outline that this resource
calcuation is done by computing the ratio of the PURR delta and the Timebase
Register delta for the sampled period.
I've sent a patch upstream to the kernel list to also export the Timebase
Register (tbr) in /proc/ppc64/lparcfg [1]. Use this value for calculating
physc value when running on a kernel that exposes tbr.
[1] https://patchwork.ozlabs.org/patch/1009906/
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 7be598c7ffdf1f934e43af88a42e8b1e6391f91e
Author: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Date: Thu Dec 6 16:21:10 2018 +0530
lparstat: Enable desired and maximum memory stats
This patch enables the display of desired memory
and maximum memory stats with lparstat -i flag.
The value for these stats are already available
in /proc/powerpc/lparcfg file.
v2: updated man pages.
Signed-off-by: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit d1576f88dcc7008bcd3448172caff1b928be1254
Author: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Date: Thu Sep 6 15:01:04 2018 +0530
lparstat: Show available physical processors in the shared pool
This patch adds the "app" field that displays the available
processors in the shared pool.
The platform provides the summation of the physical processor
pool idle cycles through H_PIC hypercall. This data is updated
in the "pool_idle_time" field of the /proc/ppc64/lparcfg file.
This patch derives the "app" from the "pool_idle_time" field.
v2: Handle fgets() errors
Signed-off-by: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit fac783d18d61af232b957af259a15ed231f6869b
Author: Juliet Kim <julietk@linux.vnet.ibm.com>
Date: Thu Sep 13 15:57:42 2018 -0400
ppc64_cpu: Limit number of CPUs for frequency calculation
The patch limits the number of threads used for CPU frequency calculation
to the minimum of either the actual number of CPUs in the system or
CPU_SETSIZE(currently 1024). In other words, if the number of CPUs in the
system is less than CPU_SETSIZE, a thread is created for each of the CPUs,
otherwise only CPU_SETSIZE threads are created. This is being done because
sched_setaffinity() will only work on CPU_SETSIZE CPUs, anything over the
limit is not supported.
Signed-off-by: Juliet Kim <julietk@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 3ce17a36d10bc09a49af9d56ceadad09708b46f1
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Thu Jul 19 23:12:40 2018 -0500
lsslot: Add ibm,dynamic-memory-v2 parsing capability
In order to support reporting memory LMB information the lsslot
command needs to know how to parse the ibm,dynamic-memory-v2
property. This patch adds this support to the shared
drslot_chrp_mem.c file.
In order to prevent the drmgr command from parsing this v2 property
a new flag is introduce, is_lsslot_cmd. The reason for this is that
we do not support memory DLPAR for ibm,dynamic-memory-v2 from
userspace.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 6a1b89bb7e9f58262da0f08906674cae3efc7bfc
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Thu Jul 19 23:12:34 2018 -0500
lsslot: Split dynamic-memory v1 parsing into separate routine
In preparation for support of parsing the new ibm,dynamic-memory-v2
device tree property, this patch splits the current code that
parses the current v1 version of the device tree propertry into
its own routine.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit c3f583a9f62ee33080523c2d1d076fdf8d5520e7
Author: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Tue Jul 17 21:24:31 2018 +0530
Patch to display logical name using bootlist -o option
Problem:
System unable to boot when OF device path name's set using -r option
EX: # bootlist -m normal -r /vdevice/v-scsi@30000010/disk@8100000000000000
Solution:
This patch is to set respective Open firmware device path names(-r)
and logical device path names(-o) using bootlist
Test Results:
Without patch:
# bootlist -m normal -r /vdevice/v-scsi@30000010/disk@8100000000000000
sda
# bootlist -m normal -r
sda
# bootlist -m normal -o
Could not translate sda to logical device name
With patch:
# ./bootlist -m normal -r /vdevice/v-scsi@30000010/disk@8100000000000000
/vdevice/v-scsi@30000010/disk@8100000000000000
# ./bootlist -m normal -r
/vdevice/v-scsi@30000010/disk@8100000000000000
# ./bootlist -m normal -o
sda
# ./bootlist -m normal -r sda
/vdevice/v-scsi@30000010/disk@8100000000000000
# ./bootlist -m normal -r
/vdevice/v-scsi@30000010/disk@8100000000000000
# ./bootlist -m normal -o
sda
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
powerpc-utils-1.3.5
=====================================================================
commit 35d01313b5d03069bf8cabbcdfe39944da4ae65c
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Thu Jun 14 16:08:50 2018 -0700
lsslot: add DRC Type description strings for new U.2 PCIe slots
Two new PCI slot types can be reported from firmware in the DRC Type
property for a PCI device. The following are the slot descriptions for
DRC types 43 and 44.
43 A U.2 PCI Express Rev 3 4x lane slot with 4x lanes connected
44 A U.2 PCI Express Rev 4 4x lane slot with 4x lanes connected
Currently, the lsslot utility reports "Unknown" for the description of
these pci devices. Update the php_slot_type_msg[] with these new slot
descriptions so that lsslot correctly reports them.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 02249d0ce03ae6b06ca5dac47a53bdeb8986ac81
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Thu Mar 15 11:12:05 2018 -0500
lsslot: Remove extra call to free_lmbs in failure cases
This reverts commit e6f476d32c33f5b8e364f930c467785495eeb0ce.
From my inspection, get_lmbs frees the lmb_list correctly in all failure
cases. The extra call to free_lmbs will cause the lmb_list to be freed
twice. I think it's likely that the original coverity issue that this was
meant to address was a false positive. Reverting the change has been seen
to resolve a seg fault.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 05bb057b8953d536a952ff86eea3b0afeeefb377
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Thu Feb 15 15:35:20 2018 -0800
ibmvscsis: remove deprecated ibmvscsis scripts and docs
The original ibmvscsis module was removed from the kernel a long time
ago, and has since been replaced with a new LIO implementation. The
documentation and administration scripts supplied in this package as
such have been deprecated. Lets go ahead and remove them.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 9d86e33b7605e25473ea0a11d22a300274c8169b
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Mon Jan 22 17:50:23 2018 -0600
Test for librtas/librtasevent headers and libraries
The current configure script only tests for the presence of librtas.h. Certain
distros have chosen to split the librtas package into seperate librtas and
librtasevent library/development packages. As a result compilation will fail
for the rtas_event_decode utility if librtasevent.h is missing.
Fix this by also checking for librtasevent.h, and for sanity purposes that
the libraries themselves are actually present and linkable.
Reported-by: Anton Blanchard <anton.blanchard@gmail.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 7790c5ae7ff50785c26e7d3942e0b86c9edb9df2
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Sun Jan 21 21:10:08 2018 +0530
update_flash: Use device tree to get firmware version details
On P9, OPAL exports firmware information via device tree
(/ibm,firmware-versions node). Even recent hostboot firmware on P8 BMC system
exports these information via mini device tree.
Lets add support to parse device tree to get firmware information. If firmware
information is not present in device tree then fall back to existing ipmi
method.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 081e7ac9675b49346e937236f38822b33c8c751b
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Sun Jan 21 21:10:07 2018 +0530
update_flash: Use inband ipmi path to get firmware version
update_flash_nv uses 'ipmitool -I usb' interface to get firmware version
details. This is AMI BMC OEM feature and not available on other BMC systems.
Hence lets use inband interface to get firmware version details.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 73d847367d1a136d8e83d48e7ca4ff4602c0f5c7
Author: Michal Suchanek <msuchanek@suse.de>
Date: Thu Jan 18 15:38:00 2018 -0800
drmgr: load rpadlpar_io on -C as well
Users do drmgr -C to verify their system.
However, -C does not select any hotplug type, and the rpadlpar_io kernel
module is loaded only when hotplug type pci, phb or slot is selected.
Make display_capabilities global and check it in check_kmods()
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 7fb22cb5b8a0c95821024aa84750945134303f20
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Wed Dec 6 10:33:59 2017 -0600
lparstat: Fix parsing of /proc/interrupts SPU line
The current means of parsing the SPU line in /proc/interrupts is incorrect.
Adding 11 to the current pointer is only correct if the number of SPU
interrupts in each column is a single digit. Otherwise, for values with
more than a single digit, we will only see the last digit of the value.
This patch fixes the issue by using strstr to check for the SPU line and
strtok to split the line into tokens in order to omit the arbitrary
whitespace between values.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Reported-by: Flos Lonicerae <lonicerae@gmail.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 3dcc222814ec1d661710eda320aced13566817f2
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Fri Jan 5 13:00:31 2018 -0800
lsdevinfo: fixup more null byte command substitution warnings
As was pointed out in commit 4fcc611a09ca ("warning: command
substitution: ignored null byte in input device") newer versions of Bash
(bash 4.4) warn about null byte in command substitutions. While that
commit fixed serveral instance by replacing the "cat" command with "tr"
it missed two other instances in the lsdevinfo script where cat was
being used to grab the "ibm,loc-code" property for a device.
This patch fixes the other two instances for virtual fibre channel
devices and pci ethernet devices.
fixes: 4fcc611a09ca ("warning: command substitution: ignored null byte in input device")
Cc: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 1f79078c979555a58a72326a318d956eb4efe4b5
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Mon Dec 4 12:34:26 2017 -0800
Add mailing list address to README
Its been pointed out that the development mailing list address is not
listed in the README file, and that a google search still points to our
old sourceforge list.
Update the README with our current development mailing list.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 149c7022a56e0ffb5fe27681f574d46860323e3c
Author: Anton Blanchard <anton.blanchard@gmail.com>
Date: Sun Oct 8 21:49:17 2017 -0700
ppc64_cpu: Scale CPU cycles counter by amount of time it ran
At the moment we start a CPU cycles counter, sleep one second and
read the counter value, assuming we got one second of time on the
PMU.
There are two issues with this. If someone else is consuming all
the available PMCs, we may end up context switching the PMC and
count for half (or less) of the time. In this case we report a CPU
frequency that is half (or less) of what it should be.
On the other hand if the sleep goes for longer than one second which
might happen on a busy box, then we count for too long and report a
CPU frequency that is too high.
Also check that we got a reasonable number of cycles and report
an error if we did not.
Signed-off-by: Anton Blanchard <anton@samba.org>
commit 8f9cd40fbcdda9d2447a1e51ed5dee2cb5c44542
Author: Harish <harish@linux.vnet.ibm.com>
Date: Fri Sep 29 10:34:44 2017 +0530
bootlist: Handle --help option
This patch handles --help option for bootlist command and returns
with 0
Signed-off-by: Harish <harish@linux.vnet.ibm.com>
[tyreld: reword patch subject line]
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
powerpc-utils-1.3.4
=====================================================================
commit c8083fbc1bfe1548057478ae46543bf58bffc7d4
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Wed Aug 23 09:06:45 2017 -0500
powerpc-utils.spec: Add "Vendor: IBM Corp."
Ensure that "Vendor: IBM Corp." appears in archive for all checkouts
and derived builds.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 50f11c6c6618e7d59232d67e7446d07714af453b
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Thu Jul 6 12:31:36 2017 -0400
lsslot: Validate DRC property groups
Recently seen on a kvm guest running on a PowerNV system, the
lsslot command segfaulted when trying to free the drc information.
# gdb -q ./lsslot
Reading symbols from ./lsslot...done.
(gdb) run -c memory
Starting program: ./lsslot -c memory
Program received signal SIGSEGV, Segmentation fault.
free_drc_info () at src/drmgr/common_ofdt.c:287
287 all_drc_lists = list->all_next;
The root cause of this is that the DRC properties in the guest were empty.
This caused the lsslot (and likely possible in drmgr since this code
is common to both commands) to improperly parse the device tree
information.
To fix this we need to add a check after gathering information for
each of the DRC properties when reading DRC property group data. If
there are no entries in any of the DRC properties we cannot continue.
Reported-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit c25ae395db914f1137bb8a718277ea4b6f69136b
Author: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Mon Jul 10 11:23:27 2017 +1000
ppc64_cpu: Treat CPUs as online if cpu hotplug not enabled
cpu_online() looks for the "online" attribute to decide if a cpu is
online, however if the kernel does not have CONFIG_HOTPLUG_CPU enabled
the attribute will not exist.
get_attribute() calls access() first to check if the attribute exists,
which will set errno with ENOENT if it is missing. If get_attribute()
fails with this specific error, treat the cpu as online.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
[tyreld: removed unnecessary braces from if block]
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 817900edd96c66d6f43f75aaefbe38bba6bab035
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Fri Aug 4 16:24:01 2017 -0700
Revert "ppc64_cpu: Treat CPUs as online if cpu hotplug not enabled"
This reverts commit 5f70f6c1af2dd61122acfdbaa6e38be062bb220a.
Reverting the commit as further inspection came to show it actually
marked a cpu as offline when hotplug was not enabled.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 136fab970076018bd56aa1aa0c09b8954b89b0b5
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Jun 6 12:12:36 2017 -0400
drmgr: Correct some bad formatting in drmig_chrp_pmig.c
No functional changes, justy making the code more readable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 1c5319c76ae8b378bfd59e8c0a08e89f83867dbf
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Jun 7 16:35:33 2017 -0400
drmgr: Correct errno usage in init_cpu_info()
The error message reported if allocaing a dr node fails
should not report the errno value. The call to allocate the
dr node makes multiple syscalls and there is no way to
determine which one last updated errno.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 998933a5185f9c56d1d6bce77301f3e7be6a54cf
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Jun 7 16:35:28 2017 -0400
drmgr: Correct errno usage use in validate_paltform()
For validate_platform(), the call to get_property makes many
system calls and there is no way to know what last updated the
errno value. This patch drops the output of strerror() due to
this reason.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit d1c6662d38adeb98a1fd8906cd54031c6fdd653d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Jun 7 16:35:22 2017 -0400
drmgr: Stale errno usage corrections
Several places in the drmgr code use a stale value of errno either
as a return code or when printing an error message. A common example
of this is calling the say() routine and then returning the value of
errno. The say() routine makes several system calls and the value of
errno after a call to say() no longer reflects the original errno
value.
Several places in the drmgr code were updated to properly handle
the return codes from functions such as write() or open() where we
should be checking for rc == -1 instead of rc <= 0. This does make
a difference as errno won't be set for rc == 0.
Note that partial write return codes are not really handled in the
drmgr code. The drmgr command is writing to sysfs and /proc
files where we know that they will either return success or
failure and set errno, no partial writes.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 479f1a1122f7d9025d3a21e60a0431d2eba6ee2f
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Jun 6 12:12:22 2017 -0400
drmgr: Correct drc type checking in check_kmods()
Fixes: f9986ac43011 ("drmgr: Move options.ctype to global usr_drc_type")
When the conversion to using the global usr_drc_type was
made the logic checking for whic drc types we need to check
the rpadlpar_io kernbel module for was broken. This corrects
the check.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 27e8d5b8218bc8c8c772080b0d99691bd31d4f0f
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Thu Jun 1 19:07:13 2017 +0530
lsslot: Rectify usr_drc_name check
This incorrect check refrains lsslot from displaying the slot information.
Fixes: e82fb588f573 (lsslot: replace struct options member s_name with usr_drc_name)
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
[tyreld: added fixes tag]
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 74715cc0e4db0e2738be7a19c852816c285d8284
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon May 22 16:40:58 2017 -0400
lsdevinfo: Add support for vNIC devices
Add support to dump information about vNIC devices so that device info
requests from the HMC can retrieve data about vNIC devices.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
[tyreld: fixed up trailing whitespace]
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 25615a80f3fb5ebcc26d7b00316afce8c46ab2f9
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon May 22 16:40:50 2017 -0400
ofpathname: Add support for vNIC devices
Add 'vnic' to the list of device types for of2l_ethernet so vNIC
devices are supported.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 6464f8e96228f7db355f08f270ada1104c3562c3
Author: Amartey Pearson <apearson@us.ibm.com>
Date: Tue May 16 14:01:30 2017 -0500
Improve perf of drmgr/lsslot with large num of virt. dev.
The current algorithm for add_pci_vio_node walks the vdevice bus
for every theoretical DRC (1000's of times). The more vdevices
you have populated, the worse this algorithm becomes. On a system
with 450 devices, this can take over 30 seconds for example.
This modifies the algorithm to populate a node list of existing
devices (so walks the tree just once), and then uses these nodes
when populating the full list instead of walking the device tree
for each one.
NOTE: This only is changed for virtual devices - a system with
large numbers of PCI devices will not be optimized, but that is
less of a concern.
Signed-off-by: Amartey Pearson <apearson@us.ibm.com>
Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
[tyreld: changed my_drc_index type from u32 to uint32_t]
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 7539330a301ff9ac7d6fd5e1cf974bb9999100b2
Author: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Fri May 19 16:02:51 2017 -0400
Test for zlib presence at configuration time
The nvram utility links with zlib and compilation will fail if zlib.h or
libz.so are not present. Check and warn at configuration time.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 3a7b15104fb956aa2e5debababe8536dbd4e8cef
Author: Russell Currey <ruscur@russell.cc>
Date: Fri May 19 17:36:45 2017 -0400
errinjct: Remove platform check to enable KVM guests
qemu/KVM guests can have RTAS as well. There's already a check to see if
RTAS is present, there's no need to hardcode the supported platform.
Removing this check allows errinjct to work on KVM guests.
Signed-off-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 5f70f6c1af2dd61122acfdbaa6e38be062bb220a
Author: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Fri Apr 21 16:47:57 2017 +1000
ppc64_cpu: Treat CPUs as online if cpu hotplug not enabled
cpu_online() looks for the "online" attribute to decide if a cpu is
online, however if the kernel does not have CONFIG_HOTPLUG_CPU enabled
the attribute will not exist.
If hotplug is not enabled then the cpu can be assumed to be online - in
this case, update cpu_online() to treat the cpu as online.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Acked-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 4fcc611a09caea70e6bca6a1275211c72ac4bb45
Author: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Date: Wed Jan 11 15:36:33 2017 +0530
warning: command substitution: ignored null byte in input device
Ubuntu 17.04: "command substitution: ignored null byte in input" warning message is displayed while running few RAS commands.
The command execution of ls-veth, ls-vscsi, lsdevinfo, and ofpathname returns following output.
lsdevinfo
/usr/sbin/lsdevinfo: line 233: warning: command substitution: ignored null byte in input
device: name="ibmveth2"
ls-vscsi
/usr/sbin/ls-vscsi: line 72: warning: command substitution: ignored null byte in input
host0 U8286.42A.1069B3T-V8-C17-T1
ls-veth
/usr/sbin/ls-veth: line 74: warning: command substitution: ignored null byte in input
ibmveth2 U8286.42A.1069B3T-V8-C2-T1
ofpathname sda
/usr/sbin/ofpathname: line 812: warning: command substitution: ignored null byte in input
/usr/sbin/ofpathname: line 865: cd: too many arguments
/vdevice/v-scsi@30000011/disk@8100000000000000
Newer versions of bash (Bash 4.4) warn about null bytes in command substitutions. This is fixed.
Also fixed /usr/sbin/ofpathname: line 865: cd: too many arguments.
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 25b8f7d67fb3acee0970cd36f24dc17fac1f6dc3
Author: Pawan K Singh5 <pawan123@linux.vnet.ibm.com>
Date: Mon Apr 10 15:00:28 2017 +0530
ofpathname : avoid duplicate entries of vFC devices
Adding support to avoid the duplicate entries of a Open Firmware device path to
logical device path for vfc-client devices.
The problem can be reproduced with the bootlist command
# bootlist -m normal /dev/sdd /dev/sds /dev/sdf /dev/sdv
# bootlist -m normal -r
/vdevice/vfc-client@30000899/disk@500507680b2255fe
/vdevice/vfc-client@30000899/disk@500507680b2255ff
/vdevice/vfc-client@3000089a/disk@500507680b2255fe
/vdevice/vfc-client@3000089a/disk@500507680b2255ff
# bootlist -m normal -o
sda---------------->expected "sdd"
sdp---------------->expected "sds"
sda---------------->expected "sdf"
sdp---------------->expected "sdv"
So, this patch check the duplicate entries of logical names of vFC devices at of2l_vfc()
and display specified bootlist :
# bootlist -m normal -r
/vdevice/vfc-client@30000899/disk@500507680b2255fe
/vdevice/vfc-client@30000899/disk@500507680b2255ff
/vdevice/vfc-client@3000089a/disk@500507680b2255fe
/vdevice/vfc-client@3000089a/disk@500507680b2255ff
# bootlist -m normal -o
sdd
sds
sdf
sdv
Signed-off-by: Pawan K Singh5 <pawan123@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
powerpc-utils-1.3.3
=====================================================================
commit d63e12aa7cd22d5e6c2baf595aacb644311e0217
Author: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Tue Dec 6 11:36:57 2016 -0500
nvram:read list of partion names dynamically
This patch is to read "list of partition dynamically and
use it rather than having hardcoded partition table list.
Test Results:
without patch:
nvram: ERROR: There is no Open Firmware "ibm,skiboot" partition!
with patch:
"ibm,skiboot" Partition
--------------------------
experimental-fast-reset=feeling-lucky
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Tested-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit b54a095e820d0163e29b76b517b57227a358950d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 6 11:29:17 2016 -0500
lsslot: Correct formatting fopr printing cpus and caches
Minor updates to the field sizes when printing cpus and caches
so that the fields no longer run together.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 9d363cd79315f08d00e63674b3608dd3fdd72939
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 6 11:16:14 2016 -0500
lsslot: Validate cpu->name when printing
When printing the information for all possible CPUs we can possibly print
a NULL string pointer. the libc printf code handles this gracefully by
printing '(NULL)' but this is not what we should be relying on.
This validates the cpu->name pointer before printing it and instead
prints '--' if cpu->name is not valid.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit b3b35e9a84913f98ab1abf8ac019c8f3a94a5e1d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 6 11:12:06 2016 -0500
lsslot: Allow printing information of all possible cpus
The lsslot command gathers information about all possible cpus on a
system but only prints information about cpus that are present. This
patch adds the ability to print information about all possible cpus
when the '-d 4' option is used.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 8b229153221416bfdcd06ef67ad3a18fb5bea171
Author: Michel Normand <normand@linux.vnet.ibm.com>
Date: Tue Dec 6 11:03:00 2016 -0500
ofpathname: Avoid infinit loop in get_slave()
This is a bypass for a problem raised on openSUSE with bug
https://bugzilla.suse.com/show_bug.cgi?id=1011529
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
commit 944cc93ae316edc99bbac1a83f5b0e1aa9401657
Author: Paul A. Clarke <pc@us.ibm.com>
Date: Thu Dec 1 11:05:25 2016 -0500
ppc64_cpu: emit error message for invalid core number to on- or offline
An off-by-one test is done to detect invalid core numbers for explicit
online/offline. For example, on a 16 core system, valid cores are 0-15.
However, specifying "16" has no effect, but does not produce an error:
--
# ./src/ppc64_cpu --cores-on
Number of cores online = 15
# ppc64_cpu --online-cores=16
# ppc64_cpu --online-cores=17
Invalid core to online: 17
--
This change will correctly report an error:
--
# ppc64_cpu --online-cores=16
Invalid core to online: 16
--
Signed-off-by: Paul A. Clarke <pc@us.ibm.com>
commit be7583177b845b69b7c2e1f21f2652c0545c996d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 29 11:42:37 2016 -0500
lsprop: Update and honor recurse option
The -R (recurse) option to lsprop is not honored when dumping the contents
of a directory. Update the option to also include --recurse and honor this
option when specified.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 69b62ea770c6f84f91706d8610a2815fbb19decc
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 29 11:41:27 2016 -0500
lsprop: Add command version
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit ab587974c47f3c45929c748a16eee33e875c53f3
Author: Paul A. Clarke <pc@us.ibm.com>
Date: Tue Nov 29 11:33:54 2016 -0500
ppc64_cpu: tolerate non-uniform per-core SMT mode
If not every core is in the same SMT state, the ppc64_cpu command will
report such and no information specific to the command request:
--
# ppc64_cpu --cores-on
Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all
cores to have the same number of online threads to continue.
Core 0: 0* 1* 2* 3*
Core 1: 4* 5* 6* 7*
Core 2: 8* 9* 10* 11*
Core 3: 12* 13* 14* 15*
Core 4: 16* 17* 18* 19*
Core 5: 20* 21* 22* 23*
Core 6: 24* 25* 26* 27*
Core 7: 28* 29* 30* 31*
Core 8: 32* 33 34 35
Core 9: 36* 37 38 39
Core 10: 40* 41* 42* 43*
Core 11: 44* 45* 46 47
Core 12: 48* 49* 50* 51*
Core 13: 52 53 54* 55*
Core 14: 56 57 58 59
Core 15: 60* 61* 62* 63
# ppc64_cpu --online-cores
Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all
cores to have the same number of online threads to continue.
Core 0: 0* 1* 2* 3*
Core 1: 4* 5* 6* 7*
Core 2: 8* 9* 10* 11*
Core 3: 12* 13* 14* 15*
Core 4: 16* 17* 18* 19*
Core 5: 20* 21* 22* 23*
Core 6: 24* 25* 26* 27*
Core 7: 28* 29* 30* 31*
Core 8: 32* 33 34 35
Core 9: 36* 37 38 39
Core 10: 40* 41* 42* 43*
Core 11: 44* 45* 46 47
Core 12: 48* 49* 50* 51*
Core 13: 52 53 54* 55*
Core 14: 56 57 58 59
Core 15: 60* 61* 62* 63
# ppc64_cpu --offline-cores
Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all
cores to have the same number of online threads to continue.
Core 0: 0* 1* 2* 3*
Core 1: 4* 5* 6* 7*
Core 2: 8* 9* 10* 11*
Core 3: 12* 13* 14* 15*
Core 4: 16* 17* 18* 19*
Core 5: 20* 21* 22* 23*
Core 6: 24* 25* 26* 27*
Core 7: 28* 29* 30* 31*
Core 8: 32* 33 34 35
Core 9: 36* 37 38 39
Core 10: 40* 41* 42* 43*
Core 11: 44* 45* 46 47
Core 12: 48* 49* 50* 51*
Core 13: 52 53 54* 55*
Core 14: 56 57 58 59
Core 15: 60* 61* 62* 63
# ppc64_cpu --smt
Inconsistent state: mix of ST and SMT cores
--
This change allows the ppc64_cpu command to properly respond to the above
requests:
--
# ppc64_cpu --cores-on
Number of cores online = 15
# ppc64_cpu --online-cores
Cores online = 0,1,2,3,4,5,6,7,8,9,10,11,12,13,15
# ppc64_cpu --offline-cores
Cores offline = 14
# ppc64_cpu --smt
SMT=1: 8-9
SMT=2: 11,13
SMT=3: 15
SMT=4: 0-7,10,12
--
Note that the output for "--smt" only changes if there is mixed modes.
If the mode is uniform, the output will remain as before:
# ppc64_cpu --smt=4
# ppc64_cpu --smt
SMT=4
Signed-off-by: Paul A. Clarke <pc@us.ibm.com>
commit e227a80df7643a1f45e0d2b06e56ef430772c2dd
Author: Breno Leitao <breno.leitao@gmail.com>
Date: Tue Nov 22 12:22:45 2016 -0500
ppc64_cpu: add a numeric option when printing SMT
Currently, there is not a numeric (non verbose) display of SMT modes,
which means that three verbose output is usually generated, as:
SMT=X
SMT is off
Machine is not SMT capable
This patch implements a easily machine parsable output for SMT, helping
a lot of scripts that needs to read SMT status on a machine.
I am considering that if the SMT is off or impossible, then SMT=1 (1
thread per core), thus, always returning SMT=X, where X means thread
enabled per core, as 1, 2, 4, 8.
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
commit 09b36b64ec51bd8ce6c0b2b345974cb228064b89
Author: Breno Leitao <breno.leitao@gmail.com>
Date: Tue Nov 22 12:16:35 2016 -0500
Fix man page for ppc64_cpu
Currently there is a typo on ppc64_cpu manpage which causes the text
to be corrupted, not printing anything after this typo, as showed:
--smt Display the current smt setting for the system. The
.....
threads online varies per core, or
As you can see, there is nothing else after the ", or" expression.
This patch simply fixes this typo, which makes the manpage render
correctly.
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 59a17aac4728a3c060f128b315df1324b8df39f5
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 22 11:43:20 2016 -0500
lprstat: Add command version
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 4519274c0bdbd781f660a1df8ca41cbe267229e4
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 22 11:42:15 2016 -0500
activate_firmware: Remove extraneous comments
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 7e9a53937469c451de78d321abe64434ce3e0731
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 22 11:41:12 2016 -0500
activate_firmware: Add verbose output option
The activate_firmware currently has some debug statements that can only
be activated by building the command with DEBUG defined. Instead, we should
always have these statements active and control their output with the
-v, --verbose option.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 2b0867d3327442fa8bcb42269db3436b5507ac2f
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 22 11:40:09 2016 -0500
activate_firmware: Update the usage message and option parsing
The usage message for activate_firmware should limit itself to 80
characters per line. Additionally the formatting could use a little
updating now that we have long options.
The new help message appears as:
Usage: src/activate_firmware [-e [keyfile]]
Without any option, the activate_firmware utility will cause a firmware image
that has already been flashed to be activated concurrently.
Option summary:
-e prints the current Update Access Key expiry date
-e <keyfile> applies the provided Update Access key-file to extend
the service expiry date
-h, --help print this message.
-v, --verbose output extra debug information
-V, --version print version information.
This patch also allows users to specify --help in addition -h for
the help option.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 1c4f7810323f3859f0359250eb3a6f4fab4ff036
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Nov 22 11:38:42 2016 -0500
activate_firmware: Add versioning
Add versioning to the activate_firmware command.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
commit 06f2033866b2a991def24354e8657c8146c43b95
Author: Breno Leitao <breno.leitao@gmail.com>
Date: Wed Nov 9 16:24:22 2016 -0500
Fix endian.h header on FreeBSD
Unfortunately Linux default endian.h is locaed in sys/endian.h on
FreeBSD. This patch simply detect what system you are running and
use the proper location on the include.
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
commit 28ec98068a3d06e77d8d3496c26e2f4ff8e61aeb
Author: Breno Leitao <breno.leitao@gmail.com>
Date: Wed Nov 9 16:23:10 2016 -0500
Avoid linking with libdl on BSD systems
FreeBSD does not have libdl, so, when linking with -ldl fails.
This patch simply check if you are running on BSD, and does not
invoke -ldl during compilation.
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
commit eca0c56ab6b041c1c90aa213492121d6f0d0c6af
Author: Breno Leitao <breno.leitao@gmail.com>
Date: Wed Nov 9 16:20:20 2016 -0500
ppc64_cpu: Fix function method signature
If HAVE_LINUX_PERF_EVENT_H is not defined, the code fails to
compile, because function do_cpu_frequency() does not have an
Argument, as it has if HAVE_LINUX_PERF_EVENT_H is defined.
This is the error message:
error: too many arguments to function 'do_cpu_frequency'
This patch simply adds an argument to the function.
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
commit 741054926742785290ed1cfacac04d8e55409b4a
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Oct 19 10:40:25 2016 -0400
.gitignore: Add errinjct and rtas_dbg executables
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit d42164cd2dde616ba51b4143d9c17aa0b9c40b4a
Author: Hariharan T.S <hari@linux.vnet.ibm.com>
Date: Wed Oct 19 10:37:51 2016 -0400
hvcsadmin: findtools should be called before is_driver installed
scripts/hvcsadmin: is_driver_installed is using systools, where as the
same is checked for existence in findtools which is called later. It has
to be called before to get the proper error message.
The patch will first check for systools before checking for drivers.
It will avoid the following situation.
hvcsadmin -status
Can't exec "systool": No such file or directory at /usr/sbin/hvcsadmin line 272.
systool: No such file or directory at /usr/sbin/hvcsadmin line 272.
Signed-off-by: Hariharan T.S. <hari@linux.vnet.ibm.com>
commit 0947a3dbaed4fc02e7d2d19cb0cdc6059fb86d5b
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Oct 19 10:35:09 2016 -0400
drmgr: Cleanup unused progress states in acquiring hotplug resources
The progress state that is updated throughout the process of acquiring
a hotplug resource is not used anywhere. This patch removes it.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit e116eb625c5cb194cb8bd59ddf1564e5268e6b31
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed Oct 19 10:33:26 2016 -0400
drmgr: Add capability for PCI hotplug only operations
We need to provide the capability to do a hotplug only style of operation
for some adapters such as nvme adapters behind a bridge that can be owned
by more than one partition. These scenarios are used for doing failovers
and this update reduces the total drmgr time from 18 seconds per add or
remove down to 2-3 seconds per action.
Note that this is different from the PAPR notion of hotplug where the
device is hotplug removed from the OS, then the slot is powered down,
a new card inserted, the slot powered up, and the device hootplug added
back into the system. This is the drmgr -R action. This new functionality
just does the hotplug to/from the OS, nothing else.
This update assumes that when doing an add, the DR indicator already has
the proper isolation and allocation state, and the power to the slot is
on. For remove operations the indicator and power for the slot is not
modified.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 071949595434f68c7ed722b932173d9f69c20c84
Author: Stephen E. Royer <seroyer@us.ibm.com>
Date: Thu Sep 1 10:12:10 2016 -0400
nvsetenv: Fix unitialized variable in 'hvcsadmin'
scripts/hvcsadmin: Fix display of distracting perl script warning
notice about an unitialized variable during execution. The message
is an annoyance during operation.
Signed-off-by: Stephen E. Royer <seroyer@us.ibm.com>
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
commit 16d7b3126e0c73a1eeb94742559934034667e4c7
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Thu Sep 1 10:09:15 2016 -0400
nvsetenv: Fix rpmbuild inclusion for nvsetenv
Update Makefile.am to add the nvsetenv command to sbin_SCRIPTS so that is
is included in generated tarballs from 'make dist'.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
commit b071e81d8cd71af496d5c5b36371c30449051def
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Fri Aug 26 15:29:58 2016 -0400
lparstat: Ignore whitespace at beginning of /proc/interrupts SPU line
In the case that any interrupt number in /proc/interrupts exceeds 3
characters, whitespace will be placed at the beginning of the SPU line in
order to keep the columns aligned. In that case, the current code will miss
the SPU line. This patch skips any whitespace preceding the SPU line.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
commit ce767e7a7254e5dd38655b67e31a7b337df5d68e
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Fri Aug 26 15:26:12 2016 -0400
drmgr: Include GPL header in prrn.c
Add GPL boilerplate to prrn.c for consistency with other files in
powerpc-utils.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
commit 5814722814f876d584f59afdb38e7d3f23e6c7ad
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Fri Aug 26 15:21:06 2016 -0400
drmgr: Add options.c to Makefile for creating tarballs
Previous updates that ctreated the file options.c that is #included
instead of built directly for drmgr and lsslot did not update the Makefile
to ensure this file is included in tarballs when doing a 'make dist'.
Add options.c to the list of NOINST_HEADERS for drmgr and lsslot.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 5799f6f26c34b6e7ac200e50666188279704937c
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Fri Aug 26 15:17:25 2016 -0400
nvsetenv: Add nvsetenv from SUSE distro
nvsetenv: Add the nvsetenv script to the package which is normally
only present in the SuSE variant of powerpc-utils. The script is
a wrapper for the nvram utility.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
commit 3c3a53825248e1ef52ee203c968f643c26820cc5
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Tue Aug 23 11:23:31 2016 -0400
lparstat: Fix segfault when parsing /proc/interrupts
Fix a bug where we hit a segfault running 'lparstat -i' on machines with a
large number of cpus. The 'SPU' line in proc interrupts would exceed the
512B allocated and we would subsequently walk off the end of the array
when we attempt to parse the line. This solution uses getline instead of
fgets in order to easily handle lines of arbitrary length.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
commit 0a93eb52603fc8ea77f69ae628f7634054363ad3
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Aug 23 10:41:39 2016 -0400
drmgr: kill the options struct
Remove the now empty struct options after making all of its members
globals.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 64c57c69ed42c4a7af0e4d6b4657f0a52e608dfe
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:20:23 2016 -0400
lsslot: Make struct options member delimiter global
Make the struct options member delimiter global and re-name it to
usr_delimiter.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit e82fb588f5738e6d51e7530b894233c190c588b8
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:19:04 2016 -0400
lsslot: replace struct options member s_name with usr_drc_name
With moving the option variables to globals we can replace the s_name
lsslot variable with the existing usr_drc_name variable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 4763b5452a120d6e7c98afcd24cc63e20e33f8de
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:17:40 2016 -0400
lsslot: make struct options member p_flag global
Make the struct options member p_flag global and re-name it to show_caches
to make it more descriptive.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 3dde5f36a9c87b9944ad4f46b983ebd2292455d2
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:16:45 2016 -0400
lsslot: make struct options member o_flag global
Make the struct options member o_flag global and re-name it to
show_occupied_slots to make it more descriptive.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 378acd01a6cc08e4afe27dd2aa102669cdf05f9b
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:15:52 2016 -0400
lsslot: make struct options member b_flag global
Make the struct options member b_flag global and rename it to
show_cpus_and_caches to make it more descriptive of what it represents.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 1d43df2b2c8090073aaafdfdc2d43ff5f2bac1e0
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:14:54 2016 -0400
lsslot: Make the struct options member a_flag global
Make the struct options member a_flag a global variable and re-name it
to show_available_slots to make it more descriptive of what it
represents.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 67e7a1e02aa0b5223df32228311c8083e293ea8a
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:13:29 2016 -0400
lsslot: remove struct options slot_type member
With the combined options struct and global variables we can re-use the
drc_type to replace the lsslot variable slot_type.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 1de7ad4c2952392d151e02f9a67835dcc479ee7c
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:10:34 2016 -0400
drmgr: Make struct options member prrn_filename global
Make the struct options member prrn_filename global.
Signd-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 48b5de724e0baf7a74ec01cb983d2cd882510484
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:09:09 2016 -0400
drmgr: Make struct options member pci_virtio global
Make the struct options member pci_virtio a global variable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 213da0d8933835f1ec9466498d1ac800a8c83f0f
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:07:25 2016 -0400
drmgr: Make struct options member p_option global
Make the struct options member p_option global as the variable
usr_p_option.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f9986ac430113c96d0398efb44159c22410bdf5f
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 16:02:09 2016 -0400
drmgr: Move options.ctype to global usr_drc_type
Move the ctype member of struct options out to be the global usr_drc_type.
This also makes the usr_drc_type an enum drc_type.
The type change to the enum allows for checking the type directly
instead of the numerous strcmp() operations that are done.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f74a63f87acd08d9391134de50673f0cf22734a4
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:52:56 2016 -0400
drmgr: Make struct options member 'quantity' global
Move the quantity member of struct options to be the global usr_drc_count.
Signed-off-by: Nathan Fonteot <nfont@linux.vnet.ibm.com>
commit 0df871dd765933322ddbb63ff66e158ef81805dd
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:49:27 2016 -0400
drmgr: Make options struct no_ident member global
Move the no_ident member of struct options to be the global usr_prompt
variable. This change also moves the variable to a positive connotation
which makes the code slightly easier to read.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 8192b8e6a79d784038ca5fdb1fc7959149e7105b
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:45:58 2016 -0400
drmgr: Make struct options member usr_drc_index global
Move the usr_drc_index member of struct options to be global.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 669f581f4f65cb9046699ed7a375bc1693cdac92
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:42:48 2016 -0400
drmgr: Make struct options member usr_drc_name global
Move the usr_drc_name out of struct options to be global.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit d1a1ed2f4349838fa162c1ef0a6b903ed1b2b42a
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:37:55 2016 -0400
drmgr: Make struct options member timeout global
Move the timeout member of struct options out to be the global usr_timeout.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 552e42d863db093881d58038f27c5d2d72025491
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:35:41 2016 -0400
drmgr: Make struct options member no_ident global
Move the no_ident member out of struct options to become the global
usr_slot_identification. This change also gives the variable a
positive connotation instead of the current negative so we are not
checking for not no_ident, this should make the code more readable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 6b9908f6c59dc2c24bf71f89f809f11b7cdb7fd3
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:33:36 2016 -0400
drmgr: Update various uses of local 'action' variable
Update the various locations that use a local action variable and just
use the global usr_action variable directly.
Signed-off-by: Nathan Fonteot <nfont@linux.vnet.ibm.com>
commit 9606e3012efd2eb0c3c7be95ea43f66c517ef3bc
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:29:00 2016 -0400
drmgr: Make option struct member 'action' global
Move the action member out of struct options to become the global
usr_action. Also introduce the enum drmgr_action as the type for
usr_action.
This patch also introduces the file options.c which will hold the
definitions of all of the global variables common to the drmgr and
lsslot commands. This file is included in drmgr.c and lsslot.c instead
of being built directly.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f3379e4bd9525a914f3e5478858de7425689a778
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Aug 22 15:22:42 2016 -0400
drmgr: Merge drmgr and lsslot options structs
Merge the lsslot cmd_opts struct in to the drmgr options struct to make
a unified options structure for both commands.
By also moving the MAX #define to dr.h we can get rid of the lsslot.h
header.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit c61535c62111d04a886a2b4d7613b7006d5fe209
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Thu Aug 11 16:30:12 2016 -0400
lparstat: Fix bad cast from integer to float
Fix a bug where the cpu stats (%user, %sys, %wait, and %idle) do not add
up to 100%. The problem was that we were casting the cpu stats and the
total cpu time to floats from ints. For large integer values, this would
cause the floating point representation to be truncated. This solution
avoids the casts and stores the cpu stats as long longs and only casts
'total' to a long double in order to perform floating point division.
Additionally, this patch parses the proc stat values as long longs as
on systems that have been running for a long time, these values can exceed
the maximum 32 bit integer limit.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
powerpc-utils-1.3.2
=====================================================================
commit 4e5b9dacf7bbddfb58269fc50de6586a9ac6fdfd
Author: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Mon Jul 11 17:13:17 2016 -0400
lparstat: Fix computation of time used in statistics
The routine get_time computes bogus timestap values due to confusing
seconds and microseconds. This leads to incorrect return values from
elapsed_time and therefore incorrect values for the physc field.
Fixed by converting the "time" sysentry field to microseconds (and
computing it correctly), and updating the user of elapsed_time.
In addition, %entc is supposed to show the ratio of physc to the
number of entitled CPUs as *percentage*, so the ratio needs to be
multiplied by 100.
Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Signed-off-by: Michael Bringmann <mbringm@us.ibm.com>
commit a97c5664f53f9a18dd0b941a842d7884253cf8ed
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Jul 11 17:06:26 2016 -0400
drmgr: Disable use of in-kernel cpu hotplug
After submitting the patch to update drmgr to use the in-kernel hotplug
capabilities for memory and cpu, commit <bbc5fc07c54d> (drmgr: Start using
in-kernel DLPAR functionality for cpu/memory), I realized there
are still distro kernels that do not have the in-kernel cpu hotplug
capabilities. Using the latest drmgr with this update breaks cpu dlpar
because the cpu dlpar code assumes that if the dlpar sysfs file exists
then in-kernel cpu dlpar is possible. this is wrong, the sysfs dlpar file
was added with in-kernel memory hotplug, its existence can only guarantee
memory hotplug capability.
For now, disable using the in-kernel cpu capabilities by drmgr until
this can be resolved.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 2bb7599d702d4e1de1ff0f9cbe53329e59c4e120
Author: Ian Neal <ian.neal@gmail.com>
Date: Mon Jul 11 10:02:45 2016 -0400
lparstat: flush data to stdout
The stdout stream is not being flushed after being written to. This
means that it doesn't behave properly in shell pipelines as the data
isn't visible until the program exits. The fix is to simply flush
after writes so the data is immediately available to other processes
in the pipeline.
Signed-off-by: Ian Neal <ian.neal@gmail.com>
commit c3269d4e3d4882fd931d1df6aece0bec86fb6734
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Thu Jun 30 10:26:58 2016 -0400
update_flash: Fix bashism issue in opp_display_current_fw_version()
Ubuntu uses dash, not bash. We hit below warning on Ubuntu system.
root@abc:/sys/firmware/devicetree/base/ibm,opal/sensors# update_flash -d
/usr/sbin/update_flash_nv: 595: [: x43: unexpected operator
Firmware version:
....
....
== is a bashism. Replace it with =.
Fixes: 767e3dd7 (update_flash: Add support for OpenPower system)
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 386a07c4dc6c09d35116dc6064f7a83d76f4415b
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue May 24 16:32:39 2016 -0400
errinjct: Correct read_file() error checking
When reading files from syfs the file length returned from a stat()
call does not always match the actual length of the file. The read_file()
routine should be checking for an error return from the read() call
instead of checking that the amount read matches the file length returned
from a stat() call.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 42b83884bfb51c0c8b23bf2949157430f8468caa
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue May 24 16:31:37 2016 -0400
errinjct: Recognize -5 return from rtas
Update the errinjct command to recognize the rturn code of -5 from
rtas indicating that PCI error injection is not enabled.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit ab848a8d5cc4c4b9f5faef1b31be3982fb7d4bf2
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue May 24 16:30:33 2016 -0400
errinjct: Correct config_addr parsing
A recent patch (commit id: ccc9c72cec2a4) to move the errinjct function to
using a common read_file() routine did not correctly update the
get_config_addr_from_reg() function. This patch corrects this to return the
proper config address.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 9fc079cf39d999040483a00d3b41000ca3e43013
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Tue May 24 16:28:27 2016 -0400
drmgr: Workaround for concurrent PRRN collisions
Proposed workaround for issues with current PRRN event handling mechanism.
Currently, the mechanism works by kicking off a script that calls a drmgr
remove followed by a drmgr add for each effected device. With this method,
problems can occur when multiple prrn events arrive in a short time span or
when other dlpar operations are happening while the script is running. What
can happen is that these other dlpar operations can jump in inbetween when
the script calls the remove and the add and take the drmgr lock. Then when
we try to add the memory back from the script, we are unable to take the
drmgr lock and the add fails.
This patch fixes this issue by creating a new -P flag for drmgr which will
perform the necessary removes/adds from within the drmgr lock. The new
option will be invoked as follows:
drmgr -P <path to prrn log file>
On the rtas_errd side, we will begin by creating a log file for the
PRRN event which will contain a list of the type and the drc index for
each effected device. Then instead of invoking the script, we will call
the above drmgr command with the path to the prrn log file. Then, on the
drmgr side, we parse the list and perform the necessary removes/adds and
then delete the prrn log file.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
commit bbc5fc07c54dd53f4ceac3552ea12717cc86cba2
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed May 11 13:16:19 2016 -0400
drmgr: Start using in-kernel DLPAR functionality for cpu/memory
Now that the capability to do DLPAR of cpus and memory can be
done completely in the kernel, update the drmgr command to use
this functionality.
The kernel updates provided a sysfs file (/sys/kernel/dlpar)
that will allow the drmgr command invoke DLPAR of cpus and memory
by writing to this file.
There are some exisitng behaviors of drmgr on the PowerVM platforms
that require cpu and memory to be done slightly differently. For
memory drmgr only needs to report the number of LMBs that were
added or removed so drmgr can just pass all requests straight to
the kernel. This patch also makes a common routine for reporting
memory resources to ensure the format is kept constant.
For cpu DLPAR the drmgr command has to report the drc name of each
cpu that is added/removed. To do this the command uses much of the
same device tree parsing that is currently used and make a request
to the kernel to remove a specific cpu (by drc index) where a
write to the sysfs probe file was previously done.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 4dafa57ec7c1498f94b324e671625b0794b92f2f
Author: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Date: Tue Apr 19 15:01:13 2016 -0400
ppc64_cpu: display error message after set_smt_state_one failure
This avoids a silent error if threads are unable to be onlined or offlined.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
commit 96745e9e1cb560af6f900b1dac920e36db750ee5
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Tue Apr 19 14:52:35 2016 -0400
lparstat: Check return value of fopen/popen before dereferencing
Checks the return value of fopen and popen in several locations to make sure
it's not null. If we pass a null file descriptor to fgets, we will hit a
segfault.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 6855b92b3f9f3ed9c02065344cc98b965c3f03ef
Author: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Tue Apr 19 14:49:43 2016 -0400
drmgr: avoid loading rpadlpar_io/rpaphp when -v flags is used
The -v / opts->pci_virtio flag was added to provide an alternative way
to scan/remove PCI devices which doesn't rely on rpaphp. That was a
workaround for a bug induced by QEMU emulating PHBs with multiple
hotpluggable slots, which fails to register slots beyond the first due
to rpaphp no longer accounting for the possibility of there being more
than 1 slot per PHB. This leads to warnings of the form:
kernel: rpaphp: pci_hp_register failed with error -16
kernel: rpaphp: pci_hp_register failed with error -16
...
For most guest distros this has resulted in the module not being
loaded by default to avoid the errors showing up.
However, as of a9b4e4e, we now load automatically load the module as
needed, but we don't take opts->pci_virtio into account when
determining if it's needed, leading to PCI hotplug operations to
KVM guests now resulting into rpaphp being loaded and
generating the errors above when drmgr is invoked.
Fix this by avoiding modprobe of rpadlpar_io/rpaphp when
opts->pci_virtio is set.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
commit efa87d93231eb0fe4f406bf58e7d5aa783ee4f13
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Tue Apr 19 14:47:32 2016 -0400
lparstat: Correct presentation of some stats
lparstat.c: Currently there are several problems with the presentation
of statistics by lparstat's default output mode. These issues include:
* Showing negative values for certain fields e.g. %user, %sys, %wait,
%lbusy.
* Showing zero values for certain fields e.g. physc, %entc
* Identifying systems with 'Shared' or 'Dedicated' Memory Mode
* Calculating the number if logical CPUs used by a system
This patch looks to correct these issues. It also changes the widths
of the physc, %entc fields which had too little precision available
to show the value change on some systems.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
commit a27c639aca69271aabe7cac287f998b29b82f333
Author: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Tue Apr 19 14:37:36 2016 -0400
drmgr: ensure PCI cleanup is done before offlining dev
As part of 4f542616, functionality was added to support add/remove
PCI devices without relying on rpaphp hotplug module. The sysfs
write used in the remove path initiates an asynchronous removal of
PCI device from kernel PCI subsystem, and eventually from the sysfs
tree. Afterward, we set the corresponding DRC for the device to
ISOLATED state so host can complete device removal.
To avoid the situation where the asychronous removal has not yet
completed by the time drmgr sets the state to ISOLATED, and simple
sleep of 3 seconds was added. This seems to have worked out okay
for virtio devices, but in the case of other devices, like PCI
passthrough of a Mellanox CX4 virtual function, the removal can take
up to 20 seconds.
When this happens, we hit a situation where the host reclaims the
devices while the guest is still attempting to access it in it's
cleanup path, which leads to guest crashes.
Fix this by polling the PCI devices sysfs path and not completing
the removal until the sysfs path is removed as part of device cleanup.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
powerpc-utils-1.3.1
=====================================================================
commit dccad2d1dc5c84571f31af3117095bd9ec6e34c4
Author: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
Date: Fri Mar 25 07:46:56 2016 -0400
snap: PowerNV platform is not correctly checked
Recent patches to change from PowerKVM to PowerNV missed a
simple change to the /usr/sbin/snap script. This patch is to
fix that.
Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com>
commit a9b4e4ed7c6a908feb04f5b066f214ad14c76745
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Fri Mar 25 07:45:20 2016 -0400
drmgr: Load kernel modules for pci hotplug
For PHB DLPAR, slot DLPAR, and PCI hotplug operations we need to ensure
that the rpadlpar_io and rpaphp kernel modules are loaded or have been
built into the kernel. A check for this is currently done for PHB and
slot DLPAR when determining if the system is capable of these operations.
This patch moves the code to validate the presence of these modules
to be called from dr_init() for PHB/SLOT/PCI operations. In order
to do this the parsing of args has to be done prior to calling dr_init.
This should not cause an issue since we can parse args without holding
the dr_lock and any errors are written to stderr.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit c66dfa6338e6bb889f4806df1518642a800992ea
Author: John Allen <jallen@linux.vnet.ibm.com>
Date: Fri Mar 25 07:43:39 2016 -0400
lsslot: Update man page/usage statement to document required argument
Update man page and usage statement for lsslot to reflect the fact that
the -d flag requires an argument.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
commit bd7e19a9ff5aebe741b0520906660dac1ecf4a2a
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Fri Mar 25 07:27:58 2016 -0400
nvram: Correct valid partition name checking
A recent update to not allow long names had a bug in that it did
not correctly check the return value when verifying a partition name.
Fixes: b15b0a7f9ffc (nvram: don't allow long names)
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
CC: Joel Stanley <joel@jms.id.au>
commit 63a362d28253e32552ff3e1e4358bfb47d69c78b
Author: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Date: Thu Mar 17 20:01:06 2016 -0400
ofpathname: Convert OF device path to logical device path for NVMe devices
Add support to convert a Open Firmware device path to logical device path
for NVMe devices (with namespace id).
Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
commit bd0a574f70f2b2af39020440e6e3ed61ab5afe35
Author: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Date: Thu Mar 17 19:59:51 2016 -0400
ofpathanme: Convert logical device path to OF device path for NVMe devices
Add support to convert logical device path to Open firmware device path
for NVMe devices.
Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
commit e4af95a7da425d37a6762b81d1614e648129b36a
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Feb 23 14:43:35 2016 -0500
drmgr: free allocated hpdev in error path
In error paths while allocating hpdevs in get_os_hp_devices() we
can exit without free'ing an allocated hpdev. Move up the addition
of the hpdev to the hpdev_list to ensure it is free'ed if an error
occurs.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 6fcff4b41726784d9f13bdc905d7eb85f84a3248
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Feb 23 12:18:12 2016 -0500
drmgr: close opened dir
Close the directory we are traversing before returning.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit faa441c184dfa28bd5793adbd17faa7f696fc49d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Feb 23 12:17:03 2016 -0500
rtas_dbg: Do not exit on failure to read rtas token
When gathering a list of the available rtas tokens if we are not able
to determine the rtas token value for a token in the device tree we
should print an error message and continue instead of exiting.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 64dd69fdc6242ec22519f1d2a18f1328825add3e
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Feb 23 12:15:53 2016 -0500
rtas_dbg: Ensure we NULL terminate token names
The current code to look up rtas tokens writes the token name
to a static buffer size, this runs the risk of not having the
string null terminated if the string length matches the buffer
length.
Update the code to use strdup so we can ensure the strings are
null terminated. This also updates the free_rtas_tokens()
routine to free the token name.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit ccc9c72cec2a4885a219958c69c35abae6cef9c4
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Feb 23 12:14:16 2016 -0500
errinjct: Correct possible buffer overflow
In multiple places in the errinjct command we read the contents of
a file into a local buffer. This presents a possible issue if the
file we are reading ever exceeds the size of the buffer. To prevent
this issue a new read_file() routine is introduced that will
allocate a buffer large enough to hold the contents of the file and
read the file into the buffer.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit fa50467bbf0f83207055124e7bee866cbc1b612c
Merge: 39dbb91 61558c9
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 15 09:03:26 2016 -0500
Merge branch 'cyphermox-mpath' into next
commit 61558c9df4571b79c435e2d7b1157f40ae7565a3
Merge: 39dbb91 2d27304
Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Mon Feb 15 08:51:37 2016 -0500
ofpathanme: map mpath* devices to the appropriate dm-* generic dm device
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.co
commit 39dbb91904e0b94aa5a665d5f84dec736fdbbb07
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 1 11:59:27 2016 -0500
errinjct: Close file descriptors
Properly handle file descriptors opened by ensuring
they are closed prior to returning. Reported as a
leaked resource by Coverity scans.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 07c190715a730dc98823691f18aa3b262a2bf432
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 1 11:57:49 2016 -0500
errinjct: Null terminate buffer from read()
Null terminate buffers filled when calling read(). Issue uncovered
with Coverity Scans.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 3153111b0ab6e6ae2b83c448443a3b6e3e8fe6e5
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 1 11:56:02 2016 -0500
activate_firmware: Remove use of strcat
Resolve uninitialized scalar variable reported by Coverity scan.
The 'msg' buffer was being used uninitialized in calls to strcat,
this patch removes the use of the local 'msg' variable and puts
the message string directly in the warnx() call.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit f3f25d4aee3f12f0dfc6611aaab6f0819d58fe33
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 1 11:53:13 2016 -0500
ppc64_cpu: free core_state on error
Make sure we free the allocated 'core_state', issue found with Coverity.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit e6f476d32c33f5b8e364f930c467785495eeb0ce
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Feb 1 11:51:55 2016 -0500
lsslot: free lmb_list on error
Free the lmb resources allocated by lsslot, Issue discovered with
Coverity scan.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 2d27304b9e8f69619927cd2f55fb1c11c3dc5f09
Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Tue Jan 12 16:46:12 2016 -0500
ofpathname: map mpath* devices to the appropriate dm-* generic dm device.
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
powerpc-utils-1.3.0
=====================================================================
commit ad4cf85f4bc80f6f5cbf4ce0b71eada696848081
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Thu Jan 7 15:17:41 2016 -0500
Move the powerpc-utils package from the IBM license to the GNU GPL license.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f037afe3bcece02ca3a3b1711a57c66db088cfa1
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 1 16:36:11 2015 -0500
drmgr: Correct checking for display adapters when adding PHB
A previous commit (c2091227) added formalization for checking for display
adapters. Unfortunately the update tries to verify if there is a display
adapter for a NULL phb pointer when trying to add a PHB resulting in a
segfault on phb add requests.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 85a5037cb01c1aaa5ad3dbd91f74dbcdd823dbb1
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 1 16:35:04 2015 -0500
drmgr: Remove extraneous debug output
Remove extra debug statements for allocating and free'ing drc information.
These were mistakenly left in during debug of a previous patch.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 33aa48a0c4ebc4e660080514939232ad2912cb6d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue Dec 1 16:33:45 2015 -0500
drmgr: Fix node add buffer overflow
When adding a node to the device tree, the drmgr command writes a terminatin
null in the first character past the end of the allocated buffer. This
results in a SIGABRT being generated by libc when the buffer is free'ed.
The fix is to move the writing of the space between properties to the
beginning of the loop instead of at the end of the loop.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 55544a975f87e9d76366e6fefcf571ae01f3e7eb
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 23 21:10:27 2015 -0500
drmgr: Remove extraneous "d" in buffer
Remove an erroneous character left in a print statement used
to update the drconf property.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f4006893d84c85bbf5b86919c28ba56047001204
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 23 21:09:47 2015 -0500
drmgr: Correct return code from set_mem_scn_state()
The set_mem_scn_state() routine incorrectly returns the number of chars
written in the case of success instead of returning 0. This results in the
caller assuming a failure occurred when setting the memroy section state
and fails the memory online/offline operation.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 4f515ea179cb36f26adb53c93b79f834e32c2abe
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 23 21:08:54 2015 -0500
drmgr: Correct LMB counting when discovering LMBs
Recent updates to how drmgr counted the number of LMBs found did
not save the count value correctly and in the case of LMBs found
in the ibm,dynamic-reconfiguration-memory property only counted
LMBs that were present. This caused havoc when trying to shuffle
the LMBs.
Save the LMB count in the lmb_list_head struct so we have it across
function calls. Also update the shuffle_lmbs to just take a pointer to
the lmb_list_head and make changes locally in the routine.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 9a1957588b040db0dddfa284dbb96a817e699792
Author: Cédric Le Goater <clg@fr.ibm.com>
Date: Mon Nov 23 21:07:17 2015 -0500
update_flash_nv: improve check_ipmitool
This patch adds a quick test in check_ipmitool to make sure the
BMC is alive
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
commit 4e4e5f9f8d16a2ad196d1fd5388de23aa2e1fdbc
Author: Cédric Le Goater <clg@fr.ibm.com>
Date: Mon Nov 23 21:06:52 2015 -0500
update_flash_nv: fix firmware update sequence for powernv
This patch modifies the way the firmware update is performed from
the host. It adds a cold reset of the BMC before and after the
update.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
commit 1f25105c1c7f1384be4aef03f2aa6d5bd065eb11
Author: Cédric Le Goater <clg@fr.ibm.com>
Date: Mon Nov 23 21:06:22 2015 -0500
update_flash_nv: force the use of the ipmitool usb backend
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
commit b0e5ba4f55dcf1a5d013eddbb95b660c65504b3c
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Mon Nov 23 21:04:45 2015 -0500
ppc64_cpu: output to user if the requested number of cores are not brought o
Now that we check the return code from set_one_core, we should ensure
that the requested number of cores in --cores-on is achieved, or return
-1 intead. Also add a slightly verbose message in that case.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 1a1bb7167a3946712a5b59b5566bac6ced46cdc9
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Mon Nov 23 21:03:37 2015 -0500
ppc64_cpu: use rc instead of boolean flag
We can overload the rc variable, reducing the number of local variables
in do_online_cores.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 37eeba5583d48558f2ca1de6096df83494005e6f
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Mon Nov 23 21:00:14 2015 -0500
ppc64_cpu: check return code from set_one_core
In both --cores-on and --online-cores, the return code from the helper
function set_one_core is not checked. This can lead to ppc64_cpu
returning 0 even though the command technically failed to do what was
requested. After this patch, --cores-on still doesn't return a proper
error code (fixing in a follow-on).
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 9711ee00b604a39d47dfced7f0c49cf40600131f
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Tue Nov 17 16:24:37 2015 -0500
ppc64_cpu: add --{on,off}line-cores to {on,off}line specific cores
We currently have support for a mechanism to ensure an exact number of
cores (or all cores after a recent patch submission) are online.
However, there is no control over which cores are selected. Add two new
options to ppc64_cpu, --online-cores and --offline-cores to support
specifying which cores to bring online or offline, respectively. Both
options take either no parameters, in which case they output a
comma-separated list of cores that are online/offline, or a
comma-separated list of cores, in which case the command sets those
cores' states to online/offline.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 2239dd005e00d63c6e68fe962928b5f0b08ef6cb
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Tue Nov 17 09:33:55 2015 -0500
ppc64_cpu: rename do_cores_online to do_cores_on
This matches the other function names more closely.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit bb8472f0658565e5188150a141fa8856b55000ca
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Tue Nov 17 09:31:57 2015 -0500
ppc64_cpu: add all parameter to --cores-on to online all cores
Rather than finding out how many cores are in a system, and then passing
that value to --cores-on, it can be handy to have a shortcut to just
online all cores.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 17cd4bbf7c20d8096523c765c1157e4a58d31363
Author: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Date: Tue Nov 17 09:29:06 2015 -0500
ppc64_cpu: handle errors from strtol in --cores-on parsing
Currently, on a 24-core system, passing certain values to `ppc64_cpu
--cores-on` leads to some surprising results:
ppc64_cpu --cores-on=all
ppc64_cpu --cores-on=adfd
offlines all but one core
This is because we are not using the endptr parameter of strtol to
determine if any of the string is consumed (and if none of the string is
consumed, strtol still returns a valid long value, namely 0).
ppc64_cpu --cores-on=12df
onlines 12 cores
This is because we are not using the endptr parameter to strtol to
determine if the entire string is consumed (checking for trailing
characters).
Add both these checks.
After this patch:
ppc64_cpu --cores-on=all
Invalid number of cores to online: all
ppc64_cpu --cores-on=adfd
Invalid number of cores to online: adfd
ppc64_cpu --cores-on=12fd
Invalid number of cores to online: 12fd
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
commit 475919d4294819e5f890f000ccadf5b13280a0a9
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:50:11 2015 -0500
powerpc-utils.spec: Fix typo in spec-file
In line:
%{__rm} -rf $RPM_BULD_ROOT
The directory should be RPM_BUILD_ROOT not RPM_BULD_ROOT
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit b1d909378cf8a9502c7207f4f51a2cf3931d5263
Author: Michael Bringmann <mwb@linux.vnet.ibm.com>
Date: Mon Nov 16 16:48:30 2015 -0500
errinjct/rtas_debug: Update RPM packaging specs
This patch updates the powerpc-utils.spec.in file to install the binaries
associated with errinjct and rtas_dbg.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
commit 03704771a36c025eb8636a90f67eaa77acd5880d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 16 16:40:47 2015 -0500
lsslot/drmgr: Performance enhancement for parsing LMBs
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 268116acde0d5f98efa150044b68d977d578ccb4
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Mon Nov 16 16:39:15 2015 -0500
errinjct: Add format specificer
We hit below build warning with "-Werror=format-security" compilation option
CC src/errinjct/icache.o
src/errinjct/errinjct.c: In function 'perr':
src/errinjct/errinjct.c:240:18: error: format not a string literal and no f
fprintf(stderr, buf);
^
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit c2091227bdf40192a37456445a6dedf3f3da8cda
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 16 16:27:08 2015 -0500
drmgr: Do not allow DLPAR of display adapters
The DLPAR of display adapters has never been supported but that support
has not ever been enforced in drmgr. Recent tests show that trying to DLPAR
remove a display adapter causes the drmngr command to appear hung as it
waits for display adapters to power down.
Add the ability to check for a drc-type of 'display' when trying to add
or remove a pci or slot, and verify that none of the children under a
PHB are display adapters when trying to add or remove a PHB.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit aef0c5daa20f38b66e5fa0255ecf5a53ba202138
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon Nov 16 16:26:01 2015 -0500
drmgr: Move check for non-hotplug children to common routine
In more than one place we check to see if a PHB has any children that
are not hotplug capable. Move this code to common routine.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 2d8ad5ef33948f07e3022c601ee99cd8efc85a76
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:22:19 2015 -0500
activate_firmware: Have man page reflect the changes made in this branch
-Edited description
-added Option section
-Added 2 new return codes 7 and 8
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit 11041ab9e8f0e75b58d2c1a593c9c410d7a82f00
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:21:02 2015 -0500
activate_fw: Return code 8, to report a parameter error when activating firm
This is a new return code mapped from rtas return code -3 which is returned
case of parameter error, when the utility is used without options.
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit d1217de2906f22dbeed54f52c683f28ffcfe90c9
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:19:56 2015 -0500
activate_fw: get update access key expiry date, set update access key
This patch provides two feature extensions:
1. activate_firmware -e
(with only -e, fetches the update access key expiry date)
2. activate_firmware -e /path/to/keyfile
(with an argument to -e applies the provided update access key-file to
extend the update access key expiry date)
These are required to provide an interface to check validity of and
update the Update Access Key. ESA will be one of the users of this tool.
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit 097c16987a65aceb0be6d66befaa0104b518abbd
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:18:09 2015 -0500
activate_fw.c: Make use of errx() to print error messages to stderr and exit
This is a more compact way to do it compared to using fprintf and explicitly
exiting in main()
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit c2dc2191bb5963b09e781b78cbf2a152520c8e87
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:17:21 2015 -0500
activate_fw.c: Factor out activate_firmware() from main()
This is done to reserve main solely for option processing and to
abstract out rtas calling function.
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit 72bc893a5f4b59d0e7742726e85f3cffab65ebd3
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 16:14:46 2015 -0500
activate_fw: fix typo
The default case in error handler should return code 6, not 4.
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit 782445384c165ea28f00c9cb233e41bdeef7a962
Author: Chandni Verma <chandni@linux.vnet.ibm.com>
Date: Mon Nov 16 15:53:42 2015 -0500
activate_fw: Coding style fixes
This patch fixes trailing white spaces and indentation issues
and in general makes to code confirm to linux's checkpatch.pl
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
commit ad93027170afe3b7bc760fed0ab3e078390ba088
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:58:44 2015 -0400
serv_config: Compile warning cleanups
Correct several compile warnings.
Remove unchecked return code from execv().
Remove unused variables.
Correct de-reference of type punned pointers.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 8ad7081b5f1d98593c8192d4d46c10050e5b8d88
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:57:34 2015 -0400
rtas_ibm_get_vpd: Compile warning cleanups
Clean up compile warning by removing the unused lflag variable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 28aeacd59e0e35753bae243cf63150f6ecc2a10b
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:56:32 2015 -0400
rtas_dbg: Compile warning cleanups
Correct compile errors to check the return value from a fread() call and
add an appropriate error message, and ensuring we do not use an
uninitialized 'rc' variable.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit dfab2e6f11a11e25da342b703bd054aaf906d818
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:55:33 2015 -0400
ppc64_cpu: Compile warning cleanups
Correct compile warning for dereference of type punned pointer.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 92fd02382fbec464562e2a84841391f09cf1e2ea
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:54:34 2015 -0400
nvram: Compile warning cleanups
Correct compile warning by removing the unused variable memctrl_data.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit f069a159755b70bf4596b2bcce5b3fb4f8c3831f
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:53:35 2015 -0400
lparstat: Compile warning cleanups
Clean up compile warnings by adding checks for the return codes from
fgets() calls and adding appropriate error messages.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 2cc2e6590a43a367ee6ca6474bc98cc0a7245caf
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:51:59 2015 -0400
drmgr: Compile warning cleanups
Fix multiple warnings generated when compiling drmgr code. These include
not checking return codes of fread() and write() calls where a check is
added and appropriate error messages.
Updating print formats to use the appropriate type of value being printed.
Correcting the use of rc values to ensure the rc variable is set.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 0e8d1534f5bf57798b74584b6f2b42bad57ddf89
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:49:57 2015 -0400
drmgr: Validate the status of a CPU before adding or removing it
When asked to perform a CPU DLPAR operation we should verify the current
status of the CPU before performing the operation. Failure to verify the
status has caused the kernel to oops in cases where we try to add a CPU
that is already owned, namely in a kvm guest the following is seen.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit dabc0264a9f3b64226da63421378ed02f2f1b201
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:48:25 2015 -0400
drmgr: Add missing free's of allocated memory
Using valgrind to do analysis of the memory usage of the drmgr command
revealed multiple instances of memory not being free'ed. Correct this
by adding appropriate calls to free commands.
Note that the analysis done, and this patch, does not cover all of the code
paths in drmgr. There may be additional patches as testing continues.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit d5a1c1bfae839e159ba049736a9719835e2a42e6
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:45:26 2015 -0400
drmgr: Add EXTRA_DEBUG output level
Introduce a new internal developer debug output level. In some cases the
drmgr command dumps all the information about slots/adapters it gathers
from the device tree, this is really meant for internal debugging purposes.
Additionally, one large systems this information can easily overwhelm
the output seen from drmgr.
This patches introduces a debug level for the say() command, EXTRA_DEBUG.
Developers can get this output by using the option '-d 5'. Several
instances of debug output are also updated to use this new option.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit a7ebbd4bbc61cd0c7d6c3c3eea9f7ea9724558d9
Author: Nathan Fontenot <nfont@linux.vnet.ibnm.com>
Date: Tue Oct 27 16:43:25 2015 -0400
drmgr: free slot nodes before adding slots
When handling a request for slot dlpar add the device tree is parsed twice,
once prior to the add and again after adding the slot. On systems with a
large number of slot devices, 200+, we are seeing that the drmgr command
segfaults when trying to parse the device tree the second time.
To avoid crashing here we need to free the parsed information from the
device tree prior to adding the new slot. While this isn't really a true
root cause fix it does alloow drmgr to run without segfaulting.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
commit 767e3dd780f1a18b2c832b5d8db82a5aac9a9818
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Fri Oct 16 10:01:50 2015 -0400
update_flash: Add support for OpenPower system
On OpenPower system we use IPMI interface to pass image to service processor
(BMC) and it will take care of updating FW.
This patch adds wrapper around ipmitool so that we can use update_flash
command to update FW.
Validation:
BMC take care of validating image. We just pass the image to BMC.
Commit/Reject operation:
Like FSP system, BMC has two sides. Golden and boot side. Golden side
is permanent and is never updated in the field. So commit/reject
operations are not allowed on BMC based system.
FW update:
OpenPower system has two components (BMC FW and host FW). We send all
the component to BMC in one command. BMC will take care of updating
all the components.
Note that we are not using "force" option. So BMC will skip the component
which are not changed.
FW version display:
We display host FW version using ipmitool fru command. like below:
Product Name : OpenPOWER Firmware
Product Version : IBM-firestone-ibm-OP8_PFD_v1.6_0.29
Product Extra : hostboot-6847d73-b8d7c0a
Product Extra : occ-0726e69
Product Extra : skiboot-5.1.3-6221bd2
Product Extra : hostboot-binaries-43d5a59
Product Extra : firestone-xml-db1a93e-4ae8032
Product Extra : capp-ucode-105cb8f
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
commit 1422abed03f78866339a7b29e3eba4b2d29cb468
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Fri Oct 16 10:01:04 2015 -0400
update_flash_nv: Add platform check
Presently we assume this script is running on FSP based PowerNV platform.
Lets add platform check to validate platform before running. That way
adding new platform support (like OpenPower) becomes easy.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
commit b7d4678e0963ff4956d02188fae33cb8d5a7fe11
Author: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Fri Oct 16 10:00:28 2015 -0400
update_flash_nv: Rename function name to reflect platform
Presently update_flash_nv supports code update on FSP based PowerNV
(Non-Virtualized) platform. We want to support code update on OpenPower
(BMC based) platform. Code update procedure on OpenPower system is
different than FSP based machine. Hence rename FSP specific function
in this script as fsp_*.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
commit a3e1c3eddb6e3486ae48dfd23f0c95c4b714322d
Author: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri Oct 16 09:59:06 2015 -0400
snap: Warn users about deprecated support for SLES 12 onwards
This patch introduce deprecated warning on SLES 12 onwards
to use supportconfig. supportconfig captures all the information
collected by snap, so it safe to deprecate snap.
It also rearranges check for distribution (RHEL/SLES/Ubuntu) into
common function check_distro_support().
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com>
|