Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964933AbbDWJZg (ORCPT ); Thu, 23 Apr 2015 05:25:36 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:32788 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753008AbbDWJZe (ORCPT ); Thu, 23 Apr 2015 05:25:34 -0400 Message-ID: <5538BA89.6090709@profitbricks.com> Date: Thu, 23 Apr 2015 11:25:29 +0200 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: "ira.weiny" CC: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 09/27] IB/Verbs: Reform IB-core verbs/uverbs_cmd/sysfs References: <5534B8C9.506@profitbricks.com> <5534BA7C.2010600@profitbricks.com> <20150421231958.GA15893@phlsvsds.ph.intel.com> <55375011.7010805@profitbricks.com> <20150422162833.GB1494@phlsvsds.ph.intel.com> In-Reply-To: <20150422162833.GB1494@phlsvsds.ph.intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3299 Lines: 93 On 04/22/2015 06:28 PM, ira.weiny wrote: [snip] > >> >> link_layer_show() was supposed to report the same info to user >> space as usual, so user tool don't have to change anything :-) > > We need to expose the "cap_*" functionality to userspace which can then convert > to this interface and stop relying on inferring support based on the link > layer. But that is a separate issue from correctly reporting the link layer. > > The link layer should be reported correctly from the drivers "get_link_layer" > call. I get your point :-) link_layer_show() and ib_uverbs_query_port() do only need the link layer type rather then a mgmt check, modification on these two will be dropped in next version. Regards, Michael Wang > > Ira > >> >> Regards, >> Michael Wang >> >>> >>> Ira >>> >>>> return sprintf(buf, "%s\n", "InfiniBand"); >>>> - case IB_LINK_LAYER_ETHERNET: >>>> + else >>>> return sprintf(buf, "%s\n", "Ethernet"); >>>> - default: >>>> - return sprintf(buf, "%s\n", "Unknown"); >>>> - } >>>> } >>>> >>>> static PORT_ATTR_RO(state); >>>> diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c >>>> index a9f0489..5dc90aa 100644 >>>> --- a/drivers/infiniband/core/uverbs_cmd.c >>>> +++ b/drivers/infiniband/core/uverbs_cmd.c >>>> @@ -515,8 +515,10 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file, >>>> resp.active_width = attr.active_width; >>>> resp.active_speed = attr.active_speed; >>>> resp.phys_state = attr.phys_state; >>>> - resp.link_layer = rdma_port_get_link_layer(file->device->ib_dev, >>>> - cmd.port_num); >>>> + resp.link_layer = rdma_tech_ib(file->device->ib_dev, >>>> + cmd.port_num) ? >>>> + IB_LINK_LAYER_INFINIBAND : >>>> + IB_LINK_LAYER_ETHERNET; >>>> >>>> if (copy_to_user((void __user *) (unsigned long) cmd.response, >>>> &resp, sizeof resp)) >>>> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c >>>> index 626c9cf..7264860 100644 >>>> --- a/drivers/infiniband/core/verbs.c >>>> +++ b/drivers/infiniband/core/verbs.c >>>> @@ -200,11 +200,9 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc, >>>> u32 flow_class; >>>> u16 gid_index; >>>> int ret; >>>> - int is_eth = (rdma_port_get_link_layer(device, port_num) == >>>> - IB_LINK_LAYER_ETHERNET); >>>> >>>> memset(ah_attr, 0, sizeof *ah_attr); >>>> - if (is_eth) { >>>> + if (rdma_tech_iboe(device, port_num)) { >>>> if (!(wc->wc_flags & IB_WC_GRH)) >>>> return -EPROTOTYPE; >>>> >>>> @@ -873,7 +871,7 @@ int ib_resolve_eth_l2_attrs(struct ib_qp *qp, >>>> union ib_gid sgid; >>>> >>>> if ((*qp_attr_mask & IB_QP_AV) && >>>> - (rdma_port_get_link_layer(qp->device, qp_attr->ah_attr.port_num) == IB_LINK_LAYER_ETHERNET)) { >>>> + (rdma_tech_iboe(qp->device, qp_attr->ah_attr.port_num))) { >>>> ret = ib_query_gid(qp->device, qp_attr->ah_attr.port_num, >>>> qp_attr->ah_attr.grh.sgid_index, &sgid); >>>> if (ret) >>>> -- >>>> 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/