Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libos] Merge Config Files #1274

Merged
merged 2 commits into from
May 21, 2024
Merged

[libos] Merge Config Files #1274

merged 2 commits into from
May 21, 2024

Conversation

iyzhang
Copy link
Contributor

@iyzhang iyzhang commented May 13, 2024

This PR closes #1265 and reworks our config to take all settings from the config file with the option to override simple config values from environment variables.

The config file should be

demikernel:
  local_ipv4_addr: 10.9.1.12
  local_link_addr: "00:22:48:7bf6:c5"
raw_socket:
  interface_name: "eth1"
dpdk:
  eal_init: ["-c", "0xff", "-n", "4", "-a", "00:02.0","--proc-type=auto", "--vdev=net_vdev_netvsc0,iface=eth1"]
tcp_socket_options:
  keepalive:
    enabled: false
    time_millis: 0
    interval: 0
  linger:
    enabled: true
    time_seconds: 0
  nodelay: true
inetstack_config:
  mtu: 1500
  mss: 1500
  enable_jumbo_frames: false
  udp_checksum_offload: false
  tcp_checksum_offload: false

@iyzhang iyzhang requested review from anandbonde and ppenna May 13, 2024 23:13
@iyzhang iyzhang self-assigned this May 13, 2024
@ppenna ppenna changed the title [libos] Enhancement: Merge config files [libos] Merge Config Files May 14, 2024
new_config.yaml~ Outdated Show resolved Hide resolved
@ppenna ppenna added the enhancement Enhancement Request on an Existing Feature label May 15, 2024
@ppenna ppenna self-requested a review May 15, 2024 15:49
Copy link
Contributor

@ppenna ppenna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⁠There is still some work left:

@ppenna ppenna self-requested a review May 15, 2024 17:34
Copy link

Processing commits from 7f8103a to e35d60b (in the last 15 days)

Performance for Push() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catpowder
0 4236 3dee402 5697.58
1 4238 540c178 5258.1
2 4241 fc96ac0 5206.82
3 4244 b7ee223 5125.77
4 4247 dca2919 7239.47
5 4254 c25fdd5 6025.63
6 4258 0fcdcdc 5994.38
7 4265 e3f3442 5924.24
8 4267 4b1ed79 5436.41
9 4270 ffaf885 5102.93
10 4272 c420595 6149.59
11 4274 71a0b41 5897.01
12 4278 9eb25d9 6345.05
13 4280 efbd0ae 6154.76
14 4285 a15818c 6078.23

Performance for Pop() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catpowder
0 4236 3dee402 476.449
1 4238 540c178 440.223
2 4241 fc96ac0 433.896
3 4244 b7ee223 460.887
4 4247 dca2919 570.242
5 4254 c25fdd5 502.417
6 4258 0fcdcdc 441.102
7 4265 e3f3442 437.991
8 4267 4b1ed79 437.951
9 4270 ffaf885 437.099
10 4272 c420595 435.595
11 4274 71a0b41 426.753
12 4278 9eb25d9 424.626
13 4280 efbd0ae 433.992
14 4285 a15818c 436.228

Performance for Push() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catpowder
0 4236 3dee402 6178.99
1 4238 540c178 5592.41
2 4241 fc96ac0 5860.03
3 4244 b7ee223 6849.73
4 4247 dca2919 6351.2
5 4254 c25fdd5 6326.4
6 4258 0fcdcdc 6345.47
7 4265 e3f3442 6373.19
8 4267 4b1ed79 5891.16
9 4270 ffaf885 5649.32
10 4272 c420595 6361.22
11 4274 71a0b41 6295.41
12 4278 9eb25d9 5845.39
13 4280 efbd0ae 6308.07
14 4285 a15818c 10279.9

Performance for Pop() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catpowder
0 4236 3dee402 433.43
1 4238 540c178 422.624
2 4241 fc96ac0 418.76
3 4244 b7ee223 573.35
4 4247 dca2919 435.835
5 4254 c25fdd5 438.997
6 4258 0fcdcdc 430.333
7 4265 e3f3442 451.595
8 4267 4b1ed79 430.163
9 4270 ffaf885 426.183
10 4272 c420595 456.317
11 4274 71a0b41 449.419
12 4278 9eb25d9 496.755
13 4280 efbd0ae 448.408
14 4285 a15818c 720.37

Copy link

Processing commits from 7f8103a to e35d60b (in the last 15 days)

Performance for Push() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catnap
0 4236 3dee402 442.857
1 4238 540c178 529.396
2 4241 fc96ac0 480.166
3 4244 b7ee223 507.442
4 4247 dca2919 489.056
5 4254 c25fdd5 476.425
6 4258 0fcdcdc 485.282
7 4265 e3f3442 450.464
8 4267 4b1ed79 516.944
9 4270 ffaf885 440.494
10 4272 c420595 447.518
11 4274 71a0b41 517.249
12 4278 9eb25d9 597.617
13 4280 efbd0ae 457.1
14 4285 a15818c 529.453

