From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02C56C31E46 for ; Wed, 12 Jun 2019 11:33:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C15EC208CA for ; Wed, 12 Jun 2019 11:33:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linux-powerpc-org.20150623.gappssmtp.com header.i=@linux-powerpc-org.20150623.gappssmtp.com header.b="lqhSGRt2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407586AbfFLLdz (ORCPT ); Wed, 12 Jun 2019 07:33:55 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:42495 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406413AbfFLLdz (ORCPT ); Wed, 12 Jun 2019 07:33:55 -0400 Received: by mail-ed1-f66.google.com with SMTP id z25so25220092edq.9 for ; Wed, 12 Jun 2019 04:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-powerpc-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TsABUyr6czjxkgVPVlQz/+LV8vXRq4YLo2VkQCGdbrI=; b=lqhSGRt2GPnBMZl9OHjZPdTnaGC8MuuF5RKiYHKLj+kJd0vO34ykhAMVvi3/ztrcb/ m7s93ddk84XOaxuiJ3CZjQ+k3I/kXSCssrBrE3CD/s8IWGBLTJYHMk5AM5sJsin63LZF 6z9sw8VObdVnzvdQ0cZT1IGNk/BA/RGUMHq0ivf9v+R37MnG0Byv+z69qfoLzB/+U0Dw Ofy5fV6mXIvP9G65alKRuPWQC6I82zmYPjBAsjXij0cUcTiYY7imMMkS/AuPxsEpdiD/ I+ACUA99Jttddfz7yZBX3n7XJxHEaOPMdNqAdHrbzJ2GqITmRGg46um1E9qrfd+mdo03 WBsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TsABUyr6czjxkgVPVlQz/+LV8vXRq4YLo2VkQCGdbrI=; b=ntu4hiFCDW23LR0rwqcvLGozEOFCThzt6WFdaDL6B6+olBIzfqf0b4qGwWVHolFVSa TjreE0YpQnOyQhlz2Mm0GmK1eiwqq4bEGKqG88m58xYM2qD3hB4xiDLtUnhcj22izqA0 6wQ44hndksU+Y8n9Ae8Xnefqsp6hTP9ltmG3+uV5sgOaoK7BikLfWM64toyfvVZTftv+ OTv1N/nhFiLaW4/3uZ76rAjmIq/4cQnr8JTMUo09M3oWXoTYIIfK3Dp/FAmlH3x9+SSC V2hTsY470TD9qTRyO8akTnNkW0mpU0Fo1BArbFJ4QiYa6U8Otwucf6qgH6Bq8ipqY3WH rVJA== X-Gm-Message-State: APjAAAUOqTK653mqCthkrlpXOZESLGJEU25qLG6Wlwd7bKmTTSchomSt NtNaL35bBQ1EPFG0pCb1quzzHlu0036RLA== X-Google-Smtp-Source: APXvYqwh3pugoDidWfjeiGQrMilab3hYM3dq0SIHQS9CnMI7n+pYFtoAg6OXHlsd8OjzJTtrkLadtg== X-Received: by 2002:a50:8dc7:: with SMTP id s7mr34856137edh.268.1560339233963; Wed, 12 Jun 2019 04:33:53 -0700 (PDT) Received: from tegmen.arch.suse.de (charybdis-ext.suse.de. [195.135.221.2]) by smtp.gmail.com with ESMTPSA id i21sm2752934ejd.76.2019.06.12.04.33.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jun 2019 04:33:53 -0700 (PDT) From: Denis Kirjanov X-Google-Original-From: Denis Kirjanov To: davem@davemloft.net, dledford@redhat.com Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, Denis Kirjanov Subject: [PATCH 1/2] ipoib: correcly show a VF hardware address Date: Wed, 12 Jun 2019 13:33:45 +0200 Message-Id: <20190612113348.59858-1-dkirjanov@suse.com> X-Mailer: git-send-email 2.12.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org in the case of IPoIB with SRIOV enabled hardware ip link show command incorrecly prints 0 instead of a VF hardware address. To correcly print the address add a new field to specify an address length. Before: 11: ib1: mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff vf 0 MAC 00:00:00:00:00:00, spoof checking off, link-state disable, trust off, query_rss off ... After: 11: ib1: mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff vf 0 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff, spoof checking off, link-state disable, trust off, query_rss off ... Signed-off-by: Denis Kirjanov --- drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 + include/uapi/linux/if_link.h | 1 + net/core/rtnetlink.c | 1 + 3 files changed, 3 insertions(+) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 9b5e11d3fb85..04ea7db08e87 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -1998,6 +1998,7 @@ static int ipoib_get_vf_config(struct net_device *dev, int vf, return err; ivf->vf = vf; + memcpy(ivf->mac, dev->dev_addr, dev->addr_len); return 0; } diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 5b225ff63b48..904ee1a7330b 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -702,6 +702,7 @@ enum { struct ifla_vf_mac { __u32 vf; __u8 mac[32]; /* MAX_ADDR_LEN */ + __u8 addr_len; }; struct ifla_vf_vlan { diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index cec60583931f..2e1b9ffbe602 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1230,6 +1230,7 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb, vf_rss_query_en.vf = vf_trust.vf = ivi.vf; + vf_mac.addr_len = dev->addr_len; memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac)); vf_vlan.vlan = ivi.vlan; vf_vlan.qos = ivi.qos; -- 2.12.3