[DNM] litep2p: Investigate 10% perf of notifications

.github/workflows/benchmarks-networking.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -28,7 +31,6 @@ jobs:
         features:
           [
             { bench: "notifications_protocol" },
-            { bench: "request_response_protocol" },
           ]
     steps:
       - name: Checkout
@@ -37,75 +39,4 @@ jobs:
       - name: Run Benchmarks
         id: run-benchmarks
         run: |
-          mkdir -p ./charts
-          forklift cargo bench -p sc-network --bench ${{ matrix.features.bench }} -- --output-format bencher | grep "^test" | tee ./charts/${{ matrix.features.bench }}.txt || echo "Benchmarks failed"
-          ls -lsa ./charts
-
-      - name: Upload artifacts
-        uses: actions/[email protected]
-        with:
-          name: ${{ matrix.features.bench }}-${{ github.sha }}
-          path: ./charts
-
-  publish-benchmarks:
-    timeout-minutes: 60
-    needs: [build]
-    if: github.ref == 'refs/heads/master'
-    environment: subsystem-benchmarks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: gh-pages
-          fetch-depth: 0
-
-      - run: git checkout master --
-
-      - name: Download artifacts
-        uses: actions/[email protected]
-        with:
-          name: notifications_protocol-${{ github.sha }}
-          path: ./charts
-
-      - name: Download artifacts
-        uses: actions/[email protected]
-        with:
-          name: request_response_protocol-${{ github.sha }}
-          path: ./charts
-
-      - name: Setup git
-        run: |
-          # Fixes "detected dubious ownership" error in the ci
-          git config --global --add safe.directory '*'
-          ls -lsR ./charts
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.POLKADOTSDK_GHPAGES_APP_ID }}
-          private-key: ${{ secrets.POLKADOTSDK_GHPAGES_APP_KEY }}
-
-      - name: Generate ${{ env.BENCH }}
-        env:
-          BENCH: notifications_protocol
-        uses: benchmark-action/github-action-benchmark@v1
-        with:
-          tool: "cargo"
-          name: ${{ env.BENCH }}
-          output-file-path: ./charts/${{ env.BENCH }}.txt
-          benchmark-data-dir-path: ./bench/${{ env.BENCH }}
-          github-token: ${{ steps.app-token.outputs.token }}
-          auto-push: true
-
-      - name: Generate ${{ env.BENCH }}
-        env:
-          BENCH: request_response_protocol
-        uses: benchmark-action/github-action-benchmark@v1
-        with:
-          tool: "cargo"
-          name: ${{ env.BENCH }}
-          output-file-path: ./charts/${{ env.BENCH }}.txt
-          benchmark-data-dir-path: ./bench/${{ env.BENCH }}
-          github-token: ${{ steps.app-token.outputs.token }}
-          auto-push: true
+          forklift cargo bench -p sc-network --bench ${{ matrix.features.bench }} -- --output-format bencher

Cargo.toml

@@ -851,7 +851,7 @@ linked-hash-map = { version = "0.5.4" }
 linked_hash_set = { version = "0.1.4" }
 linregress = { version = "0.5.1" }
 lite-json = { version = "0.2.0", default-features = false }
-litep2p = { version = "0.9.0", features = ["websocket"] }
+litep2p = { git = "https://github.com/paritytech/litep2p.git", branch = "lexnv/update-upstream-yamux", features = ["websocket"] }
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }

substrate/client/network/benches/notifications_protocol.rs

@@ -36,7 +36,7 @@ use std::{sync::Arc, time::Duration};
 use substrate_test_runtime_client::runtime;
 use tokio::{sync::Mutex, task::JoinHandle};
 
-const NUMBER_OF_NOTIFICATIONS: usize = 100;
+const NUMBER_OF_NOTIFICATIONS: usize = 1000;
 const PAYLOAD: &[(u32, &'static str)] = &[
 	// (Exponent of size, label)
 	(6, "64B"),

substrate/client/network/src/litep2p/mod.rs

@@ -39,7 +39,6 @@ use crate::{
 		},
 	},
 	peer_store::PeerStoreProvider,
-	protocol,
 	service::{
 		metrics::{register_without_sources, MetricSources, Metrics, NotificationMetrics},
 		out_events,
@@ -274,56 +273,7 @@ impl Litep2pNetworkBackend {
 		};
 		let config_builder = ConfigBuilder::new();
 
-		// The yamux buffer size limit is configured to be equal to the maximum frame size
-		// of all protocols. 10 bytes are added to each limit for the length prefix that
-		// is not included in the upper layer protocols limit but is still present in the
-		// yamux buffer. These 10 bytes correspond to the maximum size required to encode
-		// a variable-length-encoding 64bits number. In other words, we make the
-		// assumption that no notification larger than 2^64 will ever be sent.
-		let yamux_maximum_buffer_size = {
-			let requests_max = config
-				.request_response_protocols
-				.iter()
-				.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::MAX));
-			let responses_max = config
-				.request_response_protocols
-				.iter()
-				.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX));
-			let notifs_max = config
-				.notification_protocols
-				.iter()
-				.map(|cfg| usize::try_from(cfg.max_notification_size()).unwrap_or(usize::MAX));
-
-			// A "default" max is added to cover all the other protocols: ping, identify,
-			// kademlia, block announces, and transactions.
-			let default_max = cmp::max(
-				1024 * 1024,
-				usize::try_from(protocol::BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE)
-					.unwrap_or(usize::MAX),
-			);
-
-			iter::once(default_max)
-				.chain(requests_max)
-				.chain(responses_max)
-				.chain(notifs_max)
-				.max()
-				.expect("iterator known to always yield at least one element; qed")
-				.saturating_add(10)
-		};
-
-		let yamux_config = {
-			let mut yamux_config = litep2p::yamux::Config::default();
-			// Enable proper flow-control: window updates are only sent when
-			// buffered data has been consumed.
-			yamux_config.set_window_update_mode(litep2p::yamux::WindowUpdateMode::OnRead);
-			yamux_config.set_max_buffer_size(yamux_maximum_buffer_size);
-
-			if let Some(yamux_window_size) = config.network_config.yamux_window_size {
-				yamux_config.set_receive_window(yamux_window_size);
-			}
-
-			yamux_config
-		};
+		let yamux_config = litep2p::yamux::Config::default();
 
 		let (tcp, websocket): (Vec<Option<_>>, Vec<Option<_>>) = config
 			.network_config

substrate/client/network/src/protocol.rs

@@ -22,7 +22,6 @@ use crate::{
 	protocol_controller::{self, SetId},
 	service::{metrics::NotificationMetrics, traits::Direction},
 	types::ProtocolName,
-	MAX_RESPONSE_SIZE,
 };
 
 use codec::Encode;
@@ -56,10 +55,6 @@ pub mod message;
 // Log target for this file.
 const LOG_TARGET: &str = "sub-libp2p";
 
-/// Maximum size used for notifications in the block announce and transaction protocols.
-// Must be equal to `max(MAX_BLOCK_ANNOUNCE_SIZE, MAX_TRANSACTIONS_SIZE)`.
-pub(crate) const BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE: u64 = MAX_RESPONSE_SIZE;
-
 /// Identifier of the peerset for the block announces protocol.
 const HARDCODED_PEERSETS_SYNC: SetId = SetId::from(0);