* [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode
@ 2026-06-25 9:08 Jiawen Wu
2026-06-25 9:39 ` Larysa Zaremba
0 siblings, 1 reply; 4+ messages in thread
From: Jiawen Wu @ 2026-06-25 9:08 UTC (permalink / raw)
To: netdev
Cc: Mengyuan Lou, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Simon Horman, Larysa Zaremba,
Kees Cook, Jiawen Wu
In wx_set_vmdq_queues(), the VMDQ mask was not set for the devices not
support WX_FLAG_MULTI_64_FUNC, i.e., NGBE devices. A mask of 0 causes
__ALIGN_MASK(1, ~vmdq->mask) to return 0, which incorrectly sets
q_per_pool to 0 in wx_write_qde().
Fix the VMDQ 1-queue mask to 0x7F then ensures that __ALIGN_MASK(1,
0x7F) correctly evaluates to 1.
Fixes: c52d4b898901 ("net: libwx: Redesign flow when sriov is enabled")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 +
drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index d042567b8128..814d88d2aee4 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -1802,6 +1802,7 @@ static bool wx_set_vmdq_queues(struct wx *wx)
rss_i = 4;
}
} else {
+ vmdq_m = WX_VMDQ_1Q_MASK;
/* double check we are limited to maximum pools */
vmdq_i = min_t(u16, 8, vmdq_i);
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index c7befe4cdfe9..65e3e55db1cf 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
@@ -486,6 +486,7 @@ enum WX_MSCA_CMD_value {
#define WX_VMDQ_4Q_MASK 0x7C
#define WX_VMDQ_2Q_MASK 0x7E
+#define WX_VMDQ_1Q_MASK 0x7F
/****************** Manageablility Host Interface defines ********************/
#define WX_HI_MAX_BLOCK_BYTE_LENGTH 256 /* Num of bytes in range */
--
2.51.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode 2026-06-25 9:08 [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode Jiawen Wu @ 2026-06-25 9:39 ` Larysa Zaremba 2026-06-25 9:44 ` Jiawen Wu 0 siblings, 1 reply; 4+ messages in thread From: Larysa Zaremba @ 2026-06-25 9:39 UTC (permalink / raw) To: Jiawen Wu Cc: netdev, Mengyuan Lou, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Simon Horman, Kees Cook On Thu, Jun 25, 2026 at 05:08:51PM +0800, Jiawen Wu wrote: > In wx_set_vmdq_queues(), the VMDQ mask was not set for the devices not > support WX_FLAG_MULTI_64_FUNC, i.e., NGBE devices. A mask of 0 causes > __ALIGN_MASK(1, ~vmdq->mask) to return 0, which incorrectly sets > q_per_pool to 0 in wx_write_qde(). > > Fix the VMDQ 1-queue mask to 0x7F then ensures that __ALIGN_MASK(1, > 0x7F) correctly evaluates to 1. __ALIGN_MASK(1, 0x7F) evaulates to 0x80 (128), not to 1. __ALIGN_MASK(1, 0x7E) evaluates to 1. Maybe you need 0x7D for 2 queues and 0x7E for 1 queue? > > Fixes: c52d4b898901 ("net: libwx: Redesign flow when sriov is enabled") > Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> > --- > drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + > drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > index d042567b8128..814d88d2aee4 100644 > --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c > +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > @@ -1802,6 +1802,7 @@ static bool wx_set_vmdq_queues(struct wx *wx) > rss_i = 4; > } > } else { > + vmdq_m = WX_VMDQ_1Q_MASK; > /* double check we are limited to maximum pools */ > vmdq_i = min_t(u16, 8, vmdq_i); > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h > index c7befe4cdfe9..65e3e55db1cf 100644 > --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h > +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h > @@ -486,6 +486,7 @@ enum WX_MSCA_CMD_value { > > #define WX_VMDQ_4Q_MASK 0x7C > #define WX_VMDQ_2Q_MASK 0x7E > +#define WX_VMDQ_1Q_MASK 0x7F > > /****************** Manageablility Host Interface defines ********************/ > #define WX_HI_MAX_BLOCK_BYTE_LENGTH 256 /* Num of bytes in range */ > -- > 2.51.0 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode 2026-06-25 9:39 ` Larysa Zaremba @ 2026-06-25 9:44 ` Jiawen Wu 2026-06-25 10:14 ` Larysa Zaremba 0 siblings, 1 reply; 4+ messages in thread From: Jiawen Wu @ 2026-06-25 9:44 UTC (permalink / raw) To: 'Larysa Zaremba' Cc: netdev, 'Mengyuan Lou', 'Andrew Lunn', 'David S. Miller', 'Eric Dumazet', 'Jakub Kicinski', 'Paolo Abeni', 'Simon Horman', 'Kees Cook' On Thu, Jun 25, 2026 5:39 PM, Larysa Zaremba wrote: > On Thu, Jun 25, 2026 at 05:08:51PM +0800, Jiawen Wu wrote: > > In wx_set_vmdq_queues(), the VMDQ mask was not set for the devices not > > support WX_FLAG_MULTI_64_FUNC, i.e., NGBE devices. A mask of 0 causes > > __ALIGN_MASK(1, ~vmdq->mask) to return 0, which incorrectly sets > > q_per_pool to 0 in wx_write_qde(). > > > > Fix the VMDQ 1-queue mask to 0x7F then ensures that __ALIGN_MASK(1, > > 0x7F) correctly evaluates to 1. > > __ALIGN_MASK(1, 0x7F) evaulates to 0x80 (128), not to 1. __ALIGN_MASK(1, 0x7E) > evaluates to 1. Maybe you need 0x7D for 2 queues and 0x7E for 1 queue? Sorry, the commit log is so wrong for that '~' is missing... I want to describe that __ALIGN_MASK(1, ~0x7F) evaluates to 1. > > > > > Fixes: c52d4b898901 ("net: libwx: Redesign flow when sriov is enabled") > > Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> > > --- > > drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + > > drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > index d042567b8128..814d88d2aee4 100644 > > --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > @@ -1802,6 +1802,7 @@ static bool wx_set_vmdq_queues(struct wx *wx) > > rss_i = 4; > > } > > } else { > > + vmdq_m = WX_VMDQ_1Q_MASK; > > /* double check we are limited to maximum pools */ > > vmdq_i = min_t(u16, 8, vmdq_i); > > > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h > > index c7befe4cdfe9..65e3e55db1cf 100644 > > --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h > > +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h > > @@ -486,6 +486,7 @@ enum WX_MSCA_CMD_value { > > > > #define WX_VMDQ_4Q_MASK 0x7C > > #define WX_VMDQ_2Q_MASK 0x7E > > +#define WX_VMDQ_1Q_MASK 0x7F > > > > /****************** Manageablility Host Interface defines ********************/ > > #define WX_HI_MAX_BLOCK_BYTE_LENGTH 256 /* Num of bytes in range */ > > -- > > 2.51.0 > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode 2026-06-25 9:44 ` Jiawen Wu @ 2026-06-25 10:14 ` Larysa Zaremba 0 siblings, 0 replies; 4+ messages in thread From: Larysa Zaremba @ 2026-06-25 10:14 UTC (permalink / raw) To: Jiawen Wu Cc: netdev, 'Mengyuan Lou', 'Andrew Lunn', 'David S. Miller', 'Eric Dumazet', 'Jakub Kicinski', 'Paolo Abeni', 'Simon Horman', 'Kees Cook' On Thu, Jun 25, 2026 at 05:44:33PM +0800, Jiawen Wu wrote: > On Thu, Jun 25, 2026 5:39 PM, Larysa Zaremba wrote: > > On Thu, Jun 25, 2026 at 05:08:51PM +0800, Jiawen Wu wrote: > > > In wx_set_vmdq_queues(), the VMDQ mask was not set for the devices not > > > support WX_FLAG_MULTI_64_FUNC, i.e., NGBE devices. A mask of 0 causes > > > __ALIGN_MASK(1, ~vmdq->mask) to return 0, which incorrectly sets > > > q_per_pool to 0 in wx_write_qde(). > > > > > > Fix the VMDQ 1-queue mask to 0x7F then ensures that __ALIGN_MASK(1, > > > 0x7F) correctly evaluates to 1. > > > > __ALIGN_MASK(1, 0x7F) evaulates to 0x80 (128), not to 1. __ALIGN_MASK(1, 0x7E) > > evaluates to 1. Maybe you need 0x7D for 2 queues and 0x7E for 1 queue? > > Sorry, the commit log is so wrong for that '~' is missing... > I want to describe that __ALIGN_MASK(1, ~0x7F) evaluates to 1. > Then I do not have any further concerns. Given you fix the lack of "~" in the commit message and change "not support" to "not supporting" above, I approve this patch. Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com> > > > > > > > > Fixes: c52d4b898901 ("net: libwx: Redesign flow when sriov is enabled") > > > Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> > > > --- > > > drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + > > > drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 + > > > 2 files changed, 2 insertions(+) > > > > > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > > index d042567b8128..814d88d2aee4 100644 > > > --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > > +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c > > > @@ -1802,6 +1802,7 @@ static bool wx_set_vmdq_queues(struct wx *wx) > > > rss_i = 4; > > > } > > > } else { > > > + vmdq_m = WX_VMDQ_1Q_MASK; > > > /* double check we are limited to maximum pools */ > > > vmdq_i = min_t(u16, 8, vmdq_i); > > > > > > diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h > > > index c7befe4cdfe9..65e3e55db1cf 100644 > > > --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h > > > +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h > > > @@ -486,6 +486,7 @@ enum WX_MSCA_CMD_value { > > > > > > #define WX_VMDQ_4Q_MASK 0x7C > > > #define WX_VMDQ_2Q_MASK 0x7E > > > +#define WX_VMDQ_1Q_MASK 0x7F > > > > > > /****************** Manageablility Host Interface defines ********************/ > > > #define WX_HI_MAX_BLOCK_BYTE_LENGTH 256 /* Num of bytes in range */ > > > -- > > > 2.51.0 > > > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-06-25 10:14 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-06-25 9:08 [PATCH net] net: libwx: fix VMDQ mask for 1-queue mode Jiawen Wu 2026-06-25 9:39 ` Larysa Zaremba 2026-06-25 9:44 ` Jiawen Wu 2026-06-25 10:14 ` Larysa Zaremba
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox