Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d8d38df authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'act_csum-get_fill_size' 



Craig Dillabaugh says:

====================
Update csum tc action for batch operation.

This patchset includes two patches the first updating act_csum.c
to include the get_fill_size routine required for batch operation, and
the second including updated TDC tests for the feature.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5693ee4b 2c785b38

net/sched/act_csum.c

+6 −0
Original line number Diff line number Diff line
@@ -648,6 +648,11 @@ static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index, 
	return tcf_idr_search(tn, a, index);

}



static size_t tcf_csum_get_fill_size(const struct tc_action *act)

{

	return nla_total_size(sizeof(struct tc_csum));

}



static struct tc_action_ops act_csum_ops = {

	.kind		= "csum",

	.type		= TCA_ACT_CSUM,
@@ -658,6 +663,7 @@ static struct tc_action_ops act_csum_ops = { 
	.cleanup	= tcf_csum_cleanup,

	.walk		= tcf_csum_walker,

	.lookup		= tcf_csum_search,

	.get_fill_size  = tcf_csum_get_fill_size,

	.size		= sizeof(struct tcf_csum),

};

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

+72 −2
Original line number Diff line number Diff line
@@ -398,13 +398,83 @@ 
                255

            ]

        ],

        "cmdUnderTest": "for i in `seq 1 32`; do cmd=\"action csum tcp continue index $i \"; args=\"$args$cmd\"; done && $TC actions add $args",

        "expExitCode": "255",

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

        "expExitCode": "0",

        "verifyCmd": "$TC actions ls action csum",

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

        "matchCount": "32",

        "teardown": [

            "$TC actions flush action csum"

        ]

    },

    {

        "id": "b4e9",

        "name": "Delete batch of 32 csum actions",

        "category": [

            "actions",

            "csum"

        ],

        "setup": [

            [

                "$TC actions flush action csum",

                0,

                1,

                255

            ],

            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action csum tcp continue index \\$i \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\""

        ],

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

        "expExitCode": "0",

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

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

        "matchCount": "0",

        "teardown": []

    },

    {

        "id": "0015",

        "name": "Add batch of 32 csum tcp actions with large cookies",

        "category": [

            "actions",

            "csum"

        ],

        "setup": [

            [

                "$TC actions flush action csum",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action csum tcp continue index \\$i cookie aaabbbcccdddeee \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\"",

        "expExitCode": "0",

        "verifyCmd": "$TC actions ls action csum",

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

        "matchCount": "32",

        "teardown": [

            "$TC actions flush action csum"

        ]

    },

    {

        "id": "989e",

        "name": "Delete batch of 32 csum actions with large cookies",

        "category": [

            "actions",

            "csum"

        ],

        "setup": [

            [

                "$TC actions flush action csum",

                0,

                1,

                255

            ],

            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action csum tcp continue index \\$i cookie aaabbbcccdddeee \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\""

        ],

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

        "expExitCode": "0",

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

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

        "matchCount": "0",

        "teardown": []

    }

]