Commit 0de94de1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'skbedit-batch-fixes' 



Roman Mashak says:

====================
Fix batched event generation for skbedit action

When adding or deleting a batch of entries, the kernel sends up to
TCA_ACT_MAX_PRIO (defined to 32 in kernel) entries in an event to user
space. However it does not consider that the action sizes may vary and
require different skb sizes.

For example, consider the following script adding 32 entries with all
supported skbedit parameters and cookie (in order to maximize netlink
messages size):

% cat tc-batch.sh
TC="sudo /mnt/iproute2.git/tc/tc"

$TC actions flush action skbedit
for i in `seq 1 $1`;
do
   cmd="action skbedit queue_mapping 2 priority 10 mark 7/0xaabbccdd \
               ptype host inheritdsfield \
               index $i cookie aabbccddeeff112233445566778800a1 "
   args=$args$cmd
done
$TC actions add $args
%
% ./tc-batch.sh 32
Error: Failed to fill netlink attributes while adding TC action.
We have an error talking to the kernel
%

patch 1 adds callback in tc_action_ops of skbedit action, which calculates
the action size, and passes size to tcf_add_notify()/tcf_del_notify().

patch 2 updates the TDC test suite with relevant skbedit test cases.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e3e3af9a 7bc16184

net/sched/act_skbedit.c

+12 −0
Original line number Diff line number Diff line
@@ -307,6 +307,17 @@ static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index) 
	return tcf_idr_search(tn, a, index);

}



static size_t tcf_skbedit_get_fill_size(const struct tc_action *act)

{

	return nla_total_size(sizeof(struct tc_skbedit))

		+ nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_PRIORITY */

		+ nla_total_size(sizeof(u16)) /* TCA_SKBEDIT_QUEUE_MAPPING */

		+ nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_MARK */

		+ nla_total_size(sizeof(u16)) /* TCA_SKBEDIT_PTYPE */

		+ nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_MASK */

		+ nla_total_size_64bit(sizeof(u64)); /* TCA_SKBEDIT_FLAGS */

}



static struct tc_action_ops act_skbedit_ops = {

	.kind		=	"skbedit",

	.id		=	TCA_ID_SKBEDIT,
@@ -316,6 +327,7 @@ static struct tc_action_ops act_skbedit_ops = { 
	.init		=	tcf_skbedit_init,

	.cleanup	=	tcf_skbedit_cleanup,

	.walk		=	tcf_skbedit_walker,

	.get_fill_size	=	tcf_skbedit_get_fill_size,

	.lookup		=	tcf_skbedit_search,

	.size		=	sizeof(struct tcf_skbedit),

};

tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json

+47 −0
Original line number Diff line number Diff line
@@ -670,5 +670,52 @@ 
        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "630c",

        "name": "Add batch of 32 skbedit actions with all parameters and cookie",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit queue_mapping 2 priority 10 mark 7/0xaabbccdd ptype host inheritdsfield index \\$i cookie aabbccddeeff112233445566778800a1 \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\"",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "^[ \t]+index [0-9]+ ref",

        "matchCount": "32",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "706d",

        "name": "Delete batch of 32 skbedit actions with all parameters",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ],

            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit queue_mapping 2 priority 10 mark 7/0xaabbccdd ptype host inheritdsfield index \\$i \\\"; args=\\\"\\$args\\$cmd\\\"; done && $TC actions add \\$args\""

        ],

        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit index \\$i \\\"; args=\"\\$args\\$cmd\"; done && $TC actions del \\$args\"",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "^[ \t]+index [0-9]+ ref",

        "matchCount": "0",

        "teardown": []

    }

]

CRA Git | Maintained and supported by SUSTech CRA and CCSE