From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 279EC266B6B for ; Tue, 20 May 2025 16:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747757965; cv=none; b=LzxC4PhEIgSBYQoLbIHyMHJCu4Mtt8JDeLm4szPYdIFhTfYHCK7YYqN9PmzLszleyJaQXu92drIm/Em73jwChFeN85N+HYSEbz9pZBcnYuaqHZhFuZG/FEbEPWVviEoPo9XY46hxX5itYwf0N0qTDW8gho/7cTUVX4QvVwwbVXs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747757965; c=relaxed/simple; bh=drm+3T6vMFwHwT+I4LyqUan18l3+iBxMG/6JK4cUud0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMkqDPx8XhC2FX0XEUw+EnDeo6nMBY6x9ltXLpoktBqU9SWZyALwfURZMRIygQGcnicgVJAIfZJZyz0B5ZR4g9YX6kgAWoqEmJoNuOpiVlcqCmh/RMq7pOqZJbsLZr6HARajuduKdCF3JKFAy6RIXw9BRX+FRKtQkZjzLj0GdI0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BQWMt3IX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BQWMt3IX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A7AAC4CEEB; Tue, 20 May 2025 16:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747757964; bh=drm+3T6vMFwHwT+I4LyqUan18l3+iBxMG/6JK4cUud0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQWMt3IXbR5i8D4cJE0DPdiWopfxWi+5JosMGWplNfWutym/Zi3J8arDF7y9ihVhN 5WypG+AeMv1VzEUmE79ukSGDP9NpcGXsg+US/kveAzG6A8AYqSUeguKMESkpBmBsd9 jo84tP1VeClT+X8nznJDr9RxeXNBVa9vLJNyTuohKJGbS7L2Iwh/5B66/xLC4EIZ5B /in0Bf/BgDwEsLReWloYCVNyiXQIsTjYC8kXbBkT38y5yGSflm0fLUcrLG9WbbLpn/ 9G3IL4S6Z/IuHw3DZI46wRA/S80dcwUQqqq0O/ZLgEga48mrPhdbQ8w7kSfn5QPou3 cACNO9bhl5DLQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, donald.hunter@gmail.com, jacob.e.keller@intel.com, sdf@fomichev.me, jstancek@redhat.com, kory.maincent@bootlin.com, Jakub Kicinski Subject: [PATCH net-next v2 02/12] netlink: specs: tc: remove duplicate nests Date: Tue, 20 May 2025 09:19:06 -0700 Message-ID: <20250520161916.413298-3-kuba@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520161916.413298-1-kuba@kernel.org> References: <20250520161916.413298-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit tc-act-stats-attrs and tca-stats-attrs are almost identical. The only difference is that the latter has sub-message decoding for app, rather than declaring it as a binary attr. tc-act-police-attrs and tc-police-attrs are identical but for the TODO annotations. Reviewed-by: Donald Hunter Signed-off-by: Jakub Kicinski --- Documentation/netlink/specs/tc.yaml | 78 ++--------------------------- 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/Documentation/netlink/specs/tc.yaml b/Documentation/netlink/specs/tc.yaml index 953aa837958b..c7e6a734cd12 100644 --- a/Documentation/netlink/specs/tc.yaml +++ b/Documentation/netlink/specs/tc.yaml @@ -1452,7 +1452,7 @@ protonum: 0 - name: stats type: nest - nested-attributes: tc-act-stats-attrs + nested-attributes: tca-stats-attrs - name: pad type: pad @@ -1471,38 +1471,6 @@ protonum: 0 - name: in-hw-count type: u32 - - - name: tc-act-stats-attrs - attributes: - - - name: basic - type: binary - struct: gnet-stats-basic - - - name: rate-est - type: binary - struct: gnet-stats-rate-est - - - name: queue - type: binary - struct: gnet-stats-queue - - - name: app - type: binary - - - name: rate-est64 - type: binary - struct: gnet-stats-rate-est64 - - - name: pad - type: pad - - - name: basic-hw - type: binary - struct: gnet-stats-basic - - - name: pkt64 - type: u64 - name: tc-act-bpf-attrs attributes: @@ -1797,44 +1765,6 @@ protonum: 0 - name: key-ex type: binary - - - name: tc-act-police-attrs - attributes: - - - name: tbf - type: binary - struct: tc-police - - - name: rate - type: binary # TODO - - - name: peakrate - type: binary # TODO - - - name: avrate - type: u32 - - - name: result - type: u32 - - - name: tm - type: binary - struct: tcf-t - - - name: pad - type: pad - - - name: rate64 - type: u64 - - - name: peakrate64 - type: u64 - - - name: pktrate64 - type: u64 - - - name: pktburst64 - type: u64 - name: tc-act-simple-attrs attributes: @@ -3327,10 +3257,10 @@ protonum: 0 struct: tc-police - name: rate - type: binary + type: binary # TODO - name: peakrate - type: binary + type: binary # TODO - name: avrate type: u32 @@ -3817,7 +3747,7 @@ protonum: 0 attribute-set: tc-act-pedit-attrs - value: police - attribute-set: tc-act-police-attrs + attribute-set: tc-police-attrs - value: sample attribute-set: tc-act-sample-attrs -- 2.49.0