Performance for Pop() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catnap
0 4236 3dee402 409.513
1 4238 540c178 823.94
2 4241 fc96ac0 392.997
3 4244 b7ee223 404.813
4 4247 dca2919 362.229
5 4254 c25fdd5 449.675
6 4258 0fcdcdc 423.344
7 4265 e3f3442 372.509
8 4267 4b1ed79 414.03
9 4270 ffaf885 388.025
10 4272 c420595 365.31
11 4274 71a0b41 571.701
12 4278 9eb25d9 663.304
13 4280 efbd0ae 405.122
14 4285 a15818c 456.064

Performance for Push() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catnap
0 4236 3dee402 497.652
1 4238 540c178 472.631
2 4241 fc96ac0 498.244
3 4244 b7ee223 490.868
4 4247 dca2919 470.253
5 4254 c25fdd5 445.935
6 4258 0fcdcdc 477.221
7 4265 e3f3442 479.605
8 4267 4b1ed79 502.064
9 4270 ffaf885 476.914
10 4272 c420595 490.128
11 4274 71a0b41 464.041
12 4278 9eb25d9 468.682
13 4280 efbd0ae 477.776
14 4285 a15818c 500.384

Performance for Pop() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catnap
0 4236 3dee402 442.926
1 4238 540c178 384.613
2 4241 fc96ac0 397.613
3 4244 b7ee223 375.974
4 4247 dca2919 385.9
5 4254 c25fdd5 366.234
6 4258 0fcdcdc 379.738
7 4265 e3f3442 379.214
8 4267 4b1ed79 391.97
9 4270 ffaf885 373.839
10 4272 c420595 373.293
11 4274 71a0b41 387.314
12 4278 9eb25d9 380.885
13 4280 efbd0ae 424.6
14 4285 a15818c 433.062

Copy link

Processing commits from 7f8103a to e35d60b (in the last 15 days)

Performance for Push() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catnip
0 4236 3dee402 3389.54
1 4238 540c178 2034.87
2 4241 fc96ac0 1902.97
3 4244 b7ee223 2101.48
4 4247 dca2919 2106.76
5 4254 c25fdd5 2003.26
6 4258 0fcdcdc 1952.29
7 4265 e3f3442 1931.03
8 4267 4b1ed79 1949.47
9 4270 ffaf885 1894.84
10 4272 c420595 2012.8
11 4274 71a0b41 2082.83
12 4278 9eb25d9 2077.19
13 4280 efbd0ae 2054.8
14 4285 a15818c 1901.17
15 4287 e35d60b 1820.5

Performance for Pop() in tcp-ping-pong-server

Diff since root commit.

Diff Commit Catnip
0 4236 3dee402 937.122
1 4238 540c178 407.989
2 4241 fc96ac0 415.521
3 4244 b7ee223 394.332
4 4247 dca2919 407.457
5 4254 c25fdd5 426.626
6 4258 0fcdcdc 407.535
7 4265 e3f3442 396.753
8 4267 4b1ed79 395.685
9 4270 ffaf885 407.071
10 4272 c420595 415.161
11 4274 71a0b41 423.526
12 4278 9eb25d9 424.266
13 4280 efbd0ae 425.102
14 4285 a15818c 425.922
15 4287 e35d60b 398.068

Performance for Push() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catnip
0 4236 3dee402 2195.04
1 4238 540c178 1735.34
2 4241 fc96ac0 1696.62
3 4244 b7ee223 1758.94
4 4247 dca2919 1795.06
5 4254 c25fdd5 1729.9
6 4258 0fcdcdc 1714.5
7 4265 e3f3442 1788.16
8 4267 4b1ed79 1763.86
9 4270 ffaf885 1730.35
10 4272 c420595 1757.84
11 4274 71a0b41 1741.38
12 4278 9eb25d9 1803.05
13 4280 efbd0ae 1766.08
14 4285 a15818c 1741.16
15 4287 e35d60b 1688.58

Performance for Pop() in tcp-ping-pong-client

Diff since root commit.

Diff Commit Catnip
0 4236 3dee402 469.367
1 4238 540c178 386.665
2 4241 fc96ac0 387.502
3 4244 b7ee223 389.141
4 4247 dca2919 382.631
5 4254 c25fdd5 391.914
6 4258 0fcdcdc 390.17
7 4265 e3f3442 389.619
8 4267 4b1ed79 398.75
9 4270 ffaf885 395.653
10 4272 c420595 413.736
11 4274 71a0b41 416.024
12 4278 9eb25d9 406.369
13 4280 efbd0ae 416.656
14 4285 a15818c 400.591
15 4287 e35d60b 387.706

@ppenna ppenna merged commit 8447e59 into dev May 21, 2024
17 checks passed
@ppenna ppenna deleted the enhancement-tcp-defaults branch May 21, 2024 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement Request on an Existing Feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[config] Catnap section of the config.yaml file should be changed to TCP socket defaults
2 participants