d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: provide a way to check if filter is supported

Browse Source 
The information is obtained from firmware on attach. It may
change after MC reboot (firmware version or variant change).
Cache should be refreshed after MC reboot when it is handled
properly (not yet).

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andrew Lee <alee@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
Reviewed-by: Robert Stonehouse <rstonehouse@solarflare.com>
This commit is contained in:
Andrew Rybchenko 2017-03-09 15:26:26 +00:00 committed by Ferruh Yigit
parent 403030f573
commit 791f57ac6b
5 changed files with 202 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/sfc/Makefile
View File

@ -90,6 +90,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c
SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c
SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c
SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c
SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c
VPATH += $(SRCDIR)/base

7
drivers/net/sfc/sfc.c
View File

@ -633,6 +633,10 @@ sfc_attach(struct sfc_adapter *sa)
if (rc != 0)
goto fail_set_rss_defaults;
rc = sfc_filter_attach(sa);
if (rc != 0)
goto fail_filter_attach;
sfc_log_init(sa, "fini nic");
efx_nic_fini(enp);
@ -641,6 +645,7 @@ sfc_attach(struct sfc_adapter *sa)
sfc_log_init(sa, "done");
return 0;
fail_filter_attach:
fail_set_rss_defaults:
sfc_intr_detach(sa);
@ -678,6 +683,8 @@ sfc_detach(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
sfc_filter_detach(sa);
sfc_intr_detach(sa);
sfc_log_init(sa, "unprobe nic");

3
drivers/net/sfc/sfc.h
View File

@ -38,6 +38,8 @@
#include "efx.h"
#include "sfc_filter.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -180,6 +182,7 @@ struct sfc_adapter {
struct sfc_mcdi mcdi;
struct sfc_intr intr;
struct sfc_port port;
struct sfc_filter filter;
unsigned int rxq_max;
unsigned int txq_max;

135
drivers/net/sfc/sfc_filter.c Normal file
View File

@ -0,0 +1,135 @@
/*-
* Copyright (c) 2017 Solarflare Communications Inc.
* All rights reserved.
*
* This software was jointly developed between OKTET Labs (under contract
* for Solarflare) and Solarflare Communications, Inc.
*
* 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.
*
* 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.
*/
#include <rte_common.h>
#include "efx.h"
#include "sfc.h"
#include "sfc_log.h"
boolean_t
sfc_filter_is_match_supported(struct sfc_adapter *sa, uint32_t match)
{
struct sfc_filter *filter = &sa->filter;
size_t i;
for (i = 0; i < filter->supported_match_num; ++i) {
if (match == filter->supported_match[i])
return B_TRUE;
}
return B_FALSE;
}
static int
sfc_filter_cache_match_supported(struct sfc_adapter *sa)
{
struct sfc_filter *filter = &sa->filter;
size_t num = filter->supported_match_num;
uint32_t *buf = filter->supported_match;
unsigned int retry;
int rc;
/* Just a guess of possibly sufficient entries */
if (num == 0)
num = 16;
for (retry = 0; retry < 2; ++retry) {
if (num != filter->supported_match_num) {
rc = ENOMEM;
buf = rte_realloc(buf, num * sizeof(*buf), 0);
if (buf == NULL)
goto fail_realloc;
}
rc = efx_filter_supported_filters(sa->nic, buf, num, &num);
if (rc == 0) {
filter->supported_match_num = num;
filter->supported_match = buf;
return 0;
} else if (rc != ENOSPC) {
goto fail_efx_filter_supported_filters;
}
}
SFC_ASSERT(rc == ENOSPC);
fail_efx_filter_supported_filters:
fail_realloc:
/* Original pointer is not freed by rte_realloc() on failure */
rte_free(buf);
filter->supported_match = NULL;
filter->supported_match_num = 0;
return rc;
}
int
sfc_filter_attach(struct sfc_adapter *sa)
{
int rc;
sfc_log_init(sa, "entry");
rc = efx_filter_init(sa->nic);
if (rc != 0)
goto fail_filter_init;
rc = sfc_filter_cache_match_supported(sa);
if (rc != 0)
goto fail_cache_match_supported;
efx_filter_fini(sa->nic);
sfc_log_init(sa, "done");
return 0;
fail_cache_match_supported:
efx_filter_fini(sa->nic);
fail_filter_init:
sfc_log_init(sa, "failed %d", rc);
return rc;
}
void
sfc_filter_detach(struct sfc_adapter *sa)
{
struct sfc_filter *filter = &sa->filter;
sfc_log_init(sa, "entry");
rte_free(filter->supported_match);
filter->supported_match = NULL;
filter->supported_match_num = 0;
sfc_log_init(sa, "done");
}

56
drivers/net/sfc/sfc_filter.h Normal file
View File

@ -0,0 +1,56 @@
/*-
* Copyright (c) 2017 Solarflare Communications Inc.
* All rights reserved.
*
* This software was jointly developed between OKTET Labs (under contract
* for Solarflare) and Solarflare Communications, Inc.
*
* 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.
*
* 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 _SFC_FILTER_H
#define _SFC_FILTER_H
#include "efx.h"
#ifdef __cplusplus
extern "C" {
#endif
struct sfc_filter {
/** Number of elements in match_supported array */
size_t supported_match_num;
/** Driver cache of supported filter match masks */
uint32_t *supported_match;
};
struct sfc_adapter;
int sfc_filter_attach(struct sfc_adapter *sa);
void sfc_filter_detach(struct sfc_adapter *sa);
boolean_t sfc_filter_is_match_supported(struct sfc_adapter *sa, uint32_t match);
#ifdef __cplusplus
}
#endif
#endif /* _SFC_FILTER_H */