On 7/10/23 15:51, Robin Jarry wrote:
> Ilya Maximets, Jul 10, 2023 at 15:48:
>> In order to speed up the process a bit, proposing a following incremental
>> change:
>>
>> diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
>> index 27b2fa5e0..aa87ee546 100644
>> --- a/lib/netdev-dpdk.c
>> +++ b/lib/netdev-dpdk.c
>> @@ -2074,23 +2074,23 @@ dpdk_set_rx_steer_config(struct netdev *netdev,
>> struct netdev_dpdk *dev,
>> const char *arg = smap_get_def(args, "rx-steering", "rss");
>> uint64_t flags = 0;
>>
>> - if (nullable_string_is_equal(arg, "rss+lacp")) {
>> + if (!strcmp(arg, "rss+lacp")) {
>> flags = DPDK_RX_STEER_LACP;
>> - } else if (!nullable_string_is_equal(arg, "rss")) {
>> - VLOG_WARN_BUF(errp, "%s options:rx-steering "
>> + } else if (strcmp(arg, "rss")) {
>> + VLOG_WARN_BUF(errp, "%s: options:rx-steering "
>> "unsupported parameter value '%s'",
>> netdev_get_name(netdev), arg);
>> }
>>
>> if (flags && dev->type != DPDK_DEV_ETH) {
>> - VLOG_WARN_BUF(errp, "%s options:rx-steering "
>> + VLOG_WARN_BUF(errp, "%s: options:rx-steering "
>> "is only supported on ethernet ports",
>> netdev_get_name(netdev));
>> flags = 0;
>> }
>>
>> if (flags && netdev_is_flow_api_enabled()) {
>> - VLOG_WARN_BUF(errp, "%s options:rx-steering "
>> + VLOG_WARN_BUF(errp, "%s: options:rx-steering "
>> "is incompatible with hw-offload",
>> netdev_get_name(netdev));
>> flags = 0;
>> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
>> index 2f756b1b7..01408e90a 100644
>> --- a/vswitchd/vswitch.xml
>> +++ b/vswitchd/vswitch.xml
>> @@ -3539,9 +3539,9 @@ ovs-vsctl add-port br0 p0 -- set Interface p0
>> type=patch options:peer=p1 \
>> </dd>
>> </dl>
>> <p>
>> - If the user has already configured multiple
>> - <code>options:n_rxq</code> on the port, an additional one will be
>> - allocated for the specified protocols. Even if the hardware cannot
>> + If the user has already configured multiple <ref table="Interface"
>> + column="options" key="n_rxq" /> on the port, an additional one
>> will
>> + be allocated for the specified protocols. Even if the hardware
>> cannot
>> satisfy the requested number of requested Rx queues, the last Rx
>> queue will be used. If only one Rx queue is available or if the
>> hardware does not support the rte_flow matchers/actions required
>> to
>> @@ -3551,10 +3551,14 @@ ovs-vsctl add-port br0 p0 -- set Interface p0
>> type=patch options:peer=p1 \
>> <p>
>> This feature is mutually exclusive with
>> <ref table="Open_vSwitch" column="other_config" key="hw-offload"
>> />
>> - as it may conflict with the offloaded RTE flows. If both are
>> enabled,
>> + as it may conflict with the offloaded flows. If both are enabled,
>> <code>rx-steering</code> will fall back to default
>> <code>rss</code>
>> mode.
>> </p>
>> + <p>
>> + This option is only applicable to interfaces with type
>> + <code>dpdk</code>.
>> + </p>
>> </column>
>>
>> <column name="other_config" key="tx-steering"
>> ---
>>
>> If that looks good to you, I could fold it in while applying the patch.
>> What do you think?
>>
>> Best regards, Ilya Maximets.
>
> Yes, that'll be faster. Thanks!
>
Thanks, Robin, Kevin and Aaron! Applied.
Best regards, Ilya Maximets.
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
