Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/61428/?format=api
{ "id": 61428, "url": "http://patches.dpdk.org/api/patches/61428/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d016ecf54c8b744493985c34a60d43fc405abb06.1571322983.git.vladimir.medvedkin@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<d016ecf54c8b744493985c34a60d43fc405abb06.1571322983.git.vladimir.medvedkin@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d016ecf54c8b744493985c34a60d43fc405abb06.1571322983.git.vladimir.medvedkin@intel.com", "date": "2019-10-17T15:47:59", "name": "[v6,2/6] ipsec: add SAD create/destroy implementation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b3ca0fb9a97323d50f549730d32c29d737126258", "submitter": { "id": 1216, "url": "http://patches.dpdk.org/api/people/1216/?format=api", "name": "Vladimir Medvedkin", "email": "vladimir.medvedkin@intel.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d016ecf54c8b744493985c34a60d43fc405abb06.1571322983.git.vladimir.medvedkin@intel.com/mbox/", "series": [ { "id": 6917, "url": "http://patches.dpdk.org/api/series/6917/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6917", "date": "2019-10-17T15:47:57", "name": "ipsec: add inbound SAD", "version": 6, "mbox": "http://patches.dpdk.org/series/6917/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/61428/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/61428/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6D6C51E9F1;\n\tThu, 17 Oct 2019 17:48:22 +0200 (CEST)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id 1D4711E9BD\n\tfor <dev@dpdk.org>; Thu, 17 Oct 2019 17:48:11 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Oct 2019 08:48:10 -0700", "from silpixa00400072.ir.intel.com ([10.237.222.213])\n\tby orsmga005.jf.intel.com with ESMTP; 17 Oct 2019 08:48:09 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,308,1566889200\"; d=\"scan'208\";a=\"371174135\"", "From": "Vladimir Medvedkin <vladimir.medvedkin@intel.com>", "To": "dev@dpdk.org", "Cc": "konstantin.ananyev@intel.com, bernard.iremonger@intel.com,\n\takhil.goyal@nxp.com", "Date": "Thu, 17 Oct 2019 16:47:59 +0100", "Message-Id": "<d016ecf54c8b744493985c34a60d43fc405abb06.1571322983.git.vladimir.medvedkin@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": [ "<cover.1571322982.git.vladimir.medvedkin@intel.com>", "<cover.1571322982.git.vladimir.medvedkin@intel.com>" ], "References": [ "<cover.1571322982.git.vladimir.medvedkin@intel.com>", "<cover.1570725871.git.vladimir.medvedkin@intel.com>\n\t<cover.1571322982.git.vladimir.medvedkin@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v6 2/6] ipsec: add SAD create/destroy\n\timplementation", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Replace rte_ipsec_sad_create(), rte_ipsec_sad_destroy() and\nrte_ipsec_sad_find_existing() API stubs with actual\nimplementation.\n\nSigned-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>\nAcked-by: Akhil Goyal <akhil.goyal@nxp.com>\nAcked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\nTested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n lib/librte_ipsec/Makefile | 2 +-\n lib/librte_ipsec/ipsec_sad.c | 225 +++++++++++++++++++++++++++++++++++++++++--\n lib/librte_ipsec/meson.build | 2 +-\n 3 files changed, 220 insertions(+), 9 deletions(-)", "diff": "diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile\nindex 5aaab72..81fb999 100644\n--- a/lib/librte_ipsec/Makefile\n+++ b/lib/librte_ipsec/Makefile\n@@ -10,7 +10,7 @@ CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)\n CFLAGS += -DALLOW_EXPERIMENTAL_API\n LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net\n-LDLIBS += -lrte_cryptodev -lrte_security\n+LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash\n \n EXPORT_MAP := rte_ipsec_version.map\n \ndiff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/librte_ipsec/ipsec_sad.c\nindex 703be65..e16c7d9 100644\n--- a/lib/librte_ipsec/ipsec_sad.c\n+++ b/lib/librte_ipsec/ipsec_sad.c\n@@ -2,10 +2,53 @@\n * Copyright(c) 2019 Intel Corporation\n */\n \n+#include <rte_eal_memconfig.h>\n #include <rte_errno.h>\n+#include <rte_hash.h>\n+#include <rte_jhash.h>\n+#include <rte_malloc.h>\n+#include <rte_random.h>\n+#include <rte_rwlock.h>\n+#include <rte_tailq.h>\n \n #include \"rte_ipsec_sad.h\"\n \n+/*\n+ * Rules are stored in three hash tables depending on key_type.\n+ * Each rule will also be stored in SPI_ONLY table.\n+ * for each data entry within this table last two bits are reserved to\n+ * indicate presence of entries with the same SPI in DIP and DIP+SIP tables.\n+ */\n+\n+#define IPSEC_SAD_NAMESIZE\t64\n+#define SAD_PREFIX\t\t\"SAD_\"\n+/* \"SAD_<name>\" */\n+#define SAD_FORMAT\t\tSAD_PREFIX \"%s\"\n+\n+#define DEFAULT_HASH_FUNC\trte_jhash\n+#define MIN_HASH_ENTRIES\t8U /* From rte_cuckoo_hash.h */\n+\n+struct hash_cnt {\n+\tuint32_t cnt_dip;\n+\tuint32_t cnt_dip_sip;\n+};\n+\n+struct rte_ipsec_sad {\n+\tchar name[IPSEC_SAD_NAMESIZE];\n+\tstruct rte_hash\t*hash[RTE_IPSEC_SAD_KEY_TYPE_MASK];\n+\t/* Array to track number of more specific rules\n+\t * (spi_dip or spi_dip_sip). Used only in add/delete\n+\t * as a helper struct.\n+\t */\n+\t__extension__ struct hash_cnt cnt_arr[];\n+};\n+\n+TAILQ_HEAD(rte_ipsec_sad_list, rte_tailq_entry);\n+static struct rte_tailq_elem rte_ipsec_sad_tailq = {\n+\t.name = \"RTE_IPSEC_SAD\",\n+};\n+EAL_REGISTER_TAILQ(rte_ipsec_sad_tailq)\n+\n int\n rte_ipsec_sad_add(__rte_unused struct rte_ipsec_sad *sad,\n \t\t__rte_unused const union rte_ipsec_sad_key *key,\n@@ -23,22 +66,190 @@ rte_ipsec_sad_del(__rte_unused struct rte_ipsec_sad *sad,\n }\n \n struct rte_ipsec_sad *\n-rte_ipsec_sad_create(__rte_unused const char *name,\n-\t\t__rte_unused const struct rte_ipsec_sad_conf *conf)\n+rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)\n {\n-\treturn NULL;\n+\tchar hash_name[RTE_HASH_NAMESIZE];\n+\tchar sad_name[IPSEC_SAD_NAMESIZE];\n+\tstruct rte_tailq_entry *te;\n+\tstruct rte_ipsec_sad_list *sad_list;\n+\tstruct rte_ipsec_sad *sad, *tmp_sad = NULL;\n+\tstruct rte_hash_parameters hash_params = {0};\n+\tint ret;\n+\tuint32_t sa_sum;\n+\n+\tRTE_BUILD_BUG_ON(RTE_IPSEC_SAD_KEY_TYPE_MASK != 3);\n+\n+\tif ((name == NULL) || (conf == NULL) ||\n+\t\t\t((conf->max_sa[RTE_IPSEC_SAD_SPI_ONLY] == 0) &&\n+\t\t\t(conf->max_sa[RTE_IPSEC_SAD_SPI_DIP] == 0) &&\n+\t\t\t(conf->max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] == 0))) {\n+\t\trte_errno = EINVAL;\n+\t\treturn NULL;\n+\t}\n+\n+\tret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);\n+\tif (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {\n+\t\trte_errno = ENAMETOOLONG;\n+\t\treturn NULL;\n+\t}\n+\n+\t/** Init SAD*/\n+\tsa_sum = RTE_MAX(MIN_HASH_ENTRIES,\n+\t\tconf->max_sa[RTE_IPSEC_SAD_SPI_ONLY]) +\n+\t\tRTE_MAX(MIN_HASH_ENTRIES,\n+\t\tconf->max_sa[RTE_IPSEC_SAD_SPI_DIP]) +\n+\t\tRTE_MAX(MIN_HASH_ENTRIES,\n+\t\tconf->max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP]);\n+\tsad = rte_zmalloc_socket(NULL, sizeof(*sad) +\n+\t\t(sizeof(struct hash_cnt) * sa_sum),\n+\t\tRTE_CACHE_LINE_SIZE, conf->socket_id);\n+\tif (sad == NULL) {\n+\t\trte_errno = ENOMEM;\n+\t\treturn NULL;\n+\t}\n+\tmemcpy(sad->name, sad_name, sizeof(sad_name));\n+\n+\thash_params.hash_func = DEFAULT_HASH_FUNC;\n+\thash_params.hash_func_init_val = rte_rand();\n+\thash_params.socket_id = conf->socket_id;\n+\thash_params.name = hash_name;\n+\tif (conf->flags & RTE_IPSEC_SAD_FLAG_RW_CONCURRENCY)\n+\t\thash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;\n+\n+\t/** Init hash[RTE_IPSEC_SAD_SPI_ONLY] for SPI only */\n+\tsnprintf(hash_name, sizeof(hash_name), \"sad_1_%p\", sad);\n+\thash_params.key_len = sizeof(((struct rte_ipsec_sadv4_key *)0)->spi);\n+\thash_params.entries = sa_sum;\n+\tsad->hash[RTE_IPSEC_SAD_SPI_ONLY] = rte_hash_create(&hash_params);\n+\tif (sad->hash[RTE_IPSEC_SAD_SPI_ONLY] == NULL) {\n+\t\trte_ipsec_sad_destroy(sad);\n+\t\treturn NULL;\n+\t}\n+\n+\t/** Init hash[RTE_IPSEC_SAD_SPI_DIP] for SPI + DIP */\n+\tsnprintf(hash_name, sizeof(hash_name), \"sad_2_%p\", sad);\n+\tif (conf->flags & RTE_IPSEC_SAD_FLAG_IPV6)\n+\t\thash_params.key_len +=\n+\t\t\tsizeof(((struct rte_ipsec_sadv6_key *)0)->dip);\n+\telse\n+\t\thash_params.key_len +=\n+\t\t\tsizeof(((struct rte_ipsec_sadv4_key *)0)->dip);\n+\thash_params.entries = RTE_MAX(MIN_HASH_ENTRIES,\n+\t\t\tconf->max_sa[RTE_IPSEC_SAD_SPI_DIP]);\n+\tsad->hash[RTE_IPSEC_SAD_SPI_DIP] = rte_hash_create(&hash_params);\n+\tif (sad->hash[RTE_IPSEC_SAD_SPI_DIP] == NULL) {\n+\t\trte_ipsec_sad_destroy(sad);\n+\t\treturn NULL;\n+\t}\n+\n+\t/** Init hash[[RTE_IPSEC_SAD_SPI_DIP_SIP] for SPI + DIP + SIP */\n+\tsnprintf(hash_name, sizeof(hash_name), \"sad_3_%p\", sad);\n+\tif (conf->flags & RTE_IPSEC_SAD_FLAG_IPV6)\n+\t\thash_params.key_len +=\n+\t\t\tsizeof(((struct rte_ipsec_sadv6_key *)0)->sip);\n+\telse\n+\t\thash_params.key_len +=\n+\t\t\tsizeof(((struct rte_ipsec_sadv4_key *)0)->sip);\n+\thash_params.entries = RTE_MAX(MIN_HASH_ENTRIES,\n+\t\t\tconf->max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP]);\n+\tsad->hash[RTE_IPSEC_SAD_SPI_DIP_SIP] = rte_hash_create(&hash_params);\n+\tif (sad->hash[RTE_IPSEC_SAD_SPI_DIP_SIP] == NULL) {\n+\t\trte_ipsec_sad_destroy(sad);\n+\t\treturn NULL;\n+\t}\n+\n+\tsad_list = RTE_TAILQ_CAST(rte_ipsec_sad_tailq.head,\n+\t\t\trte_ipsec_sad_list);\n+\trte_mcfg_tailq_write_lock();\n+\t/* guarantee there's no existing */\n+\tTAILQ_FOREACH(te, sad_list, next) {\n+\t\ttmp_sad = (struct rte_ipsec_sad *)te->data;\n+\t\tif (strncmp(sad_name, tmp_sad->name, IPSEC_SAD_NAMESIZE) == 0)\n+\t\t\tbreak;\n+\t}\n+\tif (te != NULL) {\n+\t\trte_mcfg_tailq_write_unlock();\n+\t\trte_errno = EEXIST;\n+\t\trte_ipsec_sad_destroy(sad);\n+\t\treturn NULL;\n+\t}\n+\n+\t/* allocate tailq entry */\n+\tte = rte_zmalloc(\"IPSEC_SAD_TAILQ_ENTRY\", sizeof(*te), 0);\n+\tif (te == NULL) {\n+\t\trte_mcfg_tailq_write_unlock();\n+\t\trte_errno = ENOMEM;\n+\t\trte_ipsec_sad_destroy(sad);\n+\t\treturn NULL;\n+\t}\n+\n+\tte->data = (void *)sad;\n+\tTAILQ_INSERT_TAIL(sad_list, te, next);\n+\trte_mcfg_tailq_write_unlock();\n+\treturn sad;\n }\n \n struct rte_ipsec_sad *\n-rte_ipsec_sad_find_existing(__rte_unused const char *name)\n+rte_ipsec_sad_find_existing(const char *name)\n {\n-\treturn NULL;\n+\tchar sad_name[IPSEC_SAD_NAMESIZE];\n+\tstruct rte_ipsec_sad *sad = NULL;\n+\tstruct rte_tailq_entry *te;\n+\tstruct rte_ipsec_sad_list *sad_list;\n+\tint ret;\n+\n+\tret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);\n+\tif (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {\n+\t\trte_errno = ENAMETOOLONG;\n+\t\treturn NULL;\n+\t}\n+\n+\tsad_list = RTE_TAILQ_CAST(rte_ipsec_sad_tailq.head,\n+\t\trte_ipsec_sad_list);\n+\n+\trte_mcfg_tailq_read_lock();\n+\tTAILQ_FOREACH(te, sad_list, next) {\n+\t\tsad = (struct rte_ipsec_sad *) te->data;\n+\t\tif (strncmp(sad_name, sad->name, IPSEC_SAD_NAMESIZE) == 0)\n+\t\t\tbreak;\n+\t}\n+\trte_mcfg_tailq_read_unlock();\n+\n+\tif (te == NULL) {\n+\t\trte_errno = ENOENT;\n+\t\treturn NULL;\n+\t}\n+\n+\treturn sad;\n }\n \n void\n-rte_ipsec_sad_destroy(__rte_unused struct rte_ipsec_sad *sad)\n+rte_ipsec_sad_destroy(struct rte_ipsec_sad *sad)\n {\n-\treturn;\n+\tstruct rte_tailq_entry *te;\n+\tstruct rte_ipsec_sad_list *sad_list;\n+\n+\tif (sad == NULL)\n+\t\treturn;\n+\n+\tsad_list = RTE_TAILQ_CAST(rte_ipsec_sad_tailq.head,\n+\t\t\trte_ipsec_sad_list);\n+\trte_mcfg_tailq_write_lock();\n+\tTAILQ_FOREACH(te, sad_list, next) {\n+\t\tif (te->data == (void *)sad)\n+\t\t\tbreak;\n+\t}\n+\tif (te != NULL)\n+\t\tTAILQ_REMOVE(sad_list, te, next);\n+\n+\trte_mcfg_tailq_write_unlock();\n+\n+\trte_hash_free(sad->hash[RTE_IPSEC_SAD_SPI_ONLY]);\n+\trte_hash_free(sad->hash[RTE_IPSEC_SAD_SPI_DIP]);\n+\trte_hash_free(sad->hash[RTE_IPSEC_SAD_SPI_DIP_SIP]);\n+\trte_free(sad);\n+\tif (te != NULL)\n+\t\trte_free(te);\n }\n \n int\ndiff --git a/lib/librte_ipsec/meson.build b/lib/librte_ipsec/meson.build\nindex 91b9867..7035852 100644\n--- a/lib/librte_ipsec/meson.build\n+++ b/lib/librte_ipsec/meson.build\n@@ -7,4 +7,4 @@ sources = files('esp_inb.c', 'esp_outb.c', 'sa.c', 'ses.c', 'ipsec_sad.c')\n \n headers = files('rte_ipsec.h', 'rte_ipsec_group.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')\n \n-deps += ['mbuf', 'net', 'cryptodev', 'security']\n+deps += ['mbuf', 'net', 'cryptodev', 'security', 'hash']\n", "prefixes": [ "v6", "2/6" ] }