Skip to content

L
linux
Commit 58bd6e06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma updates from Doug Ledford:
 "We have four batched up patches for the current rc kernel.

  Two of them are small fixes that are obvious.

  One of them is larger than I would like for a late stage rc pull, but
  we found an issue in the namespace lookup code related to RoCE and
  this works around the issue for now (we allow a lookup with a
  namespace to succeed on RoCE since RoCE namespaces aren't implemented
  yet).  This will go away in 4.4 when we put in support for namespaces
  in RoCE devices.

  The last one is large in terms of lines, but is all legal and no
  functional changes.  Cisco needed to update their files to be more
  specific about their license.  They had intended the files to be dual
  licensed as GPL/BSD all along, and specified that in their module
  license tag, but their file headers were not up to par.  They
  contacted all of the contributors to get agreement and then submitted
  a patch to update the license headers in the files.

  Summary:

   - Work around connection namespace lookup bug related to RoCE

   - Change usnic license to Dual GPL/BSD (was intended to be that way
     all along, but wasn't clear, permission from contributors was
     chased down)

   - Fix an issue between NFSoRDMA and mlx5 that could cause an oops

   - Fix leak of sendonly multicast groups"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ipoib: For sendonly join free the multicast group on leave
  IB/cma: Accept connection without a valid netdev on RoCE
  xprtrdma: Don't require LOCAL_DMA_LKEY support for fastreg
  usnic: add missing clauses to BSD license
