From patchwork Sat Dec 23 14:01:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 13503996 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46722DDA5 for ; Sat, 23 Dec 2023 14:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="IWnVMb+b" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-67f47b15fa3so19493946d6.1 for ; Sat, 23 Dec 2023 06:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1703340130; x=1703944930; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9o75PhI3xzZFY6wRbm+k1VjTX3cvEH8O/7qf7mb8L+o=; b=IWnVMb+bx7gsXKbD8mBZqFansmGCy8QbA/6eQ6xaYMHxk66uqw/ch0T60emkAlx5aE aHJGLuPmdvPtfrpojcEyQk4WsQ12ZI4nbbfQ6MLMIzMtBa2GmwJmxF5suYMt31/0H9Th 5Hgjt6kbD/OVT1nl675IHyTnwDVDjjaOISFJr0au6MqDSP80UYEPxwyDURRySg/GNIHo l0U9OUerLZ27DSaluJKtaOgaREh6tcsJ2nlk9eE3L+LT1jPgrQekHrw1k3YNXQ02yx/n xp3KoK/pixalD32Kysl0/IjqnN9xoDHjTfmwdwEgnjoT7ndmVtdwN+hHNVOasXs9Q5Ev xxSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703340130; x=1703944930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9o75PhI3xzZFY6wRbm+k1VjTX3cvEH8O/7qf7mb8L+o=; b=cFvxF75fkO7Qol0HQl/DDyM8IIuPeBGQVLZS66FqwqlU/O56WzW+0X95QbjOIuXqxM nvNeNvaghQbv0LFRpTGKi8zusCIbnwt4B5KUM2+Sv33mZpurLNwVKZx0vb/slv3zobG3 XLUWUmCzQAPdj5ULvCzI8SdSndxdAlnCjyQPRis6Rd+HFQv3CgvHEJ786nHpKtDVg8tK tVww482meObqCkvNL+GAJPnhmOL/t5q8g8V4XVE19mWZFbibt4SyfTMxi6VZUr2ufjXL 116sNpADcr0Gdcg0iyv1ETtwiY/GAOzE6/INGyhQide9XSCGP6ai87La+knUiNGL1TcM NLWw== X-Gm-Message-State: AOJu0YyAk0AF1LgIk3DxVjQBjnm7l/RwF2o/0Ua0/7/K+KBaAEXiLDuV d67jV8ZDXFpkNL4JKtw35S/RpdP4GfXs X-Google-Smtp-Source: AGHT+IH7tDwFSbUS2YrlmrJpnhg9GQA6gRYAoI6s59t+cE6qDj6rFPxMnyvpqA3fIlO/2QaOyajkbA== X-Received: by 2002:a05:6214:2b06:b0:67f:65c1:2a54 with SMTP id jx6-20020a0562142b0600b0067f65c12a54mr4395697qvb.57.1703340130237; Sat, 23 Dec 2023 06:02:10 -0800 (PST) Received: from majuu.waya ([174.91.6.24]) by smtp.gmail.com with ESMTPSA id 25-20020a05620a04d900b0077f0a4bd3c6sm2062968qks.77.2023.12.23.06.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 06:02:06 -0800 (PST) From: Jamal Hadi Salim To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, pctammela@mojatatu.com, victor@mojatatu.com, Jamal Hadi Salim Subject: [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Date: Sat, 23 Dec 2023 09:01:50 -0500 Message-Id: <20231223140154.1319084-2-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231223140154.1319084-1-jhs@mojatatu.com> References: <20231223140154.1319084-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org commit 265b4da82dbf ("net/sched: Retire rsvp classifier") retired the TC RSVP classifier. Remove UAPI for it. Iproute2 will sync by equally removing it from user space. Reviewed-by: Victor Nogueira Reviewed-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/pkt_cls.h | 31 ------------------------------ tools/include/uapi/linux/pkt_cls.h | 31 ------------------------------ 2 files changed, 62 deletions(-) diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index c7082cc60d21..0d85f7faad53 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -280,37 +280,6 @@ struct tc_u32_pcnt { #define TC_U32_MAXDEPTH 8 - -/* RSVP filter */ - -enum { - TCA_RSVP_UNSPEC, - TCA_RSVP_CLASSID, - TCA_RSVP_DST, - TCA_RSVP_SRC, - TCA_RSVP_PINFO, - TCA_RSVP_POLICE, - TCA_RSVP_ACT, - __TCA_RSVP_MAX -}; - -#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 ) - -struct tc_rsvp_gpi { - __u32 key; - __u32 mask; - int offset; -}; - -struct tc_rsvp_pinfo { - struct tc_rsvp_gpi dpi; - struct tc_rsvp_gpi spi; - __u8 protocol; - __u8 tunnelid; - __u8 tunnelhdr; - __u8 pad; -}; - /* ROUTE filter */ enum { diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h index 3faee0199a9b..82eccb6a4994 100644 --- a/tools/include/uapi/linux/pkt_cls.h +++ b/tools/include/uapi/linux/pkt_cls.h @@ -204,37 +204,6 @@ struct tc_u32_pcnt { #define TC_U32_MAXDEPTH 8 - -/* RSVP filter */ - -enum { - TCA_RSVP_UNSPEC, - TCA_RSVP_CLASSID, - TCA_RSVP_DST, - TCA_RSVP_SRC, - TCA_RSVP_PINFO, - TCA_RSVP_POLICE, - TCA_RSVP_ACT, - __TCA_RSVP_MAX -}; - -#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 ) - -struct tc_rsvp_gpi { - __u32 key; - __u32 mask; - int offset; -}; - -struct tc_rsvp_pinfo { - struct tc_rsvp_gpi dpi; - struct tc_rsvp_gpi spi; - __u8 protocol; - __u8 tunnelid; - __u8 tunnelhdr; - __u8 pad; -}; - /* ROUTE filter */ enum { From patchwork Sat Dec 23 14:01:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 13503997 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F309DDC2 for ; Sat, 23 Dec 2023 14:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="NbTgR59X" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-78117e97becso150344285a.3 for ; Sat, 23 Dec 2023 06:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1703340132; x=1703944932; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8i40BQqNAyXroNCvlOksNxdslsW86ov9lOuDnEGnhAw=; b=NbTgR59XaFzOiiMAUCW1b8xFp4KuRITPRtMQKEm+VfuTwnwcaEPfyfMah9HtFArY3U jCnz3mPNMg1ipFQiRj1YMs89UbG1JqVx0cNYAT1zYiqT4y21N1r1fz282bIB1p5lZ+Kv AUl9JYeTkMNhdb7Q5Uat4owIWnUUxF4WXFDpGCBH2dtDYkzlBqQeDGYZ5WJoCDO2gwJV lDxPBc35DLPrfVG+/TT5Ga9E5rTPyEnUrJDRW6rwK4WPVaz2V2us8MN6uAEJip0/Rjl0 zMpO4koLt/xbYbmIqurD4d5JwkdJbQa5gRUsYiTiypjScZ3rw0qjva7SwCYd2TII11Z4 pTdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703340132; x=1703944932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8i40BQqNAyXroNCvlOksNxdslsW86ov9lOuDnEGnhAw=; b=QKZJxg5i/dwNEBa90/vqgb+KucXvEtTbGqnFcXvz8/zgsWxVayEtXN3Cxe8ypPikkp 244fmoLGMZKcS5pqLRvxEdcc/htYp/Y/pK+BX/LuHm7ZjnyWqShyPGFOU71lALhV38VF W8AkZyqdcqNi8a9ZxdBqYPVqa1CthRp1RuDuPABFszE7jPfTXLa+axKsI+eGolMeHqFX 6JnfP8NuBUCqgUlEYeKMBzXSf9MvjaA+2tNRCSBqI811NkXtbvllrAVofM+KTlIgDorT 4y2wQYGpl6VrsXi1R/rAQ6Vp9vybXGT1UC9YddrUmaDZ5lRSnE9v1FSKwU+wmgrfVbHA Mp+w== X-Gm-Message-State: AOJu0Yxu93dKiOGVsLyATa6gC52TpbWyoiXDymnQeL6n8nGOztU+M5TL lp4146Y4Jclp+HRWgGuVkGFY64106WLB X-Google-Smtp-Source: AGHT+IH48soYtB+0t/bne+hGf7moRou1XJ+R5BVm78Pe8nqeg7PSu6qYIszkwdIRGv/DPq2eRb0VZQ== X-Received: by 2002:a05:620a:199f:b0:77f:2baf:c95a with SMTP id bm31-20020a05620a199f00b0077f2bafc95amr3944754qkb.115.1703340132559; Sat, 23 Dec 2023 06:02:12 -0800 (PST) Received: from majuu.waya ([174.91.6.24]) by smtp.gmail.com with ESMTPSA id 25-20020a05620a04d900b0077f0a4bd3c6sm2062968qks.77.2023.12.23.06.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 06:02:10 -0800 (PST) From: Jamal Hadi Salim To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, pctammela@mojatatu.com, victor@mojatatu.com, Jamal Hadi Salim Subject: [PATCH net-next 2/5] net/sched: Remove uapi support for tcindex classifier Date: Sat, 23 Dec 2023 09:01:51 -0500 Message-Id: <20231223140154.1319084-3-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231223140154.1319084-1-jhs@mojatatu.com> References: <20231223140154.1319084-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org commit 8c710f75256b ("net/sched: Retire tcindex classifier") retired the TC tcindex classifier. Remove UAPI for it. Iproute2 will sync by equally removing it from user space. Reviewed-by: Victor Nogueira Reviewed-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/pkt_cls.h | 16 ---------------- tools/include/uapi/linux/pkt_cls.h | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 0d85f7faad53..c474cf53fa84 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -310,22 +310,6 @@ enum { #define TCA_FW_MAX (__TCA_FW_MAX - 1) -/* TC index filter */ - -enum { - TCA_TCINDEX_UNSPEC, - TCA_TCINDEX_HASH, - TCA_TCINDEX_MASK, - TCA_TCINDEX_SHIFT, - TCA_TCINDEX_FALL_THROUGH, - TCA_TCINDEX_CLASSID, - TCA_TCINDEX_POLICE, - TCA_TCINDEX_ACT, - __TCA_TCINDEX_MAX -}; - -#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1) - /* Flow filter */ enum { diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h index 82eccb6a4994..bd4b227ab4ba 100644 --- a/tools/include/uapi/linux/pkt_cls.h +++ b/tools/include/uapi/linux/pkt_cls.h @@ -234,22 +234,6 @@ enum { #define TCA_FW_MAX (__TCA_FW_MAX - 1) -/* TC index filter */ - -enum { - TCA_TCINDEX_UNSPEC, - TCA_TCINDEX_HASH, - TCA_TCINDEX_MASK, - TCA_TCINDEX_SHIFT, - TCA_TCINDEX_FALL_THROUGH, - TCA_TCINDEX_CLASSID, - TCA_TCINDEX_POLICE, - TCA_TCINDEX_ACT, - __TCA_TCINDEX_MAX -}; - -#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1) - /* Flow filter */ enum { From patchwork Sat Dec 23 14:01:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 13503998 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2341DDF63 for ; Sat, 23 Dec 2023 14:02:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="Z1TyKPN+" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7812275feccso170545085a.3 for ; Sat, 23 Dec 2023 06:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1703340136; x=1703944936; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eq6geVqGvMFNSbq2e7VJ8wt0agz2scAL9ywNSevz4mM=; b=Z1TyKPN+2iAyZRaV2RafBLgKqsOKdybrwjj5irmo7y/YmpNoS0LBpCoFFkUTZYxX+N rP4PvtJYHGEY68brJAWlaxU35ZPoPWzQykZxZal+6FMLA6iJ105cMl7mlrjl2qFiMzUe UINOWSAsX6eQByPM13jWzwrRYq0HybKXjpdPFnZZVktJ86WghmnVVummLHKUHkuKBbf8 1HztrXgah/qOPzEF2OO6O1ftCxFeqOIlrmpyh/9V4OwPAS6w0GMcAy7POG94lrLvy654 Hs+V228oInBwyYz9esLhvbwUPkERuYGfd2VCgO+k3XdYOo63nJ54fKbACOTAWdnRI3Y4 17iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703340136; x=1703944936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eq6geVqGvMFNSbq2e7VJ8wt0agz2scAL9ywNSevz4mM=; b=J4dpipIsW1yfnrUwSIHGvVwJgL3vs4YfmBTJAg6hWHSMiPny//6hpG4+xhzG1+CjIc 80rppqoTO2eHDkauILUcvvn1r7SNkXo7964Gk4oo0bx49+R2o8T5p3pk8xCGNomgJtp/ cynkvYpbT3f3T8OExK86TVWMocufoI1j0AnyVYjcJ7Ry+Q0LTemlSwejR0kOz3rJSWrl LcdLaAr0j+KkahrR//ojh5qQFpSlGlEeS9iyVz6Sl7ysiRGAYQV6NRiOya7Gf/JfuVgi MdLt9E0K+4CCMsC88QB5pWDmSXLgq7JfwQnykP5k4h4HVk2L80HZweM/ivK/Bnae85O6 PUBw== X-Gm-Message-State: AOJu0YzmBFEngKQRLfdGCxS/2b9bn36wOwcIQ6xLSnlwHyDnhZ8fCh/B oMU9SqnLs9rPp4ctZPr5dAggFsHKhxQO X-Google-Smtp-Source: AGHT+IEkVihpRw5nIkicPWRaH9cOooLRnOWkuyFqkqk1bkamIweDb2BeJt6+iuOdQ6bfLcGK3LvJeA== X-Received: by 2002:a05:620a:4556:b0:781:32c2:d578 with SMTP id u22-20020a05620a455600b0078132c2d578mr2360709qkp.143.1703340136148; Sat, 23 Dec 2023 06:02:16 -0800 (PST) Received: from majuu.waya ([174.91.6.24]) by smtp.gmail.com with ESMTPSA id 25-20020a05620a04d900b0077f0a4bd3c6sm2062968qks.77.2023.12.23.06.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 06:02:13 -0800 (PST) From: Jamal Hadi Salim To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, pctammela@mojatatu.com, victor@mojatatu.com, Jamal Hadi Salim Subject: [PATCH net-next 3/5] net/sched: Remove uapi support for dsmark qdisc Date: Sat, 23 Dec 2023 09:01:52 -0500 Message-Id: <20231223140154.1319084-4-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231223140154.1319084-1-jhs@mojatatu.com> References: <20231223140154.1319084-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit bbe77c14ee61 ("net/sched: Retire dsmark qdisc") retired the dsmark classifier. Remove UAPI support for it. Iproute2 will sync by equally removing it from user space. Reviewed-by: Victor Nogueira Reviewed-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/pkt_sched.h | 14 -------------- tools/include/uapi/linux/pkt_sched.h | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index f762a10bfb78..1e3a2b9ddf7e 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -557,20 +557,6 @@ enum { #define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) -/* dsmark section */ - -enum { - TCA_DSMARK_UNSPEC, - TCA_DSMARK_INDICES, - TCA_DSMARK_DEFAULT_INDEX, - TCA_DSMARK_SET_TC_INDEX, - TCA_DSMARK_MASK, - TCA_DSMARK_VALUE, - __TCA_DSMARK_MAX, -}; - -#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1) - /* ATM section */ enum { diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h index 5c903abc9fa5..0f164f1458fd 100644 --- a/tools/include/uapi/linux/pkt_sched.h +++ b/tools/include/uapi/linux/pkt_sched.h @@ -537,20 +537,6 @@ enum { #define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) -/* dsmark section */ - -enum { - TCA_DSMARK_UNSPEC, - TCA_DSMARK_INDICES, - TCA_DSMARK_DEFAULT_INDEX, - TCA_DSMARK_SET_TC_INDEX, - TCA_DSMARK_MASK, - TCA_DSMARK_VALUE, - __TCA_DSMARK_MAX, -}; - -#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1) - /* ATM section */ enum { From patchwork Sat Dec 23 14:01:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 13503999 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4793BDF60 for ; Sat, 23 Dec 2023 14:02:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="roNN+wy8" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7811b05d23bso190514585a.0 for ; Sat, 23 Dec 2023 06:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1703340137; x=1703944937; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nAGo65pNUCy+KMKD4r5DVW7p890G53cgas3s/t7q3qM=; b=roNN+wy8uBD5tgZ1PXo1fTKJKXNHn5U3rDW82iKwyABMEh28n7RoMCgt9+sEfib30w /Bu6+rMtpJSgBpcq/j6H8BGxVcaoDbwJN74XcOFoLyyT7PMoEi+8zOHJWS/8ve2j7qNO 20P2+AwC2tkgnCBWM57caXXrWGlkd+LxtzmG/zSNpGhocdbQpX2MqVlcT+9MsXfs0URO UWntGDmLsbJ73vbIOpQhdsDgIbRbA2gn37DR7SBVkeS3uLOFsFSyQQIyjI6IqaLlpSPD tJyEPXu4z7Dkz1/JeL8q7mM/agrEhTkhTsn5WgYYCi8ySvTqM1wsgsQhv16vK3DxlbIW ClaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703340137; x=1703944937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nAGo65pNUCy+KMKD4r5DVW7p890G53cgas3s/t7q3qM=; b=q7Kqa5D5z1dS1d3tcb+X28xPh7RsDVQq7qHSzUY0SdC3VyC+hmsuJBiyOgGVh8uy0l DrK6VxtOaMHaBVp7O5LGG2Kc4LmZ8WMK/FLru3STGMN5Sclj9dVTg0DshPyep5uGPR8y yzhe8n6jLXN6BHwjVz6MbL/t2yzfvnSuBBtcj1tBHfDW6dXi3Y+FtZzcvJFH66M+2xss t7GXoJmIV/xNVsJsPhHpGfFPbQnqNy4FpEuaMIOS/GC2CGruRgfuehf0HgI0LpcKORMI TRN/ONS/gAuoVXoyPiYOBXIXZ7U7SumC2wLV/PG4j/RfDtOJ+OpFEqla/gdijvj8b+cO j7Gg== X-Gm-Message-State: AOJu0Yw6uBJDV6MDG5eZe/AA8F0lFjTZkP6TZPmvF7vaIbyj9+VXN/aH OtDLUrQH7ItFg/kLxKzS3xRn7cVU1Kjz X-Google-Smtp-Source: AGHT+IFJDh8N6q8ip69vEs4S3phGnXvF9MdlhI4NRUxuASwAYJxhnoZlm9miPhZe3PHMJ0/cWh0Q2w== X-Received: by 2002:a05:620a:5598:b0:77f:b2ab:3f34 with SMTP id vq24-20020a05620a559800b0077fb2ab3f34mr3275101qkn.48.1703340137340; Sat, 23 Dec 2023 06:02:17 -0800 (PST) Received: from majuu.waya ([174.91.6.24]) by smtp.gmail.com with ESMTPSA id 25-20020a05620a04d900b0077f0a4bd3c6sm2062968qks.77.2023.12.23.06.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 06:02:16 -0800 (PST) From: Jamal Hadi Salim To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, pctammela@mojatatu.com, victor@mojatatu.com, Jamal Hadi Salim Subject: [PATCH net-next 4/5] net/sched: Remove uapi support for ATM qdisc Date: Sat, 23 Dec 2023 09:01:53 -0500 Message-Id: <20231223140154.1319084-5-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231223140154.1319084-1-jhs@mojatatu.com> References: <20231223140154.1319084-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit fb38306ceb9e ("net/sched: Retire ATM qdisc") retired the ATM qdisc. Remove UAPI for it. Iproute2 will sync by equally removing it from user space. Reviewed-by: Victor Nogueira Reviewed-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/pkt_sched.h | 15 --------------- tools/include/uapi/linux/pkt_sched.h | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 1e3a2b9ddf7e..28f08acdad52 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -557,21 +557,6 @@ enum { #define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) -/* ATM section */ - -enum { - TCA_ATM_UNSPEC, - TCA_ATM_FD, /* file/socket descriptor */ - TCA_ATM_PTR, /* pointer to descriptor - later */ - TCA_ATM_HDR, /* LL header */ - TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */ - TCA_ATM_ADDR, /* PVC address (for output only) */ - TCA_ATM_STATE, /* VC state (ATM_VS_*; for output only) */ - __TCA_ATM_MAX, -}; - -#define TCA_ATM_MAX (__TCA_ATM_MAX - 1) - /* Network emulator */ enum { diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h index 0f164f1458fd..fc695429bc59 100644 --- a/tools/include/uapi/linux/pkt_sched.h +++ b/tools/include/uapi/linux/pkt_sched.h @@ -537,21 +537,6 @@ enum { #define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) -/* ATM section */ - -enum { - TCA_ATM_UNSPEC, - TCA_ATM_FD, /* file/socket descriptor */ - TCA_ATM_PTR, /* pointer to descriptor - later */ - TCA_ATM_HDR, /* LL header */ - TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */ - TCA_ATM_ADDR, /* PVC address (for output only) */ - TCA_ATM_STATE, /* VC state (ATM_VS_*; for output only) */ - __TCA_ATM_MAX, -}; - -#define TCA_ATM_MAX (__TCA_ATM_MAX - 1) - /* Network emulator */ enum { From patchwork Sat Dec 23 14:01:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 13504000 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B75F5E56B for ; Sat, 23 Dec 2023 14:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="RowDf2CY" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-77f8308616eso201585585a.2 for ; Sat, 23 Dec 2023 06:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1703340138; x=1703944938; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H2qaiD8GmZiqa5r3mLnEbXbwwvsEsQgPYHKI0Z94tmc=; b=RowDf2CYpGG2CUoJhxJDaSmK62SCWr1wreRIk08V19J1A5AfsPxQtLUmRATUtrN1KW 4HxUsNmqGOQOjJR8sOVeZInu7/PVWgNpSQO6qMQ85i03BY7lNDueZMSFQDo7tiZU6G2C tWiRuZSvWPlKRPfLK0tb9ioxbaVj3NAd8sazmB5pqnnx5P1fC4Y0Auv+Q5LTlm/CfTi0 +ICGKps1mEDHDLch/r/vdKwlZlPxB4oA4vBQEvwVT5NObij121khpNfgpmVroi9sp7zI 2GhGKsoqXgzyylZkAh83lVOUOU340Gqs6PrjJxM4cxQNywUjn8JZZQMy/uzQspSo2i+i J8nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703340138; x=1703944938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H2qaiD8GmZiqa5r3mLnEbXbwwvsEsQgPYHKI0Z94tmc=; b=B9SYq8WQwbfn0zxvH5RfdFBp9Qd3l09p5FUlnuPnLNHVnrkuCwT+8XwfjJVyDNIH+s 8DscFuIofEM3TfOSEnXPOx1olFlMvtVsm9jZZpos3sYyypTHjC0xFHv4q1Kaf01e1BxL jOPPTAkhAWNKfw68v/F7T8c9vyJKCQKGhpnBxXjR0lfQf80z3vfvQWV8H3waVuCD+Hzv WS0wzUz2tk0zZ/XWYwu0kiWnkPSm3hf/2bLL4LYRph+f0imaSMfvzdSNQTK99fJNnthD EuaZe/QbsVoLcVHUP11DYFRffZyHX+Lt9MLxZYRhSl/45AuKhpNvZa+ud11t1AEh1gFD xrsA== X-Gm-Message-State: AOJu0Yz4BBhdOlEnzlJ+oH5LRCZPk9jazfoA455JP9gBVWarIFQNx9k2 jYbgAHeUYXpEvti+yW5Gqvb6sofvJL+j X-Google-Smtp-Source: AGHT+IHYfuDk06ibzexHEfBGMjzBztmWmE//HV73GyS+lyyaJxvL34W2a7sJ4e9f8OHoBfUGWZAgZA== X-Received: by 2002:a05:620a:880c:b0:781:2db2:49c9 with SMTP id qj12-20020a05620a880c00b007812db249c9mr2720329qkn.43.1703340138530; Sat, 23 Dec 2023 06:02:18 -0800 (PST) Received: from majuu.waya ([174.91.6.24]) by smtp.gmail.com with ESMTPSA id 25-20020a05620a04d900b0077f0a4bd3c6sm2062968qks.77.2023.12.23.06.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 06:02:17 -0800 (PST) From: Jamal Hadi Salim To: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, pctammela@mojatatu.com, victor@mojatatu.com, Jamal Hadi Salim Subject: [PATCH net-next 5/5] net/sched: Remove uapi support for CBQ qdisc Date: Sat, 23 Dec 2023 09:01:54 -0500 Message-Id: <20231223140154.1319084-6-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231223140154.1319084-1-jhs@mojatatu.com> References: <20231223140154.1319084-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 051d44209842 ("net/sched: Retire CBQ qdisc") retired the CBQ qdisc. Remove UAPI for it. Iproute2 will sync by equally removing it from user space. Reviewed-by: Victor Nogueira Reviewed-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim --- include/uapi/linux/pkt_sched.h | 80 ---------------------------- tools/include/uapi/linux/pkt_sched.h | 80 ---------------------------- 2 files changed, 160 deletions(-) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 28f08acdad52..a3cd0c2dc995 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -477,86 +477,6 @@ enum { #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1) - -/* CBQ section */ - -#define TC_CBQ_MAXPRIO 8 -#define TC_CBQ_MAXLEVEL 8 -#define TC_CBQ_DEF_EWMA 5 - -struct tc_cbq_lssopt { - unsigned char change; - unsigned char flags; -#define TCF_CBQ_LSS_BOUNDED 1 -#define TCF_CBQ_LSS_ISOLATED 2 - unsigned char ewma_log; - unsigned char level; -#define TCF_CBQ_LSS_FLAGS 1 -#define TCF_CBQ_LSS_EWMA 2 -#define TCF_CBQ_LSS_MAXIDLE 4 -#define TCF_CBQ_LSS_MINIDLE 8 -#define TCF_CBQ_LSS_OFFTIME 0x10 -#define TCF_CBQ_LSS_AVPKT 0x20 - __u32 maxidle; - __u32 minidle; - __u32 offtime; - __u32 avpkt; -}; - -struct tc_cbq_wrropt { - unsigned char flags; - unsigned char priority; - unsigned char cpriority; - unsigned char __reserved; - __u32 allot; - __u32 weight; -}; - -struct tc_cbq_ovl { - unsigned char strategy; -#define TC_CBQ_OVL_CLASSIC 0 -#define TC_CBQ_OVL_DELAY 1 -#define TC_CBQ_OVL_LOWPRIO 2 -#define TC_CBQ_OVL_DROP 3 -#define TC_CBQ_OVL_RCLASSIC 4 - unsigned char priority2; - __u16 pad; - __u32 penalty; -}; - -struct tc_cbq_police { - unsigned char police; - unsigned char __res1; - unsigned short __res2; -}; - -struct tc_cbq_fopt { - __u32 split; - __u32 defmap; - __u32 defchange; -}; - -struct tc_cbq_xstats { - __u32 borrows; - __u32 overactions; - __s32 avgidle; - __s32 undertime; -}; - -enum { - TCA_CBQ_UNSPEC, - TCA_CBQ_LSSOPT, - TCA_CBQ_WRROPT, - TCA_CBQ_FOPT, - TCA_CBQ_OVL_STRATEGY, - TCA_CBQ_RATE, - TCA_CBQ_RTAB, - TCA_CBQ_POLICE, - __TCA_CBQ_MAX, -}; - -#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) - /* Network emulator */ enum { diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h index fc695429bc59..587481a19433 100644 --- a/tools/include/uapi/linux/pkt_sched.h +++ b/tools/include/uapi/linux/pkt_sched.h @@ -457,86 +457,6 @@ enum { #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1) - -/* CBQ section */ - -#define TC_CBQ_MAXPRIO 8 -#define TC_CBQ_MAXLEVEL 8 -#define TC_CBQ_DEF_EWMA 5 - -struct tc_cbq_lssopt { - unsigned char change; - unsigned char flags; -#define TCF_CBQ_LSS_BOUNDED 1 -#define TCF_CBQ_LSS_ISOLATED 2 - unsigned char ewma_log; - unsigned char level; -#define TCF_CBQ_LSS_FLAGS 1 -#define TCF_CBQ_LSS_EWMA 2 -#define TCF_CBQ_LSS_MAXIDLE 4 -#define TCF_CBQ_LSS_MINIDLE 8 -#define TCF_CBQ_LSS_OFFTIME 0x10 -#define TCF_CBQ_LSS_AVPKT 0x20 - __u32 maxidle; - __u32 minidle; - __u32 offtime; - __u32 avpkt; -}; - -struct tc_cbq_wrropt { - unsigned char flags; - unsigned char priority; - unsigned char cpriority; - unsigned char __reserved; - __u32 allot; - __u32 weight; -}; - -struct tc_cbq_ovl { - unsigned char strategy; -#define TC_CBQ_OVL_CLASSIC 0 -#define TC_CBQ_OVL_DELAY 1 -#define TC_CBQ_OVL_LOWPRIO 2 -#define TC_CBQ_OVL_DROP 3 -#define TC_CBQ_OVL_RCLASSIC 4 - unsigned char priority2; - __u16 pad; - __u32 penalty; -}; - -struct tc_cbq_police { - unsigned char police; - unsigned char __res1; - unsigned short __res2; -}; - -struct tc_cbq_fopt { - __u32 split; - __u32 defmap; - __u32 defchange; -}; - -struct tc_cbq_xstats { - __u32 borrows; - __u32 overactions; - __s32 avgidle; - __s32 undertime; -}; - -enum { - TCA_CBQ_UNSPEC, - TCA_CBQ_LSSOPT, - TCA_CBQ_WRROPT, - TCA_CBQ_FOPT, - TCA_CBQ_OVL_STRATEGY, - TCA_CBQ_RATE, - TCA_CBQ_RTAB, - TCA_CBQ_POLICE, - __TCA_CBQ_MAX, -}; - -#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) - /* Network emulator */ enum {