Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1275731ybt; Thu, 9 Jul 2020 03:06:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE6rKi4B8UEnLi13MruDwBo715Uc5+FCK3RmNx0WwKbdP4/Bjo6AXlJ8n79lDGftw3WxNs X-Received: by 2002:a17:906:c451:: with SMTP id ck17mr57805728ejb.80.1594289164563; Thu, 09 Jul 2020 03:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594289164; cv=none; d=google.com; s=arc-20160816; b=nHObHrAVmwt1kz81ftURcGlaDsd2lS+7Ol6pHwxrw2fDvmTcgNl3BjIW1sCQmgJIEz YCyUV1KAxbdQFAzVr6LUVFWDbHYD+5L5nHHN1SY7KhLdwY7MWbjI6kGEEOKSedsGgw9s TF/y/kego6cSe2XoLU5Huf5GU35jFqNOlKs1tz2y/xKagtdytScO//cM0vZ1Dkr6Yo9u atg0ZpcfgisMIbnONO0QT2AMfQjSY+TLXkQhKc0NfWHu1yIuzvZVjw6zQJit4N2gH/I5 sSMjZhAT4VIVE8Tu798D0BT+TYcg9VlbY0sn68Ens2z1uBlG7eT5qGrsdLL8iEOT+pdR EQEg== 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=ER4knFsrYPjRduCiMplqqYKPGDWIMShdW/IZPxPoizH+HaWdtDUz4MO9e+GMhIGj0m fWamchNb7X+GeTGVAJBHdgBD9iJgEQSfMTxcZzkMlrcOf5X++QDO8mPBKtzcB9klfC3P Tl7hIcV901PdAVsaZbqLC+HfvRD8TCpRd8NDHe30LOjTCNiiZ1mi7uWLg3LPM+OarANU F6rXQxBjunKnTRARO+z77+e/fLier2rUqtbPiOWlcVNV+e1JAm9Fc6xg7inmPAwjzvl7 yWkdYc0S+zj+VlU+1rQRNTxkoFP6QKX0WirdQ/jIdy6Af+UZMzlWBGlyL7SldtI6PwRT 1Cqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=PpbDyekO; 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 o23si1602739ejx.620.2020.07.09.03.05.41; Thu, 09 Jul 2020 03:06:04 -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=PpbDyekO; 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 S1726506AbgGIKCk (ORCPT + 99 others); Thu, 9 Jul 2020 06:02:40 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:27726 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726376AbgGIKCY (ORCPT ); Thu, 9 Jul 2020 06:02:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594288943; x=1625824943; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BPXYksHE/6skyxwfmW3layVz9HGsj0QnR14maadzSj4=; b=PpbDyekOD/swQ7R6SPkgG5TSx5p0Tt/v66lxgKBBuz1gMszWvYDhnpc1 T3ANdCBu2Hgovpraf41uPs+irILDMD1ZhoKYw2Z+mOce5bvuJ9fQdXaRT mu8kWgAcqZNW1SI/q+HliBGRdKHhf04gHrk1zbkMj1AH4jQhLTipv2AaB D6F9mBZz5O2mV9Zuer095zDUK0P1ruCQtCzS0srCqUE4RFPiTPk6e795u w+kQ82cCmr0ePG53FU8Wno/zvNDjUcQ/Kr8ankGi9Dg8OOGLwYzlIOU0k cwMg5jrOKUvEanRDFE7aKXkSs9YWTePHe1tevXTC9rQkTs+kwqRU3Y0P4 w==; IronPort-SDR: H9lWyFo4thevO2UCMwl68KwSeEYr4X14VBHMfMdmUHMdNHIlgVS584rcGTSvgAy19R+TLDoqtU WJokifslnYK19GLvnY/7H5gVwg/ou/EarFQH5pqpzMeMgqMYeNNwBxJ2rDEYxeIXqYvemrAOZR HkvgWjffq+BeUjVDnyGXGPL0PmnnpZ9fRQAnIFLjyYeS1Roo5MTvlAqomslnAw7UIfLDWighh4 eqWBE6GzLPMTmBx2BNvWBjYu1KH+qW3GitW3gv5i1CJimiYI845K+SuLOYo6tmB7dafzECC4mG TXg= X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="82397835" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 03:02:23 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 03:02:19 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 03:02:15 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH net-next v2 12/12] net: bridge: Add port attribute IFLA_BRPORT_MRP_IN_OPEN Date: Thu, 9 Jul 2020 12:00:40 +0200 Message-ID: <20200709100040.554623-13-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709100040.554623-1-horatiu.vultur@microchip.com> References: <20200709100040.554623-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