From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 91FCD6A34D for ; Mon, 8 Apr 2024 12:20:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712578818; cv=none; b=g6sxN5Tv892tumle9rpZ0k3odKSEn94T1HGHHBaV8s6paBBxkpkatDXHoM1vQ/J5K4101WkLNwrhiMb82uls6HuRcdClRDmRMEoMJT/NSZQAg3nkrzGvS5A6zNtEwC0th8F/Wv+YTANznIJ57mfMmZe6Urk+63K8wvnNcyJZLR0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712578818; c=relaxed/simple; bh=KfGNjAUtb+mZ/8Mo8TWcHVtUWPxugUbcvST0KOlyvec=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=GfICVrDWjTL4r+LqmMK2FhMvbgWKZRD8SVU+jJWWGLN7/XcQxtBG3z1TzGOkRYyA/IoudFURq+DgFYBVp79eosl91QbsVhfAxDandrebrQybaQCpvQHynKfaazyjog/C43amxAgLE/aOm+u7heIVxPkQ42umhrXH19oY1kx36Xg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com; spf=none smtp.mailfrom=mojatatu.com; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b=nYBtxEb7; arc=none smtp.client-ip=209.85.222.169 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="nYBtxEb7" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-78d68b0816cso43158585a.1 for ; Mon, 08 Apr 2024 05:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1712578815; x=1713183615; 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=c/8OW6GFQ8bSxY2ye3MTKJIlWkM6Q2//Y6JjwJfiICo=; b=nYBtxEb70ZvLCBnhevJixZcrR5cZQ4yUi4A0lIKAjEUW1CzoYhzIvrNBt2pPWmjXIM elh37AYgrbXQ5TRnraIF0O4b7tXnPAZPYTwYaOUhjDQBWj5EyaCJlyVMWoDAXJD/C/vu 99ukfO5BmrPbDRDjf+XzYrxnF0PoXXBwtgIxD9//qbCn/17MqrVCGGUUVxAcnGOuT0gZ Jfod04jqeClcJ8m15xUbPJcdFuxljD2ZtT3xvw7jRv/lNkJCpR1ylZqrSdmSsLOMFA/v LStWgApMLahcyE7r5JHQF7P057uC8kraBM1uDyyQRojqPEs6DzlVCx8sfTC/nxHsmbCq IpHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712578815; x=1713183615; 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=c/8OW6GFQ8bSxY2ye3MTKJIlWkM6Q2//Y6JjwJfiICo=; b=GO8Sw5zRhP83BD0tuJdyU16WTzgWwleEVWL6kgB6kcLorQNjiBFGK1IPIvL04mXcrQ 00Bx7Sf5QXr1lPMfe/w8Qy3LELgdVO7qCf5XBnJYtpF4FkElD8tZaLriQo84T+wgDaZr gubx193pF5BcroUzSU+QywubTVPohV1AWXq4Rr13CP2E57s4CYrFWUKcOQtcnWXlqjMA SjLMznv7arrWJzPMWGmwUQs7KO8Trt+fjVdrIiAP07+vrzketim56fx+RRVcxtbvVJ8H hJp4lLZL0x88VXIlL26gPhjtvMKNUfUvX8yBo8tKyMlWnWjDbD92xeSemBo8b5Oqsfky Uy8A== X-Gm-Message-State: AOJu0YwpTHKEpOgXDjmoIdvhVf1rhk8KWswGWQSBuX1yKjPxCDxgPKBG dNMR5WTI0QGMfBxuT7ig9Gj5EhHFNfk36b5M7PItbMt2G+ums8bVC7d+TuOGBHy5ApH507Of7h8 = X-Google-Smtp-Source: AGHT+IFpUIr/eRMOpAdRCVD/8AVTOc3m9ghEcUX8GuEVlBJnTqSsEUG+bMimjFAZKo29pInbWQG9gQ== X-Received: by 2002:a05:620a:d86:b0:78b:eac4:a03a with SMTP id q6-20020a05620a0d8600b0078beac4a03amr13323662qkl.35.1712578815292; Mon, 08 Apr 2024 05:20:15 -0700 (PDT) Received: from majuu.waya ([174.94.28.98]) by smtp.gmail.com with ESMTPSA id w10-20020a05620a148a00b0078d5d81d65fsm1936142qkj.32.2024.04.08.05.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 05:20:14 -0700 (PDT) From: Jamal Hadi Salim To: netdev@vger.kernel.org Cc: deb.chatterjee@intel.com, anjali.singhai@intel.com, namrata.limaye@intel.com, tom@sipanda.io, mleitner@redhat.com, Mahesh.Shirshyad@amd.com, Vipin.Jain@amd.com, tomasz.osinski@intel.com, jiri@resnulli.us, xiyou.wangcong@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, vladbu@nvidia.com, horms@kernel.org, khalidm@nvidia.com, toke@redhat.com, daniel@iogearbox.net, victor@mojatatu.com, pctammela@mojatatu.com, bpf@vger.kernel.org Subject: [PATCH net-next v15 02/15] net/sched: act_api: increase action kind string length Date: Mon, 8 Apr 2024 08:19:47 -0400 Message-Id: <20240408122000.449238-3-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240408122000.449238-1-jhs@mojatatu.com> References: <20240408122000.449238-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Increase action kind string length from IFNAMSIZ to 64 The new P4 actions, created via templates, will have longer names of format: "pipeline_name/act_name". IFNAMSIZ is currently 16 and is most of the times undersized for the above format. So, to conform to this new format, we increase the maximum name length and change its definition from IFNAMSIZ to ACTNAMSIZ to account for this extra string (pipeline name) and the '/' character. Co-developed-by: Victor Nogueira Signed-off-by: Victor Nogueira Co-developed-by: Pedro Tammela Signed-off-by: Pedro Tammela Signed-off-by: Jamal Hadi Salim Reviewed-by: Vlad Buslov Reviewed-by: Marcelo Ricardo Leitner Acked-by: Toke Høiland-Jørgensen --- include/net/act_api.h | 2 +- include/uapi/linux/pkt_cls.h | 1 + net/sched/act_api.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/act_api.h b/include/net/act_api.h index f22be14bba..c839ff57c1 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -106,7 +106,7 @@ typedef void (*tc_action_priv_destructor)(void *priv); struct tc_action_ops { struct list_head head; struct list_head p4_head; - char kind[IFNAMSIZ]; + char kind[ACTNAMSIZ]; enum tca_id id; /* identifier should match kind */ unsigned int net_id; size_t size; diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 229fc925ec..898f6a05ec 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -6,6 +6,7 @@ #include #define TC_COOKIE_MAX_SIZE 16 +#define ACTNAMSIZ 64 /* Action attributes */ enum { diff --git a/net/sched/act_api.c b/net/sched/act_api.c index be78df3345..87eb09121c 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -476,7 +476,7 @@ static size_t tcf_action_shared_attrs_size(const struct tc_action *act) rcu_read_unlock(); return nla_total_size(0) /* action number nested */ - + nla_total_size(IFNAMSIZ) /* TCA_ACT_KIND */ + + nla_total_size(ACTNAMSIZ) /* TCA_ACT_KIND */ + cookie_len /* TCA_ACT_COOKIE */ + nla_total_size(sizeof(struct nla_bitfield32)) /* TCA_ACT_HW_STATS */ + nla_total_size(0) /* TCA_ACT_STATS nested */ @@ -1424,7 +1424,7 @@ tc_action_load_ops(struct net *net, struct nlattr *nla, bool police = flags & TCA_ACT_FLAGS_POLICE; struct nlattr *tb[TCA_ACT_MAX + 1]; struct tc_action_ops *a_o; - char act_name[IFNAMSIZ]; + char act_name[ACTNAMSIZ]; struct nlattr *kind; int err; @@ -1439,12 +1439,12 @@ tc_action_load_ops(struct net *net, struct nlattr *nla, NL_SET_ERR_MSG(extack, "TC action kind must be specified"); return ERR_PTR(err); } - if (nla_strscpy(act_name, kind, IFNAMSIZ) < 0) { + if (nla_strscpy(act_name, kind, ACTNAMSIZ) < 0) { NL_SET_ERR_MSG(extack, "TC action name too long"); return ERR_PTR(err); } } else { - if (strscpy(act_name, "police", IFNAMSIZ) < 0) { + if (strscpy(act_name, "police", ACTNAMSIZ) < 0) { NL_SET_ERR_MSG(extack, "TC action name too long"); return ERR_PTR(-EINVAL); } -- 2.34.1