From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9461BA04FD; Tue, 14 Jan 2020 08:45:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AAEA1C25A; Tue, 14 Jan 2020 08:45:45 +0100 (CET) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by dpdk.org (Postfix) with ESMTP id 652091C242 for ; Tue, 14 Jan 2020 08:45:44 +0100 (CET) Received: by mail-io1-f66.google.com with SMTP id c16so12781469ioo.8 for ; Mon, 13 Jan 2020 23:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=c8f1kSZDLRO1jMTe1Oh339yg5EjHm5vC7nhYLaprcDM=; b=imNjzcuxLa/U2UPylCQ6wzZlBQ10dC+9Mev+sQw0pTEm0XvCd2AoPshC3h+PTYkzaI Imu2kyyPAtbeOBta98Zs4SqMsOXZzZ3VL83eE/htN8SdXS/tV2JHUK4b4sIglvFmuI5v wjXaMNXmCMdP0uTHzHkb1J5169dXgCB0O/v173a74HeYCRhG/YtL8S6qEu79Sc94282M Te4F3r1H48qlMXVlydKcWmi/Ix+W/IRvb0Aw+Mx8/C3NGJbdEsiDqJVAeuLRVlEXDVjC tR1sxd/FLtWu9TNxKAbyGI8aBGG6p7mEeC1t15u99FvKYBfUIbQaDkKBwfdoI5leLlck YFxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=c8f1kSZDLRO1jMTe1Oh339yg5EjHm5vC7nhYLaprcDM=; b=lMFlm6tBusxVHJKMJv0y8dynm2J0ruHWnfoYw3gFZ/HX0VdgDNI51AkETDhuHxoYUJ qWjfnUxWQ40FadB4mER7saFF2zMD2MW7OLVMi33QsbkPyGoqX03Q4MeIiKjugMYx6uaj xsL5UJ+T+Dne3ZbAH+Gu2/TclSX4stDDwC5FKLQqMazIZNL/MIhiN4BwSwG+0xnHjPz/ bSvSJMcccgvm6wIt1jqsQVHHm/11ArzKI0sFIfgVrYkBwmMmlMMILU/g/tz5SfC9e5L9 2l+w/7swTseJhNJHeb4qjcNO3eyc6rPkn8jDfY5QUG1Tn2Bca0qOK3St94Aes2kjsz1N FqnQ== X-Gm-Message-State: APjAAAXaddPhXwWC//4xPz2KYO2q94wfgciD6h02OrK+LhWedpdgGT01 WigjB3FWXm15FhXaThz/YJNj5FYdKUwlqv42QZk= X-Google-Smtp-Source: APXvYqyufUDH9UKpbyJtGFPIoVYsZd1eSa+XBPOvByK4/Jncl/hmugnpmygZQ050wc6QaJmMx/Bq/zYXpw53+8Jqv0U= X-Received: by 2002:a5e:8b44:: with SMTP id z4mr15954355iom.271.1578987943530; Mon, 13 Jan 2020 23:45:43 -0800 (PST) MIME-Version: 1.0 References: <20200113061644.6320-1-skori@marvell.com> <20200114074241.GA160869@outlook.office365.com> In-Reply-To: <20200114074241.GA160869@outlook.office365.com> From: Jerin Jacob Date: Tue, 14 Jan 2020 13:15:27 +0530 Message-ID: To: Harman Kalra Cc: Sunil Kumar Kori , Jerin Jacob Kollanukkaran , John McNamara , Marko Kovacevic , "dev@dpdk.org" Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH] net/octeontx: add unicast MAC filter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Jan 14, 2020 at 1:13 PM Harman Kalra wrote: > > On Mon, Jan 13, 2020 at 11:46:44AM +0530, Sunil Kumar Kori wrote: > > At BGX, DMAC filter table can be enabled to allow defined hosts. > > Patch implements 'mac_addr_add' and 'mac_addr_remove' ops to > > add/remove MAC filters which uses BGX DMAC filter table. > > > > Signed-off-by: Sunil Kumar Kori > > Acked-by: Harman Kalra Applied to dpdk-next-net-mrvl/master. Thanks > > --- > > doc/guides/nics/features/octeontx.ini | 2 +- > > drivers/net/octeontx/base/octeontx_bgx.c | 55 ++++++++++++++++++++++++ > > drivers/net/octeontx/base/octeontx_bgx.h | 6 +++ > > drivers/net/octeontx/octeontx_ethdev.c | 50 +++++++++++++++++++-- > > 4 files changed, 109 insertions(+), 4 deletions(-) > > > > diff --git a/doc/guides/nics/features/octeontx.ini b/doc/guides/nics/features/octeontx.ini > > index c92d5aa07..323befe59 100644 > > --- a/doc/guides/nics/features/octeontx.ini > > +++ b/doc/guides/nics/features/octeontx.ini > > @@ -10,7 +10,7 @@ Lock-free Tx queue = Y > > Queue start/stop = P > > Jumbo frame = Y > > Promiscuous mode = Y > > -Unicast MAC filter = P > > +Unicast MAC filter = Y > > CRC offload = Y > > Packet type parsing = Y > > Basic stats = Y > > diff --git a/drivers/net/octeontx/base/octeontx_bgx.c b/drivers/net/octeontx/base/octeontx_bgx.c > > index 0e2388264..e70255b11 100644 > > --- a/drivers/net/octeontx/base/octeontx_bgx.c > > +++ b/drivers/net/octeontx/base/octeontx_bgx.c > > @@ -243,3 +243,58 @@ octeontx_bgx_port_mac_set(int port, uint8_t *mac_addr) > > > > return res; > > } > > + > > +int > > +octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr) > > +{ > > + struct octeontx_mbox_hdr hdr; > > + int resp = 0; > > + int len = 6; > > + int res = 0; > > + > > + hdr.coproc = OCTEONTX_BGX_COPROC; > > + hdr.msg = MBOX_BGX_PORT_ADD_MACADDR; > > + hdr.vfid = port; > > + > > + res = octeontx_mbox_send(&hdr, mac_addr, len, &resp, sizeof(int)); > > + if (res < 0) > > + return -EACCES; > > + > > + return res; > > +} > > + > > +int > > +octeontx_bgx_port_mac_del(int port, uint32_t index) > > +{ > > + struct octeontx_mbox_hdr hdr; > > + int len = sizeof(uint32_t); > > + int res = 0; > > + > > + hdr.coproc = OCTEONTX_BGX_COPROC; > > + hdr.msg = MBOX_BGX_PORT_DEL_MACADDR; > > + hdr.vfid = port; > > + > > + res = octeontx_mbox_send(&hdr, &index, len, NULL, 0); > > + if (res < 0) > > + return -EACCES; > > + > > + return res; > > +} > > + > > +int > > +octeontx_bgx_port_mac_entries_get(int port) > > +{ > > + struct octeontx_mbox_hdr hdr; > > + int resp = 6; > > + int res = 0; > > + > > + hdr.coproc = OCTEONTX_BGX_COPROC; > > + hdr.msg = MBOX_BGX_PORT_GET_MACADDR_ENTRIES; > > + hdr.vfid = port; > > + > > + res = octeontx_mbox_send(&hdr, NULL, 0, &resp, sizeof(int)); > > + if (res < 0) > > + return -EACCES; > > + > > + return resp; > > +} > > diff --git a/drivers/net/octeontx/base/octeontx_bgx.h b/drivers/net/octeontx/base/octeontx_bgx.h > > index a9bbaf2c3..caaff179c 100644 > > --- a/drivers/net/octeontx/base/octeontx_bgx.h > > +++ b/drivers/net/octeontx/base/octeontx_bgx.h > > @@ -28,6 +28,9 @@ > > #define MBOX_BGX_PORT_SET_BCAST 12 > > #define MBOX_BGX_PORT_SET_MCAST 13 > > #define MBOX_BGX_PORT_SET_MTU 14 > > +#define MBOX_BGX_PORT_ADD_MACADDR 15 > > +#define MBOX_BGX_PORT_DEL_MACADDR 16 > > +#define MBOX_BGX_PORT_GET_MACADDR_ENTRIES 17 > > > > /* BGX port configuration parameters: */ > > typedef struct octeontx_mbox_bgx_port_conf { > > @@ -120,6 +123,9 @@ int octeontx_bgx_port_stats_clr(int port); > > int octeontx_bgx_port_link_status(int port); > > int octeontx_bgx_port_promisc_set(int port, int en); > > int octeontx_bgx_port_mac_set(int port, uint8_t *mac_addr); > > +int octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr); > > +int octeontx_bgx_port_mac_del(int port, uint32_t index); > > +int octeontx_bgx_port_mac_entries_get(int port); > > > > #endif /* __OCTEONTX_BGX_H__ */ > > > > diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c > > index 679803dd4..e23162d8a 100644 > > --- a/drivers/net/octeontx/octeontx_ethdev.c > > +++ b/drivers/net/octeontx/octeontx_ethdev.c > > @@ -558,6 +558,37 @@ octeontx_dev_stats_reset(struct rte_eth_dev *dev) > > return octeontx_port_stats_clr(nic); > > } > > > > +static void > > +octeontx_dev_mac_addr_del(struct rte_eth_dev *dev, uint32_t index) > > +{ > > + struct octeontx_nic *nic = octeontx_pmd_priv(dev); > > + int ret; > > + > > + ret = octeontx_bgx_port_mac_del(nic->port_id, index); > > + if (ret != 0) > > + octeontx_log_err("failed to del MAC address filter on port %d", > > + nic->port_id); > > +} > > + > > +static int > > +octeontx_dev_mac_addr_add(struct rte_eth_dev *dev, > > + struct rte_ether_addr *mac_addr, > > + __rte_unused uint32_t index, > > + __rte_unused uint32_t vmdq) > > +{ > > + struct octeontx_nic *nic = octeontx_pmd_priv(dev); > > + int ret; > > + > > + ret = octeontx_bgx_port_mac_add(nic->port_id, mac_addr->addr_bytes); > > + if (ret < 0) { > > + octeontx_log_err("failed to add MAC address filter on port %d", > > + nic->port_id); > > + return ret; > > + } > > + > > + return 0; > > +} > > + > > static int > > octeontx_dev_default_mac_addr_set(struct rte_eth_dev *dev, > > struct rte_ether_addr *addr) > > @@ -577,7 +608,7 @@ static int > > octeontx_dev_info(struct rte_eth_dev *dev, > > struct rte_eth_dev_info *dev_info) > > { > > - RTE_SET_USED(dev); > > + struct octeontx_nic *nic = octeontx_pmd_priv(dev); > > > > /* Autonegotiation may be disabled */ > > dev_info->speed_capa = ETH_LINK_SPEED_FIXED; > > @@ -585,7 +616,8 @@ octeontx_dev_info(struct rte_eth_dev *dev, > > ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G | > > ETH_LINK_SPEED_40G; > > > > - dev_info->max_mac_addrs = 1; > > + dev_info->max_mac_addrs = > > + octeontx_bgx_port_mac_entries_get(nic->port_id); > > dev_info->max_rx_pktlen = PKI_MAX_PKTLEN; > > dev_info->max_rx_queues = 1; > > dev_info->max_tx_queues = PKO_MAX_NUM_DQ; > > @@ -986,6 +1018,8 @@ static const struct eth_dev_ops octeontx_dev_ops = { > > .link_update = octeontx_dev_link_update, > > .stats_get = octeontx_dev_stats_get, > > .stats_reset = octeontx_dev_stats_reset, > > + .mac_addr_remove = octeontx_dev_mac_addr_del, > > + .mac_addr_add = octeontx_dev_mac_addr_add, > > .mac_addr_set = octeontx_dev_default_mac_addr_set, > > .tx_queue_start = octeontx_dev_tx_queue_start, > > .tx_queue_stop = octeontx_dev_tx_queue_stop, > > @@ -1009,6 +1043,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, > > struct rte_eth_dev *eth_dev = NULL; > > struct rte_eth_dev_data *data; > > const char *name = rte_vdev_device_name(dev); > > + int max_entries; > > > > PMD_INIT_FUNC_TRACE(); > > > > @@ -1082,7 +1117,16 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, > > data->all_multicast = 0; > > data->scattered_rx = 0; > > > > - data->mac_addrs = rte_zmalloc_socket(octtx_name, RTE_ETHER_ADDR_LEN, 0, > > + /* Get maximum number of supported MAC entries */ > > + max_entries = octeontx_bgx_port_mac_entries_get(nic->port_id); > > + if (max_entries < 0) { > > + octeontx_log_err("Failed to get max entries for mac addr"); > > + res = -ENOTSUP; > > + goto err; > > + } > > + > > + data->mac_addrs = rte_zmalloc_socket(octtx_name, max_entries * > > + RTE_ETHER_ADDR_LEN, 0, > > socket_id); > > if (data->mac_addrs == NULL) { > > octeontx_log_err("failed to allocate memory for mac_addrs"); > > -- > > 2.17.1 > >