From patchwork Fri Apr 4 00:51:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 3935301 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45062BFF02 for ; Fri, 4 Apr 2014 00:52:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CE7620225 for ; Fri, 4 Apr 2014 00:52:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71A3B202FE for ; Fri, 4 Apr 2014 00:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751899AbaDDAwa (ORCPT ); Thu, 3 Apr 2014 20:52:30 -0400 Received: from mga02.intel.com ([134.134.136.20]:36703 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbaDDAw3 (ORCPT ); Thu, 3 Apr 2014 20:52:29 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 03 Apr 2014 17:52:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,791,1389772800"; d="scan'208";a="486938502" Received: from sedona.ch.intel.com ([143.182.228.65]) by orsmga001.jf.intel.com with ESMTP; 03 Apr 2014 17:52:28 -0700 Received: from phlsvsles11.ph.intel.com (phlsvsles11.ph.intel.com [10.228.195.43]) by sedona.ch.intel.com (8.13.6/8.14.3/Standard MailSET/Hub) with ESMTP id s340qRt3008214; Thu, 3 Apr 2014 17:52:28 -0700 Received: from phlsvsles11.ph.intel.com (localhost [127.0.0.1]) by phlsvsles11.ph.intel.com with ESMTP id s340qRaX017550; Thu, 3 Apr 2014 20:52:27 -0400 Received: (from iweiny@localhost) by phlsvsles11.ph.intel.com with id s340qRE1017539; Thu, 3 Apr 2014 20:52:27 -0400 X-Authentication-Warning: phlsvsles11.ph.intel.com: iweiny set sender to ira.weiny@intel.com using -f From: ira.weiny@intel.com To: linux-rdma@vger.kernel.org Cc: sean.hefty@intel.com, Ira Weiny Subject: [PATCH 10/14] ibacm: Add Netlink socket to monitor IP address changes Date: Thu, 3 Apr 2014 20:51:50 -0400 Message-Id: <1396572714-16498-11-git-send-email-ira.weiny@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1396572714-16498-1-git-send-email-ira.weiny@intel.com> References: <1396572714-16498-1-git-send-email-ira.weiny@intel.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ira Weiny Currently only reports events to the log. Signed-off-by: Ira Weiny --- src/acm.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/src/acm.c b/src/acm.c index af1c66e..45f3ed9 100644 --- a/src/acm.c +++ b/src/acm.c @@ -49,6 +49,9 @@ #include #include #include +#include +#include +#include #include "acm_mad.h" #include "acm_util.h" @@ -214,6 +217,7 @@ static event_t timeout_event; static atomic_t wait_cnt; static SOCKET listen_socket; +static SOCKET ip_mon_socket; static struct acm_client client[FD_SETSIZE - 1]; static FILE *flog; @@ -2389,6 +2393,92 @@ out: acm_disconnect_client(client); } +static int acm_ipnl_create(void) +{ + struct sockaddr_nl addr; + + if ((ip_mon_socket = socket(PF_NETLINK, SOCK_RAW | SOCK_NONBLOCK, NETLINK_ROUTE)) == -1) { + acm_log(0, "Failed to open NETLINK_ROUTE socket"); + return EIO; + } + + memset(&addr, 0, sizeof(addr)); + addr.nl_family = AF_NETLINK; + addr.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR; + + if (bind(ip_mon_socket, (struct sockaddr *)&addr, sizeof(addr)) == -1) { + acm_log(0, "Failed to bind NETLINK_ROUTE socket"); + return EIO; + } + + return 0; +} + +#define NL_MSG_BUF_SIZE 4096 +static void acm_ipnl_handler(void) +{ + int len; + char buffer[NL_MSG_BUF_SIZE]; + struct nlmsghdr *nlh; + char name[IFNAMSIZ]; + char ip_str[INET6_ADDRSTRLEN]; + + while ((len = recv(ip_mon_socket, buffer, NL_MSG_BUF_SIZE, 0)) > 0) { + nlh = (struct nlmsghdr *)buffer; + while ((NLMSG_OK(nlh, len)) && (nlh->nlmsg_type != NLMSG_DONE)) { + struct ifaddrmsg *ifa = (struct ifaddrmsg *) NLMSG_DATA(nlh); + struct ifinfomsg *ifi = (struct ifinfomsg *) NLMSG_DATA(nlh); + struct rtattr *rth = IFA_RTA(ifa); + int rtl = IFA_PAYLOAD(nlh); + + switch (nlh->nlmsg_type) { + case RTM_NEWADDR: + { + if_indextoname(ifa->ifa_index, name); + while (rtl && RTA_OK(rth, rtl)) { + if (rth->rta_type == IFA_LOCAL) { + acm_log(0, "Address added %s : %s\n", + name, inet_ntop(ifa->ifa_family, RTA_DATA(rth), + ip_str, sizeof(ip_str))); + } + rth = RTA_NEXT(rth, rtl); + } + break; + } + case RTM_DELADDR: + { + if_indextoname(ifa->ifa_index, name); + while (rtl && RTA_OK(rth, rtl)) { + if (rth->rta_type == IFA_LOCAL) { + acm_log(0, "Address deleted %s : %s\n", + name, inet_ntop(ifa->ifa_family, RTA_DATA(rth), + ip_str, sizeof(ip_str))); + } + rth = RTA_NEXT(rth, rtl); + } + break; + } + case RTM_NEWLINK: + { + acm_log(2, "Link added : %s\n", if_indextoname(ifi->ifi_index, name)); + break; + } + case RTM_DELLINK: + { + acm_log(2, "Link removed : %s\n", if_indextoname(ifi->ifi_index, name)); + break; + } + default: + acm_log(2, "unknown netlink message\n"); + break; + } + nlh = NLMSG_NEXT(nlh, len); + } + } + if (len < 0 && errno == ENOBUFS) + acm_log(0, "ENOBUFS returned from netlink... Resyncing all IP's\n"); +} + static void acm_server(void) { fd_set readfds; @@ -2407,6 +2497,9 @@ static void acm_server(void) FD_ZERO(&readfds); FD_SET(listen_socket, &readfds); + n = max(n, (int) ip_mon_socket); + FD_SET(ip_mon_socket, &readfds); + for (i = 0; i < FD_SETSIZE - 1; i++) { if (client[i].sock != INVALID_SOCKET) { FD_SET(client[i].sock, &readfds); @@ -2423,6 +2516,9 @@ static void acm_server(void) if (FD_ISSET(listen_socket, &readfds)) acm_svr_accept(); + if (FD_ISSET(ip_mon_socket, &readfds)) + acm_ipnl_handler(); + for (i = 0; i < FD_SETSIZE - 1; i++) { if (client[i].sock != INVALID_SOCKET && FD_ISSET(client[i].sock, &readfds)) { @@ -3746,6 +3842,9 @@ int CDECL_FUNC main(int argc, char **argv) return -1; } + acm_log(1, "creating IP Netlink socket\n"); + acm_ipnl_create(); + acm_activate_devices(); acm_log(1, "starting timeout/retry thread\n"); beginthread(acm_retry_handler, NULL);