openwrt-mirror/openwrt
1
0 Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-10-24 08:27:49 +04:00
Code Issues Packages Projects Releases Wiki Activity

realtek: pie: rtl839x: let L3 rules match IPv6 destinations

Browse Source 
Since b98061ac6e ("realtek: pie: rtl839x: keep the first 512 rules
for L3") blocks 0-3 hold only L3 rules. Blocks 0-2 select templates 0
and 1, block 3 templates 2 and 3, and an L3 rule takes the first
template of its block that has the IPv4 destination (DIP0): template 1,
or template 2 in block 3. Of the fixed templates only template 3 holds
a whole IPv6 destination (DIP0 to DIP7), so an IPv6 rule could only go
to block 3.

Select templates 1 and 3 in blocks 0-3, and let an L3 rule that
matches an IPv6 destination take the template with DIP2, so that IPv4
and IPv6 rules can each use the whole L3 range (#25768). IPv4 rules
now match on template 1 in all four blocks, which holds the IPv4
destination as template 2 did in block 3. Blocks 4 and up keep their
templates.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Gennaro Cimmino <gcimmino@rayonra.net>
Link: https://github.com/openwrt/openwrt/pull/25838
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
This commit is contained in:
Gennaro Cimmino authored and Markus Stockhausen committed 2026-10-12 18:54:45 +02:00
1 parent 724cf05db2
commit b086ad2f28
1 file changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/realtek/files-6.18/drivers/net/dsa/rtl83xx/pie.c
+10 -8
View File
@@ -1790,11 +1790,13 @@ void rtl839x_pie_rule_rm(struct rtl838x_switch_priv *priv, struct pie_rule *pr)
/* L3 keeps its rules in an order of its own, the longest prefix first, so it
* writes each one in place, in the rules rtl839x_pie_init() keeps for it. A
* rule matches the IPv4 destination and takes the template of its block that
* has one.
* rule matches the IPv4 or IPv6 destination and takes the template of its
* block that has it.
*/
int rtl839x_pie_l3_rule_write(struct rtl838x_switch_priv *priv, int idx, struct pie_rule *pr)
{
enum rtl839x_template_field_id dip = pr->is_ipv6 ? RTL839X_TEMPLATE_FIELD_DIP2 :
RTL839X_TEMPLATE_FIELD_DIP0;
int block = idx / PIE_BLOCK_SIZE;
int j, t;
@@ -1803,7 +1805,7 @@ int rtl839x_pie_l3_rule_write(struct rtl838x_switch_priv *priv, int idx, struct
for (j = 0; j < 2; j++) {
t = (sw_r32(RTL839X_ACL_BLK_TMPLTE_CTRL(block)) >> (j * 3)) & 0x7;
if (rtl839x_pie_templ_has(t, RTL839X_TEMPLATE_FIELD_DIP0))
if (rtl839x_pie_templ_has(t, dip))
break;
}
if (j == 2)
@@ -1843,14 +1845,14 @@ void rtl839x_pie_init(struct rtl838x_switch_priv *priv)
/* Never hand out L3's rules, see rtl839x_pie_l3_rule_write() */
bitmap_set(priv->pie_use_bm, 0, RTL839X_PIE_L3_RULES);
/* Enable predefined templates 0, 1 for blocks 0-2 */
template_selectors = 0 | (1 << 3);
for (int i = 0; i < 3; i++)
/* L3's blocks: template 1 for its IPv4 rules, 3 for its IPv6 ones */
template_selectors = 1 | (3 << 3);
for (int i = 0; i < RTL839X_PIE_L3_RULES / PIE_BLOCK_SIZE; i++)
sw_w32(template_selectors, RTL839X_ACL_BLK_TMPLTE_CTRL(i));
/* Enable predefined templates 2, 3 for blocks 3-5 */
/* Enable predefined templates 2, 3 for blocks 4-5 */
template_selectors = 2 | (3 << 3);
for (int i = 3; i < 6; i++)
for (int i = RTL839X_PIE_L3_RULES / PIE_BLOCK_SIZE; i < 6; i++)
sw_w32(template_selectors, RTL839X_ACL_BLK_TMPLTE_CTRL(i));
/* Enable predefined templates 1, 4 for blocks 6-8 */