From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Richard Houldsworth <rhouldsworth@solarflare.com>
Subject: [dpdk-dev] [PATCH 01/38] net/sfc/base: correct annotations where NULL input is OK
Date: Thu, 7 Feb 2019 16:29:06 +0000 [thread overview]
Message-ID: <1549556983-10896-2-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1549556983-10896-1-git-send-email-arybchenko@solarflare.com>
From: Richard Houldsworth <rhouldsworth@solarflare.com>
Correct annotations where NULL input can be permitted
Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/ef10_impl.h | 2 +-
drivers/net/sfc/base/ef10_rx.c | 42 +++++++++++++++++++++-----------
drivers/net/sfc/base/efx.h | 2 +-
drivers/net/sfc/base/efx_intr.c | 2 +-
drivers/net/sfc/base/efx_rx.c | 6 ++---
5 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index f971063a1..83a8a2936 100644
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -1012,7 +1012,7 @@ ef10_rx_qcreate(
__in unsigned int index,
__in unsigned int label,
__in efx_rxq_type_t type,
- __in const union efx_rxq_type_data_u *type_data,
+ __in_opt const union efx_rxq_type_data_u *type_data,
__in efsys_mem_t *esmp,
__in size_t ndescs,
__in uint32_t id,
diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c
index 3c8f4f3b9..d18010d0f 100644
--- a/drivers/net/sfc/base/ef10_rx.c
+++ b/drivers/net/sfc/base/ef10_rx.c
@@ -988,7 +988,7 @@ ef10_rx_qcreate(
__in unsigned int index,
__in unsigned int label,
__in efx_rxq_type_t type,
- __in const efx_rxq_type_data_t *type_data,
+ __in_opt const efx_rxq_type_data_t *type_data,
__in efsys_mem_t *esmp,
__in size_t ndescs,
__in uint32_t id,
@@ -1031,6 +1031,10 @@ ef10_rx_qcreate(
break;
#if EFSYS_OPT_RX_PACKED_STREAM
case EFX_RXQ_TYPE_PACKED_STREAM:
+ if (type_data == NULL) {
+ rc = EINVAL;
+ goto fail3;
+ }
switch (type_data->ertd_packed_stream.eps_buf_size) {
case EFX_RXQ_PACKED_STREAM_BUF_SIZE_1M:
ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_1M;
@@ -1049,12 +1053,16 @@ ef10_rx_qcreate(
break;
default:
rc = ENOTSUP;
- goto fail3;
+ goto fail4;
}
break;
#endif /* EFSYS_OPT_RX_PACKED_STREAM */
#if EFSYS_OPT_RX_ES_SUPER_BUFFER
case EFX_RXQ_TYPE_ES_SUPER_BUFFER:
+ if (type_data == NULL) {
+ rc = EINVAL;
+ goto fail5;
+ }
ps_buf_size = 0;
es_bufs_per_desc =
type_data->ertd_es_super_buffer.eessb_bufs_per_desc;
@@ -1068,7 +1076,7 @@ ef10_rx_qcreate(
#endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */
default:
rc = ENOTSUP;
- goto fail4;
+ goto fail6;
}
#if EFSYS_OPT_RX_PACKED_STREAM
@@ -1076,13 +1084,13 @@ ef10_rx_qcreate(
/* Check if datapath firmware supports packed stream mode */
if (encp->enc_rx_packed_stream_supported == B_FALSE) {
rc = ENOTSUP;
- goto fail5;
+ goto fail7;
}
/* Check if packed stream allows configurable buffer sizes */
if ((ps_buf_size != MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_1M) &&
(encp->enc_rx_var_packed_stream_supported == B_FALSE)) {
rc = ENOTSUP;
- goto fail6;
+ goto fail8;
}
}
#else /* EFSYS_OPT_RX_PACKED_STREAM */
@@ -1093,17 +1101,17 @@ ef10_rx_qcreate(
if (es_bufs_per_desc > 0) {
if (encp->enc_rx_es_super_buffer_supported == B_FALSE) {
rc = ENOTSUP;
- goto fail7;
+ goto fail9;
}
if (!IS_P2ALIGNED(es_max_dma_len,
EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {
rc = EINVAL;
- goto fail8;
+ goto fail10;
}
if (!IS_P2ALIGNED(es_buf_stride,
EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {
rc = EINVAL;
- goto fail9;
+ goto fail11;
}
}
#else /* EFSYS_OPT_RX_ES_SUPER_BUFFER */
@@ -1125,7 +1133,7 @@ ef10_rx_qcreate(
esmp, disable_scatter, want_inner_classes,
ps_buf_size, es_bufs_per_desc, es_max_dma_len,
es_buf_stride, hol_block_timeout)) != 0)
- goto fail10;
+ goto fail12;
erp->er_eep = eep;
erp->er_label = label;
@@ -1136,25 +1144,31 @@ ef10_rx_qcreate(
return (0);
+fail12:
+ EFSYS_PROBE(fail12);
+#if EFSYS_OPT_RX_ES_SUPER_BUFFER
+fail11:
+ EFSYS_PROBE(fail11);
fail10:
EFSYS_PROBE(fail10);
-#if EFSYS_OPT_RX_ES_SUPER_BUFFER
fail9:
EFSYS_PROBE(fail9);
+#endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */
+#if EFSYS_OPT_RX_PACKED_STREAM
fail8:
EFSYS_PROBE(fail8);
fail7:
EFSYS_PROBE(fail7);
-#endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */
-#if EFSYS_OPT_RX_PACKED_STREAM
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
fail6:
EFSYS_PROBE(fail6);
+#if EFSYS_OPT_RX_ES_SUPER_BUFFER
fail5:
EFSYS_PROBE(fail5);
-#endif /* EFSYS_OPT_RX_PACKED_STREAM */
+#endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */
+#if EFSYS_OPT_RX_PACKED_STREAM
fail4:
EFSYS_PROBE(fail4);
-#if EFSYS_OPT_RX_PACKED_STREAM
fail3:
EFSYS_PROBE(fail3);
#endif /* EFSYS_OPT_RX_PACKED_STREAM */
diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 2e847b6ce..97c4846d2 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -300,7 +300,7 @@ extern __checkReturn efx_rc_t
efx_intr_init(
__in efx_nic_t *enp,
__in efx_intr_type_t type,
- __in efsys_mem_t *esmp);
+ __in_opt efsys_mem_t *esmp);
extern void
efx_intr_enable(
diff --git a/drivers/net/sfc/base/efx_intr.c b/drivers/net/sfc/base/efx_intr.c
index b518916dc..4c68b1091 100644
--- a/drivers/net/sfc/base/efx_intr.c
+++ b/drivers/net/sfc/base/efx_intr.c
@@ -93,7 +93,7 @@ static const efx_intr_ops_t __efx_intr_ef10_ops = {
efx_intr_init(
__in efx_nic_t *enp,
__in efx_intr_type_t type,
- __in efsys_mem_t *esmp)
+ __in_opt efsys_mem_t *esmp)
{
efx_intr_t *eip = &(enp->en_intr);
const efx_intr_ops_t *eiop;
diff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c
index 04bc7aed8..afa3ac588 100644
--- a/drivers/net/sfc/base/efx_rx.c
+++ b/drivers/net/sfc/base/efx_rx.c
@@ -107,7 +107,7 @@ siena_rx_qcreate(
__in unsigned int index,
__in unsigned int label,
__in efx_rxq_type_t type,
- __in const efx_rxq_type_data_t *type_data,
+ __in_opt const efx_rxq_type_data_t *type_data,
__in efsys_mem_t *esmp,
__in size_t ndescs,
__in uint32_t id,
@@ -784,7 +784,7 @@ efx_rx_qcreate_internal(
__in unsigned int index,
__in unsigned int label,
__in efx_rxq_type_t type,
- __in const efx_rxq_type_data_t *type_data,
+ __in_opt const efx_rxq_type_data_t *type_data,
__in efsys_mem_t *esmp,
__in size_t ndescs,
__in uint32_t id,
@@ -1568,7 +1568,7 @@ siena_rx_qcreate(
__in unsigned int index,
__in unsigned int label,
__in efx_rxq_type_t type,
- __in const efx_rxq_type_data_t *type_data,
+ __in_opt const efx_rxq_type_data_t *type_data,
__in efsys_mem_t *esmp,
__in size_t ndescs,
__in uint32_t id,
--
2.17.1
next prev parent reply other threads:[~2019-02-07 16:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 16:29 [dpdk-dev] [PATCH 00/38] net/sfc: update base driver Andrew Rybchenko
2019-02-07 16:29 ` Andrew Rybchenko [this message]
2019-02-07 16:29 ` [dpdk-dev] [PATCH 02/38] net/sfc/base: update external port number calculation Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 03/38] net/sfc/base: ensure EvQ poll stops when abort is requested Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 04/38] net/sfc/base: report support for Tx checksum op descriptors Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 05/38] net/sfc/base: remove min define for number of Tx descs Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 06/38] net/sfc/base: define max desc number for every EF10 NIC Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 07/38] net/sfc/base: remove min/max defines for number of Rx descs Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 08/38] net/sfc/base: remove min/max defines for number of events Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 09/38] net/sfc: use NIC min number of Tx descs instead of define Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 10/38] net/sfc: use NIC Rx descs limits instead of defines Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 11/38] net/sfc: use NIC EVQ " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 12/38] net/sfc/base: move Tx descs number check to generic place Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 13/38] net/sfc/base: move Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 14/38] net/sfc/base: move EVQ " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 15/38] net/sfc/base: move a macro to Siena implementation header Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 16/38] net/sfc/base: make max number of TxQ bufs EF10-specific Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 17/38] net/sfc/base: make NIC pointer const in NIC config get Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 18/38] net/sfc/base: support different Tx descriptor sizes Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 19/38] net/sfc/base: support different Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 20/38] net/sfc/base: support different event " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 21/38] net/sfc/base: round number of queue buffers up Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 22/38] net/sfc: use NIC Tx descritor size instead of common Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 23/38] net/sfc: use NIC Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 24/38] net/sfc: use NIC event " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 25/38] net/sfc/base: remove deprecated min/max desc defines Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 26/38] net/sfc/base: remove deprecated macros that get queue sizes Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 27/38] net/sfc/base: update auto-generated MCDI definition headers Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 28/38] net/sfc/base: add support for the Rx event mode w/o continue Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 29/38] net/sfc/base: rename header with MCDI strings Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 30/38] net/sfc/base: add Rx parse incomplete event queue statistic Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 31/38] net/sfc/base: make bundle partition type available for X2 Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 32/38] net/sfc/base: allow to specify Rx buffer size on queue setup Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 33/38] net/sfc/base: pass Rx buffer size to RxQ init if supported Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 34/38] net/sfc/base: simplify EF10 family conditional code checks Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 35/38] net/sfc/base: simplify EF10 family run-time checks Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 36/38] net/sfc/base: avoid division by 0 if no event queue timers Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 37/38] net/sfc/base: improve MCDI interface header inclusion Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 38/38] net/sfc/base: share macro to increment per-event type stats Andrew Rybchenko
2019-02-08 13:18 ` [dpdk-dev] [PATCH 00/38] net/sfc: update base driver Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1549556983-10896-2-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=rhouldsworth@solarflare.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).