From patchwork Fri Sep 4 02:59:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Kimmel X-Patchwork-Id: 1357147 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bareminimum.eu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=qvuH5HmS; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BjMsY332Hz9sV7 for ; Fri, 4 Sep 2020 13:02:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KChm/YkMOk4mST4NXZPNQTaUVHys8Duf8cHUeGLBx+8=; b=qvuH5HmSx+E7eUpEHMK9mz52C M6/pVNWCQ3a0yB7K5/33Y9xefLCTOwSckzZckAeTXmrv26RuzLJUC1ivNScXAaMMtEwmi2yN+Ao6r KpV89gpbf59rnvExhgU1AYhP+z8hZOqT5Tfk2xq5DtLhPfWSrx4kmzEwH66om3iQCmw1QZz4eJ1D7 AglUdz/qcWgb4JfEvSBWJF7gk4xZtSOB/V3ZPd9bex2/pNUOuE1ke9rg8I9wU7TLhyTbJE4cGHs4o Exn2Ey2tMHIEDxWKhizMg71KBgkLH5y2C68KklrT3jQJHzv0v88KPXRLG7PfSdL5udHsMBgiSIB4G y5lWp6Enw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kE1xh-0008Bi-Qm; Fri, 04 Sep 2020 03:00:25 +0000 Received: from mail.nerd2nerd.org ([2a01:4f8:190:3211::25]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kE1xc-00089y-Os for openwrt-devel@lists.openwrt.org; Fri, 04 Sep 2020 03:00:22 +0000 Received: from kosch.limbus.lpm.pw (200116b828f1af0276d435fffe9b7588.dip.versatel-1u1.de [IPv6:2001:16b8:28f1:af02:76d4:35ff:fe9b:7588]) by mail.nerd2nerd.org (Postfix) with ESMTPA id 57A84612FF; Fri, 4 Sep 2020 05:00:15 +0200 (CEST) From: Johannes Kimmel To: openwrt-devel@lists.openwrt.org Subject: [PATCH 4/4] netifd: vxlan: add aging and maxaddress options Date: Fri, 4 Sep 2020 04:59:43 +0200 Message-Id: <20200904025943.9067-4-fff@bareminimum.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200904025943.9067-1-fff@bareminimum.eu> References: <20200904025943.9067-1-fff@bareminimum.eu> MIME-Version: 1.0 Authentication-Results: mail.nerd2nerd.org; auth=pass smtp.auth=info@bareminimum.eu smtp.mailfrom=fff@bareminimum.eu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200903_230020_925707_3DDBD87A X-CRM114-Status: GOOD ( 12.41 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 LOTS_OF_MONEY Huge... sums of money X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Kimmel Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org For both options the values can just be passed to the kernel. All unsigned values are accepted, thus no range checking required. Signed-off-by: Johannes Kimmel --- system-linux.c | 10 ++++++++++ system.c | 2 ++ system.h | 2 ++ 3 files changed, 14 insertions(+) diff --git a/system-linux.c b/system-linux.c index a68af63..c497509 100644 --- a/system-linux.c +++ b/system-linux.c @@ -3235,6 +3235,16 @@ static int system_add_vxlan(const char *name, const unsigned int link, struct bl system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L3MISS , VXLAN_DATA_ATTR_L3MISS, false); system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_GBP , VXLAN_DATA_ATTR_GBP, false); + if ((cur = tb_data[VXLAN_DATA_ATTR_AGEING])) { + uint32_t ageing = blobmsg_get_u32(cur); + nla_put_u32(msg, IFLA_VXLAN_AGEING, ageing); + } + + if ((cur = tb_data[VXLAN_DATA_ATTR_LIMIT])) { + uint32_t maxaddress = blobmsg_get_u32(cur); + nla_put_u32(msg, IFLA_VXLAN_LIMIT, maxaddress); + } + if ((cur = tb[TUNNEL_ATTR_TOS])) { char *str = blobmsg_get_string(cur); unsigned tos = 1; diff --git a/system.c b/system.c index 95721e1..834748e 100644 --- a/system.c +++ b/system.c @@ -46,6 +46,8 @@ static const struct blobmsg_policy vxlan_data_attrs[__VXLAN_DATA_ATTR_MAX] = { [VXLAN_DATA_ATTR_L2MISS] = { .name = "l2miss", .type = BLOBMSG_TYPE_BOOL }, [VXLAN_DATA_ATTR_L3MISS] = { .name = "l3miss", .type = BLOBMSG_TYPE_BOOL }, [VXLAN_DATA_ATTR_GBP] = { .name = "gbp", .type = BLOBMSG_TYPE_BOOL }, + [VXLAN_DATA_ATTR_AGEING] = { .name = "ageing", .type = BLOBMSG_TYPE_INT32 }, + [VXLAN_DATA_ATTR_LIMIT] = { .name = "maxaddress", .type = BLOBMSG_TYPE_INT32 }, }; const struct uci_blob_param_list vxlan_data_attr_list = { diff --git a/system.h b/system.h index 290c2e5..52161a8 100644 --- a/system.h +++ b/system.h @@ -52,6 +52,8 @@ enum vxlan_data { VXLAN_DATA_ATTR_L2MISS, VXLAN_DATA_ATTR_L3MISS, VXLAN_DATA_ATTR_GBP, + VXLAN_DATA_ATTR_AGEING, + VXLAN_DATA_ATTR_LIMIT, __VXLAN_DATA_ATTR_MAX };