parents c7823b6b 0b5c9279
Hide whitespace changes
Inline Side-by-side
Showing with 481 additions and 94 deletions
drivers/infiniband/core/cma.c
View file @ 58bd6e06
...@@ -1232,14 +1232,32 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv, ...@@ -1232,14 +1232,32 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv,
return true; return true;
} }
static bool cma_protocol_roce_dev_port(struct ib_device *device, int port_num)
{
enum rdma_link_layer ll = rdma_port_get_link_layer(device, port_num);
enum rdma_transport_type transport =
rdma_node_get_transport(device->node_type);
return ll == IB_LINK_LAYER_ETHERNET && transport == RDMA_TRANSPORT_IB;
}
static bool cma_protocol_roce(const struct rdma_cm_id *id)
{
struct ib_device *device = id->device;
const int port_num = id->port_num ?: rdma_start_port(device);
return cma_protocol_roce_dev_port(device, port_num);
}
static bool cma_match_net_dev(const struct rdma_id_private *id_priv, static bool cma_match_net_dev(const struct rdma_id_private *id_priv,
const struct net_device *net_dev) const struct net_device *net_dev)
{ {
const struct rdma_addr *addr = &id_priv->id.route.addr; const struct rdma_addr *addr = &id_priv->id.route.addr;
if (!net_dev) if (!net_dev)
/* This request is an AF_IB request */ /* This request is an AF_IB request or a RoCE request */
return addr->src_addr.ss_family == AF_IB; return addr->src_addr.ss_family == AF_IB ||
cma_protocol_roce(&id_priv->id);
return !addr->dev_addr.bound_dev_if || return !addr->dev_addr.bound_dev_if ||
(net_eq(dev_net(net_dev), &init_net) && (net_eq(dev_net(net_dev), &init_net) &&
...@@ -1294,6 +1312,10 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id, ...@@ -1294,6 +1312,10 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id,
if (PTR_ERR(*net_dev) == -EAFNOSUPPORT) { if (PTR_ERR(*net_dev) == -EAFNOSUPPORT) {
/* Assuming the protocol is AF_IB */ /* Assuming the protocol is AF_IB */
*net_dev = NULL; *net_dev = NULL;
} else if (cma_protocol_roce_dev_port(req.device, req.port)) {
/* TODO find the net dev matching the request parameters
* through the RoCE GID table */
*net_dev = NULL;
} else { } else {
return ERR_CAST(*net_dev); return ERR_CAST(*net_dev);
} }
...@@ -1593,11 +1615,16 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, ...@@ -1593,11 +1615,16 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
if (ret) if (ret)
goto err; goto err;
} else { } else {
/* An AF_IB connection */ if (!cma_protocol_roce(listen_id) &&
WARN_ON_ONCE(ss_family != AF_IB); cma_any_addr(cma_src_addr(id_priv))) {
rt->addr.dev_addr.dev_type = ARPHRD_INFINIBAND;
cma_translate_ib((struct sockaddr_ib *)cma_src_addr(id_priv), rdma_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid);
&rt->addr.dev_addr); ib_addr_set_pkey(&rt->addr.dev_addr, be16_to_cpu(rt->path_rec[0].pkey));
} else if (!cma_any_addr(cma_src_addr(id_priv))) {
ret = cma_translate_addr(cma_src_addr(id_priv), &rt->addr.dev_addr);
if (ret)
goto err;
}
} }
rdma_addr_set_dgid(&rt->addr.dev_addr, &rt->path_rec[0].dgid); rdma_addr_set_dgid(&rt->addr.dev_addr, &rt->path_rec[0].dgid);
...@@ -1635,13 +1662,12 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id, ...@@ -1635,13 +1662,12 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
if (ret) if (ret)
goto err; goto err;
} else { } else {
/* An AF_IB connection */ if (!cma_any_addr(cma_src_addr(id_priv))) {
WARN_ON_ONCE(ss_family != AF_IB); ret = cma_translate_addr(cma_src_addr(id_priv),
&id->route.addr.dev_addr);
if (!cma_any_addr(cma_src_addr(id_priv))) if (ret)
cma_translate_ib((struct sockaddr_ib *) goto err;
cma_src_addr(id_priv), }
&id->route.addr.dev_addr);
} }
id_priv->state = RDMA_CM_CONNECT; id_priv->state = RDMA_CM_CONNECT;
......
drivers/infiniband/hw/usnic/usnic.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_abi.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_common_util.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_debugfs.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_debugfs.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_fwd.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_fwd.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_main.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_sysfs.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_verbs.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_ib_verbs.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_log.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_transport.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_transport.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_uiom.c
View file @ 58bd6e06
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* licenses. You may choose to be licensed under the terms of the GNU * licenses. You may choose to be licensed under the terms of the GNU
* General Public License (GPL) Version 2, available from the file * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the * COPYING in the main directory of this source tree, or the
* OpenIB.org BSD license below: * BSD license below:
* *
* Redistribution and use in source and binary forms, with or * Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following * without modification, are permitted provided that the following
......
drivers/infiniband/hw/usnic/usnic_uiom.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2014, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_vnic.c
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/hw/usnic/usnic_vnic.h
View file @ 58bd6e06
/* /*
* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
* *
* This program is free software; you may redistribute it and/or modify * This software is available to you under a choice of one of two
* it under the terms of the GNU General Public License as published by * licenses. You may choose to be licensed under the terms of the GNU
* the Free Software Foundation; version 2 of the License. * General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the
* BSD license below:
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
......
drivers/infiniband/ulp/ipoib/ipoib.h
View file @ 58bd6e06
...@@ -495,6 +495,7 @@ void ipoib_dev_cleanup(struct net_device *dev); ...@@ -495,6 +495,7 @@ void ipoib_dev_cleanup(struct net_device *dev);
void ipoib_mcast_join_task(struct work_struct *work); void ipoib_mcast_join_task(struct work_struct *work);
void ipoib_mcast_carrier_on_task(struct work_struct *work); void ipoib_mcast_carrier_on_task(struct work_struct *work);
void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb); void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb);
void ipoib_mcast_free(struct ipoib_mcast *mc);
void ipoib_mcast_restart_task(struct work_struct *work); void ipoib_mcast_restart_task(struct work_struct *work);
int ipoib_mcast_start_thread(struct net_device *dev); int ipoib_mcast_start_thread(struct net_device *dev);
......
drivers/infiniband/ulp/ipoib/ipoib_main.c
View file @ 58bd6e06
...@@ -1207,8 +1207,10 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) ...@@ -1207,8 +1207,10 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv)
out_unlock: out_unlock:
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
list_for_each_entry_safe(mcast, tmcast, &remove_list, list) list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
ipoib_mcast_leave(dev, mcast); ipoib_mcast_leave(dev, mcast);
ipoib_mcast_free(mcast);
}
} }
static void ipoib_reap_neigh(struct work_struct *work) static void ipoib_reap_neigh(struct work_struct *work)
......
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
View file @ 58bd6e06
...@@ -106,7 +106,7 @@ static void __ipoib_mcast_schedule_join_thread(struct ipoib_dev_priv *priv, ...@@ -106,7 +106,7 @@ static void __ipoib_mcast_schedule_join_thread(struct ipoib_dev_priv *priv,
queue_delayed_work(priv->wq, &priv->mcast_task, 0); queue_delayed_work(priv->wq, &priv->mcast_task, 0);
} }
static void ipoib_mcast_free(struct ipoib_mcast *mcast) void ipoib_mcast_free(struct ipoib_mcast *mcast)
{ {
struct net_device *dev = mcast->dev; struct net_device *dev = mcast->dev;
int tx_dropped = 0; int tx_dropped = 0;
......
net/sunrpc/xprtrdma/verbs.c
View file @ 58bd6e06
...@@ -543,11 +543,8 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) ...@@ -543,11 +543,8 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
} }
if (memreg == RPCRDMA_FRMR) { if (memreg == RPCRDMA_FRMR) {
/* Requires both frmr reg and local dma lkey */ if (!(devattr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) ||
if (((devattr->device_cap_flags & (devattr->max_fast_reg_page_list_len == 0)) {
(IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) !=
(IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) ||
(devattr->max_fast_reg_page_list_len == 0)) {
dprintk("RPC: %s: FRMR registration " dprintk("RPC: %s: FRMR registration "
"not supported by HCA\n", __func__); "not supported by HCA\n", __func__);
memreg = RPCRDMA_MTHCAFMR; memreg = RPCRDMA_MTHCAFMR;
...@@ -557,6 +554,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) ...@@ -557,6 +554,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
if (!ia->ri_device->alloc_fmr) { if (!ia->ri_device->alloc_fmr) {
dprintk("RPC: %s: MTHCAFMR registration " dprintk("RPC: %s: MTHCAFMR registration "
"not supported by HCA\n", __func__); "not supported by HCA\n", __func__);
rc = -EINVAL;
goto out3; goto out3;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7