Prepare to add extended 2GHz channels on ath9k
parent
3a00b15dce
commit
dc9fbc6f76
|
@ -10,17 +10,11 @@
|
|||
|
||||
FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
|
||||
FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))
|
||||
FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed)))
|
||||
FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
|
||||
|
||||
PACKAGE_SUBDIRS=$(PACKAGE_DIR)
|
||||
ifneq ($(CONFIG_PER_FEED_REPO),)
|
||||
PACKAGE_SUBDIRS += $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/base
|
||||
ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),)
|
||||
PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
|
||||
else
|
||||
PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_ENABLED),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
|
||||
endif
|
||||
PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
|
||||
endif
|
||||
|
||||
opkg_package_files = $(wildcard \
|
||||
|
@ -39,10 +33,11 @@ endef
|
|||
# 1: destination file
|
||||
define FeedSourcesAppend
|
||||
( \
|
||||
echo "src/gz %d_core %U/targets/%S/packages"; \
|
||||
echo 'src/gz %d_core %U/targets/%S/packages'; \
|
||||
echo 'src/gz %d_base %U/packages/%A/base'; \
|
||||
$(strip $(if $(CONFIG_PER_FEED_REPO), \
|
||||
$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \
|
||||
$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
|
||||
$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \
|
||||
$(foreach feed,$(FEEDS_AVAILABLE), \
|
||||
$(if $(CONFIG_FEED_$(feed)), \
|
||||
echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/%A/$(feed)';)))) \
|
||||
) >> $(1)
|
||||
endef
|
||||
|
|
|
@ -11,7 +11,7 @@ ifneq ($(DUMP),1)
|
|||
all: compile
|
||||
endif
|
||||
|
||||
KERNEL_FILE_DEPENDS=$(BACKPORT_PATCH_DIR) $(GENERIC_PATCH_DIR) $(GENERIC_HACK_DIR) $(PATCH_DIR) $(GENERIC_FILES_DIR) $(FILES_DIR)
|
||||
KERNEL_FILE_DEPENDS=$(GENERIC_BACKPORT_DIR) $(GENERIC_PATCH_DIR) $(GENERIC_HACK_DIR) $(PATCH_DIR) $(GENERIC_FILES_DIR) $(FILES_DIR)
|
||||
STAMP_PREPARED=$(LINUX_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,$(KERNEL_FILE_DEPENDS),)))
|
||||
STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
|
||||
include $(INCLUDE_DIR)/download.mk
|
||||
|
|
|
@ -4,13 +4,13 @@ LINUX_RELEASE?=1
|
|||
|
||||
LINUX_VERSION-3.18 = .71
|
||||
LINUX_VERSION-4.4 = .121
|
||||
LINUX_VERSION-4.9 = .110
|
||||
LINUX_VERSION-4.14 = .52
|
||||
LINUX_VERSION-4.9 = .111
|
||||
LINUX_VERSION-4.14 = .54
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
||||
LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
|
||||
LINUX_KERNEL_HASH-4.9.110 = 379a143a70a79f0eea6c9f6638942b65e6043abdde17ad23264c0abd93c4ea7a
|
||||
LINUX_KERNEL_HASH-4.14.52 = a5d226c7b2fd1eb0f01d56e4e2c6a0100784b68df907cc7317f32bde34f88810
|
||||
LINUX_KERNEL_HASH-4.9.111 = 5966558959dc580f163766f3fdefd7e57c01b2b45d51202d00b3807c253759dd
|
||||
LINUX_KERNEL_HASH-4.14.54 = 451642ac28c539a91072f1fb83b1c061d6d44df870ddf5562400ade5e1c4b6c6
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||
|
|
|
@ -138,10 +138,10 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \
|
|||
$(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
|
||||
wget --version | grep GNU))
|
||||
|
||||
$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time', \
|
||||
$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time' that supports -f, \
|
||||
gtime --version 2>&1 | grep GNU, \
|
||||
time --version 2>&1 | grep GNU, \
|
||||
busybox time 2>&1 | grep BusyBox))
|
||||
busybox time 2>&1 | grep -- '-f FMT'))
|
||||
|
||||
$(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
|
||||
perl --version | grep "perl.*v5"))
|
||||
|
|
|
@ -25,9 +25,7 @@ PKG_CONFIG_DEPENDS += \
|
|||
CONFIG_NAND_SUPPORT \
|
||||
CONFIG_CLEAN_IPKG \
|
||||
CONFIG_PER_FEED_REPO \
|
||||
CONFIG_PER_FEED_REPO_ADD_DISABLED \
|
||||
CONFIG_PER_FEED_REPO_ADD_COMMENTED \
|
||||
$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
|
||||
$(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed))
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
|
@ -268,18 +268,4 @@ menuconfig PER_FEED_REPO
|
|||
If set, a separate repository is generated within bin/*/packages/
|
||||
for the core packages and each enabled feed.
|
||||
|
||||
config PER_FEED_REPO_ADD_DISABLED
|
||||
bool "Add available but not enabled feeds to opkg.conf"
|
||||
default y
|
||||
depends on PER_FEED_REPO
|
||||
help
|
||||
Add not installed or disabled feeds from feeds.conf to opkg.conf.
|
||||
|
||||
config PER_FEED_REPO_ADD_COMMENTED
|
||||
bool "Comment out not enabled feeds"
|
||||
default !BUILDBOT
|
||||
depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
|
||||
help
|
||||
Add not enabled feeds as commented out source lines to opkg.conf.
|
||||
|
||||
source "tmp/.config-feeds.in"
|
||||
|
|
|
@ -3,10 +3,10 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=wireless-regdb
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
|
||||
PKG_SOURCE_URL:=https://github.com/Excalibur201010/wireless-regdb
|
||||
PKG_SOURCE_DATE:=2017-10-20
|
||||
PKG_SOURCE_VERSION:=4343d359ed5e7404de8803a74df186457b26ab79
|
||||
PKG_MIRROR_HASH:=5f5b669f32ae36cb65b1d99efbbbfd42c2983cda32f6448346e3e54ffaba3889
|
||||
PKG_SOURCE_VERSION:=87759c4c7940b2dc496543d7be7fef30ac9f8b4a
|
||||
#PKG_MIRROR_HASH:=5f5b669f32ae36cb65b1d99efbbbfd42c2983cda32f6448346e3e54ffaba3889
|
||||
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ath10k-ct
|
||||
PKG_RELEASE=2
|
||||
PKG_RELEASE=3
|
||||
|
||||
PKG_LICENSE:=GPLv2
|
||||
PKG_LICENSE_FILES:=
|
||||
|
|
|
@ -0,0 +1,113 @@
|
|||
From d06f26c5c8a41f246a9c40862a77a55725cedbd3 Mon Sep 17 00:00:00 2001
|
||||
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Date: Fri, 8 Dec 2017 11:37:42 +0100
|
||||
Subject: ath10k: search DT for qcom,ath10k-calibration-variant
|
||||
|
||||
Board Data File (BDF) is loaded upon driver boot-up procedure. The right
|
||||
board data file is identified on QCA4019 using bus, bmi-chip-id and
|
||||
bmi-board-id.
|
||||
|
||||
The problem, however, can occur when the (default) board data file cannot
|
||||
fulfill with the vendor requirements and it is necessary to use a different
|
||||
board data file.
|
||||
|
||||
This problem was solved for SMBIOS by adding a special SMBIOS type 0xF8.
|
||||
Something similar has to be provided for systems without SMBIOS but with
|
||||
device trees. No solution was specified by QCA and therefore a new one has
|
||||
to be found for ath10k.
|
||||
|
||||
The device tree requires addition strings to define the variant name
|
||||
|
||||
wifi@a000000 {
|
||||
status = "okay";
|
||||
qcom,ath10k-calibration-variant = "RT-AC58U";
|
||||
};
|
||||
|
||||
wifi@a800000 {
|
||||
status = "okay";
|
||||
qcom,ath10k-calibration-variant = "RT-AC58U";
|
||||
};
|
||||
|
||||
This would create the boarddata identifiers for the board-2.bin search
|
||||
|
||||
* bus=ahb,bmi-chip-id=0,bmi-board-id=16,variant=RT-AC58U
|
||||
* bus=ahb,bmi-chip-id=0,bmi-board-id=17,variant=RT-AC58U
|
||||
|
||||
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
||||
|
||||
Origin: upstream, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d06f26c5c8a41f246a9c40862a77a55725cedbd3
|
||||
---
|
||||
ath10k-4.13/core.c | 40 ++++++++++++++++++++++++++++------
|
||||
1 file changed, 33 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/ath10k-4.13/core.c
|
||||
+++ b/ath10k-4.13/core.c
|
||||
@@ -889,6 +889,28 @@ static int ath10k_core_check_smbios(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int ath10k_core_check_dt(struct ath10k *ar)
|
||||
+{
|
||||
+ struct device_node *node;
|
||||
+ const char *variant = NULL;
|
||||
+
|
||||
+ node = ar->dev->of_node;
|
||||
+ if (!node)
|
||||
+ return -ENOENT;
|
||||
+
|
||||
+ of_property_read_string(node, "qcom,ath10k-calibration-variant",
|
||||
+ &variant);
|
||||
+ if (!variant)
|
||||
+ return -ENODATA;
|
||||
+
|
||||
+ if (strscpy(ar->id.bdf_ext, variant, sizeof(ar->id.bdf_ext)) < 0)
|
||||
+ ath10k_dbg(ar, ATH10K_DBG_BOOT,
|
||||
+ "bdf variant string is longer than the buffer can accommodate (variant: %s)\n",
|
||||
+ variant);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int ath10k_download_and_run_otp(struct ath10k *ar)
|
||||
{
|
||||
u32 result, address = ar->hw_params.patch_load_addr;
|
||||
@@ -1522,19 +1544,19 @@ static int ath10k_core_create_board_name
|
||||
/* strlen(',variant=') + strlen(ar->id.bdf_ext) */
|
||||
char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };
|
||||
|
||||
+ if (ar->id.bdf_ext[0] != '\0')
|
||||
+ scnprintf(variant, sizeof(variant), ",variant=%s",
|
||||
+ ar->id.bdf_ext);
|
||||
+
|
||||
if (ar->id.bmi_ids_valid) {
|
||||
scnprintf(name, name_len,
|
||||
- "bus=%s,bmi-chip-id=%d,bmi-board-id=%d",
|
||||
+ "bus=%s,bmi-chip-id=%d,bmi-board-id=%d%s",
|
||||
ath10k_bus_str(ar->hif.bus),
|
||||
ar->id.bmi_chip_id,
|
||||
- ar->id.bmi_board_id);
|
||||
+ ar->id.bmi_board_id, variant);
|
||||
goto out;
|
||||
}
|
||||
|
||||
- if (ar->id.bdf_ext[0] != '\0')
|
||||
- scnprintf(variant, sizeof(variant), ",variant=%s",
|
||||
- ar->id.bdf_ext);
|
||||
-
|
||||
scnprintf(name, name_len,
|
||||
"bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",
|
||||
ath10k_bus_str(ar->hif.bus),
|
||||
@@ -2964,7 +2986,11 @@ static int ath10k_core_probe_fw(struct a
|
||||
|
||||
ret = ath10k_core_check_smbios(ar);
|
||||
if (ret)
|
||||
- ath10k_dbg(ar, ATH10K_DBG_BOOT, "bdf variant name not set.\n");
|
||||
+ ath10k_dbg(ar, ATH10K_DBG_BOOT, "SMBIOS bdf variant name not set.\n");
|
||||
+
|
||||
+ ret = ath10k_core_check_dt(ar);
|
||||
+ if (ret)
|
||||
+ ath10k_dbg(ar, ATH10K_DBG_BOOT, "DT bdf variant name not set.\n");
|
||||
|
||||
ret = ath10k_core_fetch_board_file(ar);
|
||||
if (ret) {
|
|
@ -0,0 +1,249 @@
|
|||
From: Thomas Hebb <tommyhebb@gmail.com>
|
||||
Date: Fri, 13 Apr 2018 17:40:26 +0300
|
||||
Subject: [PATCH] ath10k: search all IEs for variant before falling back
|
||||
|
||||
commit f2593cb1b291 ("ath10k: Search SMBIOS for OEM board file
|
||||
extension") added a feature to ath10k that allows Board Data File
|
||||
(BDF) conflicts between multiple devices that use the same device IDs
|
||||
but have different calibration requirements to be resolved by allowing
|
||||
a "variant" string to be stored in SMBIOS [and later device tree, added
|
||||
by commit d06f26c5c8a4 ("ath10k: search DT for qcom,ath10k-calibration-
|
||||
variant")] that gets appended to the ID stored in board-2.bin.
|
||||
|
||||
This original patch had a regression, however. Namely that devices with
|
||||
a variant present in SMBIOS that didn't need custom BDFs could no longer
|
||||
find the default BDF, which has no variant appended. The patch was
|
||||
reverted and re-applied with a fix for this issue in commit 1657b8f84ed9
|
||||
("search SMBIOS for OEM board file extension").
|
||||
|
||||
But the fix to fall back to a default BDF introduced another issue: the
|
||||
driver currently parses IEs in board-2.bin one by one, and for each one
|
||||
it first checks to see if it matches the ID with the variant appended.
|
||||
If it doesn't, it checks to see if it matches the "fallback" ID with no
|
||||
variant. If a matching BDF is found at any point during this search, the
|
||||
search is terminated and that BDF is used. The issue is that it's very
|
||||
possible (and is currently the case for board-2.bin files present in the
|
||||
ath10k-firmware repository) for the default BDF to occur in an earlier
|
||||
IE than the variant-specific BDF. In this case, the current code will
|
||||
happily choose the default BDF even though a better-matching BDF is
|
||||
present later in the file.
|
||||
|
||||
This patch fixes the issue by first searching the entire file for the ID
|
||||
with variant, and searching for the fallback ID only if that search
|
||||
fails. It also includes some code cleanup in the area, as
|
||||
ath10k_core_fetch_board_data_api_n() no longer does its own string
|
||||
mangling to remove the variant from an ID, instead leaving that job to a
|
||||
new flag passed to ath10k_core_create_board_name().
|
||||
|
||||
I've tested this patch on a QCA4019 and verified that the driver behaves
|
||||
correctly for 1) both fallback and variant BDFs present, 2) only fallback
|
||||
BDF present, and 3) no matching BDFs present.
|
||||
|
||||
Fixes: 1657b8f84ed9 ("ath10k: search SMBIOS for OEM board file extension")
|
||||
Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||||
|
||||
Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c8489668065a283d3027e86e877b103a87f99d22
|
||||
---
|
||||
ath10k-4.13/core.c | 134 ++++++++++++++++++---------------
|
||||
1 file changed, 72 insertions(+), 62 deletions(-)
|
||||
|
||||
--- a/ath10k-4.13/core.c
|
||||
+++ b/ath10k-4.13/core.c
|
||||
@@ -1419,14 +1419,61 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static int ath10k_core_search_bd(struct ath10k *ar,
|
||||
+ const char *boardname,
|
||||
+ const u8 *data,
|
||||
+ size_t len)
|
||||
+{
|
||||
+ size_t ie_len;
|
||||
+ struct ath10k_fw_ie *hdr;
|
||||
+ int ret = -ENOENT, ie_id;
|
||||
+
|
||||
+ while (len > sizeof(struct ath10k_fw_ie)) {
|
||||
+ hdr = (struct ath10k_fw_ie *)data;
|
||||
+ ie_id = le32_to_cpu(hdr->id);
|
||||
+ ie_len = le32_to_cpu(hdr->len);
|
||||
+
|
||||
+ len -= sizeof(*hdr);
|
||||
+ data = hdr->data;
|
||||
+
|
||||
+ if (len < ALIGN(ie_len, 4)) {
|
||||
+ ath10k_err(ar, "invalid length for board ie_id %d ie_len %zu len %zu\n",
|
||||
+ ie_id, ie_len, len);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ switch (ie_id) {
|
||||
+ case ATH10K_BD_IE_BOARD:
|
||||
+ ret = ath10k_core_parse_bd_ie_board(ar, data, ie_len,
|
||||
+ boardname);
|
||||
+ if (ret == -ENOENT)
|
||||
+ /* no match found, continue */
|
||||
+ break;
|
||||
+
|
||||
+ /* either found or error, so stop searching */
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ /* jump over the padding */
|
||||
+ ie_len = ALIGN(ie_len, 4);
|
||||
+
|
||||
+ len -= ie_len;
|
||||
+ data += ie_len;
|
||||
+ }
|
||||
+
|
||||
+out:
|
||||
+ /* return result of parse_bd_ie_board() or -ENOENT */
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar,
|
||||
const char *boardname,
|
||||
+ const char *fallback_boardname,
|
||||
const char *filename)
|
||||
{
|
||||
- size_t len, magic_len, ie_len;
|
||||
- struct ath10k_fw_ie *hdr;
|
||||
+ size_t len, magic_len;
|
||||
const u8 *data;
|
||||
- int ret, ie_id;
|
||||
+ int ret;
|
||||
|
||||
ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar,
|
||||
ar->hw_params.fw.dir,
|
||||
@@ -1464,73 +1511,28 @@ static int ath10k_core_fetch_board_data_
|
||||
data += magic_len;
|
||||
len -= magic_len;
|
||||
|
||||
- while (len > sizeof(struct ath10k_fw_ie)) {
|
||||
- hdr = (struct ath10k_fw_ie *)data;
|
||||
- ie_id = le32_to_cpu(hdr->id);
|
||||
- ie_len = le32_to_cpu(hdr->len);
|
||||
-
|
||||
- len -= sizeof(*hdr);
|
||||
- data = hdr->data;
|
||||
-
|
||||
- if (len < ALIGN(ie_len, 4)) {
|
||||
- ath10k_err(ar, "invalid length for board ie_id %d ie_len %zu len %zu\n",
|
||||
- ie_id, ie_len, len);
|
||||
- ret = -EINVAL;
|
||||
- goto err;
|
||||
- }
|
||||
-
|
||||
- switch (ie_id) {
|
||||
- case ATH10K_BD_IE_BOARD:
|
||||
- ret = ath10k_core_parse_bd_ie_board(ar, data, ie_len,
|
||||
- boardname);
|
||||
- if (ret == -ENOENT && ar->id.bdf_ext[0] != '\0') {
|
||||
- /* try default bdf if variant was not found */
|
||||
- char *s, *v = ",variant=";
|
||||
- char boardname2[100];
|
||||
-
|
||||
- strlcpy(boardname2, boardname,
|
||||
- sizeof(boardname2));
|
||||
-
|
||||
- s = strstr(boardname2, v);
|
||||
- if (s)
|
||||
- *s = '\0'; /* strip ",variant=%s" */
|
||||
-
|
||||
- ret = ath10k_core_parse_bd_ie_board(ar, data,
|
||||
- ie_len,
|
||||
- boardname2);
|
||||
- }
|
||||
-
|
||||
- if (ret == -ENOENT)
|
||||
- /* no match found, continue */
|
||||
- break;
|
||||
- else if (ret)
|
||||
- /* there was an error, bail out */
|
||||
- goto err;
|
||||
-
|
||||
- /* board data found */
|
||||
- goto out;
|
||||
- }
|
||||
+ /* attempt to find boardname in the IE list */
|
||||
+ ret = ath10k_core_search_bd(ar, boardname, data, len);
|
||||
|
||||
- /* jump over the padding */
|
||||
- ie_len = ALIGN(ie_len, 4);
|
||||
-
|
||||
- len -= ie_len;
|
||||
- data += ie_len;
|
||||
- }
|
||||
+ /* if we didn't find it and have a fallback name, try that */
|
||||
+ if (ret == -ENOENT && fallback_boardname)
|
||||
+ ret = ath10k_core_search_bd(ar, fallback_boardname, data, len);
|
||||
|
||||
out:
|
||||
- if (!ar->normal_mode_fw.board_data || !ar->normal_mode_fw.board_len) {
|
||||
+ if (ret == -ENOENT) {
|
||||
ath10k_err(ar,
|
||||
"failed to fetch board data for %s from %s/%s\n",
|
||||
boardname, ar->hw_params.fw.dir, filename);
|
||||
ret = -ENODATA;
|
||||
- goto err;
|
||||
}
|
||||
|
||||
/* Save firmware board name so we can display it later. */
|
||||
strlcpy(ar->normal_mode_fw.fw_file.fw_board_name, filename,
|
||||
sizeof(ar->normal_mode_fw.fw_file.fw_board_name));
|
||||
|
||||
+ if (ret)
|
||||
+ goto err;
|
||||
+
|
||||
return 0;
|
||||
|
||||
err:
|
||||
@@ -1539,12 +1541,12 @@ err:
|
||||
}
|
||||
|
||||
static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
|
||||
- size_t name_len)
|
||||
+ size_t name_len, bool with_variant)
|
||||
{
|
||||
/* strlen(',variant=') + strlen(ar->id.bdf_ext) */
|
||||
char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };
|
||||
|
||||
- if (ar->id.bdf_ext[0] != '\0')
|
||||
+ if (with_variant && ar->id.bdf_ext[0] != '\0')
|
||||
scnprintf(variant, sizeof(variant), ",variant=%s",
|
||||
ar->id.bdf_ext);
|
||||
|
||||
@@ -1570,21 +1572,31 @@ out:
|
||||
|
||||
static int ath10k_core_fetch_board_file(struct ath10k *ar)
|
||||
{
|
||||
- char boardname[100];
|
||||
+ char boardname[100], fallback_boardname[100];
|
||||
int ret;
|
||||
|
||||
- ret = ath10k_core_create_board_name(ar, boardname, sizeof(boardname));
|
||||
+ ret = ath10k_core_create_board_name(ar, boardname,
|
||||
+ sizeof(boardname), true);
|
||||
if (ret) {
|
||||
ath10k_err(ar, "failed to create board name: %d", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ ret = ath10k_core_create_board_name(ar, fallback_boardname,
|
||||
+ sizeof(boardname), false);
|
||||
+ if (ret) {
|
||||
+ ath10k_err(ar, "failed to create fallback board name: %d", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
ar->bd_api = 2;
|
||||
if (ar->fwcfg.bname[0])
|
||||
ret = ath10k_core_fetch_board_data_api_n(ar, boardname,
|
||||
+ fallback_boardname,
|
||||
ar->fwcfg.bname);
|
||||
else
|
||||
ret = ath10k_core_fetch_board_data_api_n(ar, boardname,
|
||||
+ fallback_boardname,
|
||||
ATH10K_BOARD_API2_FILE);
|
||||
if (!ret)
|
||||
goto success;
|
|
@ -13,9 +13,9 @@ PKG_RELEASE:=1
|
|||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git
|
||||
PKG_SOURCE_DATE:=2018-05-15
|
||||
PKG_SOURCE_VERSION:=779e91a91e803cf2b95a6a46de721d3a4fd4dfe6
|
||||
PKG_MIRROR_HASH:=2bd1e9aee6d53a2a140ad5ece6d8eeccbfb8ae8c788e84f9dd946e29abb64010
|
||||
PKG_SOURCE_DATE:=2018-07-06
|
||||
PKG_SOURCE_VERSION:=c91b94f0b4456c43def2e77248a455a9a2449ed1
|
||||
PKG_MIRROR_HASH:=e1b7081e1b559a9c01721ffc856debdb91e36488b51b9facb7db73f40ab85914
|
||||
PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
|
@ -57,6 +57,7 @@ PKG_CONFIG_DEPENDS:= \
|
|||
CONFIG_PACKAGE_ATH_DEBUG \
|
||||
CONFIG_PACKAGE_ATH_DFS \
|
||||
CONFIG_PACKAGE_ATH_SPECTRAL \
|
||||
CONFIG_PACKAGE_ATH_DYNACK \
|
||||
CONFIG_PACKAGE_B43_DEBUG \
|
||||
CONFIG_PACKAGE_B43_PIO \
|
||||
CONFIG_PACKAGE_B43_PHY_G \
|
||||
|
@ -197,6 +198,17 @@ define KernelPackage/ath/config
|
|||
help
|
||||
Say Y to enable access to the FFT/spectral data via debugfs.
|
||||
|
||||
config PACKAGE_ATH_DYNACK
|
||||
bool "Enable Dynack support"
|
||||
depends on PACKAGE_kmod-ath9k-common
|
||||
help
|
||||
Enables support for Dynamic ACK estimation, which allows the fastest possible speed
|
||||
at any distance automatically by increasing/decreasing the max frame ACK time for
|
||||
the most remote station detected. It can be enabled by using iw (iw phy0 set distance auto),
|
||||
or by sending the NL80211_ATTR_WIPHY_DYN_ACK flag to mac80211 driver using netlink.
|
||||
|
||||
Select this option if you want to enable this feature
|
||||
|
||||
endif
|
||||
endef
|
||||
|
||||
|
@ -1614,7 +1626,7 @@ config-$(call config_package,ath) += ATH_CARDS ATH_COMMON ATH_REG_DYNAMIC_USER_R
|
|||
config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
|
||||
config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
|
||||
config-$(CONFIG_PACKAGE_ATH_SPECTRAL) += ATH9K_COMMON_SPECTRAL ATH10K_SPECTRAL
|
||||
|
||||
config-$(CONFIG_PACKAGE_ATH_DYNACK) += ATH9K_DYNACK
|
||||
config-$(call config_package,ath9k) += ATH9K
|
||||
config-$(call config_package,ath9k-common) += ATH9K_COMMON
|
||||
config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
From 4f717a2589be649afddbbd3ac58b67ebfa7426f7 Mon Sep 17 00:00:00 2001
|
||||
From: Sven Eckelmann <sven@narfation.org>
|
||||
Date: Wed, 6 Jun 2018 10:18:31 +0200
|
||||
Subject: [PATCH v2] cfg80211: initialize sinfo in cfg80211_get_station
|
||||
|
||||
Most of the implementations behind cfg80211_get_station will not initialize
|
||||
sinfo to zero before manipulating it. For example, the member "filled",
|
||||
which indicates the filled in parts of this struct, is often only modified
|
||||
by enabling certain bits in the bitfield while keeping the remaining bits
|
||||
in their original state. A caller without a preinitialized sinfo.filled can
|
||||
then no longer decide which parts of sinfo were filled in by
|
||||
cfg80211_get_station (or actually the underlying implementations).
|
||||
|
||||
cfg80211_get_station must therefore take care that sinfo is initialized to
|
||||
zero. Otherwise, the caller may tries to read information which was not
|
||||
filled in and which must therefore also be considered uninitialized. In
|
||||
batadv_v_elp_get_throughput's case, an invalid "random" expected throughput
|
||||
may be stored for this neighbor and thus the B.A.T.M.A.N V algorithm may
|
||||
switch to non-optimal neighbors for certain destinations.
|
||||
|
||||
Fixes: 7406353d43c8 ("cfg80211: implement cfg80211_get_station cfg80211 API")
|
||||
Reported-by: Thomas Lauer <holminateur@gmail.com>
|
||||
Reported-by: Marcel Schmidt <ff.z-casparistrasse@mailbox.org>
|
||||
Cc: b.a.t.m.a.n@lists.open-mesh.org
|
||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
||||
|
||||
Forwarded: https://patchwork.kernel.org/patch/10449857/
|
||||
---
|
||||
net/wireless/util.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/net/wireless/util.c
|
||||
+++ b/net/wireless/util.c
|
||||
@@ -1749,6 +1749,8 @@ int cfg80211_get_station(struct net_devi
|
||||
if (!rdev->ops->get_station)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
+ memset(sinfo, 0, sizeof(*sinfo));
|
||||
+
|
||||
return rdev_get_station(rdev, dev, mac_addr, sinfo);
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_get_station);
|
|
@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
|
|||
|
||||
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_DATE:=2018-06-19
|
||||
PKG_SOURCE_VERSION:=1d4ca10a562b6d9eaec3aaa5f3905804070ae743
|
||||
PKG_MIRROR_HASH:=5906436e8fecd2d7d70328a9aa27c6598c242ea3bc8922ed4ec7245a3ff861cd
|
||||
PKG_SOURCE_DATE:=2018-07-13
|
||||
PKG_SOURCE_VERSION:=67803752363db5e81c7a74a9491a3041aa776284
|
||||
PKG_MIRROR_HASH:=733030674a782d96c5ea2fcbcbc2de5486f645d9fb4a84cfb74246a78b459569
|
||||
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
|
|
@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
|
|||
|
||||
PKG_NAME:=wireguard
|
||||
|
||||
PKG_VERSION:=0.0.20180620
|
||||
PKG_VERSION:=0.0.20180625
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
|
||||
PKG_HASH:=b4db98ea751c8e667454f98ea1c15d704a784fe1bc093b03bd64575418a7c242
|
||||
PKG_HASH:=d9bedeb22b1f83d48581608a6521fea1d429fbeb8809419d08703ef2ec570020
|
||||
|
||||
PKG_LICENSE:=GPL-2.0 Apache-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
--- a/include/uapi/linux/pkt_sched.h
|
||||
+++ b/include/uapi/linux/pkt_sched.h
|
||||
@@ -934,4 +934,110 @@ enum {
|
||||
@@ -934,4 +934,118 @@ enum {
|
||||
|
||||
#define TCA_CBS_MAX (__TCA_CBS_MAX - 1)
|
||||
|
||||
+/* CAKE */
|
||||
+enum {
|
||||
+ TCA_CAKE_UNSPEC,
|
||||
+ TCA_CAKE_BASE_RATE,
|
||||
+ TCA_CAKE_PAD,
|
||||
+ TCA_CAKE_BASE_RATE64,
|
||||
+ TCA_CAKE_DIFFSERV_MODE,
|
||||
+ TCA_CAKE_ATM,
|
||||
+ TCA_CAKE_FLOW_MODE,
|
||||
|
@ -29,7 +30,8 @@
|
|||
+
|
||||
+enum {
|
||||
+ __TCA_CAKE_STATS_INVALID,
|
||||
+ TCA_CAKE_STATS_CAPACITY_ESTIMATE,
|
||||
+ TCA_CAKE_STATS_PAD,
|
||||
+ TCA_CAKE_STATS_CAPACITY_ESTIMATE64,
|
||||
+ TCA_CAKE_STATS_MEMORY_LIMIT,
|
||||
+ TCA_CAKE_STATS_MEMORY_USED,
|
||||
+ TCA_CAKE_STATS_AVG_NETOFF,
|
||||
|
@ -38,6 +40,12 @@
|
|||
+ TCA_CAKE_STATS_MIN_ADJLEN,
|
||||
+ TCA_CAKE_STATS_MAX_ADJLEN,
|
||||
+ TCA_CAKE_STATS_TIN_STATS,
|
||||
+ TCA_CAKE_STATS_DEFICIT,
|
||||
+ TCA_CAKE_STATS_COBALT_COUNT,
|
||||
+ TCA_CAKE_STATS_DROPPING,
|
||||
+ TCA_CAKE_STATS_DROP_NEXT_US,
|
||||
+ TCA_CAKE_STATS_P_DROP,
|
||||
+ TCA_CAKE_STATS_BLUE_TIMER_US,
|
||||
+ __TCA_CAKE_STATS_MAX
|
||||
+};
|
||||
+#define TCA_CAKE_STATS_MAX (__TCA_CAKE_STATS_MAX - 1)
|
||||
|
@ -54,8 +62,8 @@
|
|||
+ TCA_CAKE_TIN_STATS_ECN_MARKED_PACKETS,
|
||||
+ TCA_CAKE_TIN_STATS_ECN_MARKED_BYTES64,
|
||||
+ TCA_CAKE_TIN_STATS_BACKLOG_PACKETS,
|
||||
+ TCA_CAKE_TIN_STATS_BACKLOG_BYTES64,
|
||||
+ TCA_CAKE_TIN_STATS_THRESHOLD_RATE,
|
||||
+ TCA_CAKE_TIN_STATS_BACKLOG_BYTES,
|
||||
+ TCA_CAKE_TIN_STATS_THRESHOLD_RATE64,
|
||||
+ TCA_CAKE_TIN_STATS_TARGET_US,
|
||||
+ TCA_CAKE_TIN_STATS_INTERVAL_US,
|
||||
+ TCA_CAKE_TIN_STATS_WAY_INDIRECT_HITS,
|
||||
|
@ -758,7 +766,7 @@
|
|||
TCMODULES += q_hhf.o
|
||||
--- /dev/null
|
||||
+++ b/tc/q_cake.c
|
||||
@@ -0,0 +1,749 @@
|
||||
@@ -0,0 +1,796 @@
|
||||
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
|
||||
+/*
|
||||
+ * Common Applications Kept Enhanced -- CAKE
|
||||
|
@ -831,7 +839,7 @@
|
|||
+ struct nlmsghdr *n, const char *dev)
|
||||
+{
|
||||
+ int unlimited = 0;
|
||||
+ unsigned bandwidth = 0;
|
||||
+ __u64 bandwidth = 0;
|
||||
+ unsigned interval = 0;
|
||||
+ unsigned target = 0;
|
||||
+ unsigned diffserv = 0;
|
||||
|
@ -853,7 +861,7 @@
|
|||
+ while (argc > 0) {
|
||||
+ if (strcmp(*argv, "bandwidth") == 0) {
|
||||
+ NEXT_ARG();
|
||||
+ if (get_rate(&bandwidth, *argv)) {
|
||||
+ if (get_rate64(&bandwidth, *argv)) {
|
||||
+ fprintf(stderr, "Illegal \"bandwidth\"\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
|
@ -1088,7 +1096,7 @@
|
|||
+ tail = NLMSG_TAIL(n);
|
||||
+ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
|
||||
+ if (bandwidth || unlimited)
|
||||
+ addattr_l(n, 1024, TCA_CAKE_BASE_RATE, &bandwidth, sizeof(bandwidth));
|
||||
+ addattr_l(n, 1024, TCA_CAKE_BASE_RATE64, &bandwidth, sizeof(bandwidth));
|
||||
+ if (diffserv)
|
||||
+ addattr_l(n, 1024, TCA_CAKE_DIFFSERV_MODE, &diffserv, sizeof(diffserv));
|
||||
+ if (atm != -1)
|
||||
|
@ -1128,7 +1136,7 @@
|
|||
+static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
|
||||
+{
|
||||
+ struct rtattr *tb[TCA_CAKE_MAX + 1];
|
||||
+ unsigned bandwidth = 0;
|
||||
+ __u64 bandwidth = 0;
|
||||
+ unsigned diffserv = 0;
|
||||
+ unsigned flowmode = 0;
|
||||
+ unsigned interval = 0;
|
||||
|
@ -1151,9 +1159,9 @@
|
|||
+
|
||||
+ parse_rtattr_nested(tb, TCA_CAKE_MAX, opt);
|
||||
+
|
||||
+ if (tb[TCA_CAKE_BASE_RATE] &&
|
||||
+ RTA_PAYLOAD(tb[TCA_CAKE_BASE_RATE]) >= sizeof(__u32)) {
|
||||
+ bandwidth = rta_getattr_u32(tb[TCA_CAKE_BASE_RATE]);
|
||||
+ if (tb[TCA_CAKE_BASE_RATE64] &&
|
||||
+ RTA_PAYLOAD(tb[TCA_CAKE_BASE_RATE64]) >= sizeof(bandwidth)) {
|
||||
+ bandwidth = rta_getattr_u64(tb[TCA_CAKE_BASE_RATE64]);
|
||||
+ if(bandwidth) {
|
||||
+ print_uint(PRINT_JSON, "bandwidth", NULL, bandwidth);
|
||||
+ print_string(PRINT_FP, NULL, "bandwidth %s ", sprint_rate(bandwidth, b1));
|
||||
|
@ -1306,7 +1314,7 @@
|
|||
+ else if (!raw)
|
||||
+ print_string(PRINT_ANY, "atm", "%s ", "noatm");
|
||||
+
|
||||
+ print_uint(PRINT_ANY, "overhead", "overhead %d ", overhead);
|
||||
+ print_int(PRINT_ANY, "overhead", "overhead %d ", overhead);
|
||||
+
|
||||
+ if (mpu)
|
||||
+ print_uint(PRINT_ANY, "mpu", "mpu %u ", mpu);
|
||||
|
@ -1322,18 +1330,19 @@
|
|||
+static void cake_print_json_tin(struct rtattr **tstat)
|
||||
+{
|
||||
+#define PRINT_TSTAT_JSON(type, name, attr) if (tstat[TCA_CAKE_TIN_STATS_ ## attr]) \
|
||||
+ print_uint(PRINT_JSON, name, NULL, \
|
||||
+ print_u64(PRINT_JSON, name, NULL, \
|
||||
+ rta_getattr_ ## type((struct rtattr *)tstat[TCA_CAKE_TIN_STATS_ ## attr]))
|
||||
+
|
||||
+ open_json_object(NULL);
|
||||
+ PRINT_TSTAT_JSON(u32, "threshold_rate", THRESHOLD_RATE);
|
||||
+ PRINT_TSTAT_JSON(u64, "threshold_rate", THRESHOLD_RATE64);
|
||||
+ PRINT_TSTAT_JSON(u64, "sent_bytes", SENT_BYTES64);
|
||||
+ PRINT_TSTAT_JSON(u32, "backlog_bytes", BACKLOG_BYTES);
|
||||
+ PRINT_TSTAT_JSON(u32, "target_us", TARGET_US);
|
||||
+ PRINT_TSTAT_JSON(u32, "interval_us", INTERVAL_US);
|
||||
+ PRINT_TSTAT_JSON(u32, "peak_delay_us", PEAK_DELAY_US);
|
||||
+ PRINT_TSTAT_JSON(u32, "avg_delay_us", AVG_DELAY_US);
|
||||
+ PRINT_TSTAT_JSON(u32, "base_delay_us", BASE_DELAY_US);
|
||||
+ PRINT_TSTAT_JSON(u32, "sent_packets", SENT_PACKETS);
|
||||
+ PRINT_TSTAT_JSON(u64, "sent_bytes", SENT_BYTES64);
|
||||
+ PRINT_TSTAT_JSON(u32, "way_indirect_hits", WAY_INDIRECT_HITS);
|
||||
+ PRINT_TSTAT_JSON(u32, "way_misses", WAY_MISSES);
|
||||
+ PRINT_TSTAT_JSON(u32, "way_collisions", WAY_COLLISIONS);
|
||||
|
@ -1361,6 +1370,8 @@
|
|||
+ return 0;
|
||||
+
|
||||
+#define GET_STAT_U32(attr) rta_getattr_u32(st[TCA_CAKE_STATS_ ## attr])
|
||||
+#define GET_STAT_S32(attr) (*(__s32*)RTA_DATA(st[TCA_CAKE_STATS_ ## attr]))
|
||||
+#define GET_STAT_U64(attr) rta_getattr_u64(st[TCA_CAKE_STATS_ ## attr])
|
||||
+
|
||||
+ parse_rtattr_nested(st, TCA_CAKE_STATS_MAX, xstats);
|
||||
+
|
||||
|
@ -1378,11 +1389,11 @@
|
|||
+ GET_STAT_U32(MEMORY_LIMIT));
|
||||
+ }
|
||||
+
|
||||
+ if (st[TCA_CAKE_STATS_CAPACITY_ESTIMATE]) {
|
||||
+ if (st[TCA_CAKE_STATS_CAPACITY_ESTIMATE64]) {
|
||||
+ print_string(PRINT_FP, NULL, " capacity estimate: %s\n",
|
||||
+ sprint_rate(GET_STAT_U32(CAPACITY_ESTIMATE), b1));
|
||||
+ sprint_rate(GET_STAT_U64(CAPACITY_ESTIMATE64), b1));
|
||||
+ print_uint(PRINT_JSON, "capacity_estimate", NULL,
|
||||
+ GET_STAT_U32(CAPACITY_ESTIMATE));
|
||||
+ GET_STAT_U64(CAPACITY_ESTIMATE64));
|
||||
+ }
|
||||
+
|
||||
+ if (st[TCA_CAKE_STATS_MIN_NETLEN] &&
|
||||
|
@ -1408,7 +1419,50 @@
|
|||
+ " average network hdr offset: %8u\n\n",
|
||||
+ GET_STAT_U32(AVG_NETOFF));
|
||||
+
|
||||
+ /* class stats */
|
||||
+ if (st[TCA_CAKE_STATS_DEFICIT])
|
||||
+ print_int(PRINT_ANY, "deficit", " deficit %u",
|
||||
+ GET_STAT_S32(DEFICIT));
|
||||
+ if (st[TCA_CAKE_STATS_COBALT_COUNT])
|
||||
+ print_uint(PRINT_ANY, "count", " count %u",
|
||||
+ GET_STAT_U32(COBALT_COUNT));
|
||||
+
|
||||
+ if (st[TCA_CAKE_STATS_DROPPING] && GET_STAT_U32(DROPPING)) {
|
||||
+ print_bool(PRINT_ANY, "dropping", " dropping", true);
|
||||
+ if (st[TCA_CAKE_STATS_DROP_NEXT_US]) {
|
||||
+ int drop_next = GET_STAT_S32(DROP_NEXT_US);
|
||||
+ if (drop_next < 0) {
|
||||
+ print_string(PRINT_FP, NULL, " drop_next -%s",
|
||||
+ sprint_time(drop_next, b1));
|
||||
+ } else {
|
||||
+ print_uint(PRINT_JSON, "drop_next", NULL,
|
||||
+ drop_next);
|
||||
+ print_string(PRINT_FP, NULL, " drop_next %s",
|
||||
+ sprint_time(drop_next, b1));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (st[TCA_CAKE_STATS_P_DROP]) {
|
||||
+ print_uint(PRINT_ANY, "blue_prob", " blue_prob %u",
|
||||
+ GET_STAT_U32(P_DROP));
|
||||
+ if (st[TCA_CAKE_STATS_BLUE_TIMER_US]) {
|
||||
+ int blue_timer = GET_STAT_S32(BLUE_TIMER_US);
|
||||
+ if (blue_timer < 0) {
|
||||
+ print_string(PRINT_FP, NULL, " blue_timer -%s",
|
||||
+ sprint_time(blue_timer, b1));
|
||||
+ } else {
|
||||
+ print_uint(PRINT_JSON, "blue_timer", NULL,
|
||||
+ blue_timer);
|
||||
+ print_string(PRINT_FP, NULL, " blue_timer %s",
|
||||
+ sprint_time(blue_timer, b1));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+#undef GET_STAT_U32
|
||||
+#undef GET_STAT_S32
|
||||
+#undef GET_STAT_U64
|
||||
+
|
||||
+ if (st[TCA_CAKE_STATS_TIN_STATS]) {
|
||||
+ struct rtattr *tins[TC_CAKE_MAX_TINS + 1];
|
||||
|
@ -1461,9 +1515,9 @@
|
|||
+ } \
|
||||
+ } while (0)
|
||||
+
|
||||
+#define SPRINT_TSTAT(pfunc, name, attr) PRINT_TSTAT( \
|
||||
+#define SPRINT_TSTAT(pfunc, type, name, attr) PRINT_TSTAT( \
|
||||
+ name, attr, "s", sprint_ ## pfunc( \
|
||||
+ rta_getattr_u32(GET_TSTAT(i, attr)), b1))
|
||||
+ rta_getattr_ ## type(GET_TSTAT(i, attr)), b1))
|
||||
+
|
||||
+#define PRINT_TSTAT_U32(name, attr) PRINT_TSTAT( \
|
||||
+ name, attr, "u", rta_getattr_u32(GET_TSTAT(i, attr)))
|
||||
|
@ -1471,12 +1525,13 @@
|
|||
+#define PRINT_TSTAT_U64(name, attr) PRINT_TSTAT( \
|
||||
+ name, attr, "llu", rta_getattr_u64(GET_TSTAT(i, attr)))
|
||||
+
|
||||
+ SPRINT_TSTAT(rate, " thresh ", THRESHOLD_RATE);
|
||||
+ SPRINT_TSTAT(time, " target ", TARGET_US);
|
||||
+ SPRINT_TSTAT(time, " interval", INTERVAL_US);
|
||||
+ SPRINT_TSTAT(time, " pk_delay", PEAK_DELAY_US);
|
||||
+ SPRINT_TSTAT(time, " av_delay", AVG_DELAY_US);
|
||||
+ SPRINT_TSTAT(time, " sp_delay", BASE_DELAY_US);
|
||||
+ SPRINT_TSTAT(rate, u64, " thresh ", THRESHOLD_RATE64);
|
||||
+ SPRINT_TSTAT(time, u32, " target ", TARGET_US);
|
||||
+ SPRINT_TSTAT(time, u32, " interval", INTERVAL_US);
|
||||
+ SPRINT_TSTAT(time, u32, " pk_delay", PEAK_DELAY_US);
|
||||
+ SPRINT_TSTAT(time, u32, " av_delay", AVG_DELAY_US);
|
||||
+ SPRINT_TSTAT(time, u32, " sp_delay", BASE_DELAY_US);
|
||||
+ SPRINT_TSTAT(size, u32, " backlog ", BACKLOG_BYTES);
|
||||
+
|
||||
+ PRINT_TSTAT_U32(" pkts ", SENT_PACKETS);
|
||||
+ PRINT_TSTAT_U64(" bytes ", SENT_BYTES64);
|
||||
|
|
|
@ -59,7 +59,8 @@ sub parse_config() {
|
|||
my $valid = 1;
|
||||
$line[0] =~ /^src-[\w-]+$/ or $valid = 0;
|
||||
$line[1] =~ /^\w+$/ or $valid = 0;
|
||||
@src = split /\s+/, $line[2];
|
||||
@src = split /\s+/, ($line[2] or '');
|
||||
@src = ('') if @src == 0;
|
||||
$valid or die "Syntax error in feeds.conf, line: $line\n";
|
||||
|
||||
$name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
|
||||
|
@ -127,6 +128,10 @@ my %update_method = (
|
|||
'init' => "ln -s '%s' '%s'",
|
||||
'update' => "",
|
||||
'revision' => "echo -n 'local'"},
|
||||
'src-dummy' => {
|
||||
'init' => "true '%s' && mkdir '%s'",
|
||||
'update' => "",
|
||||
'revision' => "echo -n 'dummy'"},
|
||||
'src-git' => {
|
||||
'init' => "git clone --depth 1 '%s' '%s'",
|
||||
'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
|
||||
|
@ -819,11 +824,12 @@ sub feed_config() {
|
|||
my $installed = (-f "feeds/$feed->[1].index");
|
||||
|
||||
printf "\tconfig FEED_%s\n", $feed->[1];
|
||||
printf "\t\tbool \"Enable feed %s\"\n", $feed->[1];
|
||||
printf "\t\ttristate \"Enable feed %s\"\n", $feed->[1];
|
||||
printf "\t\tdepends on PER_FEED_REPO\n";
|
||||
printf "\t\tdefault y\n" if $installed;
|
||||
printf "\t\thelp\n";
|
||||
printf "\t\t Enable the \\\"%s\\\" feed at %s.\n", $feed->[1], $feed->[2][0];
|
||||
printf "\t\t Enable the \\\"%s\\\" feed in opkg distfeeds.conf.\n", $feed->[1];
|
||||
printf "\t\t Say M to add the feed commented out.\n";
|
||||
printf "\n";
|
||||
}
|
||||
|
||||
|
|
|
@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
|||
}
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -5062,7 +5062,7 @@ static void port_event(struct usb_hub *h
|
||||
@@ -5064,7 +5064,7 @@ static void port_event(struct usb_hub *h
|
||||
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
|
||||
u16 status = 0, unused;
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <asm/bootinfo.h>
|
||||
#include <asm/idle.h>
|
||||
#include <asm/prom.h>
|
||||
@@ -225,6 +226,33 @@ static struct fixed_phy_status bcm47xx_f
|
||||
@@ -231,6 +232,33 @@ static struct fixed_phy_status bcm47xx_f
|
||||
.duplex = DUPLEX_FULL,
|
||||
};
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
|||
static int __init bcm47xx_register_bus_complete(void)
|
||||
{
|
||||
switch (bcm47xx_bus_type) {
|
||||
@@ -244,6 +272,7 @@ static int __init bcm47xx_register_bus_c
|
||||
@@ -250,6 +278,7 @@ static int __init bcm47xx_register_bus_c
|
||||
bcm47xx_workarounds();
|
||||
|
||||
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <asm/bootinfo.h>
|
||||
#include <asm/idle.h>
|
||||
#include <asm/prom.h>
|
||||
@@ -225,6 +226,33 @@ static struct fixed_phy_status bcm47xx_f
|
||||
@@ -231,6 +232,33 @@ static struct fixed_phy_status bcm47xx_f
|
||||
.duplex = DUPLEX_FULL,
|
||||
};
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
|||
static int __init bcm47xx_register_bus_complete(void)
|
||||
{
|
||||
switch (bcm47xx_bus_type) {
|
||||
@@ -244,6 +272,7 @@ static int __init bcm47xx_register_bus_c
|
||||
@@ -250,6 +278,7 @@ static int __init bcm47xx_register_bus_c
|
||||
bcm47xx_workarounds();
|
||||
|
||||
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);
|
||||
|
|
|
@ -135,7 +135,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
new->hooks[nhooks] = old->hooks[i];
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -1400,6 +1400,8 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1431,6 +1431,8 @@ static int nf_tables_addchain(struct nft
|
||||
ops->hook = hookfn;
|
||||
if (afi->hook_ops_init)
|
||||
afi->hook_ops_init(ops, i);
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -892,8 +892,6 @@ struct nft_stats {
|
||||
@@ -897,8 +897,6 @@ struct nft_stats {
|
||||
struct u64_stats_sync syncp;
|
||||
};
|
||||
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
/**
|
||||
* struct nft_base_chain - nf_tables base chain
|
||||
*
|
||||
@@ -905,7 +903,7 @@ struct nft_stats {
|
||||
@@ -910,7 +908,7 @@ struct nft_stats {
|
||||
* @dev_name: device name that this base chain is attached to (if any)
|
||||
*/
|
||||
struct nft_base_chain {
|
||||
|
@ -29,7 +29,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nf_chain_type *type;
|
||||
u8 policy;
|
||||
u8 flags;
|
||||
@@ -966,8 +964,6 @@ enum nft_af_flags {
|
||||
@@ -971,8 +969,6 @@ enum nft_af_flags {
|
||||
* @owner: module owner
|
||||
* @tables: used internally
|
||||
* @flags: family flags
|
||||
|
@ -38,7 +38,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @hooks: hookfn overrides for packet validation
|
||||
*/
|
||||
struct nft_af_info {
|
||||
@@ -977,9 +973,6 @@ struct nft_af_info {
|
||||
@@ -982,9 +978,6 @@ struct nft_af_info {
|
||||
struct module *owner;
|
||||
struct list_head tables;
|
||||
u32 flags;
|
||||
|
@ -128,7 +128,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
|
||||
static int nft_trans_table_add(struct nft_ctx *ctx, int msg_type)
|
||||
@@ -595,8 +592,7 @@ static void _nf_tables_table_disable(str
|
||||
@@ -624,8 +621,7 @@ static void _nf_tables_table_disable(str
|
||||
if (cnt && i++ == cnt)
|
||||
break;
|
||||
|
||||
|
@ -138,7 +138,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
|
||||
@@ -613,8 +609,7 @@ static int nf_tables_table_enable(struct
|
||||
@@ -642,8 +638,7 @@ static int nf_tables_table_enable(struct
|
||||
if (!nft_is_base_chain(chain))
|
||||
continue;
|
||||
|
||||
|
@ -148,7 +148,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (err < 0)
|
||||
goto err;
|
||||
|
||||
@@ -1026,7 +1021,7 @@ static int nf_tables_fill_chain_info(str
|
||||
@@ -1055,7 +1050,7 @@ static int nf_tables_fill_chain_info(str
|
||||
|
||||
if (nft_is_base_chain(chain)) {
|
||||
const struct nft_base_chain *basechain = nft_base_chain(chain);
|
||||
|
@ -157,7 +157,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nlattr *nest;
|
||||
|
||||
nest = nla_nest_start(skb, NFTA_CHAIN_HOOK);
|
||||
@@ -1252,8 +1247,8 @@ static void nf_tables_chain_destroy(stru
|
||||
@@ -1283,8 +1278,8 @@ static void nf_tables_chain_destroy(stru
|
||||
free_percpu(basechain->stats);
|
||||
if (basechain->stats)
|
||||
static_branch_dec(&nft_counters_enabled);
|
||||
|
@ -168,7 +168,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
kfree(chain->name);
|
||||
kfree(basechain);
|
||||
} else {
|
||||
@@ -1349,7 +1344,6 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1380,7 +1375,6 @@ static int nf_tables_addchain(struct nft
|
||||
struct nft_stats __percpu *stats;
|
||||
struct net *net = ctx->net;
|
||||
struct nft_chain *chain;
|
||||
|
@ -176,7 +176,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int err;
|
||||
|
||||
if (table->use == UINT_MAX)
|
||||
@@ -1388,21 +1382,18 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1419,21 +1413,18 @@ static int nf_tables_addchain(struct nft
|
||||
basechain->type = hook.type;
|
||||
chain = &basechain->chain;
|
||||
|
||||
|
@ -210,7 +210,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
chain->flags |= NFT_BASE_CHAIN;
|
||||
basechain->policy = policy;
|
||||
@@ -1420,7 +1411,7 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1451,7 +1442,7 @@ static int nf_tables_addchain(struct nft
|
||||
goto err1;
|
||||
}
|
||||
|
||||
|
@ -219,7 +219,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (err < 0)
|
||||
goto err1;
|
||||
|
||||
@@ -1434,7 +1425,7 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1465,7 +1456,7 @@ static int nf_tables_addchain(struct nft
|
||||
|
||||
return 0;
|
||||
err2:
|
||||
|
@ -228,7 +228,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
err1:
|
||||
nf_tables_chain_destroy(chain);
|
||||
|
||||
@@ -1447,14 +1438,13 @@ static int nf_tables_updchain(struct nft
|
||||
@@ -1478,14 +1469,13 @@ static int nf_tables_updchain(struct nft
|
||||
const struct nlattr * const *nla = ctx->nla;
|
||||
struct nft_table *table = ctx->table;
|
||||
struct nft_chain *chain = ctx->chain;
|
||||
|
@ -244,7 +244,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (nla[NFTA_CHAIN_HOOK]) {
|
||||
if (!nft_is_base_chain(chain))
|
||||
@@ -1471,14 +1461,12 @@ static int nf_tables_updchain(struct nft
|
||||
@@ -1502,14 +1492,12 @@ static int nf_tables_updchain(struct nft
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
|
@ -265,7 +265,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
nft_chain_release_hook(&hook);
|
||||
}
|
||||
@@ -5069,10 +5057,9 @@ static int nf_tables_commit(struct net *
|
||||
@@ -5112,10 +5100,9 @@ static int nf_tables_commit(struct net *
|
||||
case NFT_MSG_DELCHAIN:
|
||||
list_del_rcu(&trans->ctx.chain->list);
|
||||
nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN);
|
||||
|
@ -279,7 +279,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
break;
|
||||
case NFT_MSG_NEWRULE:
|
||||
nft_clear(trans->ctx.net, nft_trans_rule(trans));
|
||||
@@ -5209,10 +5196,9 @@ static int nf_tables_abort(struct net *n
|
||||
@@ -5252,10 +5239,9 @@ static int nf_tables_abort(struct net *n
|
||||
} else {
|
||||
trans->ctx.table->use--;
|
||||
list_del_rcu(&trans->ctx.chain->list);
|
||||
|
@ -293,7 +293,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
break;
|
||||
case NFT_MSG_DELCHAIN:
|
||||
@@ -5313,7 +5299,7 @@ int nft_chain_validate_hooks(const struc
|
||||
@@ -5358,7 +5344,7 @@ int nft_chain_validate_hooks(const struc
|
||||
if (nft_is_base_chain(chain)) {
|
||||
basechain = nft_base_chain(chain);
|
||||
|
||||
|
@ -302,7 +302,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
|
||||
return -EOPNOTSUPP;
|
||||
@@ -5795,8 +5781,7 @@ int __nft_release_basechain(struct nft_c
|
||||
@@ -5840,8 +5826,7 @@ int __nft_release_basechain(struct nft_c
|
||||
|
||||
BUG_ON(!nft_is_base_chain(ctx->chain));
|
||||
|
||||
|
@ -312,7 +312,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) {
|
||||
list_del(&rule->list);
|
||||
ctx->chain->use--;
|
||||
@@ -5825,8 +5810,7 @@ static void __nft_release_afinfo(struct
|
||||
@@ -5870,8 +5855,7 @@ static void __nft_release_afinfo(struct
|
||||
|
||||
list_for_each_entry_safe(table, nt, &afi->tables, list) {
|
||||
list_for_each_entry(chain, &table->chains, list)
|
||||
|
@ -353,7 +353,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
strncpy(basechain->dev_name, dev->name, IFNAMSIZ);
|
||||
--- a/net/netfilter/nft_compat.c
|
||||
+++ b/net/netfilter/nft_compat.c
|
||||
@@ -169,7 +169,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
@@ -186,7 +186,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
if (nft_is_base_chain(ctx->chain)) {
|
||||
const struct nft_base_chain *basechain =
|
||||
nft_base_chain(ctx->chain);
|
||||
|
@ -362,7 +362,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
par->hook_mask = 1 << ops->hooknum;
|
||||
} else {
|
||||
@@ -302,7 +302,7 @@ static int nft_target_validate(const str
|
||||
@@ -317,7 +317,7 @@ static int nft_target_validate(const str
|
||||
if (nft_is_base_chain(ctx->chain)) {
|
||||
const struct nft_base_chain *basechain =
|
||||
nft_base_chain(ctx->chain);
|
||||
|
@ -371,7 +371,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
hook_mask = 1 << ops->hooknum;
|
||||
if (target->hooks && !(hook_mask & target->hooks))
|
||||
@@ -383,7 +383,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
@@ -414,7 +414,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
if (nft_is_base_chain(ctx->chain)) {
|
||||
const struct nft_base_chain *basechain =
|
||||
nft_base_chain(ctx->chain);
|
||||
|
@ -380,7 +380,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
par->hook_mask = 1 << ops->hooknum;
|
||||
} else {
|
||||
@@ -481,7 +481,7 @@ static int nft_match_validate(const stru
|
||||
@@ -564,7 +564,7 @@ static int nft_match_validate(const stru
|
||||
if (nft_is_base_chain(ctx->chain)) {
|
||||
const struct nft_base_chain *basechain =
|
||||
nft_base_chain(ctx->chain);
|
||||
|
|
|
@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -870,7 +870,7 @@ enum nft_chain_type {
|
||||
@@ -875,7 +875,7 @@ enum nft_chain_type {
|
||||
* @family: address family
|
||||
* @owner: module owner
|
||||
* @hook_mask: mask of valid hooks
|
||||
|
@ -19,7 +19,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
*/
|
||||
struct nf_chain_type {
|
||||
const char *name;
|
||||
@@ -964,7 +964,6 @@ enum nft_af_flags {
|
||||
@@ -969,7 +969,6 @@ enum nft_af_flags {
|
||||
* @owner: module owner
|
||||
* @tables: used internally
|
||||
* @flags: family flags
|
||||
|
@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
*/
|
||||
struct nft_af_info {
|
||||
struct list_head list;
|
||||
@@ -973,7 +972,6 @@ struct nft_af_info {
|
||||
@@ -978,7 +977,6 @@ struct nft_af_info {
|
||||
struct module *owner;
|
||||
struct list_head tables;
|
||||
u32 flags;
|
||||
|
@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static int __init nf_tables_ipv6_init(void)
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -1352,7 +1352,6 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1383,7 +1383,6 @@ static int nf_tables_addchain(struct nft
|
||||
if (nla[NFTA_CHAIN_HOOK]) {
|
||||
struct nft_chain_hook hook;
|
||||
struct nf_hook_ops *ops;
|
||||
|
@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
err = nft_chain_parse_hook(net, nla, afi, &hook, create);
|
||||
if (err < 0)
|
||||
@@ -1378,7 +1377,6 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1409,7 +1408,6 @@ static int nf_tables_addchain(struct nft
|
||||
static_branch_inc(&nft_counters_enabled);
|
||||
}
|
||||
|
||||
|
@ -167,7 +167,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
basechain->type = hook.type;
|
||||
chain = &basechain->chain;
|
||||
|
||||
@@ -1387,10 +1385,8 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1418,10 +1416,8 @@ static int nf_tables_addchain(struct nft
|
||||
ops->hooknum = hook.num;
|
||||
ops->priority = hook.priority;
|
||||
ops->priv = chain;
|
||||
|
|
|
@ -40,7 +40,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
default:
|
||||
WARN_ON(1);
|
||||
goto err;
|
||||
@@ -308,6 +313,11 @@ int nft_meta_get_init(const struct nft_c
|
||||
@@ -310,6 +315,11 @@ int nft_meta_get_init(const struct nft_c
|
||||
prandom_init_once(&nft_prandom_state);
|
||||
len = sizeof(u32);
|
||||
break;
|
||||
|
@ -52,7 +52,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
@@ -318,6 +328,38 @@ int nft_meta_get_init(const struct nft_c
|
||||
@@ -320,6 +330,38 @@ int nft_meta_get_init(const struct nft_c
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nft_meta_get_init);
|
||||
|
||||
|
@ -91,7 +91,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int nft_meta_set_validate(const struct nft_ctx *ctx,
|
||||
const struct nft_expr *expr,
|
||||
const struct nft_data **data)
|
||||
@@ -434,6 +476,7 @@ static const struct nft_expr_ops nft_met
|
||||
@@ -436,6 +478,7 @@ static const struct nft_expr_ops nft_met
|
||||
.eval = nft_meta_get_eval,
|
||||
.init = nft_meta_get_init,
|
||||
.dump = nft_meta_get_dump,
|
||||
|
|
|
@ -50,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
#include <net/netlink.h>
|
||||
|
||||
#define NFT_JUMP_STACK_SIZE 16
|
||||
@@ -933,6 +934,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
@@ -938,6 +939,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
* @chains: chains in the table
|
||||
* @sets: sets in the table
|
||||
* @objects: stateful objects in the table
|
||||
|
@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @hgenerator: handle generator state
|
||||
* @use: number of chain references to this table
|
||||
* @flags: table flag (see enum nft_table_flags)
|
||||
@@ -944,6 +946,7 @@ struct nft_table {
|
||||
@@ -949,6 +951,7 @@ struct nft_table {
|
||||
struct list_head chains;
|
||||
struct list_head sets;
|
||||
struct list_head objects;
|
||||
|
@ -66,7 +66,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
u64 hgenerator;
|
||||
u32 use;
|
||||
u16 flags:14,
|
||||
@@ -1075,6 +1078,44 @@ int nft_register_obj(struct nft_object_t
|
||||
@@ -1080,6 +1083,44 @@ int nft_register_obj(struct nft_object_t
|
||||
void nft_unregister_obj(struct nft_object_type *obj_type);
|
||||
|
||||
/**
|
||||
|
@ -111,7 +111,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* struct nft_traceinfo - nft tracing information and state
|
||||
*
|
||||
* @pkt: pktinfo currently processed
|
||||
@@ -1310,4 +1351,11 @@ struct nft_trans_obj {
|
||||
@@ -1315,4 +1356,11 @@ struct nft_trans_obj {
|
||||
#define nft_trans_obj(trans) \
|
||||
(((struct nft_trans_obj *)trans->data)->obj)
|
||||
|
||||
|
@ -217,7 +217,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
/**
|
||||
* nft_register_afinfo - register nf_tables address family info
|
||||
@@ -345,6 +347,40 @@ static int nft_delobj(struct nft_ctx *ct
|
||||
@@ -374,6 +376,40 @@ static int nft_delobj(struct nft_ctx *ct
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -258,7 +258,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
/*
|
||||
* Tables
|
||||
*/
|
||||
@@ -728,6 +764,7 @@ static int nf_tables_newtable(struct net
|
||||
@@ -757,6 +793,7 @@ static int nf_tables_newtable(struct net
|
||||
INIT_LIST_HEAD(&table->chains);
|
||||
INIT_LIST_HEAD(&table->sets);
|
||||
INIT_LIST_HEAD(&table->objects);
|
||||
|
@ -266,7 +266,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
table->flags = flags;
|
||||
|
||||
nft_ctx_init(&ctx, net, skb, nlh, afi, table, NULL, nla);
|
||||
@@ -749,10 +786,11 @@ err1:
|
||||
@@ -778,10 +815,11 @@ err1:
|
||||
|
||||
static int nft_flush_table(struct nft_ctx *ctx)
|
||||
{
|
||||
|
@ -279,7 +279,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
list_for_each_entry(chain, &ctx->table->chains, list) {
|
||||
if (!nft_is_active_next(ctx->net, chain))
|
||||
@@ -778,6 +816,12 @@ static int nft_flush_table(struct nft_ct
|
||||
@@ -807,6 +845,12 @@ static int nft_flush_table(struct nft_ct
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
list_for_each_entry_safe(obj, ne, &ctx->table->objects, list) {
|
||||
err = nft_delobj(ctx, obj);
|
||||
if (err < 0)
|
||||
@@ -4774,6 +4818,605 @@ static void nf_tables_obj_notify(const s
|
||||
@@ -4817,6 +4861,605 @@ static void nf_tables_obj_notify(const s
|
||||
ctx->afi->family, ctx->report, GFP_KERNEL);
|
||||
}
|
||||
|
||||
|
@ -898,7 +898,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net,
|
||||
u32 portid, u32 seq)
|
||||
{
|
||||
@@ -4804,6 +5447,49 @@ nla_put_failure:
|
||||
@@ -4847,6 +5490,49 @@ nla_put_failure:
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
|
@ -948,7 +948,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static void nf_tables_gen_notify(struct net *net, struct sk_buff *skb,
|
||||
int event)
|
||||
{
|
||||
@@ -4956,6 +5642,21 @@ static const struct nfnl_callback nf_tab
|
||||
@@ -4999,6 +5685,21 @@ static const struct nfnl_callback nf_tab
|
||||
.attr_count = NFTA_OBJ_MAX,
|
||||
.policy = nft_obj_policy,
|
||||
},
|
||||
|
@ -970,7 +970,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
|
||||
static void nft_chain_commit_update(struct nft_trans *trans)
|
||||
@@ -5001,6 +5702,9 @@ static void nf_tables_commit_release(str
|
||||
@@ -5044,6 +5745,9 @@ static void nf_tables_commit_release(str
|
||||
case NFT_MSG_DELOBJ:
|
||||
nft_obj_destroy(nft_trans_obj(trans));
|
||||
break;
|
||||
|
@ -980,7 +980,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
kfree(trans);
|
||||
}
|
||||
@@ -5118,6 +5822,21 @@ static int nf_tables_commit(struct net *
|
||||
@@ -5161,6 +5865,21 @@ static int nf_tables_commit(struct net *
|
||||
nf_tables_obj_notify(&trans->ctx, nft_trans_obj(trans),
|
||||
NFT_MSG_DELOBJ);
|
||||
break;
|
||||
|
@ -1002,7 +1002,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
|
||||
@@ -5155,6 +5874,9 @@ static void nf_tables_abort_release(stru
|
||||
@@ -5198,6 +5917,9 @@ static void nf_tables_abort_release(stru
|
||||
case NFT_MSG_NEWOBJ:
|
||||
nft_obj_destroy(nft_trans_obj(trans));
|
||||
break;
|
||||
|
@ -1012,7 +1012,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
kfree(trans);
|
||||
}
|
||||
@@ -5244,6 +5966,17 @@ static int nf_tables_abort(struct net *n
|
||||
@@ -5289,6 +6011,17 @@ static int nf_tables_abort(struct net *n
|
||||
nft_clear(trans->ctx.net, nft_trans_obj(trans));
|
||||
nft_trans_destroy(trans);
|
||||
break;
|
||||
|
@ -1030,7 +1030,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
|
||||
@@ -5794,6 +6527,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai
|
||||
@@ -5839,6 +6572,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai
|
||||
/* Called by nft_unregister_afinfo() from __net_exit path, nfnl_lock is held. */
|
||||
static void __nft_release_afinfo(struct net *net, struct nft_af_info *afi)
|
||||
{
|
||||
|
@ -1038,7 +1038,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table, *nt;
|
||||
struct nft_chain *chain, *nc;
|
||||
struct nft_object *obj, *ne;
|
||||
@@ -5807,6 +6541,9 @@ static void __nft_release_afinfo(struct
|
||||
@@ -5852,6 +6586,9 @@ static void __nft_release_afinfo(struct
|
||||
list_for_each_entry_safe(table, nt, &afi->tables, list) {
|
||||
list_for_each_entry(chain, &table->chains, list)
|
||||
nf_tables_unregister_hook(net, table, chain);
|
||||
|
@ -1048,8 +1048,8 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
/* No packets are walking on these chains anymore. */
|
||||
ctx.table = table;
|
||||
list_for_each_entry(chain, &table->chains, list) {
|
||||
@@ -5817,6 +6554,11 @@ static void __nft_release_afinfo(struct
|
||||
nf_tables_rule_destroy(&ctx, rule);
|
||||
@@ -5862,6 +6599,11 @@ static void __nft_release_afinfo(struct
|
||||
nf_tables_rule_release(&ctx, rule);
|
||||
}
|
||||
}
|
||||
+ list_for_each_entry_safe(flowtable, nf, &table->flowtables, list) {
|
||||
|
@ -1060,7 +1060,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
list_for_each_entry_safe(set, ns, &table->sets, list) {
|
||||
list_del(&set->list);
|
||||
table->use--;
|
||||
@@ -5860,6 +6602,8 @@ static int __init nf_tables_module_init(
|
||||
@@ -5905,6 +6647,8 @@ static int __init nf_tables_module_init(
|
||||
if (err < 0)
|
||||
goto err3;
|
||||
|
||||
|
@ -1069,7 +1069,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
pr_info("nf_tables: (c) 2007-2009 Patrick McHardy <kaber@trash.net>\n");
|
||||
return register_pernet_subsys(&nf_tables_net_ops);
|
||||
err3:
|
||||
@@ -5874,6 +6618,7 @@ static void __exit nf_tables_module_exit
|
||||
@@ -5919,6 +6663,7 @@ static void __exit nf_tables_module_exit
|
||||
{
|
||||
unregister_pernet_subsys(&nf_tables_net_ops);
|
||||
nfnetlink_subsys_unregister(&nf_tables_subsys);
|
||||
|
|
|
@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -963,7 +963,6 @@ enum nft_af_flags {
|
||||
@@ -968,7 +968,6 @@ enum nft_af_flags {
|
||||
*
|
||||
* @list: used internally
|
||||
* @family: address family
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @owner: module owner
|
||||
* @tables: used internally
|
||||
* @flags: family flags
|
||||
@@ -971,7 +970,6 @@ enum nft_af_flags {
|
||||
@@ -976,7 +975,6 @@ enum nft_af_flags {
|
||||
struct nft_af_info {
|
||||
struct list_head list;
|
||||
int family;
|
||||
|
@ -72,7 +72,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -1328,9 +1328,6 @@ static int nft_chain_parse_hook(struct n
|
||||
@@ -1359,9 +1359,6 @@ static int nft_chain_parse_hook(struct n
|
||||
return -EINVAL;
|
||||
|
||||
hook->num = ntohl(nla_get_be32(ha[NFTA_HOOK_HOOKNUM]));
|
||||
|
@ -82,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));
|
||||
|
||||
type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
|
||||
@@ -4926,7 +4923,7 @@ static int nf_tables_flowtable_parse_hoo
|
||||
@@ -4969,7 +4966,7 @@ static int nf_tables_flowtable_parse_hoo
|
||||
return -EINVAL;
|
||||
|
||||
hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM]));
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5350,7 +5350,7 @@ static int nf_tables_getflowtable(struct
|
||||
@@ -5393,7 +5393,7 @@ static int nf_tables_getflowtable(struct
|
||||
|
||||
flowtable = nf_tables_flowtable_lookup(table, nla[NFTA_FLOWTABLE_NAME],
|
||||
genmask);
|
||||
|
|
|
@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -954,10 +954,6 @@ struct nft_table {
|
||||
@@ -959,10 +959,6 @@ struct nft_table {
|
||||
char *name;
|
||||
};
|
||||
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
/**
|
||||
* struct nft_af_info - nf_tables address family info
|
||||
*
|
||||
@@ -965,14 +961,12 @@ enum nft_af_flags {
|
||||
@@ -970,14 +966,12 @@ enum nft_af_flags {
|
||||
* @family: address family
|
||||
* @owner: module owner
|
||||
* @tables: used internally
|
||||
|
@ -38,7 +38,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int nft_register_afinfo(struct net *, struct nft_af_info *);
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -1345,7 +1345,7 @@ static int nft_chain_parse_hook(struct n
|
||||
@@ -1376,7 +1376,7 @@ static int nft_chain_parse_hook(struct n
|
||||
hook->type = type;
|
||||
|
||||
hook->dev = NULL;
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -611,10 +611,7 @@ err:
|
||||
@@ -640,10 +640,7 @@ err:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
struct nft_chain *chain;
|
||||
u32 i = 0;
|
||||
@@ -632,9 +629,7 @@ static void _nf_tables_table_disable(str
|
||||
@@ -661,9 +658,7 @@ static void _nf_tables_table_disable(str
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
struct nft_chain *chain;
|
||||
int err, i = 0;
|
||||
@@ -654,15 +649,13 @@ static int nf_tables_table_enable(struct
|
||||
@@ -683,15 +678,13 @@ static int nf_tables_table_enable(struct
|
||||
return 0;
|
||||
err:
|
||||
if (i)
|
||||
|
@ -53,7 +53,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
|
||||
static int nf_tables_updtable(struct nft_ctx *ctx)
|
||||
@@ -691,7 +684,7 @@ static int nf_tables_updtable(struct nft
|
||||
@@ -720,7 +713,7 @@ static int nf_tables_updtable(struct nft
|
||||
nft_trans_table_enable(trans) = false;
|
||||
} else if (!(flags & NFT_TABLE_F_DORMANT) &&
|
||||
ctx->table->flags & NFT_TABLE_F_DORMANT) {
|
||||
|
@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (ret >= 0) {
|
||||
ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
|
||||
nft_trans_table_enable(trans) = true;
|
||||
@@ -5728,7 +5721,6 @@ static int nf_tables_commit(struct net *
|
||||
@@ -5771,7 +5764,6 @@ static int nf_tables_commit(struct net *
|
||||
if (nft_trans_table_update(trans)) {
|
||||
if (!nft_trans_table_enable(trans)) {
|
||||
nf_tables_table_disable(net,
|
||||
|
@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
trans->ctx.table);
|
||||
trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
|
||||
}
|
||||
@@ -5890,7 +5882,6 @@ static int nf_tables_abort(struct net *n
|
||||
@@ -5933,7 +5925,6 @@ static int nf_tables_abort(struct net *n
|
||||
if (nft_trans_table_update(trans)) {
|
||||
if (nft_trans_table_enable(trans)) {
|
||||
nf_tables_table_disable(net,
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -423,7 +423,7 @@ static inline u64 nf_tables_alloc_handle
|
||||
@@ -452,7 +452,7 @@ static inline u64 nf_tables_alloc_handle
|
||||
static const struct nf_chain_type *chain_type[NFPROTO_NUMPROTO][NFT_CHAIN_T_MAX];
|
||||
|
||||
static const struct nf_chain_type *
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
int i;
|
||||
|
||||
@@ -436,22 +436,20 @@ __nf_tables_chain_type_lookup(int family
|
||||
@@ -465,22 +465,20 @@ __nf_tables_chain_type_lookup(int family
|
||||
}
|
||||
|
||||
static const struct nf_chain_type *
|
||||
|
@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (type != NULL)
|
||||
return ERR_PTR(-EAGAIN);
|
||||
}
|
||||
@@ -1325,8 +1323,8 @@ static int nft_chain_parse_hook(struct n
|
||||
@@ -1356,8 +1354,8 @@ static int nft_chain_parse_hook(struct n
|
||||
|
||||
type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
|
||||
if (nla[NFTA_CHAIN_TYPE]) {
|
||||
|
|
|
@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5269,8 +5269,10 @@ static int nf_tables_dump_flowtable_done
|
||||
@@ -5312,8 +5312,10 @@ static int nf_tables_dump_flowtable_done
|
||||
if (!filter)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
bool report;
|
||||
};
|
||||
|
||||
@@ -939,6 +939,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
@@ -944,6 +944,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
* @use: number of chain references to this table
|
||||
* @flags: table flag (see enum nft_table_flags)
|
||||
* @genmask: generation mask
|
||||
|
@ -50,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @name: name of the table
|
||||
*/
|
||||
struct nft_table {
|
||||
@@ -951,6 +952,7 @@ struct nft_table {
|
||||
@@ -956,6 +957,7 @@ struct nft_table {
|
||||
u32 use;
|
||||
u16 flags:14,
|
||||
genmask:2;
|
||||
|
@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
char *name;
|
||||
};
|
||||
|
||||
@@ -960,13 +962,11 @@ struct nft_table {
|
||||
@@ -965,13 +967,11 @@ struct nft_table {
|
||||
* @list: used internally
|
||||
* @family: address family
|
||||
* @owner: module owner
|
||||
|
@ -108,7 +108,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ctx->table = table;
|
||||
ctx->chain = chain;
|
||||
ctx->nla = nla;
|
||||
@@ -385,30 +384,31 @@ static int nft_delflowtable(struct nft_c
|
||||
@@ -414,30 +413,31 @@ static int nft_delflowtable(struct nft_c
|
||||
* Tables
|
||||
*/
|
||||
|
||||
|
@ -146,7 +146,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (table != NULL)
|
||||
return table;
|
||||
|
||||
@@ -507,7 +507,7 @@ static void nf_tables_table_notify(const
|
||||
@@ -536,7 +536,7 @@ static void nf_tables_table_notify(const
|
||||
goto err;
|
||||
|
||||
err = nf_tables_fill_table_info(skb, ctx->net, ctx->portid, ctx->seq,
|
||||
|
@ -155,7 +155,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (err < 0) {
|
||||
kfree_skb(skb);
|
||||
goto err;
|
||||
@@ -524,7 +524,6 @@ static int nf_tables_dump_tables(struct
|
||||
@@ -553,7 +553,6 @@ static int nf_tables_dump_tables(struct
|
||||
struct netlink_callback *cb)
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
|
||||
|
@ -163,7 +163,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
unsigned int idx = 0, s_idx = cb->args[0];
|
||||
struct net *net = sock_net(skb->sk);
|
||||
@@ -533,30 +532,27 @@ static int nf_tables_dump_tables(struct
|
||||
@@ -562,30 +561,27 @@ static int nf_tables_dump_tables(struct
|
||||
rcu_read_lock();
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
|
@ -211,7 +211,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
done:
|
||||
rcu_read_unlock();
|
||||
@@ -588,7 +584,8 @@ static int nf_tables_gettable(struct net
|
||||
@@ -617,7 +613,8 @@ static int nf_tables_gettable(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -221,7 +221,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -719,7 +716,7 @@ static int nf_tables_newtable(struct net
|
||||
@@ -748,7 +745,7 @@ static int nf_tables_newtable(struct net
|
||||
return PTR_ERR(afi);
|
||||
|
||||
name = nla[NFTA_TABLE_NAME];
|
||||
|
@ -230,7 +230,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table)) {
|
||||
if (PTR_ERR(table) != -ENOENT)
|
||||
return PTR_ERR(table);
|
||||
@@ -729,7 +726,7 @@ static int nf_tables_newtable(struct net
|
||||
@@ -758,7 +755,7 @@ static int nf_tables_newtable(struct net
|
||||
if (nlh->nlmsg_flags & NLM_F_REPLACE)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
|
@ -239,7 +239,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return nf_tables_updtable(&ctx);
|
||||
}
|
||||
|
||||
@@ -756,14 +753,15 @@ static int nf_tables_newtable(struct net
|
||||
@@ -785,14 +782,15 @@ static int nf_tables_newtable(struct net
|
||||
INIT_LIST_HEAD(&table->sets);
|
||||
INIT_LIST_HEAD(&table->objects);
|
||||
INIT_LIST_HEAD(&table->flowtables);
|
||||
|
@ -257,7 +257,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
err4:
|
||||
kfree(table->name);
|
||||
@@ -837,30 +835,28 @@ out:
|
||||
@@ -866,30 +864,28 @@ out:
|
||||
|
||||
static int nft_flush(struct nft_ctx *ctx, int family)
|
||||
{
|
||||
|
@ -301,7 +301,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
out:
|
||||
return err;
|
||||
@@ -878,7 +874,7 @@ static int nf_tables_deltable(struct net
|
||||
@@ -907,7 +903,7 @@ static int nf_tables_deltable(struct net
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_ctx ctx;
|
||||
|
||||
|
@ -310,7 +310,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (family == AF_UNSPEC || nla[NFTA_TABLE_NAME] == NULL)
|
||||
return nft_flush(&ctx, family);
|
||||
|
||||
@@ -886,7 +882,8 @@ static int nf_tables_deltable(struct net
|
||||
@@ -915,7 +911,8 @@ static int nf_tables_deltable(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -320,7 +320,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -894,7 +891,7 @@ static int nf_tables_deltable(struct net
|
||||
@@ -923,7 +920,7 @@ static int nf_tables_deltable(struct net
|
||||
table->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -329,7 +329,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ctx.table = table;
|
||||
|
||||
return nft_flush_table(&ctx);
|
||||
@@ -906,7 +903,7 @@ static void nf_tables_table_destroy(stru
|
||||
@@ -935,7 +932,7 @@ static void nf_tables_table_destroy(stru
|
||||
|
||||
kfree(ctx->table->name);
|
||||
kfree(ctx->table);
|
||||
|
@ -338,7 +338,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
|
||||
int nft_register_chain_type(const struct nf_chain_type *ctype)
|
||||
@@ -1107,7 +1104,7 @@ static void nf_tables_chain_notify(const
|
||||
@@ -1136,7 +1133,7 @@ static void nf_tables_chain_notify(const
|
||||
goto err;
|
||||
|
||||
err = nf_tables_fill_chain_info(skb, ctx->net, ctx->portid, ctx->seq,
|
||||
|
@ -347,7 +347,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ctx->chain);
|
||||
if (err < 0) {
|
||||
kfree_skb(skb);
|
||||
@@ -1125,7 +1122,6 @@ static int nf_tables_dump_chains(struct
|
||||
@@ -1154,7 +1151,6 @@ static int nf_tables_dump_chains(struct
|
||||
struct netlink_callback *cb)
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
|
||||
|
@ -355,7 +355,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
const struct nft_chain *chain;
|
||||
unsigned int idx = 0, s_idx = cb->args[0];
|
||||
@@ -1135,31 +1131,30 @@ static int nf_tables_dump_chains(struct
|
||||
@@ -1164,31 +1160,30 @@ static int nf_tables_dump_chains(struct
|
||||
rcu_read_lock();
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
|
@ -407,7 +407,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
done:
|
||||
@@ -1193,7 +1188,8 @@ static int nf_tables_getchain(struct net
|
||||
@@ -1222,7 +1217,8 @@ static int nf_tables_getchain(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -417,7 +417,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -1301,8 +1297,8 @@ struct nft_chain_hook {
|
||||
@@ -1332,8 +1328,8 @@ struct nft_chain_hook {
|
||||
|
||||
static int nft_chain_parse_hook(struct net *net,
|
||||
const struct nlattr * const nla[],
|
||||
|
@ -428,7 +428,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
struct nlattr *ha[NFTA_HOOK_MAX + 1];
|
||||
const struct nf_chain_type *type;
|
||||
@@ -1321,10 +1317,10 @@ static int nft_chain_parse_hook(struct n
|
||||
@@ -1352,10 +1348,10 @@ static int nft_chain_parse_hook(struct n
|
||||
hook->num = ntohl(nla_get_be32(ha[NFTA_HOOK_HOOKNUM]));
|
||||
hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));
|
||||
|
||||
|
@ -441,7 +441,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(type))
|
||||
return PTR_ERR(type);
|
||||
}
|
||||
@@ -1336,7 +1332,7 @@ static int nft_chain_parse_hook(struct n
|
||||
@@ -1367,7 +1363,7 @@ static int nft_chain_parse_hook(struct n
|
||||
hook->type = type;
|
||||
|
||||
hook->dev = NULL;
|
||||
|
@ -450,7 +450,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
char ifname[IFNAMSIZ];
|
||||
|
||||
if (!ha[NFTA_HOOK_DEV]) {
|
||||
@@ -1371,7 +1367,6 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1402,7 +1398,6 @@ static int nf_tables_addchain(struct nft
|
||||
{
|
||||
const struct nlattr * const *nla = ctx->nla;
|
||||
struct nft_table *table = ctx->table;
|
||||
|
@ -458,7 +458,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_base_chain *basechain;
|
||||
struct nft_stats __percpu *stats;
|
||||
struct net *net = ctx->net;
|
||||
@@ -1385,7 +1380,7 @@ static int nf_tables_addchain(struct nft
|
||||
@@ -1416,7 +1411,7 @@ static int nf_tables_addchain(struct nft
|
||||
struct nft_chain_hook hook;
|
||||
struct nf_hook_ops *ops;
|
||||
|
||||
|
@ -467,7 +467,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (err < 0)
|
||||
return err;
|
||||
|
||||
@@ -1478,7 +1473,7 @@ static int nf_tables_updchain(struct nft
|
||||
@@ -1509,7 +1504,7 @@ static int nf_tables_updchain(struct nft
|
||||
if (!nft_is_base_chain(chain))
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -476,7 +476,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
create);
|
||||
if (err < 0)
|
||||
return err;
|
||||
@@ -1571,7 +1566,8 @@ static int nf_tables_newchain(struct net
|
||||
@@ -1602,7 +1597,8 @@ static int nf_tables_newchain(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -486,7 +486,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -1611,7 +1607,7 @@ static int nf_tables_newchain(struct net
|
||||
@@ -1642,7 +1638,7 @@ static int nf_tables_newchain(struct net
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -495,7 +495,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (chain != NULL) {
|
||||
if (nlh->nlmsg_flags & NLM_F_EXCL)
|
||||
@@ -1645,7 +1641,8 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1676,7 +1672,8 @@ static int nf_tables_delchain(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -505,7 +505,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -1657,7 +1654,7 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1688,7 +1685,7 @@ static int nf_tables_delchain(struct net
|
||||
chain->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -514,7 +514,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
use = chain->use;
|
||||
list_for_each_entry(rule, &chain->rules, list) {
|
||||
@@ -1822,7 +1819,7 @@ static int nf_tables_expr_parse(const st
|
||||
@@ -1853,7 +1850,7 @@ static int nf_tables_expr_parse(const st
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
|
@ -523,7 +523,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(type))
|
||||
return PTR_ERR(type);
|
||||
|
||||
@@ -2045,7 +2042,7 @@ static void nf_tables_rule_notify(const
|
||||
@@ -2077,7 +2074,7 @@ static void nf_tables_rule_notify(const
|
||||
goto err;
|
||||
|
||||
err = nf_tables_fill_rule_info(skb, ctx->net, ctx->portid, ctx->seq,
|
||||
|
@ -532,7 +532,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ctx->chain, rule);
|
||||
if (err < 0) {
|
||||
kfree_skb(skb);
|
||||
@@ -2069,7 +2066,6 @@ static int nf_tables_dump_rules(struct s
|
||||
@@ -2101,7 +2098,6 @@ static int nf_tables_dump_rules(struct s
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
|
||||
const struct nft_rule_dump_ctx *ctx = cb->data;
|
||||
|
@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
const struct nft_chain *chain;
|
||||
const struct nft_rule *rule;
|
||||
@@ -2080,39 +2076,37 @@ static int nf_tables_dump_rules(struct s
|
||||
@@ -2112,39 +2108,37 @@ static int nf_tables_dump_rules(struct s
|
||||
rcu_read_lock();
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
|
@ -605,7 +605,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
}
|
||||
@@ -2190,7 +2184,8 @@ static int nf_tables_getrule(struct net
|
||||
@@ -2222,7 +2216,8 @@ static int nf_tables_getrule(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -615,7 +615,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -2267,7 +2262,8 @@ static int nf_tables_newrule(struct net
|
||||
@@ -2306,7 +2301,8 @@ static int nf_tables_newrule(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -625,7 +625,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -2306,7 +2302,7 @@ static int nf_tables_newrule(struct net
|
||||
@@ -2345,7 +2341,7 @@ static int nf_tables_newrule(struct net
|
||||
return PTR_ERR(old_rule);
|
||||
}
|
||||
|
||||
|
@ -634,7 +634,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
n = 0;
|
||||
size = 0;
|
||||
@@ -2446,7 +2442,8 @@ static int nf_tables_delrule(struct net
|
||||
@@ -2485,7 +2481,8 @@ static int nf_tables_delrule(struct net
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -644,7 +644,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -2457,7 +2454,7 @@ static int nf_tables_delrule(struct net
|
||||
@@ -2496,7 +2493,7 @@ static int nf_tables_delrule(struct net
|
||||
return PTR_ERR(chain);
|
||||
}
|
||||
|
||||
|
@ -653,7 +653,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (chain) {
|
||||
if (nla[NFTA_RULE_HANDLE]) {
|
||||
@@ -2655,13 +2652,13 @@ static int nft_ctx_init_from_setattr(str
|
||||
@@ -2694,13 +2691,13 @@ static int nft_ctx_init_from_setattr(str
|
||||
if (afi == NULL)
|
||||
return -EAFNOSUPPORT;
|
||||
|
||||
|
@ -670,7 +670,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -2788,7 +2785,7 @@ static int nf_tables_fill_set(struct sk_
|
||||
@@ -2827,7 +2824,7 @@ static int nf_tables_fill_set(struct sk_
|
||||
goto nla_put_failure;
|
||||
|
||||
nfmsg = nlmsg_data(nlh);
|
||||
|
@ -679,7 +679,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nfmsg->version = NFNETLINK_V0;
|
||||
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
|
||||
|
||||
@@ -2880,10 +2877,8 @@ static int nf_tables_dump_sets(struct sk
|
||||
@@ -2919,10 +2916,8 @@ static int nf_tables_dump_sets(struct sk
|
||||
{
|
||||
const struct nft_set *set;
|
||||
unsigned int idx, s_idx = cb->args[0];
|
||||
|
@ -690,7 +690,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_ctx *ctx = cb->data, ctx_set;
|
||||
|
||||
if (cb->args[1])
|
||||
@@ -2892,51 +2887,44 @@ static int nf_tables_dump_sets(struct sk
|
||||
@@ -2931,51 +2926,44 @@ static int nf_tables_dump_sets(struct sk
|
||||
rcu_read_lock();
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
|
@ -771,7 +771,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
cb->args[1] = 1;
|
||||
done:
|
||||
@@ -3146,11 +3134,12 @@ static int nf_tables_newset(struct net *
|
||||
@@ -3185,11 +3173,12 @@ static int nf_tables_newset(struct net *
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -786,7 +786,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
set = nf_tables_set_lookup(table, nla[NFTA_SET_NAME], genmask);
|
||||
if (IS_ERR(set)) {
|
||||
@@ -3417,12 +3406,12 @@ static int nft_ctx_init_from_elemattr(st
|
||||
@@ -3458,12 +3447,12 @@ static int nft_ctx_init_from_elemattr(st
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -802,7 +802,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -3527,7 +3516,6 @@ static int nf_tables_dump_set(struct sk_
|
||||
@@ -3568,7 +3557,6 @@ static int nf_tables_dump_set(struct sk_
|
||||
{
|
||||
struct nft_set_dump_ctx *dump_ctx = cb->data;
|
||||
struct net *net = sock_net(skb->sk);
|
||||
|
@ -810,7 +810,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_set *set;
|
||||
struct nft_set_dump_args args;
|
||||
@@ -3539,21 +3527,19 @@ static int nf_tables_dump_set(struct sk_
|
||||
@@ -3580,21 +3568,19 @@ static int nf_tables_dump_set(struct sk_
|
||||
int event;
|
||||
|
||||
rcu_read_lock();
|
||||
|
@ -841,7 +841,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
break;
|
||||
}
|
||||
@@ -3573,7 +3559,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
@@ -3614,7 +3600,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
goto nla_put_failure;
|
||||
|
||||
nfmsg = nlmsg_data(nlh);
|
||||
|
@ -850,7 +850,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nfmsg->version = NFNETLINK_V0;
|
||||
nfmsg->res_id = htons(net->nft.base_seq & 0xffff);
|
||||
|
||||
@@ -3675,7 +3661,7 @@ static int nf_tables_fill_setelem_info(s
|
||||
@@ -3716,7 +3702,7 @@ static int nf_tables_fill_setelem_info(s
|
||||
goto nla_put_failure;
|
||||
|
||||
nfmsg = nlmsg_data(nlh);
|
||||
|
@ -859,7 +859,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nfmsg->version = NFNETLINK_V0;
|
||||
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
|
||||
|
||||
@@ -3919,7 +3905,7 @@ static int nft_add_set_elem(struct nft_c
|
||||
@@ -3960,7 +3946,7 @@ static int nft_add_set_elem(struct nft_c
|
||||
list_for_each_entry(binding, &set->bindings, list) {
|
||||
struct nft_ctx bind_ctx = {
|
||||
.net = ctx->net,
|
||||
|
@ -868,7 +868,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
.table = ctx->table,
|
||||
.chain = (struct nft_chain *)binding->chain,
|
||||
};
|
||||
@@ -4466,7 +4452,8 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4509,7 +4495,8 @@ static int nf_tables_newobj(struct net *
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -878,7 +878,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -4484,7 +4471,7 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4527,7 +4514,7 @@ static int nf_tables_newobj(struct net *
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -887,7 +887,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
type = nft_obj_type_get(objtype);
|
||||
if (IS_ERR(type))
|
||||
@@ -4561,7 +4548,6 @@ struct nft_obj_filter {
|
||||
@@ -4604,7 +4591,6 @@ struct nft_obj_filter {
|
||||
static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
|
||||
|
@ -895,7 +895,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
unsigned int idx = 0, s_idx = cb->args[0];
|
||||
struct nft_obj_filter *filter = cb->data;
|
||||
@@ -4576,38 +4562,37 @@ static int nf_tables_dump_obj(struct sk_
|
||||
@@ -4619,38 +4605,37 @@ static int nf_tables_dump_obj(struct sk_
|
||||
rcu_read_lock();
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
|
@ -914,7 +914,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
- if (idx > s_idx)
|
||||
- memset(&cb->args[1], 0,
|
||||
- sizeof(cb->args) - sizeof(cb->args[0]));
|
||||
- if (filter && filter->table[0] &&
|
||||
- if (filter && filter->table &&
|
||||
- strcmp(filter->table, table->name))
|
||||
- goto cont;
|
||||
- if (filter &&
|
||||
|
@ -929,7 +929,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
+ if (idx > s_idx)
|
||||
+ memset(&cb->args[1], 0,
|
||||
+ sizeof(cb->args) - sizeof(cb->args[0]));
|
||||
+ if (filter && filter->table[0] &&
|
||||
+ if (filter && filter->table &&
|
||||
+ strcmp(filter->table, table->name))
|
||||
+ goto cont;
|
||||
+ if (filter &&
|
||||
|
@ -960,7 +960,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
done:
|
||||
@@ -4694,7 +4679,8 @@ static int nf_tables_getobj(struct net *
|
||||
@@ -4737,7 +4722,8 @@ static int nf_tables_getobj(struct net *
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -970,7 +970,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -4754,7 +4740,8 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4797,7 +4783,8 @@ static int nf_tables_delobj(struct net *
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -980,7 +980,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -4765,7 +4752,7 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4808,7 +4795,7 @@ static int nf_tables_delobj(struct net *
|
||||
if (obj->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -989,7 +989,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
return nft_delobj(&ctx, obj);
|
||||
}
|
||||
@@ -4803,7 +4790,7 @@ static void nf_tables_obj_notify(const s
|
||||
@@ -4846,7 +4833,7 @@ static void nf_tables_obj_notify(const s
|
||||
struct nft_object *obj, int event)
|
||||
{
|
||||
nft_obj_notify(ctx->net, ctx->table, obj, ctx->portid, ctx->seq, event,
|
||||
|
@ -998,7 +998,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
|
||||
/*
|
||||
@@ -4993,7 +4980,7 @@ void nft_flow_table_iterate(struct net *
|
||||
@@ -5036,7 +5023,7 @@ void nft_flow_table_iterate(struct net *
|
||||
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(afi, &net->nft.af_info, list) {
|
||||
|
@ -1007,7 +1007,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
list_for_each_entry_rcu(flowtable, &table->flowtables, list) {
|
||||
iter(&flowtable->data, data);
|
||||
}
|
||||
@@ -5041,7 +5028,8 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5084,7 +5071,8 @@ static int nf_tables_newflowtable(struct
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -1017,7 +1017,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -5058,7 +5046,7 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5101,7 +5089,7 @@ static int nf_tables_newflowtable(struct
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1026,7 +1026,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
|
||||
if (!flowtable)
|
||||
@@ -5139,7 +5127,8 @@ static int nf_tables_delflowtable(struct
|
||||
@@ -5182,7 +5170,8 @@ static int nf_tables_delflowtable(struct
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -1036,7 +1036,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -5150,7 +5139,7 @@ static int nf_tables_delflowtable(struct
|
||||
@@ -5193,7 +5182,7 @@ static int nf_tables_delflowtable(struct
|
||||
if (flowtable->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -1045,7 +1045,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
return nft_delflowtable(&ctx, flowtable);
|
||||
}
|
||||
@@ -5219,40 +5208,37 @@ static int nf_tables_dump_flowtable(stru
|
||||
@@ -5262,40 +5251,37 @@ static int nf_tables_dump_flowtable(stru
|
||||
struct net *net = sock_net(skb->sk);
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_flowtable *flowtable;
|
||||
|
@ -1081,7 +1081,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
+ if (idx > s_idx)
|
||||
+ memset(&cb->args[1], 0,
|
||||
+ sizeof(cb->args) - sizeof(cb->args[0]));
|
||||
+ if (filter && filter->table[0] &&
|
||||
+ if (filter && filter->table &&
|
||||
+ strcmp(filter->table, table->name))
|
||||
+ goto cont;
|
||||
|
||||
|
@ -1107,7 +1107,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
done:
|
||||
@@ -5337,7 +5323,8 @@ static int nf_tables_getflowtable(struct
|
||||
@@ -5380,7 +5366,8 @@ static int nf_tables_getflowtable(struct
|
||||
if (IS_ERR(afi))
|
||||
return PTR_ERR(afi);
|
||||
|
||||
|
@ -1117,7 +1117,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -5380,7 +5367,7 @@ static void nf_tables_flowtable_notify(s
|
||||
@@ -5423,7 +5410,7 @@ static void nf_tables_flowtable_notify(s
|
||||
|
||||
err = nf_tables_fill_flowtable_info(skb, ctx->net, ctx->portid,
|
||||
ctx->seq, event, 0,
|
||||
|
@ -1126,7 +1126,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (err < 0) {
|
||||
kfree_skb(skb);
|
||||
goto err;
|
||||
@@ -5458,17 +5445,14 @@ static int nf_tables_flowtable_event(str
|
||||
@@ -5501,17 +5488,14 @@ static int nf_tables_flowtable_event(str
|
||||
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
|
||||
struct nft_flowtable *flowtable;
|
||||
struct nft_table *table;
|
||||
|
@ -1147,7 +1147,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
nfnl_unlock(NFNL_SUBSYS_NFTABLES);
|
||||
@@ -6487,6 +6471,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump);
|
||||
@@ -6532,6 +6516,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump);
|
||||
static int __net_init nf_tables_init_net(struct net *net)
|
||||
{
|
||||
INIT_LIST_HEAD(&net->nft.af_info);
|
||||
|
@ -1155,7 +1155,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
INIT_LIST_HEAD(&net->nft.commit_list);
|
||||
net->nft.base_seq = 1;
|
||||
return 0;
|
||||
@@ -6523,10 +6508,10 @@ static void __nft_release_afinfo(struct
|
||||
@@ -6568,10 +6553,10 @@ static void __nft_release_afinfo(struct
|
||||
struct nft_set *set, *ns;
|
||||
struct nft_ctx ctx = {
|
||||
.net = net,
|
||||
|
@ -1210,7 +1210,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nfnl_unlock(NFNL_SUBSYS_NFTABLES);
|
||||
--- a/net/netfilter/nft_compat.c
|
||||
+++ b/net/netfilter/nft_compat.c
|
||||
@@ -144,7 +144,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
@@ -161,7 +161,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
{
|
||||
par->net = ctx->net;
|
||||
par->table = ctx->table->name;
|
||||
|
@ -1219,7 +1219,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
case AF_INET:
|
||||
entry->e4.ip.proto = proto;
|
||||
entry->e4.ip.invflags = inv ? IPT_INV_PROTO : 0;
|
||||
@@ -175,7 +175,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
@@ -192,7 +192,7 @@ nft_target_set_tgchk_param(struct xt_tgc
|
||||
} else {
|
||||
par->hook_mask = 0;
|
||||
}
|
||||
|
@ -1228,7 +1228,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
par->nft_compat = true;
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ nft_target_destroy(const struct nft_ctx
|
||||
@@ -282,7 +282,7 @@ nft_target_destroy(const struct nft_ctx
|
||||
par.net = ctx->net;
|
||||
par.target = target;
|
||||
par.targinfo = info;
|
||||
|
@ -1237,7 +1237,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (par.target->destroy != NULL)
|
||||
par.target->destroy(&par);
|
||||
|
||||
@@ -358,7 +358,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
@@ -389,7 +389,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
{
|
||||
par->net = ctx->net;
|
||||
par->table = ctx->table->name;
|
||||
|
@ -1246,7 +1246,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
case AF_INET:
|
||||
entry->e4.ip.proto = proto;
|
||||
entry->e4.ip.invflags = inv ? IPT_INV_PROTO : 0;
|
||||
@@ -389,7 +389,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
@@ -420,7 +420,7 @@ nft_match_set_mtchk_param(struct xt_mtch
|
||||
} else {
|
||||
par->hook_mask = 0;
|
||||
}
|
||||
|
@ -1255,7 +1255,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
par->nft_compat = true;
|
||||
}
|
||||
|
||||
@@ -446,7 +446,7 @@ nft_match_destroy(const struct nft_ctx *
|
||||
@@ -502,7 +502,7 @@ __nft_match_destroy(const struct nft_ctx
|
||||
par.net = ctx->net;
|
||||
par.match = match;
|
||||
par.matchinfo = info;
|
||||
|
@ -1264,7 +1264,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (par.match->destroy != NULL)
|
||||
par.match->destroy(&par);
|
||||
|
||||
@@ -648,7 +648,7 @@ nft_match_select_ops(const struct nft_ct
|
||||
@@ -732,7 +732,7 @@ nft_match_select_ops(const struct nft_ct
|
||||
|
||||
mt_name = nla_data(tb[NFTA_MATCH_NAME]);
|
||||
rev = ntohl(nla_get_be32(tb[NFTA_MATCH_REV]));
|
||||
|
@ -1273,7 +1273,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
/* Re-use the existing match if it's already loaded. */
|
||||
list_for_each_entry(nft_match, &nft_match_list, head) {
|
||||
@@ -733,7 +733,7 @@ nft_target_select_ops(const struct nft_c
|
||||
@@ -823,7 +823,7 @@ nft_target_select_ops(const struct nft_c
|
||||
|
||||
tg_name = nla_data(tb[NFTA_TARGET_NAME]);
|
||||
rev = ntohl(nla_get_be32(tb[NFTA_TARGET_REV]));
|
||||
|
@ -1408,7 +1408,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nft_meta.c
|
||||
+++ b/net/netfilter/nft_meta.c
|
||||
@@ -339,7 +339,7 @@ static int nft_meta_get_validate(const s
|
||||
@@ -341,7 +341,7 @@ static int nft_meta_get_validate(const s
|
||||
if (priv->key != NFT_META_SECPATH)
|
||||
return 0;
|
||||
|
||||
|
@ -1417,7 +1417,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
case NFPROTO_NETDEV:
|
||||
hooks = 1 << NF_NETDEV_INGRESS;
|
||||
break;
|
||||
@@ -370,7 +370,7 @@ int nft_meta_set_validate(const struct n
|
||||
@@ -372,7 +372,7 @@ int nft_meta_set_validate(const struct n
|
||||
if (priv->key != NFT_META_PKTTYPE)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static struct pernet_operations clusterip_net_ops = {
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -6477,6 +6477,12 @@ static int __net_init nf_tables_init_net
|
||||
@@ -6522,6 +6522,12 @@ static int __net_init nf_tables_init_net
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int __nft_release_basechain(struct nft_ctx *ctx)
|
||||
{
|
||||
struct nft_rule *rule, *nr;
|
||||
@@ -6554,6 +6560,7 @@ static void __nft_release_afinfo(struct
|
||||
@@ -6599,6 +6605,7 @@ static void __nft_release_afinfo(struct
|
||||
|
||||
static struct pernet_operations nf_tables_net_ops = {
|
||||
.init = nf_tables_init_net,
|
||||
|
|
|
@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -969,8 +969,8 @@ struct nft_af_info {
|
||||
@@ -974,8 +974,8 @@ struct nft_af_info {
|
||||
struct module *owner;
|
||||
};
|
||||
|
||||
|
@ -364,7 +364,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (afi->family == family)
|
||||
return afi;
|
||||
}
|
||||
@@ -4975,15 +4973,12 @@ void nft_flow_table_iterate(struct net *
|
||||
@@ -5018,15 +5016,12 @@ void nft_flow_table_iterate(struct net *
|
||||
void *data)
|
||||
{
|
||||
struct nft_flowtable *flowtable;
|
||||
|
@ -383,7 +383,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
}
|
||||
rcu_read_unlock();
|
||||
@@ -6468,21 +6463,6 @@ int nft_data_dump(struct sk_buff *skb, i
|
||||
@@ -6513,21 +6508,6 @@ int nft_data_dump(struct sk_buff *skb, i
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nft_data_dump);
|
||||
|
||||
|
@ -405,7 +405,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int __nft_release_basechain(struct nft_ctx *ctx)
|
||||
{
|
||||
struct nft_rule *rule, *nr;
|
||||
@@ -6503,8 +6483,7 @@ int __nft_release_basechain(struct nft_c
|
||||
@@ -6548,8 +6528,7 @@ int __nft_release_basechain(struct nft_c
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__nft_release_basechain);
|
||||
|
||||
|
@ -415,7 +415,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
struct nft_flowtable *flowtable, *nf;
|
||||
struct nft_table *table, *nt;
|
||||
@@ -6514,10 +6493,11 @@ static void __nft_release_afinfo(struct
|
||||
@@ -6559,10 +6538,11 @@ static void __nft_release_afinfo(struct
|
||||
struct nft_set *set, *ns;
|
||||
struct nft_ctx ctx = {
|
||||
.net = net,
|
||||
|
@ -428,7 +428,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
list_for_each_entry(chain, &table->chains, list)
|
||||
nf_tables_unregister_hook(net, table, chain);
|
||||
list_for_each_entry(flowtable, &table->flowtables, list)
|
||||
@@ -6558,6 +6538,21 @@ static void __nft_release_afinfo(struct
|
||||
@@ -6603,6 +6583,21 @@ static void __nft_release_afinfo(struct
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -950,28 +950,12 @@ struct nft_table {
|
||||
@@ -955,28 +955,12 @@ struct nft_table {
|
||||
struct list_head flowtables;
|
||||
u64 hgenerator;
|
||||
u32 use;
|
||||
|
@ -42,7 +42,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
int nft_register_chain_type(const struct nf_chain_type *);
|
||||
void nft_unregister_chain_type(const struct nf_chain_type *);
|
||||
|
||||
@@ -1139,9 +1123,6 @@ void nft_trace_notify(struct nft_tracein
|
||||
@@ -1144,9 +1128,6 @@ void nft_trace_notify(struct nft_tracein
|
||||
#define nft_dereference(p) \
|
||||
nfnl_dereference(p, NFNL_SUBSYS_NFTABLES)
|
||||
|
||||
|
@ -323,7 +323,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
static void nft_ctx_init(struct nft_ctx *ctx,
|
||||
struct net *net,
|
||||
@@ -390,7 +325,7 @@ static struct nft_table *nft_table_looku
|
||||
@@ -419,7 +354,7 @@ static struct nft_table *nft_table_looku
|
||||
|
||||
list_for_each_entry(table, &net->nft.tables, list) {
|
||||
if (!nla_strcmp(nla, table->name) &&
|
||||
|
@ -332,7 +332,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nft_active_genmask(table, genmask))
|
||||
return table;
|
||||
}
|
||||
@@ -531,7 +466,7 @@ static int nf_tables_dump_tables(struct
|
||||
@@ -560,7 +495,7 @@ static int nf_tables_dump_tables(struct
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
|
@ -341,7 +341,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
if (idx < s_idx)
|
||||
@@ -545,7 +480,7 @@ static int nf_tables_dump_tables(struct
|
||||
@@ -574,7 +509,7 @@ static int nf_tables_dump_tables(struct
|
||||
NETLINK_CB(cb->skb).portid,
|
||||
cb->nlh->nlmsg_seq,
|
||||
NFT_MSG_NEWTABLE, NLM_F_MULTI,
|
||||
|
@ -350,7 +350,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
goto done;
|
||||
|
||||
nl_dump_check_consistent(cb, nlmsg_hdr(skb));
|
||||
@@ -565,7 +500,6 @@ static int nf_tables_gettable(struct net
|
||||
@@ -594,7 +529,6 @@ static int nf_tables_gettable(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_cur(net);
|
||||
|
@ -358,7 +358,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
struct sk_buff *skb2;
|
||||
int family = nfmsg->nfgen_family;
|
||||
@@ -578,11 +512,7 @@ static int nf_tables_gettable(struct net
|
||||
@@ -607,11 +541,7 @@ static int nf_tables_gettable(struct net
|
||||
return netlink_dump_start(nlsk, skb, nlh, &c);
|
||||
}
|
||||
|
||||
|
@ -371,7 +371,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -702,19 +632,14 @@ static int nf_tables_newtable(struct net
|
||||
@@ -731,19 +661,14 @@ static int nf_tables_newtable(struct net
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
const struct nlattr *name;
|
||||
|
@ -392,7 +392,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table)) {
|
||||
if (PTR_ERR(table) != -ENOENT)
|
||||
return PTR_ERR(table);
|
||||
@@ -724,7 +649,7 @@ static int nf_tables_newtable(struct net
|
||||
@@ -753,7 +678,7 @@ static int nf_tables_newtable(struct net
|
||||
if (nlh->nlmsg_flags & NLM_F_REPLACE)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
|
@ -401,7 +401,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return nf_tables_updtable(&ctx);
|
||||
}
|
||||
|
||||
@@ -734,40 +659,34 @@ static int nf_tables_newtable(struct net
|
||||
@@ -763,40 +688,34 @@ static int nf_tables_newtable(struct net
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -450,7 +450,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return err;
|
||||
}
|
||||
|
||||
@@ -838,10 +757,10 @@ static int nft_flush(struct nft_ctx *ctx
|
||||
@@ -867,10 +786,10 @@ static int nft_flush(struct nft_ctx *ctx
|
||||
int err = 0;
|
||||
|
||||
list_for_each_entry_safe(table, nt, &ctx->net->nft.tables, list) {
|
||||
|
@ -463,7 +463,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (!nft_is_active_next(ctx->net, table))
|
||||
continue;
|
||||
@@ -867,7 +786,6 @@ static int nf_tables_deltable(struct net
|
||||
@@ -896,7 +815,6 @@ static int nf_tables_deltable(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
|
@ -471,7 +471,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_ctx ctx;
|
||||
@@ -876,11 +794,7 @@ static int nf_tables_deltable(struct net
|
||||
@@ -905,11 +823,7 @@ static int nf_tables_deltable(struct net
|
||||
if (family == AF_UNSPEC || nla[NFTA_TABLE_NAME] == NULL)
|
||||
return nft_flush(&ctx, family);
|
||||
|
||||
|
@ -484,7 +484,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -889,7 +803,7 @@ static int nf_tables_deltable(struct net
|
||||
@@ -918,7 +832,7 @@ static int nf_tables_deltable(struct net
|
||||
table->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -493,7 +493,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ctx.table = table;
|
||||
|
||||
return nft_flush_table(&ctx);
|
||||
@@ -901,7 +815,6 @@ static void nf_tables_table_destroy(stru
|
||||
@@ -930,7 +844,6 @@ static void nf_tables_table_destroy(stru
|
||||
|
||||
kfree(ctx->table->name);
|
||||
kfree(ctx->table);
|
||||
|
@ -501,7 +501,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
}
|
||||
|
||||
int nft_register_chain_type(const struct nf_chain_type *ctype)
|
||||
@@ -1130,7 +1043,7 @@ static int nf_tables_dump_chains(struct
|
||||
@@ -1159,7 +1072,7 @@ static int nf_tables_dump_chains(struct
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
|
@ -510,7 +510,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
list_for_each_entry_rcu(chain, &table->chains, list) {
|
||||
@@ -1146,7 +1059,7 @@ static int nf_tables_dump_chains(struct
|
||||
@@ -1175,7 +1088,7 @@ static int nf_tables_dump_chains(struct
|
||||
cb->nlh->nlmsg_seq,
|
||||
NFT_MSG_NEWCHAIN,
|
||||
NLM_F_MULTI,
|
||||
|
@ -519,7 +519,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
chain) < 0)
|
||||
goto done;
|
||||
|
||||
@@ -1168,7 +1081,6 @@ static int nf_tables_getchain(struct net
|
||||
@@ -1197,7 +1110,6 @@ static int nf_tables_getchain(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_cur(net);
|
||||
|
@ -527,7 +527,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
const struct nft_chain *chain;
|
||||
struct sk_buff *skb2;
|
||||
@@ -1182,11 +1094,7 @@ static int nf_tables_getchain(struct net
|
||||
@@ -1211,11 +1123,7 @@ static int nf_tables_getchain(struct net
|
||||
return netlink_dump_start(nlsk, skb, nlh, &c);
|
||||
}
|
||||
|
||||
|
@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -1550,7 +1458,6 @@ static int nf_tables_newchain(struct net
|
||||
@@ -1581,7 +1489,6 @@ static int nf_tables_newchain(struct net
|
||||
const struct nlattr * uninitialized_var(name);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
|
@ -548,7 +548,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_chain *chain;
|
||||
u8 policy = NF_ACCEPT;
|
||||
@@ -1560,11 +1467,7 @@ static int nf_tables_newchain(struct net
|
||||
@@ -1591,11 +1498,7 @@ static int nf_tables_newchain(struct net
|
||||
|
||||
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
||||
|
||||
|
@ -561,7 +561,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -1605,7 +1508,7 @@ static int nf_tables_newchain(struct net
|
||||
@@ -1636,7 +1539,7 @@ static int nf_tables_newchain(struct net
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -570,7 +570,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (chain != NULL) {
|
||||
if (nlh->nlmsg_flags & NLM_F_EXCL)
|
||||
@@ -1626,7 +1529,6 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1657,7 +1560,6 @@ static int nf_tables_delchain(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
|
@ -578,7 +578,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_chain *chain;
|
||||
struct nft_rule *rule;
|
||||
@@ -1635,11 +1537,7 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1666,11 +1568,7 @@ static int nf_tables_delchain(struct net
|
||||
u32 use;
|
||||
int err;
|
||||
|
||||
|
@ -591,7 +591,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -1652,7 +1550,7 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1683,7 +1581,7 @@ static int nf_tables_delchain(struct net
|
||||
chain->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -600,7 +600,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
use = chain->use;
|
||||
list_for_each_entry(rule, &chain->rules, list) {
|
||||
@@ -2075,7 +1973,7 @@ static int nf_tables_dump_rules(struct s
|
||||
@@ -2107,7 +2005,7 @@ static int nf_tables_dump_rules(struct s
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
|
@ -609,7 +609,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
if (ctx && ctx->table && strcmp(ctx->table, table->name) != 0)
|
||||
@@ -2098,7 +1996,7 @@ static int nf_tables_dump_rules(struct s
|
||||
@@ -2130,7 +2028,7 @@ static int nf_tables_dump_rules(struct s
|
||||
cb->nlh->nlmsg_seq,
|
||||
NFT_MSG_NEWRULE,
|
||||
NLM_F_MULTI | NLM_F_APPEND,
|
||||
|
@ -618,7 +618,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
table, chain, rule) < 0)
|
||||
goto done;
|
||||
|
||||
@@ -2134,7 +2032,6 @@ static int nf_tables_getrule(struct net
|
||||
@@ -2166,7 +2064,6 @@ static int nf_tables_getrule(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_cur(net);
|
||||
|
@ -626,7 +626,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
const struct nft_chain *chain;
|
||||
const struct nft_rule *rule;
|
||||
@@ -2178,11 +2075,7 @@ static int nf_tables_getrule(struct net
|
||||
@@ -2210,11 +2107,7 @@ static int nf_tables_getrule(struct net
|
||||
return netlink_dump_start(nlsk, skb, nlh, &c);
|
||||
}
|
||||
|
||||
|
@ -639,7 +639,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -2240,7 +2133,7 @@ static int nf_tables_newrule(struct net
|
||||
@@ -2279,7 +2172,7 @@ static int nf_tables_newrule(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
|
@ -648,7 +648,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_chain *chain;
|
||||
struct nft_rule *rule, *old_rule = NULL;
|
||||
@@ -2256,11 +2149,7 @@ static int nf_tables_newrule(struct net
|
||||
@@ -2295,11 +2188,7 @@ static int nf_tables_newrule(struct net
|
||||
|
||||
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
||||
|
||||
|
@ -661,7 +661,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -2300,7 +2189,7 @@ static int nf_tables_newrule(struct net
|
||||
@@ -2339,7 +2228,7 @@ static int nf_tables_newrule(struct net
|
||||
return PTR_ERR(old_rule);
|
||||
}
|
||||
|
||||
|
@ -670,7 +670,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
n = 0;
|
||||
size = 0;
|
||||
@@ -2429,18 +2318,13 @@ static int nf_tables_delrule(struct net
|
||||
@@ -2468,18 +2357,13 @@ static int nf_tables_delrule(struct net
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
|
@ -690,7 +690,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -2452,7 +2336,7 @@ static int nf_tables_delrule(struct net
|
||||
@@ -2491,7 +2375,7 @@ static int nf_tables_delrule(struct net
|
||||
return PTR_ERR(chain);
|
||||
}
|
||||
|
||||
|
@ -699,7 +699,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (chain) {
|
||||
if (nla[NFTA_RULE_HANDLE]) {
|
||||
@@ -2637,26 +2521,17 @@ static int nft_ctx_init_from_setattr(str
|
||||
@@ -2676,26 +2560,17 @@ static int nft_ctx_init_from_setattr(str
|
||||
u8 genmask)
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
|
@ -729,7 +729,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -2887,7 +2762,7 @@ static int nf_tables_dump_sets(struct sk
|
||||
@@ -2926,7 +2801,7 @@ static int nf_tables_dump_sets(struct sk
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
if (ctx->family != NFPROTO_UNSPEC &&
|
||||
|
@ -738,7 +738,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
if (ctx->table && ctx->table != table)
|
||||
@@ -2908,7 +2783,7 @@ static int nf_tables_dump_sets(struct sk
|
||||
@@ -2947,7 +2822,7 @@ static int nf_tables_dump_sets(struct sk
|
||||
|
||||
ctx_set = *ctx;
|
||||
ctx_set.table = table;
|
||||
|
@ -747,7 +747,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
if (nf_tables_fill_set(skb, &ctx_set, set,
|
||||
NFT_MSG_NEWSET,
|
||||
@@ -3020,8 +2895,8 @@ static int nf_tables_newset(struct net *
|
||||
@@ -3059,8 +2934,8 @@ static int nf_tables_newset(struct net *
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
|
@ -757,7 +757,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_set *set;
|
||||
struct nft_ctx ctx;
|
||||
@@ -3128,16 +3003,12 @@ static int nf_tables_newset(struct net *
|
||||
@@ -3167,16 +3042,12 @@ static int nf_tables_newset(struct net *
|
||||
|
||||
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
||||
|
||||
|
@ -776,7 +776,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
set = nf_tables_set_lookup(table, nla[NFTA_SET_NAME], genmask);
|
||||
if (IS_ERR(set)) {
|
||||
@@ -3397,19 +3268,15 @@ static int nft_ctx_init_from_elemattr(st
|
||||
@@ -3438,19 +3309,15 @@ static int nft_ctx_init_from_elemattr(st
|
||||
u8 genmask)
|
||||
{
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
|
@ -799,7 +799,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -3527,7 +3394,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
@@ -3568,7 +3435,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
if (dump_ctx->ctx.family != NFPROTO_UNSPEC &&
|
||||
|
@ -808,7 +808,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
if (table != dump_ctx->ctx.table)
|
||||
@@ -3557,7 +3424,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
@@ -3598,7 +3465,7 @@ static int nf_tables_dump_set(struct sk_
|
||||
goto nla_put_failure;
|
||||
|
||||
nfmsg = nlmsg_data(nlh);
|
||||
|
@ -817,7 +817,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
nfmsg->version = NFNETLINK_V0;
|
||||
nfmsg->res_id = htons(net->nft.base_seq & 0xffff);
|
||||
|
||||
@@ -4434,7 +4301,6 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4477,7 +4344,6 @@ static int nf_tables_newobj(struct net *
|
||||
const struct nft_object_type *type;
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
|
@ -825,7 +825,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_object *obj;
|
||||
struct nft_ctx ctx;
|
||||
@@ -4446,11 +4312,7 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4489,11 +4355,7 @@ static int nf_tables_newobj(struct net *
|
||||
!nla[NFTA_OBJ_DATA])
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -838,7 +838,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -4469,7 +4331,7 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4512,7 +4374,7 @@ static int nf_tables_newobj(struct net *
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -847,7 +847,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
type = nft_obj_type_get(objtype);
|
||||
if (IS_ERR(type))
|
||||
@@ -4561,7 +4423,7 @@ static int nf_tables_dump_obj(struct sk_
|
||||
@@ -4604,7 +4466,7 @@ static int nf_tables_dump_obj(struct sk_
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
|
@ -856,7 +856,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
list_for_each_entry_rcu(obj, &table->objects, list) {
|
||||
@@ -4584,7 +4446,7 @@ static int nf_tables_dump_obj(struct sk_
|
||||
@@ -4627,7 +4489,7 @@ static int nf_tables_dump_obj(struct sk_
|
||||
cb->nlh->nlmsg_seq,
|
||||
NFT_MSG_NEWOBJ,
|
||||
NLM_F_MULTI | NLM_F_APPEND,
|
||||
|
@ -865,7 +865,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
obj, reset) < 0)
|
||||
goto done;
|
||||
|
||||
@@ -4642,7 +4504,6 @@ static int nf_tables_getobj(struct net *
|
||||
@@ -4685,7 +4547,6 @@ static int nf_tables_getobj(struct net *
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_cur(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
|
@ -873,7 +873,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
struct nft_object *obj;
|
||||
struct sk_buff *skb2;
|
||||
@@ -4673,11 +4534,7 @@ static int nf_tables_getobj(struct net *
|
||||
@@ -4716,11 +4577,7 @@ static int nf_tables_getobj(struct net *
|
||||
!nla[NFTA_OBJ_TYPE])
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -886,7 +886,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -4724,7 +4581,6 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4767,7 +4624,6 @@ static int nf_tables_delobj(struct net *
|
||||
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
|
@ -894,7 +894,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_object *obj;
|
||||
struct nft_ctx ctx;
|
||||
@@ -4734,11 +4590,7 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4777,11 +4633,7 @@ static int nf_tables_delobj(struct net *
|
||||
!nla[NFTA_OBJ_NAME])
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -907,7 +907,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
genmask);
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
@@ -4750,7 +4602,7 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4793,7 +4645,7 @@ static int nf_tables_delobj(struct net *
|
||||
if (obj->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -916,7 +916,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
return nft_delobj(&ctx, obj);
|
||||
}
|
||||
@@ -4935,33 +4787,31 @@ err1:
|
||||
@@ -4978,33 +4830,31 @@ err1:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -956,7 +956,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return ERR_PTR(-EAGAIN);
|
||||
}
|
||||
#endif
|
||||
@@ -5009,7 +4859,6 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5052,7 +4902,6 @@ static int nf_tables_newflowtable(struct
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_flowtable *flowtable;
|
||||
|
@ -964,7 +964,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
struct nft_table *table;
|
||||
struct nft_ctx ctx;
|
||||
int err, i, k;
|
||||
@@ -5019,12 +4868,8 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5062,12 +4911,8 @@ static int nf_tables_newflowtable(struct
|
||||
!nla[NFTA_FLOWTABLE_HOOK])
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -978,7 +978,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -5041,7 +4886,7 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5084,7 +4929,7 @@ static int nf_tables_newflowtable(struct
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -987,7 +987,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
|
||||
if (!flowtable)
|
||||
@@ -5054,7 +4899,7 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5097,7 +4942,7 @@ static int nf_tables_newflowtable(struct
|
||||
goto err1;
|
||||
}
|
||||
|
||||
|
@ -996,7 +996,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(type)) {
|
||||
err = PTR_ERR(type);
|
||||
goto err2;
|
||||
@@ -5114,16 +4959,11 @@ static int nf_tables_delflowtable(struct
|
||||
@@ -5157,16 +5002,11 @@ static int nf_tables_delflowtable(struct
|
||||
u8 genmask = nft_genmask_next(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_flowtable *flowtable;
|
||||
|
@ -1014,7 +1014,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -5134,7 +4974,7 @@ static int nf_tables_delflowtable(struct
|
||||
@@ -5177,7 +5017,7 @@ static int nf_tables_delflowtable(struct
|
||||
if (flowtable->use > 0)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -1023,7 +1023,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
return nft_delflowtable(&ctx, flowtable);
|
||||
}
|
||||
@@ -5209,7 +5049,7 @@ static int nf_tables_dump_flowtable(stru
|
||||
@@ -5252,7 +5092,7 @@ static int nf_tables_dump_flowtable(stru
|
||||
cb->seq = net->nft.base_seq;
|
||||
|
||||
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
||||
|
@ -1032,7 +1032,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
continue;
|
||||
|
||||
list_for_each_entry_rcu(flowtable, &table->flowtables, list) {
|
||||
@@ -5228,7 +5068,7 @@ static int nf_tables_dump_flowtable(stru
|
||||
@@ -5271,7 +5111,7 @@ static int nf_tables_dump_flowtable(stru
|
||||
cb->nlh->nlmsg_seq,
|
||||
NFT_MSG_NEWFLOWTABLE,
|
||||
NLM_F_MULTI | NLM_F_APPEND,
|
||||
|
@ -1041,7 +1041,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
goto done;
|
||||
|
||||
nl_dump_check_consistent(cb, nlmsg_hdr(skb));
|
||||
@@ -5288,7 +5128,6 @@ static int nf_tables_getflowtable(struct
|
||||
@@ -5331,7 +5171,6 @@ static int nf_tables_getflowtable(struct
|
||||
u8 genmask = nft_genmask_cur(net);
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_flowtable *flowtable;
|
||||
|
@ -1049,7 +1049,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
const struct nft_table *table;
|
||||
struct sk_buff *skb2;
|
||||
int err;
|
||||
@@ -5314,12 +5153,8 @@ static int nf_tables_getflowtable(struct
|
||||
@@ -5357,12 +5196,8 @@ static int nf_tables_getflowtable(struct
|
||||
if (!nla[NFTA_FLOWTABLE_NAME])
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -1063,7 +1063,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -6483,7 +6318,7 @@ int __nft_release_basechain(struct nft_c
|
||||
@@ -6528,7 +6363,7 @@ int __nft_release_basechain(struct nft_c
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__nft_release_basechain);
|
||||
|
||||
|
@ -1072,7 +1072,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
{
|
||||
struct nft_flowtable *flowtable, *nf;
|
||||
struct nft_table *table, *nt;
|
||||
@@ -6496,7 +6331,7 @@ static void __nft_release_afinfo(struct
|
||||
@@ -6541,7 +6376,7 @@ static void __nft_release_afinfo(struct
|
||||
};
|
||||
|
||||
list_for_each_entry_safe(table, nt, &net->nft.tables, list) {
|
||||
|
@ -1081,7 +1081,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
list_for_each_entry(chain, &table->chains, list)
|
||||
nf_tables_unregister_hook(net, table, chain);
|
||||
@@ -6548,7 +6383,7 @@ static int __net_init nf_tables_init_net
|
||||
@@ -6593,7 +6428,7 @@ static int __net_init nf_tables_init_net
|
||||
|
||||
static void __net_exit nf_tables_exit_net(struct net *net)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -4825,13 +4825,13 @@ void nft_flow_table_iterate(struct net *
|
||||
@@ -4868,13 +4868,13 @@ void nft_flow_table_iterate(struct net *
|
||||
struct nft_flowtable *flowtable;
|
||||
const struct nft_table *table;
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5210,17 +5210,12 @@ err:
|
||||
@@ -5253,17 +5253,12 @@ err:
|
||||
nfnetlink_set_err(ctx->net, ctx->portid, NFNLGRP_NFTABLES, -ENOBUFS);
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -369,6 +369,7 @@ void nft_unregister_set(struct nft_set_t
|
||||
@@ -370,6 +370,7 @@ void nft_unregister_set(struct nft_set_t
|
||||
* @list: table set list node
|
||||
* @bindings: list of set bindings
|
||||
* @name: name of the set
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @ktype: key type (numeric type defined by userspace, not used in the kernel)
|
||||
* @dtype: data type (verdict or numeric type defined by userspace)
|
||||
* @objtype: object type (see NFT_OBJECT_* definitions)
|
||||
@@ -391,6 +392,7 @@ struct nft_set {
|
||||
@@ -392,6 +393,7 @@ struct nft_set {
|
||||
struct list_head list;
|
||||
struct list_head bindings;
|
||||
char *name;
|
||||
|
@ -28,7 +28,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
u32 ktype;
|
||||
u32 dtype;
|
||||
u32 objtype;
|
||||
@@ -936,6 +938,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
@@ -941,6 +943,7 @@ unsigned int nft_do_chain(struct nft_pkt
|
||||
* @objects: stateful objects in the table
|
||||
* @flowtables: flow tables in the table
|
||||
* @hgenerator: handle generator state
|
||||
|
@ -36,7 +36,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @use: number of chain references to this table
|
||||
* @flags: table flag (see enum nft_table_flags)
|
||||
* @genmask: generation mask
|
||||
@@ -949,6 +952,7 @@ struct nft_table {
|
||||
@@ -954,6 +957,7 @@ struct nft_table {
|
||||
struct list_head objects;
|
||||
struct list_head flowtables;
|
||||
u64 hgenerator;
|
||||
|
@ -44,7 +44,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
u32 use;
|
||||
u16 family:6,
|
||||
flags:8,
|
||||
@@ -973,9 +977,9 @@ int nft_verdict_dump(struct sk_buff *skb
|
||||
@@ -978,9 +982,9 @@ int nft_verdict_dump(struct sk_buff *skb
|
||||
* @name: name of this stateful object
|
||||
* @genmask: generation mask
|
||||
* @use: number of references to this stateful object
|
||||
|
@ -56,7 +56,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
*/
|
||||
struct nft_object {
|
||||
struct list_head list;
|
||||
@@ -983,6 +987,7 @@ struct nft_object {
|
||||
@@ -988,6 +992,7 @@ struct nft_object {
|
||||
struct nft_table *table;
|
||||
u32 genmask:2,
|
||||
use:30;
|
||||
|
@ -64,7 +64,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
/* runtime data below here */
|
||||
const struct nft_object_ops *ops ____cacheline_aligned;
|
||||
unsigned char data[]
|
||||
@@ -1064,6 +1069,7 @@ void nft_unregister_obj(struct nft_objec
|
||||
@@ -1069,6 +1074,7 @@ void nft_unregister_obj(struct nft_objec
|
||||
* @ops_len: number of hooks in array
|
||||
* @genmask: generation mask
|
||||
* @use: number of references to this flow table
|
||||
|
@ -72,7 +72,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
* @data: rhashtable and garbage collector
|
||||
* @ops: array of hooks
|
||||
*/
|
||||
@@ -1076,6 +1082,7 @@ struct nft_flowtable {
|
||||
@@ -1081,6 +1087,7 @@ struct nft_flowtable {
|
||||
int ops_len;
|
||||
u32 genmask:2,
|
||||
use:30;
|
||||
|
@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
static void nft_ctx_init(struct nft_ctx *ctx,
|
||||
struct net *net,
|
||||
@@ -332,6 +333,20 @@ static struct nft_table *nft_table_looku
|
||||
@@ -361,6 +362,20 @@ static struct nft_table *nft_table_looku
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -172,7 +172,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static struct nft_table *nf_tables_table_lookup(const struct net *net,
|
||||
const struct nlattr *nla,
|
||||
u8 family, u8 genmask)
|
||||
@@ -348,6 +363,22 @@ static struct nft_table *nf_tables_table
|
||||
@@ -377,6 +392,22 @@ static struct nft_table *nf_tables_table
|
||||
return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
|
@ -195,7 +195,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static inline u64 nf_tables_alloc_handle(struct nft_table *table)
|
||||
{
|
||||
return ++table->hgenerator;
|
||||
@@ -394,6 +425,7 @@ static const struct nla_policy nft_table
|
||||
@@ -423,6 +454,7 @@ static const struct nla_policy nft_table
|
||||
[NFTA_TABLE_NAME] = { .type = NLA_STRING,
|
||||
.len = NFT_TABLE_MAXNAMELEN - 1 },
|
||||
[NFTA_TABLE_FLAGS] = { .type = NLA_U32 },
|
||||
|
@ -203,7 +203,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
|
||||
static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net,
|
||||
@@ -415,7 +447,9 @@ static int nf_tables_fill_table_info(str
|
||||
@@ -444,7 +476,9 @@ static int nf_tables_fill_table_info(str
|
||||
|
||||
if (nla_put_string(skb, NFTA_TABLE_NAME, table->name) ||
|
||||
nla_put_be32(skb, NFTA_TABLE_FLAGS, htonl(table->flags)) ||
|
||||
|
@ -214,7 +214,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
goto nla_put_failure;
|
||||
|
||||
nlmsg_end(skb, nlh);
|
||||
@@ -674,6 +708,7 @@ static int nf_tables_newtable(struct net
|
||||
@@ -703,6 +737,7 @@ static int nf_tables_newtable(struct net
|
||||
INIT_LIST_HEAD(&table->flowtables);
|
||||
table->family = family;
|
||||
table->flags = flags;
|
||||
|
@ -222,7 +222,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
nft_ctx_init(&ctx, net, skb, nlh, family, table, NULL, nla);
|
||||
err = nft_trans_table_add(&ctx, NFT_MSG_NEWTABLE);
|
||||
@@ -791,11 +826,18 @@ static int nf_tables_deltable(struct net
|
||||
@@ -820,11 +855,18 @@ static int nf_tables_deltable(struct net
|
||||
struct nft_ctx ctx;
|
||||
|
||||
nft_ctx_init(&ctx, net, skb, nlh, 0, NULL, NULL, nla);
|
||||
|
@ -244,7 +244,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
@@ -1534,6 +1576,7 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1565,6 +1607,7 @@ static int nf_tables_delchain(struct net
|
||||
struct nft_rule *rule;
|
||||
int family = nfmsg->nfgen_family;
|
||||
struct nft_ctx ctx;
|
||||
|
@ -252,7 +252,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
u32 use;
|
||||
int err;
|
||||
|
||||
@@ -1542,7 +1585,12 @@ static int nf_tables_delchain(struct net
|
||||
@@ -1573,7 +1616,12 @@ static int nf_tables_delchain(struct net
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
|
@ -266,7 +266,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(chain))
|
||||
return PTR_ERR(chain);
|
||||
|
||||
@@ -2508,6 +2556,7 @@ static const struct nla_policy nft_set_p
|
||||
@@ -2547,6 +2595,7 @@ static const struct nla_policy nft_set_p
|
||||
[NFTA_SET_USERDATA] = { .type = NLA_BINARY,
|
||||
.len = NFT_USERDATA_MAXLEN },
|
||||
[NFTA_SET_OBJ_TYPE] = { .type = NLA_U32 },
|
||||
|
@ -274,7 +274,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
|
||||
static const struct nla_policy nft_set_desc_policy[NFTA_SET_DESC_MAX + 1] = {
|
||||
@@ -2551,6 +2600,22 @@ static struct nft_set *nf_tables_set_loo
|
||||
@@ -2590,6 +2639,22 @@ static struct nft_set *nf_tables_set_loo
|
||||
return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
|
@ -297,7 +297,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static struct nft_set *nf_tables_set_lookup_byid(const struct net *net,
|
||||
const struct nlattr *nla,
|
||||
u8 genmask)
|
||||
@@ -2666,6 +2731,9 @@ static int nf_tables_fill_set(struct sk_
|
||||
@@ -2705,6 +2770,9 @@ static int nf_tables_fill_set(struct sk_
|
||||
goto nla_put_failure;
|
||||
if (nla_put_string(skb, NFTA_SET_NAME, set->name))
|
||||
goto nla_put_failure;
|
||||
|
@ -307,7 +307,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (set->flags != 0)
|
||||
if (nla_put_be32(skb, NFTA_SET_FLAGS, htonl(set->flags)))
|
||||
goto nla_put_failure;
|
||||
@@ -3074,6 +3142,7 @@ static int nf_tables_newset(struct net *
|
||||
@@ -3113,6 +3181,7 @@ static int nf_tables_newset(struct net *
|
||||
set->udata = udata;
|
||||
set->timeout = timeout;
|
||||
set->gc_int = gc_int;
|
||||
|
@ -315,7 +315,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
|
||||
err = ops->init(set, &desc, nla);
|
||||
if (err < 0)
|
||||
@@ -3133,7 +3202,10 @@ static int nf_tables_delset(struct net *
|
||||
@@ -3172,7 +3241,10 @@ static int nf_tables_delset(struct net *
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
|
@ -327,7 +327,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(set))
|
||||
return PTR_ERR(set);
|
||||
|
||||
@@ -4189,6 +4261,21 @@ struct nft_object *nf_tables_obj_lookup(
|
||||
@@ -4232,6 +4304,21 @@ struct nft_object *nf_tables_obj_lookup(
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_tables_obj_lookup);
|
||||
|
||||
|
@ -349,7 +349,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
static const struct nla_policy nft_obj_policy[NFTA_OBJ_MAX + 1] = {
|
||||
[NFTA_OBJ_TABLE] = { .type = NLA_STRING,
|
||||
.len = NFT_TABLE_MAXNAMELEN - 1 },
|
||||
@@ -4196,6 +4283,7 @@ static const struct nla_policy nft_obj_p
|
||||
@@ -4239,6 +4326,7 @@ static const struct nla_policy nft_obj_p
|
||||
.len = NFT_OBJ_MAXNAMELEN - 1 },
|
||||
[NFTA_OBJ_TYPE] = { .type = NLA_U32 },
|
||||
[NFTA_OBJ_DATA] = { .type = NLA_NESTED },
|
||||
|
@ -357,7 +357,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
|
||||
static struct nft_object *nft_obj_init(const struct nft_ctx *ctx,
|
||||
@@ -4343,6 +4431,8 @@ static int nf_tables_newobj(struct net *
|
||||
@@ -4386,6 +4474,8 @@ static int nf_tables_newobj(struct net *
|
||||
goto err1;
|
||||
}
|
||||
obj->table = table;
|
||||
|
@ -366,7 +366,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
obj->name = nla_strdup(nla[NFTA_OBJ_NAME], GFP_KERNEL);
|
||||
if (!obj->name) {
|
||||
err = -ENOMEM;
|
||||
@@ -4389,7 +4479,9 @@ static int nf_tables_fill_obj_info(struc
|
||||
@@ -4432,7 +4522,9 @@ static int nf_tables_fill_obj_info(struc
|
||||
nla_put_string(skb, NFTA_OBJ_NAME, obj->name) ||
|
||||
nla_put_be32(skb, NFTA_OBJ_TYPE, htonl(obj->ops->type->type)) ||
|
||||
nla_put_be32(skb, NFTA_OBJ_USE, htonl(obj->use)) ||
|
||||
|
@ -377,7 +377,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
goto nla_put_failure;
|
||||
|
||||
nlmsg_end(skb, nlh);
|
||||
@@ -4587,7 +4679,7 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4630,7 +4722,7 @@ static int nf_tables_delobj(struct net *
|
||||
u32 objtype;
|
||||
|
||||
if (!nla[NFTA_OBJ_TYPE] ||
|
||||
|
@ -386,7 +386,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
return -EINVAL;
|
||||
|
||||
table = nf_tables_table_lookup(net, nla[NFTA_OBJ_TABLE], family,
|
||||
@@ -4596,7 +4688,12 @@ static int nf_tables_delobj(struct net *
|
||||
@@ -4639,7 +4731,12 @@ static int nf_tables_delobj(struct net *
|
||||
return PTR_ERR(table);
|
||||
|
||||
objtype = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));
|
||||
|
@ -400,7 +400,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(obj))
|
||||
return PTR_ERR(obj);
|
||||
if (obj->use > 0)
|
||||
@@ -4668,6 +4765,7 @@ static const struct nla_policy nft_flowt
|
||||
@@ -4711,6 +4808,7 @@ static const struct nla_policy nft_flowt
|
||||
[NFTA_FLOWTABLE_NAME] = { .type = NLA_STRING,
|
||||
.len = NFT_NAME_MAXLEN - 1 },
|
||||
[NFTA_FLOWTABLE_HOOK] = { .type = NLA_NESTED },
|
||||
|
@ -408,7 +408,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
};
|
||||
|
||||
struct nft_flowtable *nf_tables_flowtable_lookup(const struct nft_table *table,
|
||||
@@ -4685,6 +4783,20 @@ struct nft_flowtable *nf_tables_flowtabl
|
||||
@@ -4728,6 +4826,20 @@ struct nft_flowtable *nf_tables_flowtabl
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_tables_flowtable_lookup);
|
||||
|
||||
|
@ -429,7 +429,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
#define NFT_FLOWTABLE_DEVICE_MAX 8
|
||||
|
||||
static int nf_tables_parse_devices(const struct nft_ctx *ctx,
|
||||
@@ -4893,6 +5005,8 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -4936,6 +5048,8 @@ static int nf_tables_newflowtable(struct
|
||||
return -ENOMEM;
|
||||
|
||||
flowtable->table = table;
|
||||
|
@ -438,7 +438,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
flowtable->name = nla_strdup(nla[NFTA_FLOWTABLE_NAME], GFP_KERNEL);
|
||||
if (!flowtable->name) {
|
||||
err = -ENOMEM;
|
||||
@@ -4967,8 +5081,14 @@ static int nf_tables_delflowtable(struct
|
||||
@@ -5010,8 +5124,14 @@ static int nf_tables_delflowtable(struct
|
||||
if (IS_ERR(table))
|
||||
return PTR_ERR(table);
|
||||
|
||||
|
@ -455,7 +455,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
if (IS_ERR(flowtable))
|
||||
return PTR_ERR(flowtable);
|
||||
if (flowtable->use > 0)
|
||||
@@ -5001,7 +5121,9 @@ static int nf_tables_fill_flowtable_info
|
||||
@@ -5044,7 +5164,9 @@ static int nf_tables_fill_flowtable_info
|
||||
|
||||
if (nla_put_string(skb, NFTA_FLOWTABLE_TABLE, flowtable->table->name) ||
|
||||
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
||||
|
|
|
@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
.owner = THIS_MODULE,
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5020,40 +5020,38 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5063,40 +5063,38 @@ static int nf_tables_newflowtable(struct
|
||||
}
|
||||
|
||||
flowtable->data.type = type;
|
||||
|
@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
err3:
|
||||
module_put(type->owner);
|
||||
err2:
|
||||
@@ -5334,10 +5332,8 @@ err:
|
||||
@@ -5377,10 +5375,8 @@ err:
|
||||
|
||||
static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
|
||||
{
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -4886,7 +4886,7 @@ static int nf_tables_flowtable_parse_hoo
|
||||
@@ -4929,7 +4929,7 @@ static int nf_tables_flowtable_parse_hoo
|
||||
flowtable->ops[i].pf = NFPROTO_NETDEV;
|
||||
flowtable->ops[i].hooknum = hooknum;
|
||||
flowtable->ops[i].priority = priority;
|
||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
struct delayed_work gc_work;
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -1091,9 +1091,6 @@ struct nft_flowtable {
|
||||
@@ -1096,9 +1096,6 @@ struct nft_flowtable {
|
||||
struct nft_flowtable *nf_tables_flowtable_lookup(const struct nft_table *table,
|
||||
const struct nlattr *nla,
|
||||
u8 genmask);
|
||||
|
@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
WARN_ON(!nf_flow_offload_gc_step(flow_table));
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -4930,23 +4930,6 @@ static const struct nf_flowtable_type *n
|
||||
@@ -4973,23 +4973,6 @@ static const struct nf_flowtable_type *n
|
||||
return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,75 @@
|
|||
From: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Date: Wed, 14 Dec 2016 15:05:26 -0800
|
||||
Subject: [PATCH] mm: add support for releasing multiple instances of a page
|
||||
|
||||
Add a function that allows us to batch free a page that has multiple
|
||||
references outstanding. Specifically this function can be used to drop
|
||||
a page being used in the page frag alloc cache. With this drivers can
|
||||
make use of functionality similar to the page frag alloc cache without
|
||||
having to do any workarounds for the fact that there is no function that
|
||||
frees multiple references.
|
||||
|
||||
Link: http://lkml.kernel.org/r/20161110113606.76501.70752.stgit@ahduyck-blue-test.jf.intel.com
|
||||
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Cc: "David S. Miller" <davem@davemloft.net>
|
||||
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
|
||||
Cc: Chris Metcalf <cmetcalf@mellanox.com>
|
||||
Cc: David Howells <dhowells@redhat.com>
|
||||
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
|
||||
Cc: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>
|
||||
Cc: Helge Deller <deller@gmx.de>
|
||||
Cc: James Hogan <james.hogan@imgtec.com>
|
||||
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
||||
Cc: Jonas Bonn <jonas@southpole.se>
|
||||
Cc: Keguang Zhang <keguang.zhang@gmail.com>
|
||||
Cc: Ley Foon Tan <lftan@altera.com>
|
||||
Cc: Mark Salter <msalter@redhat.com>
|
||||
Cc: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Cc: Michael Ellerman <mpe@ellerman.id.au>
|
||||
Cc: Michal Simek <monstr@monstr.eu>
|
||||
Cc: Ralf Baechle <ralf@linux-mips.org>
|
||||
Cc: Rich Felker <dalias@libc.org>
|
||||
Cc: Richard Kuo <rkuo@codeaurora.org>
|
||||
Cc: Russell King <linux@armlinux.org.uk>
|
||||
Cc: Steven Miao <realmz6@gmail.com>
|
||||
Cc: Tobias Klauser <tklauser@distanz.ch>
|
||||
Cc: Vineet Gupta <vgupta@synopsys.com>
|
||||
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
|
||||
--- a/include/linux/gfp.h
|
||||
+++ b/include/linux/gfp.h
|
||||
@@ -506,6 +506,8 @@ extern void free_hot_cold_page(struct pa
|
||||
extern void free_hot_cold_page_list(struct list_head *list, bool cold);
|
||||
|
||||
struct page_frag_cache;
|
||||
+extern void __page_frag_drain(struct page *page, unsigned int order,
|
||||
+ unsigned int count);
|
||||
extern void *__alloc_page_frag(struct page_frag_cache *nc,
|
||||
unsigned int fragsz, gfp_t gfp_mask);
|
||||
extern void __free_page_frag(void *addr);
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -3946,6 +3946,20 @@ static struct page *__page_frag_refill(s
|
||||
return page;
|
||||
}
|
||||
|
||||
+void __page_frag_drain(struct page *page, unsigned int order,
|
||||
+ unsigned int count)
|
||||
+{
|
||||
+ VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
|
||||
+
|
||||
+ if (page_ref_sub_and_test(page, count)) {
|
||||
+ if (order == 0)
|
||||
+ free_hot_cold_page(page, false);
|
||||
+ else
|
||||
+ __free_pages_ok(page, order);
|
||||
+ }
|
||||
+}
|
||||
+EXPORT_SYMBOL(__page_frag_drain);
|
||||
+
|
||||
void *__alloc_page_frag(struct page_frag_cache *nc,
|
||||
unsigned int fragsz, gfp_t gfp_mask)
|
||||
{
|
|
@ -0,0 +1,137 @@
|
|||
From: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Date: Tue, 10 Jan 2017 16:58:06 -0800
|
||||
Subject: [PATCH] mm: rename __alloc_page_frag to page_frag_alloc and
|
||||
__free_page_frag to page_frag_free
|
||||
|
||||
Patch series "Page fragment updates", v4.
|
||||
|
||||
This patch series takes care of a few cleanups for the page fragments
|
||||
API.
|
||||
|
||||
First we do some renames so that things are much more consistent. First
|
||||
we move the page_frag_ portion of the name to the front of the functions
|
||||
names. Secondly we split out the cache specific functions from the
|
||||
other page fragment functions by adding the word "cache" to the name.
|
||||
|
||||
Finally I added a bit of documentation that will hopefully help to
|
||||
explain some of this. I plan to revisit this later as we get things
|
||||
more ironed out in the near future with the changes planned for the DMA
|
||||
setup to support eXpress Data Path.
|
||||
|
||||
This patch (of 3):
|
||||
|
||||
This patch renames the page frag functions to be more consistent with
|
||||
other APIs. Specifically we place the name page_frag first in the name
|
||||
and then have either an alloc or free call name that we append as the
|
||||
suffix. This makes it a bit clearer in terms of naming.
|
||||
|
||||
In addition we drop the leading double underscores since we are
|
||||
technically no longer a backing interface and instead the front end that
|
||||
is called from the networking APIs.
|
||||
|
||||
Link: http://lkml.kernel.org/r/20170104023854.13451.67390.stgit@localhost.localdomain
|
||||
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
|
||||
--- a/include/linux/gfp.h
|
||||
+++ b/include/linux/gfp.h
|
||||
@@ -508,9 +508,9 @@ extern void free_hot_cold_page_list(stru
|
||||
struct page_frag_cache;
|
||||
extern void __page_frag_drain(struct page *page, unsigned int order,
|
||||
unsigned int count);
|
||||
-extern void *__alloc_page_frag(struct page_frag_cache *nc,
|
||||
- unsigned int fragsz, gfp_t gfp_mask);
|
||||
-extern void __free_page_frag(void *addr);
|
||||
+extern void *page_frag_alloc(struct page_frag_cache *nc,
|
||||
+ unsigned int fragsz, gfp_t gfp_mask);
|
||||
+extern void page_frag_free(void *addr);
|
||||
|
||||
#define __free_page(page) __free_pages((page), 0)
|
||||
#define free_page(addr) free_pages((addr), 0)
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -2471,7 +2471,7 @@ static inline struct sk_buff *netdev_all
|
||||
|
||||
static inline void skb_free_frag(void *addr)
|
||||
{
|
||||
- __free_page_frag(addr);
|
||||
+ page_frag_free(addr);
|
||||
}
|
||||
|
||||
void *napi_alloc_frag(unsigned int fragsz);
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -3960,8 +3960,8 @@ void __page_frag_drain(struct page *page
|
||||
}
|
||||
EXPORT_SYMBOL(__page_frag_drain);
|
||||
|
||||
-void *__alloc_page_frag(struct page_frag_cache *nc,
|
||||
- unsigned int fragsz, gfp_t gfp_mask)
|
||||
+void *page_frag_alloc(struct page_frag_cache *nc,
|
||||
+ unsigned int fragsz, gfp_t gfp_mask)
|
||||
{
|
||||
unsigned int size = PAGE_SIZE;
|
||||
struct page *page;
|
||||
@@ -4012,19 +4012,19 @@ refill:
|
||||
|
||||
return nc->va + offset;
|
||||
}
|
||||
-EXPORT_SYMBOL(__alloc_page_frag);
|
||||
+EXPORT_SYMBOL(page_frag_alloc);
|
||||
|
||||
/*
|
||||
* Frees a page fragment allocated out of either a compound or order 0 page.
|
||||
*/
|
||||
-void __free_page_frag(void *addr)
|
||||
+void page_frag_free(void *addr)
|
||||
{
|
||||
struct page *page = virt_to_head_page(addr);
|
||||
|
||||
if (unlikely(put_page_testzero(page)))
|
||||
__free_pages_ok(page, compound_order(page));
|
||||
}
|
||||
-EXPORT_SYMBOL(__free_page_frag);
|
||||
+EXPORT_SYMBOL(page_frag_free);
|
||||
|
||||
static void *make_alloc_exact(unsigned long addr, unsigned int order,
|
||||
size_t size)
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -369,7 +369,7 @@ static void *__netdev_alloc_frag(unsigne
|
||||
|
||||
local_irq_save(flags);
|
||||
nc = this_cpu_ptr(&netdev_alloc_cache);
|
||||
- data = __alloc_page_frag(nc, fragsz, gfp_mask);
|
||||
+ data = page_frag_alloc(nc, fragsz, gfp_mask);
|
||||
local_irq_restore(flags);
|
||||
return data;
|
||||
}
|
||||
@@ -391,7 +391,7 @@ static void *__napi_alloc_frag(unsigned
|
||||
{
|
||||
struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
|
||||
|
||||
- return __alloc_page_frag(&nc->page, fragsz, gfp_mask);
|
||||
+ return page_frag_alloc(&nc->page, fragsz, gfp_mask);
|
||||
}
|
||||
|
||||
void *napi_alloc_frag(unsigned int fragsz)
|
||||
@@ -441,7 +441,7 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
local_irq_save(flags);
|
||||
|
||||
nc = this_cpu_ptr(&netdev_alloc_cache);
|
||||
- data = __alloc_page_frag(nc, len, gfp_mask);
|
||||
+ data = page_frag_alloc(nc, len, gfp_mask);
|
||||
pfmemalloc = nc->pfmemalloc;
|
||||
|
||||
local_irq_restore(flags);
|
||||
@@ -505,7 +505,7 @@ struct sk_buff *__napi_alloc_skb(struct
|
||||
if (sk_memalloc_socks())
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
- data = __alloc_page_frag(&nc->page, len, gfp_mask);
|
||||
+ data = page_frag_alloc(&nc->page, len, gfp_mask);
|
||||
if (unlikely(!data))
|
||||
return NULL;
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
From: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Date: Tue, 10 Jan 2017 16:58:09 -0800
|
||||
Subject: [PATCH] mm: rename __page_frag functions to __page_frag_cache, drop
|
||||
order from drain
|
||||
|
||||
This patch does two things.
|
||||
|
||||
First it goes through and renames the __page_frag prefixed functions to
|
||||
__page_frag_cache so that we can be clear that we are draining or
|
||||
refilling the cache, not the frags themselves.
|
||||
|
||||
Second we drop the order parameter from __page_frag_cache_drain since we
|
||||
don't actually need to pass it since all fragments are either order 0 or
|
||||
must be a compound page.
|
||||
|
||||
Link: http://lkml.kernel.org/r/20170104023954.13451.5678.stgit@localhost.localdomain
|
||||
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
|
||||
--- a/include/linux/gfp.h
|
||||
+++ b/include/linux/gfp.h
|
||||
@@ -506,8 +506,7 @@ extern void free_hot_cold_page(struct pa
|
||||
extern void free_hot_cold_page_list(struct list_head *list, bool cold);
|
||||
|
||||
struct page_frag_cache;
|
||||
-extern void __page_frag_drain(struct page *page, unsigned int order,
|
||||
- unsigned int count);
|
||||
+extern void __page_frag_cache_drain(struct page *page, unsigned int count);
|
||||
extern void *page_frag_alloc(struct page_frag_cache *nc,
|
||||
unsigned int fragsz, gfp_t gfp_mask);
|
||||
extern void page_frag_free(void *addr);
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -3925,8 +3925,8 @@ EXPORT_SYMBOL(free_pages);
|
||||
* drivers to provide a backing region of memory for use as either an
|
||||
* sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
|
||||
*/
|
||||
-static struct page *__page_frag_refill(struct page_frag_cache *nc,
|
||||
- gfp_t gfp_mask)
|
||||
+static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
|
||||
+ gfp_t gfp_mask)
|
||||
{
|
||||
struct page *page = NULL;
|
||||
gfp_t gfp = gfp_mask;
|
||||
@@ -3946,19 +3946,20 @@ static struct page *__page_frag_refill(s
|
||||
return page;
|
||||
}
|
||||
|
||||
-void __page_frag_drain(struct page *page, unsigned int order,
|
||||
- unsigned int count)
|
||||
+void __page_frag_cache_drain(struct page *page, unsigned int count)
|
||||
{
|
||||
VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
|
||||
|
||||
if (page_ref_sub_and_test(page, count)) {
|
||||
+ unsigned int order = compound_order(page);
|
||||
+
|
||||
if (order == 0)
|
||||
free_hot_cold_page(page, false);
|
||||
else
|
||||
__free_pages_ok(page, order);
|
||||
}
|
||||
}
|
||||
-EXPORT_SYMBOL(__page_frag_drain);
|
||||
+EXPORT_SYMBOL(__page_frag_cache_drain);
|
||||
|
||||
void *page_frag_alloc(struct page_frag_cache *nc,
|
||||
unsigned int fragsz, gfp_t gfp_mask)
|
||||
@@ -3969,7 +3970,7 @@ void *page_frag_alloc(struct page_frag_c
|
||||
|
||||
if (unlikely(!nc->va)) {
|
||||
refill:
|
||||
- page = __page_frag_refill(nc, gfp_mask);
|
||||
+ page = __page_frag_cache_refill(nc, gfp_mask);
|
||||
if (!page)
|
||||
return NULL;
|
||||
|
|
@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
+MODULE_LICENSE("GPL");
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -2147,6 +2147,7 @@ int wake_up_state(struct task_struct *p,
|
||||
@@ -2164,6 +2164,7 @@ int wake_up_state(struct task_struct *p,
|
||||
{
|
||||
return try_to_wake_up(p, state, 0);
|
||||
}
|
||||
|
|
|
@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|||
|
||||
if (trx.offset[i]) {
|
||||
part = &parts[curr_part++];
|
||||
part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
|
||||
- part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
|
||||
- part->offset = trx.offset[i];
|
||||
+ part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
|
||||
+ part->name = parser_trx_data_part_name(mtd, part->offset);
|
||||
i++;
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
||||
--- a/drivers/mtd/ubi/build.c
|
||||
+++ b/drivers/mtd/ubi/build.c
|
||||
@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd
|
||||
@@ -1171,6 +1171,49 @@ static struct mtd_info * __init open_mtd
|
||||
return mtd;
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
static int __init ubi_init(void)
|
||||
{
|
||||
int err, i, k;
|
||||
@@ -1251,6 +1294,12 @@ static int __init ubi_init(void)
|
||||
@@ -1254,6 +1297,12 @@ static int __init ubi_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
+MODULE_ALIAS("nf-flow-table-hw");
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -4873,6 +4873,14 @@ static int nf_tables_flowtable_parse_hoo
|
||||
@@ -4916,6 +4916,14 @@ static int nf_tables_flowtable_parse_hoo
|
||||
if (err < 0)
|
||||
goto err1;
|
||||
|
||||
|
@ -521,7 +521,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
ops = kzalloc(sizeof(struct nf_hook_ops) * n, GFP_KERNEL);
|
||||
if (!ops) {
|
||||
err = -ENOMEM;
|
||||
@@ -5003,10 +5011,19 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5046,10 +5054,19 @@ static int nf_tables_newflowtable(struct
|
||||
}
|
||||
|
||||
flowtable->data.type = type;
|
||||
|
@ -541,7 +541,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|||
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
|
||||
flowtable);
|
||||
if (err < 0)
|
||||
@@ -5104,7 +5121,8 @@ static int nf_tables_fill_flowtable_info
|
||||
@@ -5147,7 +5164,8 @@ static int nf_tables_fill_flowtable_info
|
||||
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
||||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
|
||||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
The gen_stats facility will add a header for the toplevel nlattr of type
|
||||
TCA_STATS2 that contains all stats added by qdisc callbacks. A reference
|
||||
to this header is stored in the gnet_dump struct, and when all the
|
||||
per-qdisc callbacks have finished adding their stats, the length of the
|
||||
containing header will be adjusted to the right value.
|
||||
|
||||
However, on architectures that need padding (i.e., that don't set
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS), the padding nlattr is added
|
||||
before the stats, which means that the stored pointer will point to the
|
||||
padding, and so when the header is fixed up, the result is just a very
|
||||
big padding nlattr. Because most qdiscs also supply the legacy TCA_STATS
|
||||
struct, this problem has been mostly invisible, but we exposed it with
|
||||
the netlink attribute-based statistics in CAKE.
|
||||
|
||||
Fix the issue by fixing up the stored pointer if it points to a padding
|
||||
nlattr.
|
||||
|
||||
Tested-by: Pete Heist <pete@heistp.net>
|
||||
Tested-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
|
||||
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
|
||||
---
|
||||
net/core/gen_stats.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/net/core/gen_stats.c
|
||||
+++ b/net/core/gen_stats.c
|
||||
@@ -77,8 +77,20 @@ gnet_stats_start_copy_compat(struct sk_b
|
||||
d->lock = lock;
|
||||
spin_lock_bh(lock);
|
||||
}
|
||||
- if (d->tail)
|
||||
- return gnet_stats_copy(d, type, NULL, 0, padattr);
|
||||
+ if (d->tail) {
|
||||
+ int ret = gnet_stats_copy(d, type, NULL, 0, padattr);
|
||||
+
|
||||
+ /* The initial attribute added in gnet_stats_copy() may be
|
||||
+ * preceded by a padding attribute, in which case d->tail will
|
||||
+ * end up pointing at the padding instead of the real attribute.
|
||||
+ * Fix this so gnet_stats_finish_copy() adjusts the length of
|
||||
+ * the right attribute.
|
||||
+ */
|
||||
+ if (ret == 0 && d->tail->nla_type == padattr)
|
||||
+ d->tail = (struct nlattr *)((char *)d->tail +
|
||||
+ NLA_ALIGN(d->tail->nla_len));
|
||||
+ return ret;
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|||
|
||||
if (trx.offset[i]) {
|
||||
part = &parts[curr_part++];
|
||||
part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
|
||||
- part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
|
||||
- part->offset = trx.offset[i];
|
||||
+ part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
|
||||
+ part->name = parser_trx_data_part_name(mtd, part->offset);
|
||||
i++;
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
||||
--- a/drivers/mtd/ubi/build.c
|
||||
+++ b/drivers/mtd/ubi/build.c
|
||||
@@ -1223,6 +1223,49 @@ static struct mtd_info * __init open_mtd
|
||||
@@ -1226,6 +1226,49 @@ static struct mtd_info * __init open_mtd
|
||||
return mtd;
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
static int __init ubi_init(void)
|
||||
{
|
||||
int err, i, k;
|
||||
@@ -1306,6 +1349,12 @@ static int __init ubi_init(void)
|
||||
@@ -1309,6 +1352,12 @@ static int __init ubi_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
The gen_stats facility will add a header for the toplevel nlattr of type
|
||||
TCA_STATS2 that contains all stats added by qdisc callbacks. A reference
|
||||
to this header is stored in the gnet_dump struct, and when all the
|
||||
per-qdisc callbacks have finished adding their stats, the length of the
|
||||
containing header will be adjusted to the right value.
|
||||
|
||||
However, on architectures that need padding (i.e., that don't set
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS), the padding nlattr is added
|
||||
before the stats, which means that the stored pointer will point to the
|
||||
padding, and so when the header is fixed up, the result is just a very
|
||||
big padding nlattr. Because most qdiscs also supply the legacy TCA_STATS
|
||||
struct, this problem has been mostly invisible, but we exposed it with
|
||||
the netlink attribute-based statistics in CAKE.
|
||||
|
||||
Fix the issue by fixing up the stored pointer if it points to a padding
|
||||
nlattr.
|
||||
|
||||
Tested-by: Pete Heist <pete@heistp.net>
|
||||
Tested-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
|
||||
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
|
||||
---
|
||||
net/core/gen_stats.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/net/core/gen_stats.c
|
||||
+++ b/net/core/gen_stats.c
|
||||
@@ -77,8 +77,20 @@ gnet_stats_start_copy_compat(struct sk_b
|
||||
d->lock = lock;
|
||||
spin_lock_bh(lock);
|
||||
}
|
||||
- if (d->tail)
|
||||
- return gnet_stats_copy(d, type, NULL, 0, padattr);
|
||||
+ if (d->tail) {
|
||||
+ int ret = gnet_stats_copy(d, type, NULL, 0, padattr);
|
||||
+
|
||||
+ /* The initial attribute added in gnet_stats_copy() may be
|
||||
+ * preceded by a padding attribute, in which case d->tail will
|
||||
+ * end up pointing at the padding instead of the real attribute.
|
||||
+ * Fix this so gnet_stats_finish_copy() adjusts the length of
|
||||
+ * the right attribute.
|
||||
+ */
|
||||
+ if (ret == 0 && d->tail->nla_type == padattr)
|
||||
+ d->tail = (struct nlattr *)((char *)d->tail +
|
||||
+ NLA_ALIGN(d->tail->nla_len));
|
||||
+ return ret;
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
|
|||
|
||||
--- a/drivers/mtd/ubi/build.c
|
||||
+++ b/drivers/mtd/ubi/build.c
|
||||
@@ -1181,6 +1181,9 @@ static void __init ubi_auto_attach(void)
|
||||
@@ -1184,6 +1184,9 @@ static void __init ubi_auto_attach(void)
|
||||
mtd = open_mtd_device("ubi");
|
||||
if (IS_ERR(mtd))
|
||||
mtd = open_mtd_device("data");
|
||||
|
|
|
@ -16,7 +16,6 @@ compex,wpq864 |\
|
|||
netgear,d7800 |\
|
||||
netgear,r7500 |\
|
||||
netgear,r7500v2 |\
|
||||
netgear,r7800 |\
|
||||
qcom,ipq8064-ap148 |\
|
||||
tplink,vr2600v)
|
||||
ucidef_add_switch "switch0" \
|
||||
|
@ -33,15 +32,16 @@ nec,wg2600hp)
|
|||
ucidef_add_switch "switch0" \
|
||||
"2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "1:wan" "0@eth0"
|
||||
;;
|
||||
netgear,r7800 |\
|
||||
tplink,c2600)
|
||||
ucidef_add_switch "switch0" \
|
||||
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
|
||||
;;
|
||||
qcom,ipq8064-db149)
|
||||
ucidef_set_interface_lan "eth1 eth2 eth3"
|
||||
ucidef_add_switch "switch0" \
|
||||
"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
|
||||
;;
|
||||
tplink,c2600)
|
||||
ucidef_add_switch "switch0" \
|
||||
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
|
||||
;;
|
||||
zyxel,nbg6817)
|
||||
hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
|
||||
ucidef_add_switch "switch0" \
|
||||
|
|
|
@ -0,0 +1,47 @@
|
|||
From 5b9b2b5284f81941972105b13337c58489ea8fca Mon Sep 17 00:00:00 2001
|
||||
From: Mathias Kresin <dev@kresin.me>
|
||||
Date: Thu, 28 Jun 2018 21:57:40 +0200
|
||||
Subject: [PATCH] gpio: stp-xway: Implement get callback
|
||||
|
||||
Add an implementation to get the current GPIO state.
|
||||
|
||||
The callback is used by the leds-gpio driver for example, in case the
|
||||
current LED/GPIO state should be kept during driver load.
|
||||
|
||||
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/gpio/gpio-stp-xway.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
--- a/drivers/gpio/gpio-stp-xway.c
|
||||
+++ b/drivers/gpio/gpio-stp-xway.c
|
||||
@@ -91,6 +91,20 @@ struct xway_stp {
|
||||
};
|
||||
|
||||
/**
|
||||
+ * xway_stp_get() - gpio_chip->get - get gpios.
|
||||
+ * @gc: Pointer to gpio_chip device structure.
|
||||
+ * @gpio: GPIO signal number.
|
||||
+ *
|
||||
+ * Gets the shadow value.
|
||||
+ */
|
||||
+static int xway_stp_get(struct gpio_chip *gc, unsigned int gpio)
|
||||
+{
|
||||
+ struct xway_stp *chip = gpiochip_get_data(gc);
|
||||
+
|
||||
+ return (xway_stp_r32(chip->virt, XWAY_STP_CPU0) & BIT(gpio));
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* xway_stp_set() - gpio_chip->set - set gpios.
|
||||
* @gc: Pointer to gpio_chip device structure.
|
||||
* @gpio: GPIO signal number.
|
||||
@@ -215,6 +229,7 @@ static int xway_stp_probe(struct platfor
|
||||
chip->gc.parent = &pdev->dev;
|
||||
chip->gc.label = "stp-xway";
|
||||
chip->gc.direction_output = xway_stp_dir_out;
|
||||
+ chip->gc.get = xway_stp_get;
|
||||
chip->gc.set = xway_stp_set;
|
||||
chip->gc.request = xway_stp_request;
|
||||
chip->gc.base = -1;
|
|
@ -0,0 +1,47 @@
|
|||
From 5b9b2b5284f81941972105b13337c58489ea8fca Mon Sep 17 00:00:00 2001
|
||||
From: Mathias Kresin <dev@kresin.me>
|
||||
Date: Thu, 28 Jun 2018 21:57:40 +0200
|
||||
Subject: [PATCH] gpio: stp-xway: Implement get callback
|
||||
|
||||
Add an implementation to get the current GPIO state.
|
||||
|
||||
The callback is used by the leds-gpio driver for example, in case the
|
||||
current LED/GPIO state should be kept during driver load.
|
||||
|
||||
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/gpio/gpio-stp-xway.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
--- a/drivers/gpio/gpio-stp-xway.c
|
||||
+++ b/drivers/gpio/gpio-stp-xway.c
|
||||
@@ -91,6 +91,20 @@ struct xway_stp {
|
||||
};
|
||||
|
||||
/**
|
||||
+ * xway_stp_get() - gpio_chip->get - get gpios.
|
||||
+ * @gc: Pointer to gpio_chip device structure.
|
||||
+ * @gpio: GPIO signal number.
|
||||
+ *
|
||||
+ * Gets the shadow value.
|
||||
+ */
|
||||
+static int xway_stp_get(struct gpio_chip *gc, unsigned int gpio)
|
||||
+{
|
||||
+ struct xway_stp *chip = gpiochip_get_data(gc);
|
||||
+
|
||||
+ return (xway_stp_r32(chip->virt, XWAY_STP_CPU0) & BIT(gpio));
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* xway_stp_set() - gpio_chip->set - set gpios.
|
||||
* @gc: Pointer to gpio_chip device structure.
|
||||
* @gpio: GPIO signal number.
|
||||
@@ -215,6 +229,7 @@ static int xway_stp_probe(struct platfor
|
||||
chip->gc.parent = &pdev->dev;
|
||||
chip->gc.label = "stp-xway";
|
||||
chip->gc.direction_output = xway_stp_dir_out;
|
||||
+ chip->gc.get = xway_stp_get;
|
||||
chip->gc.set = xway_stp_set;
|
||||
chip->gc.request = xway_stp_request;
|
||||
chip->gc.base = -1;
|
|
@ -2060,7 +2060,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
}
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -4659,3 +4659,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
||||
@@ -4679,3 +4679,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
cpus {
|
||||
cpu@0 {
|
||||
proc-supply = <&mt6323_vproc_reg>;
|
||||
@@ -102,6 +106,10 @@
|
||||
memory@80000000 {
|
||||
@@ -103,6 +107,10 @@
|
||||
device_type = "memory";
|
||||
reg = <0 0x80000000 0 0x40000000>;
|
||||
};
|
||||
+
|
||||
|
@ -22,7 +22,7 @@
|
|||
};
|
||||
|
||||
&cir {
|
||||
@@ -129,11 +137,24 @@
|
||||
@@ -130,11 +138,24 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -49,7 +49,7 @@
|
|||
compatible = "mediatek,mt7530";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -143,6 +164,8 @@
|
||||
@@ -144,6 +165,8 @@
|
||||
core-supply = <&mt6323_vpa_reg>;
|
||||
io-supply = <&mt6323_vemc3v3_reg>;
|
||||
|
||||
|
@ -58,7 +58,7 @@
|
|||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -151,29 +174,46 @@
|
||||
@@ -152,29 +175,46 @@
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
label = "wan";
|
||||
|
@ -106,7 +106,7 @@
|
|||
reg = <6>;
|
||||
label = "cpu";
|
||||
ethernet = <&gmac0>;
|
||||
@@ -186,8 +226,6 @@
|
||||
@@ -187,8 +227,6 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -579,7 +579,7 @@
|
|||
+
|
||||
--- a/arch/arm/boot/dts/mt7623.dtsi
|
||||
+++ b/arch/arm/boot/dts/mt7623.dtsi
|
||||
@@ -322,6 +322,7 @@
|
||||
@@ -323,6 +323,7 @@
|
||||
"syscon";
|
||||
reg = <0 0x10209000 0 0x1000>;
|
||||
#clock-cells = <1>;
|
||||
|
|
|
@ -32,6 +32,12 @@
|
|||
gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <BTN_1>;
|
||||
};
|
||||
|
||||
wps {
|
||||
label = "wps";
|
||||
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_WPS_BUTTON>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
|
@ -72,7 +78,7 @@
|
|||
&pinctrl {
|
||||
state_default: pinctrl0 {
|
||||
gpio {
|
||||
ralink,group = "i2c", "i2s", "p0led_an", "p4led_an", "uart1", "wdt", "wled_an";
|
||||
ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an";
|
||||
ralink,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -219,8 +219,9 @@ static inline void fe_set_txd(struct fe_tx_dma *txd, struct fe_tx_dma *dma_txd)
|
|||
|
||||
static void fe_clean_rx(struct fe_priv *priv)
|
||||
{
|
||||
int i;
|
||||
struct fe_rx_ring *ring = &priv->rx_ring;
|
||||
struct page *page;
|
||||
int i;
|
||||
|
||||
if (ring->rx_data) {
|
||||
for (i = 0; i < ring->rx_ring_size; i++)
|
||||
|
@ -230,7 +231,7 @@ static void fe_clean_rx(struct fe_priv *priv)
|
|||
ring->rx_dma[i].rxd1,
|
||||
ring->rx_buf_size,
|
||||
DMA_FROM_DEVICE);
|
||||
put_page(virt_to_head_page(ring->rx_data[i]));
|
||||
skb_free_frag(ring->rx_data[i]);
|
||||
}
|
||||
|
||||
kfree(ring->rx_data);
|
||||
|
@ -244,6 +245,13 @@ static void fe_clean_rx(struct fe_priv *priv)
|
|||
ring->rx_phys);
|
||||
ring->rx_dma = NULL;
|
||||
}
|
||||
|
||||
if (!ring->frag_cache.va)
|
||||
return;
|
||||
|
||||
page = virt_to_page(ring->frag_cache.va);
|
||||
__page_frag_cache_drain(page, ring->frag_cache.pagecnt_bias);
|
||||
memset(&ring->frag_cache, 0, sizeof(ring->frag_cache));
|
||||
}
|
||||
|
||||
static int fe_alloc_rx(struct fe_priv *priv)
|
||||
|
@ -258,7 +266,9 @@ static int fe_alloc_rx(struct fe_priv *priv)
|
|||
goto no_rx_mem;
|
||||
|
||||
for (i = 0; i < ring->rx_ring_size; i++) {
|
||||
ring->rx_data[i] = netdev_alloc_frag(ring->frag_size);
|
||||
ring->rx_data[i] = page_frag_alloc(&ring->frag_cache,
|
||||
ring->frag_size,
|
||||
GFP_KERNEL);
|
||||
if (!ring->rx_data[i])
|
||||
goto no_rx_mem;
|
||||
}
|
||||
|
@ -846,7 +856,8 @@ static int fe_poll_rx(struct napi_struct *napi, int budget,
|
|||
break;
|
||||
|
||||
/* alloc new buffer */
|
||||
new_data = netdev_alloc_frag(ring->frag_size);
|
||||
new_data = page_frag_alloc(&ring->frag_cache, ring->frag_size,
|
||||
GFP_ATOMIC);
|
||||
if (unlikely(!new_data)) {
|
||||
stats->rx_dropped++;
|
||||
goto release_desc;
|
||||
|
@ -856,14 +867,14 @@ static int fe_poll_rx(struct napi_struct *napi, int budget,
|
|||
ring->rx_buf_size,
|
||||
DMA_FROM_DEVICE);
|
||||
if (unlikely(dma_mapping_error(&netdev->dev, dma_addr))) {
|
||||
put_page(virt_to_head_page(new_data));
|
||||
skb_free_frag(new_data);
|
||||
goto release_desc;
|
||||
}
|
||||
|
||||
/* receive data */
|
||||
skb = build_skb(data, ring->frag_size);
|
||||
if (unlikely(!skb)) {
|
||||
put_page(virt_to_head_page(new_data));
|
||||
skb_free_frag(new_data);
|
||||
goto release_desc;
|
||||
}
|
||||
skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
|
||||
|
|
|
@ -461,6 +461,7 @@ struct fe_tx_ring {
|
|||
};
|
||||
|
||||
struct fe_rx_ring {
|
||||
struct page_frag_cache frag_cache;
|
||||
struct fe_rx_dma *rx_dma;
|
||||
u8 **rx_data;
|
||||
dma_addr_t rx_phys;
|
||||
|
|
|
@ -220,7 +220,6 @@ define Device/tplink_tl-wr902ac-v3
|
|||
TPLINK_HWREV := 0x89
|
||||
TPLINK_HWREVADD := 0x1
|
||||
TPLINK_HVERSION := 3
|
||||
IMAGES += factory.bin
|
||||
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
|
||||
endef
|
||||
TARGET_DEVICES += tplink_tl-wr902ac-v3
|
||||
|
|
|
@ -14,7 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
drivers/mtd/nand/mtk_nand2.c | 2304 +++++++++++++++++++++++++++++++++++
|
||||
drivers/mtd/nand/mtk_nand2.h | 452 +++++++
|
||||
drivers/mtd/nand/nand_base.c | 6 +-
|
||||
drivers/mtd/nand/nand_bbt.c | 19 +
|
||||
drivers/mtd/nand/nand_def.h | 123 ++
|
||||
drivers/mtd/nand/nand_device_list.h | 55 +
|
||||
drivers/mtd/nand/partition.h | 115 ++
|
||||
|
@ -1299,7 +1298,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+
|
||||
--- /dev/null
|
||||
+++ b/drivers/mtd/nand/mtk_nand2.c
|
||||
@@ -0,0 +1,2365 @@
|
||||
@@ -0,0 +1,2345 @@
|
||||
+/******************************************************************************
|
||||
+* mtk_nand2.c - MTK NAND Flash Device Driver
|
||||
+ *
|
||||
|
@ -1347,8 +1346,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+unsigned int CFG_BLOCKSIZE;
|
||||
+
|
||||
+static int shift_on_bbt = 0;
|
||||
+extern void nand_bbt_set(struct mtd_info *mtd, int page, int flag);
|
||||
+extern int nand_bbt_get(struct mtd_info *mtd, int page);
|
||||
+int mtk_nand_read_oob_hw(struct mtd_info *mtd, struct nand_chip *chip, int page);
|
||||
+
|
||||
+static const char * const probe_types[] = { "cmdlinepart", "ofpart", NULL };
|
||||
|
@ -1397,9 +1394,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+BOOL g_bHwEcc = true;
|
||||
+
|
||||
+
|
||||
+static u8 *local_buffer_16_align; // 16 byte aligned buffer, for HW issue
|
||||
+static u8 local_buffer[4096 + 512];
|
||||
+
|
||||
+extern void nand_release_device(struct mtd_info *mtd);
|
||||
+extern int nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state);
|
||||
+
|
||||
|
@ -1420,6 +1414,25 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+
|
||||
+static u8 nand_badblock_offset = 0;
|
||||
+
|
||||
+static void nand_bbt_set(struct mtd_info *mtd, int page, int flag)
|
||||
+{
|
||||
+ struct nand_chip *this = mtd->priv;
|
||||
+ int block;
|
||||
+
|
||||
+ block = (int)(page >> (this->bbt_erase_shift - this->page_shift - 1));
|
||||
+ this->bbt[block >> 3] &= ~(0x03 << (block & 0x6));
|
||||
+ this->bbt[block >> 3] |= (flag & 0x3) << (block & 0x6);
|
||||
+}
|
||||
+
|
||||
+static int nand_bbt_get(struct mtd_info *mtd, int page)
|
||||
+{
|
||||
+ struct nand_chip *this = mtd->priv;
|
||||
+ int block;
|
||||
+
|
||||
+ block = (int)(page >> (this->bbt_erase_shift - this->page_shift - 1));
|
||||
+ return (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
|
||||
+}
|
||||
+
|
||||
+void nand_enable_clock(void)
|
||||
+{
|
||||
+ //enable_clock(MT65XX_PDN_PERI_NFI, "NAND");
|
||||
|
@ -2164,10 +2177,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ struct nand_chip *nand = mtd->priv;
|
||||
+ u32 u4SecNum = u4PageSize >> 9;
|
||||
+
|
||||
+ if (((u32) pPageBuf % 16) && local_buffer_16_align)
|
||||
+ buf = local_buffer_16_align;
|
||||
+ else
|
||||
+ buf = pPageBuf;
|
||||
+ buf = pPageBuf;
|
||||
+ if (mtk_nand_ready_for_read(nand, u4RowAddr, 0, true, buf)) {
|
||||
+ int j;
|
||||
+ for (j = 0 ; j < u4SecNum; j++) {
|
||||
|
@ -2185,9 +2195,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ mtk_nand_stop_read();
|
||||
+ }
|
||||
+
|
||||
+ if (buf == local_buffer_16_align)
|
||||
+ memcpy(pPageBuf, buf, u4PageSize);
|
||||
+
|
||||
+ return bRet;
|
||||
+}
|
||||
+
|
||||
|
@ -2201,12 +2208,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+
|
||||
+ MSG(WRITE, "mtk_nand_exec_write_page, page: 0x%x\n", u4RowAddr);
|
||||
+
|
||||
+ if (((u32) pPageBuf % 16) && local_buffer_16_align) {
|
||||
+ printk(KERN_INFO "Data buffer not 16 bytes aligned: %p\n", pPageBuf);
|
||||
+ memcpy(local_buffer_16_align, pPageBuf, mtd->writesize);
|
||||
+ buf = local_buffer_16_align;
|
||||
+ } else
|
||||
+ buf = pPageBuf;
|
||||
+ buf = pPageBuf;
|
||||
+
|
||||
+ if (mtk_nand_ready_for_write(chip, u4RowAddr, 0, true, buf)) {
|
||||
+ mtk_nand_write_fdm_data(chip, pFDMBuf, u4SecNum);
|
||||
|
@ -3390,9 +3392,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ /* Allocate memory for 16 byte aligned buffer */
|
||||
+ local_buffer_16_align = local_buffer + 16 - ((u32) local_buffer % 16);
|
||||
+ printk(KERN_INFO "Allocate 16 byte aligned buffer: %p\n", local_buffer_16_align);
|
||||
+ host->hw = hw;
|
||||
+
|
||||
+ /* init mtd data structure */
|
||||
|
@ -3515,23 +3514,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ nand_chip->chip_shift = ffs(nand_chip->chipsize) - 1;//0x1C;//ffs(nand_chip->chipsize) - 1;
|
||||
+ nand_chip->cmd_ctrl = mtk_nfc_cmd_ctrl;
|
||||
+
|
||||
+ /* allocate buffers or call select_chip here or a bit earlier*/
|
||||
+ {
|
||||
+ struct nand_buffers *nbuf = kzalloc(sizeof(*nbuf) + mtd->writesize + mtd->oobsize * 3, GFP_KERNEL);
|
||||
+ if (!nbuf) {
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+ nbuf->ecccalc = (uint8_t *)(nbuf + 1);
|
||||
+ nbuf->ecccode = nbuf->ecccalc + mtd->oobsize;
|
||||
+ nbuf->databuf = nbuf->ecccode + mtd->oobsize;
|
||||
+
|
||||
+ nand_chip->buffers = nbuf;
|
||||
+ nand_chip->options |= NAND_OWN_BUFFERS;
|
||||
+ }
|
||||
+
|
||||
+ nand_chip->oob_poi = nand_chip->buffers->databuf + mtd->writesize;
|
||||
+ nand_chip->badblockpos = 0;
|
||||
+
|
||||
+ if (devinfo.pagesize == 4096)
|
||||
+ layout = &nand_oob_128;
|
||||
+ else if (devinfo.pagesize == 2048)
|
||||
|
@ -3555,6 +3537,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ mtd->oobsize = devinfo.sparesize;
|
||||
+ hw->nfi_cs_num = 1;
|
||||
+
|
||||
+ nand_chip->options |= NAND_USE_BOUNCE_BUFFER;
|
||||
+ nand_chip->buf_align = 16;
|
||||
+
|
||||
+ /* Scan to find existance of the device */
|
||||
+ if (nand_scan(mtd, hw->nfi_cs_num)) {
|
||||
+ MSG(INIT, "%s : nand_scan fail.\n", MODULE_NAME);
|
||||
|
@ -3607,9 +3592,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ MSG(INIT, "[NFI] mtk_nand_probe fail, err = %d!\n", err);
|
||||
+ nand_release(mtd);
|
||||
+ platform_set_drvdata(pdev, NULL);
|
||||
+ if ( NULL != nand_chip->buffers) {
|
||||
+ kfree(nand_chip->buffers);
|
||||
+ }
|
||||
+ kfree(host);
|
||||
+ nand_disable_clock();
|
||||
+ return err;
|
||||
|
@ -3623,9 +3605,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ struct nand_chip *nand_chip = &host->nand_chip;
|
||||
+
|
||||
+ nand_release(mtd);
|
||||
+ if ( NULL != nand_chip->buffers) {
|
||||
+ kfree(nand_chip->buffers);
|
||||
+ }
|
||||
+ kfree(host);
|
||||
+ nand_disable_clock();
|
||||
+
|
||||
|
@ -4149,34 +4128,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
nand_get_device(struct mtd_info *mtd, int new_state)
|
||||
{
|
||||
struct nand_chip *chip = mtd_to_nand(mtd);
|
||||
--- a/drivers/mtd/nand/nand_bbt.c
|
||||
+++ b/drivers/mtd/nand/nand_bbt.c
|
||||
@@ -1215,6 +1215,25 @@ err:
|
||||
return res;
|
||||
}
|
||||
|
||||
+void nand_bbt_set(struct mtd_info *mtd, int page, int flag)
|
||||
+{
|
||||
+ struct nand_chip *this = mtd->priv;
|
||||
+ int block;
|
||||
+
|
||||
+ block = (int)(page >> (this->bbt_erase_shift - this->page_shift - 1));
|
||||
+ this->bbt[block >> 3] &= ~(0x03 << (block & 0x6));
|
||||
+ this->bbt[block >> 3] |= (flag & 0x3) << (block & 0x6);
|
||||
+}
|
||||
+
|
||||
+int nand_bbt_get(struct mtd_info *mtd, int page)
|
||||
+{
|
||||
+ struct nand_chip *this = mtd->priv;
|
||||
+ int block;
|
||||
+
|
||||
+ block = (int)(page >> (this->bbt_erase_shift - this->page_shift - 1));
|
||||
+ return (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* nand_update_bbt - update bad block table(s)
|
||||
* @mtd: MTD device structure
|
||||
--- /dev/null
|
||||
+++ b/drivers/mtd/nand/nand_def.h
|
||||
@@ -0,0 +1,123 @@
|
||||
|
|
|
@ -3095,7 +3095,7 @@
|
|||
|
||||
if (priv->hw->mode->set_16kib_bfsize)
|
||||
bfsize = priv->hw->mode->set_16kib_bfsize(dev->mtu);
|
||||
@@ -1033,235 +1234,409 @@ static int init_dma_desc_rings(struct ne
|
||||
@@ -1033,257 +1234,516 @@ static int init_dma_desc_rings(struct ne
|
||||
|
||||
priv->dma_buf_sz = bfsize;
|
||||
|
||||
|
@ -3351,17 +3351,10 @@
|
|||
- priv->tx_skbuff_dma[i].buf,
|
||||
- priv->tx_skbuff_dma[i].len,
|
||||
- DMA_TO_DEVICE);
|
||||
- }
|
||||
+ for (i = 0; i < DMA_TX_SIZE; i++)
|
||||
+ stmmac_free_tx_buffer(priv, queue, i);
|
||||
+}
|
||||
|
||||
- if (priv->tx_skbuff[i]) {
|
||||
- dev_kfree_skb_any(priv->tx_skbuff[i]);
|
||||
- priv->tx_skbuff[i] = NULL;
|
||||
- priv->tx_skbuff_dma[i].buf = 0;
|
||||
- priv->tx_skbuff_dma[i].map_as_page = false;
|
||||
- }
|
||||
+
|
||||
+/**
|
||||
+ * free_dma_rx_desc_resources - free RX dma desc resources
|
||||
+ * @priv: private structure
|
||||
|
@ -3390,11 +3383,10 @@
|
|||
+
|
||||
+ kfree(rx_q->rx_skbuff_dma);
|
||||
+ kfree(rx_q->rx_skbuff);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
- * alloc_dma_desc_resources - alloc TX/RX resources.
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * free_dma_tx_desc_resources - free TX dma desc resources
|
||||
+ * @priv: private structure
|
||||
+ */
|
||||
|
@ -3427,90 +3419,36 @@
|
|||
+
|
||||
+/**
|
||||
+ * alloc_dma_rx_desc_resources - alloc RX resources.
|
||||
* @priv: private structure
|
||||
* Description: according to which descriptor can be used (extend or basic)
|
||||
* this function allocates the resources for TX and RX paths. In case of
|
||||
* reception, for example, it pre-allocated the RX socket buffer in order to
|
||||
* allow zero-copy mechanism.
|
||||
*/
|
||||
-static int alloc_dma_desc_resources(struct stmmac_priv *priv)
|
||||
+ * @priv: private structure
|
||||
+ * Description: according to which descriptor can be used (extend or basic)
|
||||
+ * this function allocates the resources for TX and RX paths. In case of
|
||||
+ * reception, for example, it pre-allocated the RX socket buffer in order to
|
||||
+ * allow zero-copy mechanism.
|
||||
+ */
|
||||
+static int alloc_dma_rx_desc_resources(struct stmmac_priv *priv)
|
||||
{
|
||||
+{
|
||||
+ u32 rx_count = priv->plat->rx_queues_to_use;
|
||||
int ret = -ENOMEM;
|
||||
+ int ret = -ENOMEM;
|
||||
+ u32 queue;
|
||||
|
||||
- priv->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE, sizeof(dma_addr_t),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->rx_skbuff_dma)
|
||||
- return -ENOMEM;
|
||||
+
|
||||
+ /* RX queues buffers and DMA */
|
||||
+ for (queue = 0; queue < rx_count; queue++) {
|
||||
+ struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
|
||||
|
||||
- priv->rx_skbuff = kmalloc_array(DMA_RX_SIZE, sizeof(struct sk_buff *),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->rx_skbuff)
|
||||
- goto err_rx_skbuff;
|
||||
-
|
||||
- priv->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE,
|
||||
- sizeof(*priv->tx_skbuff_dma),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->tx_skbuff_dma)
|
||||
- goto err_tx_skbuff_dma;
|
||||
-
|
||||
- priv->tx_skbuff = kmalloc_array(DMA_TX_SIZE, sizeof(struct sk_buff *),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->tx_skbuff)
|
||||
- goto err_tx_skbuff;
|
||||
-
|
||||
- if (priv->extend_desc) {
|
||||
- priv->dma_erx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct
|
||||
- dma_extended_desc),
|
||||
- &priv->dma_rx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_erx)
|
||||
- goto err_dma;
|
||||
+
|
||||
+ rx_q->queue_index = queue;
|
||||
+ rx_q->priv_data = priv;
|
||||
|
||||
- priv->dma_etx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE *
|
||||
- sizeof(struct
|
||||
- dma_extended_desc),
|
||||
- &priv->dma_tx_phy,
|
||||
+
|
||||
+ rx_q->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE,
|
||||
+ sizeof(dma_addr_t),
|
||||
GFP_KERNEL);
|
||||
- if (!priv->dma_etx) {
|
||||
- dma_free_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_extended_desc),
|
||||
- priv->dma_erx, priv->dma_rx_phy);
|
||||
- goto err_dma;
|
||||
- }
|
||||
- } else {
|
||||
- priv->dma_rx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- &priv->dma_rx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_rx)
|
||||
- goto err_dma;
|
||||
+ GFP_KERNEL);
|
||||
+ if (!rx_q->rx_skbuff_dma)
|
||||
+ return -ENOMEM;
|
||||
|
||||
- priv->dma_tx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- &priv->dma_tx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_tx) {
|
||||
- dma_free_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- priv->dma_rx, priv->dma_rx_phy);
|
||||
+
|
||||
+ rx_q->rx_skbuff = kmalloc_array(DMA_RX_SIZE,
|
||||
+ sizeof(struct sk_buff *),
|
||||
+ GFP_KERNEL);
|
||||
+ if (!rx_q->rx_skbuff)
|
||||
goto err_dma;
|
||||
+ goto err_dma;
|
||||
+
|
||||
+ if (priv->extend_desc) {
|
||||
+ rx_q->dma_erx = dma_zalloc_coherent(priv->device,
|
||||
|
@ -3531,19 +3469,12 @@
|
|||
+ GFP_KERNEL);
|
||||
+ if (!rx_q->dma_rx)
|
||||
+ goto err_dma;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_dma:
|
||||
- kfree(priv->tx_skbuff);
|
||||
-err_tx_skbuff:
|
||||
- kfree(priv->tx_skbuff_dma);
|
||||
-err_tx_skbuff_dma:
|
||||
- kfree(priv->rx_skbuff);
|
||||
-err_rx_skbuff:
|
||||
- kfree(priv->rx_skbuff_dma);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+err_dma:
|
||||
+ free_dma_rx_desc_resources(priv);
|
||||
+
|
||||
+ return ret;
|
||||
|
@ -3600,7 +3531,7 @@
|
|||
+ GFP_KERNEL);
|
||||
+ if (!tx_q->dma_tx)
|
||||
+ goto err_dma_buffers;
|
||||
+ }
|
||||
}
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
|
@ -3629,14 +3560,183 @@
|
|||
+
|
||||
+ ret = alloc_dma_tx_desc_resources(priv);
|
||||
+
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * free_dma_desc_resources - free dma desc resources
|
||||
+ * @priv: private structure
|
||||
+ */
|
||||
static void free_dma_desc_resources(struct stmmac_priv *priv)
|
||||
+static void free_dma_desc_resources(struct stmmac_priv *priv)
|
||||
+{
|
||||
+ /* Release the DMA RX socket buffers */
|
||||
+ free_dma_rx_desc_resources(priv);
|
||||
+
|
||||
+ /* Release the DMA TX socket buffers */
|
||||
+ free_dma_tx_desc_resources(priv);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * stmmac_mac_enable_rx_queues - Enable MAC rx queues
|
||||
+ * @priv: driver private structure
|
||||
+ * Description: It is used for enabling the rx queues in the MAC
|
||||
+ */
|
||||
+static void stmmac_mac_enable_rx_queues(struct stmmac_priv *priv)
|
||||
+{
|
||||
+ u32 rx_queues_count = priv->plat->rx_queues_to_use;
|
||||
+ int queue;
|
||||
+ u8 mode;
|
||||
|
||||
- if (priv->tx_skbuff[i]) {
|
||||
- dev_kfree_skb_any(priv->tx_skbuff[i]);
|
||||
- priv->tx_skbuff[i] = NULL;
|
||||
- priv->tx_skbuff_dma[i].buf = 0;
|
||||
- priv->tx_skbuff_dma[i].map_as_page = false;
|
||||
- }
|
||||
+ for (queue = 0; queue < rx_queues_count; queue++) {
|
||||
+ mode = priv->plat->rx_queues_cfg[queue].mode_to_use;
|
||||
+ priv->hw->mac->rx_queue_enable(priv->hw, mode, queue);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
- * alloc_dma_desc_resources - alloc TX/RX resources.
|
||||
- * @priv: private structure
|
||||
- * Description: according to which descriptor can be used (extend or basic)
|
||||
- * this function allocates the resources for TX and RX paths. In case of
|
||||
- * reception, for example, it pre-allocated the RX socket buffer in order to
|
||||
- * allow zero-copy mechanism.
|
||||
+ * stmmac_start_rx_dma - start RX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: RX channel index
|
||||
+ * Description:
|
||||
+ * This starts a RX DMA channel
|
||||
*/
|
||||
-static int alloc_dma_desc_resources(struct stmmac_priv *priv)
|
||||
+static void stmmac_start_rx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
{
|
||||
- int ret = -ENOMEM;
|
||||
-
|
||||
- priv->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE, sizeof(dma_addr_t),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->rx_skbuff_dma)
|
||||
- return -ENOMEM;
|
||||
-
|
||||
- priv->rx_skbuff = kmalloc_array(DMA_RX_SIZE, sizeof(struct sk_buff *),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->rx_skbuff)
|
||||
- goto err_rx_skbuff;
|
||||
-
|
||||
- priv->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE,
|
||||
- sizeof(*priv->tx_skbuff_dma),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->tx_skbuff_dma)
|
||||
- goto err_tx_skbuff_dma;
|
||||
-
|
||||
- priv->tx_skbuff = kmalloc_array(DMA_TX_SIZE, sizeof(struct sk_buff *),
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->tx_skbuff)
|
||||
- goto err_tx_skbuff;
|
||||
-
|
||||
- if (priv->extend_desc) {
|
||||
- priv->dma_erx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct
|
||||
- dma_extended_desc),
|
||||
- &priv->dma_rx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_erx)
|
||||
- goto err_dma;
|
||||
-
|
||||
- priv->dma_etx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE *
|
||||
- sizeof(struct
|
||||
- dma_extended_desc),
|
||||
- &priv->dma_tx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_etx) {
|
||||
- dma_free_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_extended_desc),
|
||||
- priv->dma_erx, priv->dma_rx_phy);
|
||||
- goto err_dma;
|
||||
- }
|
||||
- } else {
|
||||
- priv->dma_rx = dma_zalloc_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- &priv->dma_rx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_rx)
|
||||
- goto err_dma;
|
||||
+ netdev_dbg(priv->dev, "DMA RX processes started in channel %d\n", chan);
|
||||
+ priv->hw->dma->start_rx(priv->ioaddr, chan);
|
||||
+}
|
||||
|
||||
- priv->dma_tx = dma_zalloc_coherent(priv->device, DMA_TX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- &priv->dma_tx_phy,
|
||||
- GFP_KERNEL);
|
||||
- if (!priv->dma_tx) {
|
||||
- dma_free_coherent(priv->device, DMA_RX_SIZE *
|
||||
- sizeof(struct dma_desc),
|
||||
- priv->dma_rx, priv->dma_rx_phy);
|
||||
- goto err_dma;
|
||||
- }
|
||||
- }
|
||||
+/**
|
||||
+ * stmmac_start_tx_dma - start TX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: TX channel index
|
||||
+ * Description:
|
||||
+ * This starts a TX DMA channel
|
||||
+ */
|
||||
+static void stmmac_start_tx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA TX processes started in channel %d\n", chan);
|
||||
+ priv->hw->dma->start_tx(priv->ioaddr, chan);
|
||||
+}
|
||||
|
||||
- return 0;
|
||||
+/**
|
||||
+ * stmmac_stop_rx_dma - stop RX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: RX channel index
|
||||
+ * Description:
|
||||
+ * This stops a RX DMA channel
|
||||
+ */
|
||||
+static void stmmac_stop_rx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA RX processes stopped in channel %d\n", chan);
|
||||
+ priv->hw->dma->stop_rx(priv->ioaddr, chan);
|
||||
+}
|
||||
|
||||
-err_dma:
|
||||
- kfree(priv->tx_skbuff);
|
||||
-err_tx_skbuff:
|
||||
- kfree(priv->tx_skbuff_dma);
|
||||
-err_tx_skbuff_dma:
|
||||
- kfree(priv->rx_skbuff);
|
||||
-err_rx_skbuff:
|
||||
- kfree(priv->rx_skbuff_dma);
|
||||
- return ret;
|
||||
+/**
|
||||
+ * stmmac_stop_tx_dma - stop TX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: TX channel index
|
||||
+ * Description:
|
||||
+ * This stops a TX DMA channel
|
||||
+ */
|
||||
+static void stmmac_stop_tx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA TX processes stopped in channel %d\n", chan);
|
||||
+ priv->hw->dma->stop_tx(priv->ioaddr, chan);
|
||||
}
|
||||
|
||||
-static void free_dma_desc_resources(struct stmmac_priv *priv)
|
||||
+/**
|
||||
+ * stmmac_start_all_dma - start all RX and TX DMA channels
|
||||
+ * @priv: driver private structure
|
||||
+ * Description:
|
||||
+ * This starts all the RX and TX DMA channels
|
||||
+ */
|
||||
+static void stmmac_start_all_dma(struct stmmac_priv *priv)
|
||||
{
|
||||
- /* Release the DMA TX/RX socket buffers */
|
||||
- dma_free_rx_skbufs(priv);
|
||||
|
@ -3662,99 +3762,6 @@
|
|||
- kfree(priv->rx_skbuff);
|
||||
- kfree(priv->tx_skbuff_dma);
|
||||
- kfree(priv->tx_skbuff);
|
||||
+ /* Release the DMA RX socket buffers */
|
||||
+ free_dma_rx_desc_resources(priv);
|
||||
+
|
||||
+ /* Release the DMA TX socket buffers */
|
||||
+ free_dma_tx_desc_resources(priv);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1271,19 +1646,104 @@ static void free_dma_desc_resources(stru
|
||||
*/
|
||||
static void stmmac_mac_enable_rx_queues(struct stmmac_priv *priv)
|
||||
{
|
||||
- int rx_count = priv->dma_cap.number_rx_queues;
|
||||
- int queue = 0;
|
||||
+ u32 rx_queues_count = priv->plat->rx_queues_to_use;
|
||||
+ int queue;
|
||||
+ u8 mode;
|
||||
|
||||
- /* If GMAC does not have multiple queues, then this is not necessary*/
|
||||
- if (rx_count == 1)
|
||||
- return;
|
||||
+ for (queue = 0; queue < rx_queues_count; queue++) {
|
||||
+ mode = priv->plat->rx_queues_cfg[queue].mode_to_use;
|
||||
+ priv->hw->mac->rx_queue_enable(priv->hw, mode, queue);
|
||||
+ }
|
||||
+}
|
||||
|
||||
- /**
|
||||
- * If the core is synthesized with multiple rx queues / multiple
|
||||
- * dma channels, then rx queues will be disabled by default.
|
||||
- * For now only rx queue 0 is enabled.
|
||||
- */
|
||||
- priv->hw->mac->rx_queue_enable(priv->hw, queue);
|
||||
+/**
|
||||
+ * stmmac_start_rx_dma - start RX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: RX channel index
|
||||
+ * Description:
|
||||
+ * This starts a RX DMA channel
|
||||
+ */
|
||||
+static void stmmac_start_rx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA RX processes started in channel %d\n", chan);
|
||||
+ priv->hw->dma->start_rx(priv->ioaddr, chan);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * stmmac_start_tx_dma - start TX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: TX channel index
|
||||
+ * Description:
|
||||
+ * This starts a TX DMA channel
|
||||
+ */
|
||||
+static void stmmac_start_tx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA TX processes started in channel %d\n", chan);
|
||||
+ priv->hw->dma->start_tx(priv->ioaddr, chan);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * stmmac_stop_rx_dma - stop RX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: RX channel index
|
||||
+ * Description:
|
||||
+ * This stops a RX DMA channel
|
||||
+ */
|
||||
+static void stmmac_stop_rx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA RX processes stopped in channel %d\n", chan);
|
||||
+ priv->hw->dma->stop_rx(priv->ioaddr, chan);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * stmmac_stop_tx_dma - stop TX DMA channel
|
||||
+ * @priv: driver private structure
|
||||
+ * @chan: TX channel index
|
||||
+ * Description:
|
||||
+ * This stops a TX DMA channel
|
||||
+ */
|
||||
+static void stmmac_stop_tx_dma(struct stmmac_priv *priv, u32 chan)
|
||||
+{
|
||||
+ netdev_dbg(priv->dev, "DMA TX processes stopped in channel %d\n", chan);
|
||||
+ priv->hw->dma->stop_tx(priv->ioaddr, chan);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * stmmac_start_all_dma - start all RX and TX DMA channels
|
||||
+ * @priv: driver private structure
|
||||
+ * Description:
|
||||
+ * This starts all the RX and TX DMA channels
|
||||
+ */
|
||||
+static void stmmac_start_all_dma(struct stmmac_priv *priv)
|
||||
+{
|
||||
+ u32 rx_channels_count = priv->plat->rx_queues_to_use;
|
||||
+ u32 tx_channels_count = priv->plat->tx_queues_to_use;
|
||||
+ u32 chan = 0;
|
||||
|
@ -3764,23 +3771,38 @@
|
|||
+
|
||||
+ for (chan = 0; chan < tx_channels_count; chan++)
|
||||
+ stmmac_start_tx_dma(priv, chan);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
}
|
||||
|
||||
/**
|
||||
- * stmmac_mac_enable_rx_queues - Enable MAC rx queues
|
||||
- * @priv: driver private structure
|
||||
- * Description: It is used for enabling the rx queues in the MAC
|
||||
+ * stmmac_stop_all_dma - stop all RX and TX DMA channels
|
||||
+ * @priv: driver private structure
|
||||
+ * Description:
|
||||
+ * This stops the RX and TX DMA channels
|
||||
+ */
|
||||
*/
|
||||
-static void stmmac_mac_enable_rx_queues(struct stmmac_priv *priv)
|
||||
+static void stmmac_stop_all_dma(struct stmmac_priv *priv)
|
||||
+{
|
||||
{
|
||||
- int rx_count = priv->dma_cap.number_rx_queues;
|
||||
- int queue = 0;
|
||||
+ u32 rx_channels_count = priv->plat->rx_queues_to_use;
|
||||
+ u32 tx_channels_count = priv->plat->tx_queues_to_use;
|
||||
+ u32 chan = 0;
|
||||
+
|
||||
|
||||
- /* If GMAC does not have multiple queues, then this is not necessary*/
|
||||
- if (rx_count == 1)
|
||||
- return;
|
||||
+ for (chan = 0; chan < rx_channels_count; chan++)
|
||||
+ stmmac_stop_rx_dma(priv, chan);
|
||||
+
|
||||
|
||||
- /**
|
||||
- * If the core is synthesized with multiple rx queues / multiple
|
||||
- * dma channels, then rx queues will be disabled by default.
|
||||
- * For now only rx queue 0 is enabled.
|
||||
- */
|
||||
- priv->hw->mac->rx_queue_enable(priv->hw, queue);
|
||||
+ for (chan = 0; chan < tx_channels_count; chan++)
|
||||
+ stmmac_stop_tx_dma(priv, chan);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue