mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
03fe2debbb
Fun set of conflict resolutions here...
For the mac80211 stuff, these were fortunately just parallel
adds. Trivially resolved.
In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.
In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.
The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.
The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:
====================
Due to bug fixes found by the syzkaller bot and taken into the for-rc
branch after development for the 4.17 merge window had already started
being taken into the for-next branch, there were fairly non-trivial
merge issues that would need to be resolved between the for-rc branch
and the for-next branch. This merge resolves those conflicts and
provides a unified base upon which ongoing development for 4.17 can
be based.
Conflicts:
drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f95
(IB/mlx5: Fix cleanup order on unload) added to for-rc and
commit b5ca15ad7e (IB/mlx5: Add proper representors support)
add as part of the devel cycle both needed to modify the
init/de-init functions used by mlx5. To support the new
representors, the new functions added by the cleanup patch
needed to be made non-static, and the init/de-init list
added by the representors patch needed to be modified to
match the init/de-init list changes made by the cleanup
patch.
Updates:
drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
prototypes added by representors patch to reflect new function
names as changed by cleanup patch
drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
stage list to match new order from cleanup patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
108 lines
3.8 KiB
C
108 lines
3.8 KiB
C
/*
|
|
* drivers/net/ethernet/mellanox/mlxsw/mlxsw_span.h
|
|
* Copyright (c) 2018 Mellanox Technologies. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. 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.
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _MLXSW_SPECTRUM_SPAN_H
|
|
#define _MLXSW_SPECTRUM_SPAN_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/if_ether.h>
|
|
|
|
#include "spectrum_router.h"
|
|
|
|
struct mlxsw_sp;
|
|
struct mlxsw_sp_port;
|
|
|
|
enum mlxsw_sp_span_type {
|
|
MLXSW_SP_SPAN_EGRESS,
|
|
MLXSW_SP_SPAN_INGRESS
|
|
};
|
|
|
|
struct mlxsw_sp_span_inspected_port {
|
|
struct list_head list;
|
|
enum mlxsw_sp_span_type type;
|
|
u8 local_port;
|
|
|
|
/* Whether this is a directly bound mirror (port-to-port) or an ACL. */
|
|
bool bound;
|
|
};
|
|
|
|
struct mlxsw_sp_span_parms {
|
|
struct mlxsw_sp_port *dest_port; /* NULL for unoffloaded SPAN. */
|
|
unsigned int ttl;
|
|
unsigned char dmac[ETH_ALEN];
|
|
unsigned char smac[ETH_ALEN];
|
|
union mlxsw_sp_l3addr daddr;
|
|
union mlxsw_sp_l3addr saddr;
|
|
};
|
|
|
|
struct mlxsw_sp_span_entry_ops;
|
|
|
|
struct mlxsw_sp_span_entry {
|
|
const struct net_device *to_dev;
|
|
const struct mlxsw_sp_span_entry_ops *ops;
|
|
struct mlxsw_sp_span_parms parms;
|
|
struct list_head bound_ports_list;
|
|
int ref_count;
|
|
int id;
|
|
};
|
|
|
|
struct mlxsw_sp_span_entry_ops {
|
|
bool (*can_handle)(const struct net_device *to_dev);
|
|
int (*parms)(const struct net_device *to_dev,
|
|
struct mlxsw_sp_span_parms *sparmsp);
|
|
int (*configure)(struct mlxsw_sp_span_entry *span_entry,
|
|
struct mlxsw_sp_span_parms sparms);
|
|
void (*deconfigure)(struct mlxsw_sp_span_entry *span_entry);
|
|
};
|
|
|
|
int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp);
|
|
void mlxsw_sp_span_fini(struct mlxsw_sp *mlxsw_sp);
|
|
void mlxsw_sp_span_respin(struct mlxsw_sp *mlxsw_sp);
|
|
|
|
int mlxsw_sp_span_mirror_add(struct mlxsw_sp_port *from,
|
|
const struct net_device *to_dev,
|
|
enum mlxsw_sp_span_type type,
|
|
bool bind, int *p_span_id);
|
|
void mlxsw_sp_span_mirror_del(struct mlxsw_sp_port *from, int span_id,
|
|
enum mlxsw_sp_span_type type, bool bind);
|
|
struct mlxsw_sp_span_entry *
|
|
mlxsw_sp_span_entry_find_by_port(struct mlxsw_sp *mlxsw_sp,
|
|
const struct net_device *to_dev);
|
|
|
|
void mlxsw_sp_span_entry_invalidate(struct mlxsw_sp *mlxsw_sp,
|
|
struct mlxsw_sp_span_entry *span_entry);
|
|
|
|
int mlxsw_sp_span_port_mtu_update(struct mlxsw_sp_port *port, u16 mtu);
|
|
|
|
#endif
|