net/virtio: rationalize queue flushing

[dpdk.git] / lib / librte_ether / rte_flow.c

diff --git a/lib/librte_ether/rte_flow.c b/lib/librte_ether/rte_flow.c
index 95d9ee0..a86bfbd 100644 (file)
--- a/lib/librte_ether/rte_flow.c
+++ b/lib/librte_ether/rte_flow.c
@@ -81,6 +81,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
        MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
        MK_FLOW_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
        MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
+       MK_FLOW_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)),
 };
 
 /** Generate flow_action[] entry. */
@@ -106,6 +107,18 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {
        MK_FLOW_ACTION(VF, sizeof(struct rte_flow_action_vf)),
 };
 
+static int
+flow_err(uint16_t port_id, int ret, struct rte_flow_error *error)
+{
+       if (ret == 0)
+               return 0;
+       if (rte_eth_dev_is_removed(port_id))
+               return rte_flow_error_set(error, EIO,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL, rte_strerror(EIO));
+       return ret;
+}
+
 /* Get generic flow operations structure from a port. */
 const struct rte_flow_ops *
 rte_flow_ops_get(uint16_t port_id, struct rte_flow_error *error)
@@ -132,7 +145,7 @@ rte_flow_ops_get(uint16_t port_id, struct rte_flow_error *error)
 
 /* Check whether a flow rule can be created on a given port. */
 int
-rte_flow_validate(uint8_t port_id,
+rte_flow_validate(uint16_t port_id,
                  const struct rte_flow_attr *attr,
                  const struct rte_flow_item pattern[],
                  const struct rte_flow_action actions[],
@@ -144,27 +157,33 @@ rte_flow_validate(uint8_t port_id,
        if (unlikely(!ops))
                return -rte_errno;
        if (likely(!!ops->validate))
-               return ops->validate(dev, attr, pattern, actions, error);
-       return -rte_flow_error_set(error, ENOSYS,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                  NULL, rte_strerror(ENOSYS));
+               return flow_err(port_id, ops->validate(dev, attr, pattern,
+                                                      actions, error), error);
+       return rte_flow_error_set(error, ENOSYS,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL, rte_strerror(ENOSYS));
 }
 
 /* Create a flow rule on a given port. */
 struct rte_flow *
-rte_flow_create(uint8_t port_id,
+rte_flow_create(uint16_t port_id,
                const struct rte_flow_attr *attr,
                const struct rte_flow_item pattern[],
                const struct rte_flow_action actions[],
                struct rte_flow_error *error)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct rte_flow *flow;
        const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
 
        if (unlikely(!ops))
                return NULL;
-       if (likely(!!ops->create))
-               return ops->create(dev, attr, pattern, actions, error);
+       if (likely(!!ops->create)) {
+               flow = ops->create(dev, attr, pattern, actions, error);
+               if (flow == NULL)
+                       flow_err(port_id, -rte_errno, error);
+               return flow;
+       }
        rte_flow_error_set(error, ENOSYS, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                           NULL, rte_strerror(ENOSYS));
        return NULL;
@@ -172,7 +191,7 @@ rte_flow_create(uint8_t port_id,
 
 /* Destroy a flow rule on a given port. */
 int
-rte_flow_destroy(uint8_t port_id,
+rte_flow_destroy(uint16_t port_id,
                 struct rte_flow *flow,
                 struct rte_flow_error *error)
 {
@@ -182,15 +201,16 @@ rte_flow_destroy(uint8_t port_id,
        if (unlikely(!ops))
                return -rte_errno;
        if (likely(!!ops->destroy))
-               return ops->destroy(dev, flow, error);
-       return -rte_flow_error_set(error, ENOSYS,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                  NULL, rte_strerror(ENOSYS));
+               return flow_err(port_id, ops->destroy(dev, flow, error),
+                               error);
+       return rte_flow_error_set(error, ENOSYS,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL, rte_strerror(ENOSYS));
 }
 
 /* Destroy all flow rules associated with a port. */
 int
-rte_flow_flush(uint8_t port_id,
+rte_flow_flush(uint16_t port_id,
               struct rte_flow_error *error)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -199,15 +219,15 @@ rte_flow_flush(uint8_t port_id,
        if (unlikely(!ops))
                return -rte_errno;
        if (likely(!!ops->flush))
-               return ops->flush(dev, error);
-       return -rte_flow_error_set(error, ENOSYS,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                  NULL, rte_strerror(ENOSYS));
+               return flow_err(port_id, ops->flush(dev, error), error);
+       return rte_flow_error_set(error, ENOSYS,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL, rte_strerror(ENOSYS));
 }
 
 /* Query an existing flow rule. */
 int
-rte_flow_query(uint8_t port_id,
+rte_flow_query(uint16_t port_id,
               struct rte_flow *flow,
               enum rte_flow_action_type action,
               void *data,
@@ -219,15 +239,16 @@ rte_flow_query(uint8_t port_id,
        if (!ops)
                return -rte_errno;
        if (likely(!!ops->query))
-               return ops->query(dev, flow, action, data, error);
-       return -rte_flow_error_set(error, ENOSYS,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                  NULL, rte_strerror(ENOSYS));
+               return flow_err(port_id, ops->query(dev, flow, action, data,
+                                                   error), error);
+       return rte_flow_error_set(error, ENOSYS,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL, rte_strerror(ENOSYS));
 }
 
 /* Restrict ingress traffic to the defined flow rules. */
 int
-rte_flow_isolate(uint8_t port_id,
+rte_flow_isolate(uint16_t port_id,
                 int set,
                 struct rte_flow_error *error)
 {
@@ -237,10 +258,29 @@ rte_flow_isolate(uint8_t port_id,
        if (!ops)
                return -rte_errno;
        if (likely(!!ops->isolate))
-               return ops->isolate(dev, set, error);
-       return -rte_flow_error_set(error, ENOSYS,
-                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                  NULL, rte_strerror(ENOSYS));
+               return flow_err(port_id, ops->isolate(dev, set, error), error);
+       return rte_flow_error_set(error, ENOSYS,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL, rte_strerror(ENOSYS));
+}
+
+/* Initialize flow error structure. */
+int
+rte_flow_error_set(struct rte_flow_error *error,
+                  int code,
+                  enum rte_flow_error_type type,
+                  const void *cause,
+                  const char *message)
+{
+       if (error) {
+               *error = (struct rte_flow_error){
+                       .type = type,
+                       .cause = cause,
+                       .message = message,
+               };
+       }
+       rte_errno = code;
+       return -code;
 }
 
 /** Compute storage space needed by item specification. */