Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1560489ybh; Tue, 14 Jul 2020 00:42:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUe9L+wY+8yhwF6PMgatxOtpqzQfFlIdMHxTHVF97myWNyuJbVZhDjs7IldoknLpxZuP8c X-Received: by 2002:a17:907:9495:: with SMTP id dm21mr3302399ejc.357.1594712577692; Tue, 14 Jul 2020 00:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594712577; cv=none; d=google.com; s=arc-20160816; b=Yb4MJChDMzt3MBZG8BgO9V1yPX/1G4hQDj8XlFGUKD28aNFYAhmNWn5JpDtXvxVI0a dor38NOQEOtw7DlK1gJbNfJpCyR/2GQM4is/BzlSeApZnQoW1uUSe/tHYXCP8HYlrs6g cLLzRc4zyIfQPEfkC5R19X5GoUzAWvzZ+i5fNFCvcISt35s5mOEgo/pOQG6FBd+csQXR TjuFFDSfJzZtFLkxJR/ohucEeZO+BjH0h0gXipn9+W84uEW6i60hpIHacA/sNyXcZVoi yVfv7GDrtkgLfTB3Zpy2CWG5925JrBh2CMwFddUjr9netQ2Uj7VznXcXd9XK9lnVBPd1 pk6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:dkim-signature; bh=Yu89jbRx/pJZw9YTaZnORL7toOOlmBFgt//XrEPQssc=; b=tQeTTb+UwRF8+K9VpqgYNPl/HdTnT/LY1tOWYRivl7+HxEPPpP/MuRiagx6T6fZwKf nZSLMT2YDugXHXbllL3bRD0WgPx82YvXYu5Cplhx2NCT/Pye7TPuQ4oG11z+t1lAZVH9 zNYT/YFVW7WK1S8CvLe9oKUiJsNgPmFpdNS85FrO4KPtasmvUuyfa7u8s35nwgBibTIx qq2+NBLZ5qHSuVfhwEOBb5BUKNyUhhLm7+koOcHJ1vd1CnaHmkxj6StCBthxZaTs7kar XsK3B9SB/7TUSwMSyUV354X+rEOELKHBENKmcIY3w5Pw7VPyPXYemJdExIrm1fu/yRtt IqnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=yI1DNvr3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y7si9836103ejw.8.2020.07.14.00.42.34; Tue, 14 Jul 2020 00:42:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=yI1DNvr3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727771AbgGNHjk (ORCPT + 99 others); Tue, 14 Jul 2020 03:39:40 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:28220 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727033AbgGNHjf (ORCPT ); Tue, 14 Jul 2020 03:39:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594712375; x=1626248375; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BPXYksHE/6skyxwfmW3layVz9HGsj0QnR14maadzSj4=; b=yI1DNvr3vwFmAoP6K1zLHmblXuUVriM8TsMKRYHkqBjp2UXo0FLZEqEN 6q7+8Yj2dRt9qfja5Go9Ijvvt/1cToMEspdkUmdT6fdbCP2+iOUuCFHno sEF6omAg2f9aTqbWa25wKElS7W2uhqAfLwBGMSvnwSZ9ZSkyY+O7nZgXi TQsLxgOa4ZP1fTjls2hB/2TiDxAg2QDk5uJSq8txP8VPP9dbZf7hwvo75 YND0Ai9/gtIpB/7+hyQHRYFud8gwDi3nWZ0kBywpd+oXc+mSRV+IO3zd+ H9PdFULi4odSHaB+xEWNf3LjOwyCV9pUw1yrctDJJDL9bsChO9ee0yPwW g==; IronPort-SDR: qVrw3YIn6sG4hEyRQbgC1jJhSLzmMiDdnEs20Z0NqMWb24KNqNO6o5pMaIkal9ygUealwfWviX /vQGaXHO8wlR51SPQmPB686T4PxLwWrnSXhvPI1D02wsvjidMegkj9oFoSKg+2oSxriNau2xaY VJtzMrmezc3USpI+0rgGutAYxZuQO3SVaPg7Rva/4gKuVSkFkEgTzzLAy51Fn/HZT46RflfwDu OY0L9dSKBPfhAFL5uMchREOkfTL02dr2hXFVMMy32VyLF+33UCgqQ0CEtgrir6hnu9CbeDDi52 2F0= X-IronPort-AV: E=Sophos;i="5.75,350,1589266800"; d="scan'208";a="87494105" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2020 00:39:34 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 14 Jul 2020 00:39:34 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 14 Jul 2020 00:39:31 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH net-next v4 12/12] net: bridge: Add port attribute IFLA_BRPORT_MRP_IN_OPEN Date: Tue, 14 Jul 2020 09:34:58 +0200 Message-ID: <20200714073458.1939574-13-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714073458.1939574-1-horatiu.vultur@microchip.com> References: <20200714073458.1939574-1-horatiu.vultur@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds a new port attribute, IFLA_BRPORT_MRP_IN_OPEN, which allows to notify the userspace when the node lost the contiuity of MRP_InTest frames. Signed-off-by: Horatiu Vultur --- include/uapi/linux/if_link.h | 1 + net/bridge/br_netlink.c | 3 +++ tools/include/uapi/linux/if_link.h | 1 + 3 files changed, 5 insertions(+) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index cc185a007ade8..26842ffd0501d 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -344,6 +344,7 @@ enum { IFLA_BRPORT_ISOLATED, IFLA_BRPORT_BACKUP_PORT, IFLA_BRPORT_MRP_RING_OPEN, + IFLA_BRPORT_MRP_IN_OPEN, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index c532fa65c9834..147d52596e174 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -152,6 +152,7 @@ static inline size_t br_port_info_size(void) #endif + nla_total_size(sizeof(u16)) /* IFLA_BRPORT_GROUP_FWD_MASK */ + nla_total_size(sizeof(u8)) /* IFLA_BRPORT_MRP_RING_OPEN */ + + nla_total_size(sizeof(u8)) /* IFLA_BRPORT_MRP_IN_OPEN */ + 0; } @@ -216,6 +217,8 @@ static int br_port_fill_attrs(struct sk_buff *skb, !!(p->flags & BR_NEIGH_SUPPRESS)) || nla_put_u8(skb, IFLA_BRPORT_MRP_RING_OPEN, !!(p->flags & BR_MRP_LOST_CONT)) || + nla_put_u8(skb, IFLA_BRPORT_MRP_IN_OPEN, + !!(p->flags & BR_MRP_LOST_IN_CONT)) || nla_put_u8(skb, IFLA_BRPORT_ISOLATED, !!(p->flags & BR_ISOLATED))) return -EMSGSIZE; diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h index cafedbbfefbe9..781e482dc499f 100644 --- a/tools/include/uapi/linux/if_link.h +++ b/tools/include/uapi/linux/if_link.h @@ -344,6 +344,7 @@ enum { IFLA_BRPORT_ISOLATED, IFLA_BRPORT_BACKUP_PORT, IFLA_BRPORT_MRP_RING_OPEN, + IFLA_BRPORT_MRP_IN_OPEN, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) -- 2.27.0