summaryrefslogtreecommitdiff
path: root/sys/net/npf
diff options
context:
space:
mode:
authorrmind <rmind@NetBSD.org>2019-08-21 21:45:47 +0000
committerrmind <rmind@NetBSD.org>2019-08-21 21:45:47 +0000
commit1065c38dd3a58d2bfdb1e60e77eea0626cbdf2bb (patch)
tree165fb237e29a13d6dbcf8600a5256f7544608167 /sys/net/npf
parente4709b50ba046650a66baef592c3e510f1341f4f (diff)
npfkern/libnpf: Add support for the table replace/swap operation.
Contributed by Timshel Knoll-Miller.
Diffstat (limited to 'sys/net/npf')
-rw-r--r--sys/net/npf/npf.h1
-rw-r--r--sys/net/npf/npf_ctl.c152
-rw-r--r--sys/net/npf/npf_impl.h3
-rw-r--r--sys/net/npf/npf_os.c5
-rw-r--r--sys/net/npf/npf_tableset.c15
5 files changed, 133 insertions, 43 deletions
diff --git a/sys/net/npf/npf.h b/sys/net/npf/npf.h
index 1c47c6a4375..2a298c39256 100644
--- a/sys/net/npf/npf.h
+++ b/sys/net/npf/npf.h
@@ -310,6 +310,7 @@ typedef struct npf_ioctl_table {
#define IOC_NPF_SAVE _IOR('N', 105, nvlist_ref_t)
#define IOC_NPF_RULE _IOWR('N', 107, nvlist_ref_t)
#define IOC_NPF_CONN_LOOKUP _IOWR('N', 108, nvlist_ref_t)
+#define IOC_NPF_TABLE_REPLACE _IOWR('N', 109, nvlist_ref_t)
/*
* NPF error report.
diff --git a/sys/net/npf/npf_ctl.c b/sys/net/npf/npf_ctl.c
index 7b80349bf7e..d451810e646 100644
--- a/sys/net/npf/npf_ctl.c
+++ b/sys/net/npf/npf_ctl.c
@@ -36,7 +36,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.55 2019/08/11 20:26:33 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.56 2019/08/21 21:45:47 rmind Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -178,6 +178,63 @@ npf_mk_table_entries(npf_table_t *t, const nvlist_t *table, nvlist_t *errdict)
return error;
}
+/*
+ * npf_mk_table: create a table from provided nvlist.
+ */
+static int __noinline
+npf_mk_table(npf_t *npf, const nvlist_t *tbl_dict, nvlist_t *errdict,
+ npf_tableset_t *tblset, npf_table_t **tblp, bool replacing)
+{
+ npf_table_t *t;
+ const char *name;
+ const void *blob;
+ uint64_t tid;
+ size_t size;
+ int type;
+ int error = 0;
+
+ KASSERT(tblp != NULL);
+
+ /* Table name, ID and type. Validate them. */
+ name = dnvlist_get_string(tbl_dict, "name", NULL);
+ if (!name) {
+ NPF_ERR_DEBUG(errdict);
+ error = EINVAL;
+ goto out;
+ }
+ tid = dnvlist_get_number(tbl_dict, "id", UINT64_MAX);
+ type = dnvlist_get_number(tbl_dict, "type", UINT64_MAX);
+ error = npf_table_check(tblset, name, tid, type, replacing);
+ if (error) {
+ NPF_ERR_DEBUG(errdict);
+ goto out;
+ }
+
+ /* Get the entries or binary data. */
+ blob = dnvlist_get_binary(tbl_dict, "data", &size, NULL, 0);
+ if (type == NPF_TABLE_CONST && (blob == NULL || size == 0)) {
+ NPF_ERR_DEBUG(errdict);
+ error = EINVAL;
+ goto out;
+ }
+
+ t = npf_table_create(name, (u_int)tid, type, blob, size);
+ if (t == NULL) {
+ NPF_ERR_DEBUG(errdict);
+ error = ENOMEM;
+ goto out;
+ }
+
+ if ((error = npf_mk_table_entries(t, tbl_dict, errdict)) != 0) {
+ npf_table_destroy(t);
+ goto out;
+ }
+
+ *tblp = t;
+out:
+ return error;
+}
+
static int __noinline
npf_mk_tables(npf_t *npf, nvlist_t *npf_dict, nvlist_t *errdict,
npf_tableset_t **tblsetp)
@@ -200,49 +257,15 @@ npf_mk_tables(npf_t *npf, nvlist_t *npf_dict, nvlist_t *errdict,
tblset = npf_tableset_create(nitems);
for (unsigned i = 0; i < nitems; i++) {
const nvlist_t *table = tables[i];
- const char *name;
- const void *blob;
npf_table_t *t;
- uint64_t tid;
- size_t size;
- int type;
- /* Table name, ID and type. Validate them. */
- name = dnvlist_get_string(table, "name", NULL);
- if (!name) {
- NPF_ERR_DEBUG(errdict);
- error = EINVAL;
- break;
- }
- tid = dnvlist_get_number(table, "id", UINT64_MAX);
- type = dnvlist_get_number(table, "type", UINT64_MAX);
- error = npf_table_check(tblset, name, tid, type);
+ error = npf_mk_table(npf, table, errdict, tblset, &t, 0);
if (error) {
- NPF_ERR_DEBUG(errdict);
- break;
- }
-
- /* Get the entries or binary data. */
- blob = dnvlist_get_binary(table, "data", &size, NULL, 0);
- if (type == NPF_TABLE_CONST && (blob == NULL || size == 0)) {
- NPF_ERR_DEBUG(errdict);
- error = EINVAL;
break;
}
- /* Create and insert the table. */
- t = npf_table_create(name, (u_int)tid, type, blob, size);
- if (t == NULL) {
- NPF_ERR_DEBUG(errdict);
- error = ENOMEM;
- break;
- }
error = npf_tableset_insert(tblset, t);
KASSERT(error == 0);
-
- if ((error = npf_mk_table_entries(t, table, errdict)) != 0) {
- break;
- }
}
*tblsetp = tblset;
return error;
@@ -733,6 +756,63 @@ out:
}
/*
+ * npfctl_table_replace_nvlist: atomically replace a table's contents
+ * with the passed table data.
+ */
+static int __noinline
+npfctl_table_replace_nvlist(npf_t *npf, nvlist_t *npf_dict, nvlist_t *errdict)
+{
+ npf_table_t *tbl, *gc_tbl = NULL;
+ npf_tableset_t *tblset;
+ int error = 0;
+
+ npf_config_enter(npf);
+ tblset = npf_config_tableset(npf);
+
+ /* Get the entries or binary data. */
+ error = npf_mk_table(npf, npf_dict, errdict, tblset, &tbl, true);
+ if (error) {
+ goto err;
+ }
+
+ gc_tbl = npf_tableset_swap(tblset, tbl);
+ if (gc_tbl == NULL) {
+ error = EINVAL;
+ gc_tbl = tbl;
+ goto err;
+ }
+ npf_config_sync(npf);
+err:
+ npf_config_exit(npf);
+ if (gc_tbl) {
+ npf_table_destroy(gc_tbl);
+ }
+ return error;
+}
+
+int
+npfctl_table_replace(npf_t *npf, u_long cmd, void *data)
+{
+ nvlist_t *request, *response;
+ int error;
+
+ /*
+ * Retrieve the configuration and check the version.
+ * Construct a response with error reporting.
+ */
+ error = npf_nvlist_copyin(npf, data, &request);
+ if (error) {
+ return error;
+ }
+ response = nvlist_create(0);
+ error = npfctl_table_replace_nvlist(npf, request, response);
+ nvlist_add_number(response, "errno", error);
+ error = npf_nvlist_copyout(npf, data, response);
+ nvlist_destroy(request);
+ return error;
+}
+
+/*
* npfctl_conn_lookup: lookup a connection in the list of connections
*/
int
diff --git a/sys/net/npf/npf_impl.h b/sys/net/npf/npf_impl.h
index db321951977..6c4b254f832 100644
--- a/sys/net/npf/npf_impl.h
+++ b/sys/net/npf/npf_impl.h
@@ -292,6 +292,7 @@ int npfctl_save(npf_t *, u_long, void *);
int npfctl_load(npf_t *, u_long, void *);
int npfctl_rule(npf_t *, u_long, void *);
int npfctl_conn_lookup(npf_t *, u_long, void *);
+int npfctl_table_replace(npf_t *, u_long, void *);
int npfctl_table(npf_t *, void *);
void npf_stats_inc(npf_t *, npf_stats_t);
@@ -379,7 +380,7 @@ npf_table_t * npf_table_create(const char *, u_int, int, const void *, size_t);
void npf_table_destroy(npf_table_t *);
u_int npf_table_getid(npf_table_t *);
-int npf_table_check(npf_tableset_t *, const char *, uint64_t, uint64_t);
+int npf_table_check(npf_tableset_t *, const char *, uint64_t, uint64_t, bool);
int npf_table_insert(npf_table_t *, const int,
const npf_addr_t *, const npf_netmask_t);
int npf_table_remove(npf_table_t *, const int,
diff --git a/sys/net/npf/npf_os.c b/sys/net/npf/npf_os.c
index a318af3f306..705aea6ff54 100644
--- a/sys/net/npf/npf_os.c
+++ b/sys/net/npf/npf_os.c
@@ -33,7 +33,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.14 2019/08/11 20:26:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.15 2019/08/21 21:45:47 rmind Exp $");
#ifdef _KERNEL_OPT
#include "pf.h"
@@ -259,6 +259,9 @@ npf_dev_ioctl(dev_t dev, u_long cmd, void *data, int flag, lwp_t *l)
case IOC_NPF_CONN_LOOKUP:
error = npfctl_conn_lookup(npf, cmd, data);
break;
+ case IOC_NPF_TABLE_REPLACE:
+ error = npfctl_table_replace(npf, cmd, data);
+ break;
case IOC_NPF_VERSION:
*(int *)data = NPF_VERSION;
error = 0;
diff --git a/sys/net/npf/npf_tableset.c b/sys/net/npf/npf_tableset.c
index 6dba1613ccf..60a392cadf9 100644
--- a/sys/net/npf/npf_tableset.c
+++ b/sys/net/npf/npf_tableset.c
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.33 2019/07/23 00:52:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.34 2019/08/21 21:45:47 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -456,12 +456,15 @@ npf_table_getid(npf_table_t *t)
* npf_table_check: validate the name, ID and type.
*/
int
-npf_table_check(npf_tableset_t *ts, const char *name, uint64_t tid, uint64_t type)
+npf_table_check(npf_tableset_t *ts, const char *name, uint64_t tid,
+ uint64_t type, bool replacing)
{
+ const npf_table_t *t;
+
if (tid >= ts->ts_nitems) {
return EINVAL;
}
- if (ts->ts_map[tid] != NULL) {
+ if (!replacing && ts->ts_map[tid] != NULL) {
return EEXIST;
}
switch (type) {
@@ -476,8 +479,10 @@ npf_table_check(npf_tableset_t *ts, const char *name, uint64_t tid, uint64_t typ
if (strlen(name) >= NPF_TABLE_MAXNAMELEN) {
return ENAMETOOLONG;
}
- if (npf_tableset_getbyname(ts, name)) {
- return EEXIST;
+ if ((t = npf_tableset_getbyname(ts, name)) != NULL) {
+ if (!replacing || t->t_id != tid) {
+ return EEXIST;
+ }
}
return 0;
}