ON-14783: Use additional NIC flags for X3522 #68
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |
| \**************************************************************************/ | ||
|
|
||
|
|
||
| #include <cerrno> | ||
| #include <zf/zf.h> | ||
| #include <zf_internal/private/zf_hal.h> | ||
| #include <zf_internal/zf_pool_res.h> | ||
|
|
@@ -242,19 +243,25 @@ static int zf_stack_init_pio(struct zf_stack_impl* sti, struct zf_attr* attr, | |
| struct zf_stack_nic* st_nic = &st->nic[nicno]; | ||
| struct zf_stack_res_nic* sti_nic = &sti->nic[nicno]; | ||
| ef_vi* vi = zf_stack_nic_tx_vi(st_nic); | ||
| unsigned long pio_available; | ||
| /* Check whether the NIC supports PIO mode. */ | ||
| int rc = ef_pd_capabilities_get(sti_nic->dh, &sti_nic->pd, sti_nic->dh, | ||
| EF_VI_CAP_PIO, &pio_available); | ||
| if ( rc != 0 ) { | ||
| pio_available = 0; | ||
| zf_log_stack_warn(st, "Failed to query PIO capability (rc = %d)\n", rc); | ||
| if( attr->pio >= PIO_MUST_USE ) { | ||
| zf_log_stack_warn(st, | ||
| "PIO not supported by %s but pio=%d. " | ||
| "Not attempting to allocate PIO buffer.\n", | ||
| sti_nic->if_name, attr->pio); | ||
| st_nic->pio.busy = 3; | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| /* Try to allocate. If alloc fails and we are in-strict mode (2) then fail */ | ||
| rc = ef_pio_alloc(&sti_nic->pio, sti_nic->dh, &sti_nic->pd, | ||
| -1, sti_nic->dh); | ||
| if( rc < 0 && attr->pio >= PIO_MUST_USE ) { | ||
| zf_log_stack_err(st, "Failed to allocate PIO buffer (rc = %d)\n", rc); | ||
|
|
@@ -499,36 +506,45 @@ static int zf_stack_init_nic_capabilities(struct zf_stack* st, int nicno) | |
|
|
||
| sti->nic[nicno].flags = 0; | ||
|
|
||
| rc = ef_pd_capabilities_get(dh, pd, dh, EF_VI_CAP_RX_SHARED, &variant); | ||
| if( rc == 0 ) | ||
| sti->nic[nicno].flags |= ZF_RES_NIC_FLAG_SHARED_RXQ; | ||
| else { | ||
| rc = ef_pd_capabilities_get(dh, pd, dh, EF_VI_CAP_RX_FW_VARIANT, &variant); | ||
| if ( rc != 0 ) { | ||
| zf_log_stack_err(st, "Failed to query RX mode for interface %s (rc %d)\n", | ||
| sti->nic[nicno].if_name, rc); | ||
| return rc; | ||
| } | ||
| else if( variant != MC_CMD_GET_CAPABILITIES_OUT_RXDP_LOW_LATENCY && | ||
| variant != MC_CMD_GET_CAPABILITIES_OUT_RXDP ) { | ||
| zf_log_stack_err(st, "Interface %s is not in supported mode for RX (%d).\n", | ||
| sti->nic[nicno].if_name, variant); | ||
| return -EOPNOTSUPP; | ||
| } | ||
| if( variant == MC_CMD_GET_CAPABILITIES_OUT_RXDP_LOW_LATENCY ) | ||
| sti->nic[nicno].flags |= ZF_RES_NIC_FLAG_RX_LL; | ||
| } | ||
|
|
||
| rc = ef_pd_capabilities_get(dh, pd, dh, EF_VI_CAP_CTPIO_ONLY, &variant); | ||
| if( rc == 0 ) | ||
| sti->nic[nicno].flags |= ZF_RES_NIC_FLAG_CTPIO_ONLY; | ||
| else { | ||
| rc = ef_pd_capabilities_get(dh, pd, dh, EF_VI_CAP_TX_FW_VARIANT, &variant); | ||
| if( rc != 0 ) { | ||
| zf_log_stack_err(st, "Failed to query TX mode for interface %s (rc %d)\n", | ||
| sti->nic[nicno].if_name, rc); | ||
| return rc; | ||
| } | ||
| else if( variant != MC_CMD_GET_CAPABILITIES_OUT_TXDP_LOW_LATENCY && | ||
| variant != MC_CMD_GET_CAPABILITIES_OUT_TXDP ) { | ||
| zf_log_stack_err(st, "Interface %s is not in supported mode for TX (%d).\n", | ||
| sti->nic[nicno].if_name, variant); | ||
| return -EOPNOTSUPP; | ||
| } | ||
| if( variant == MC_CMD_GET_CAPABILITIES_OUT_TXDP_LOW_LATENCY ) | ||
| sti->nic[nicno].flags |= ZF_RES_NIC_FLAG_TX_LL; | ||
| } | ||
| rc = ef_pd_capabilities_get(dh, pd, dh, EF_VI_CAP_RX_FILTER_TYPE_IP_VLAN, | ||
| &vlan_filters); | ||
| if( rc == 0 && vlan_filters != 0 ) | ||
|
|
@@ -574,8 +590,9 @@ int zf_stack_init_nic_resources(struct zf_stack_impl* sti, | |
| if( rc < 0 ) | ||
| goto fail1; | ||
|
|
||
| if( (!(sti_nic->flags & ZF_RES_NIC_FLAG_RX_LL) || | ||
| !(sti_nic->flags & ZF_RES_NIC_FLAG_TX_LL)) && | ||
| !(sti_nic->flags & ZF_RES_NIC_FLAG_SHARED_RXQ) ) { | ||
| zf_log_stack_warn(st, "Interface %s is not in low latency mode.\n", | ||
| sti->nic[nicno].if_name); | ||
| zf_log_stack_warn(st, "Low latency mode is recommended for best " | ||
|
|
@@ -636,9 +653,9 @@ int zf_stack_init_nic_resources(struct zf_stack_impl* sti, | |
| ); | ||
|
|
||
| if ( attr->rx_ring_max != 0 ) { | ||
| /* For shared rxqs, we store the timestamp in a fake prefix when copying | ||
| * from the shared rx buffer into our own packet buffer. */ | ||
| if( sti_nic->flags & ZF_RES_NIC_FLAG_SHARED_RXQ ) | ||
| st_nic->rx_prefix_len = ES_DZ_RX_PREFIX_SIZE; | ||
|
Comment on lines
+656
to
659
There was a problem hiding this comment. This should be based on There was a problem hiding this comment. This was based against Onload-9 branch which does not have this capability I can update it and rebase to master. There was a problem hiding this comment. If the following commit is merged to Onload-9 branch happy to update this: Xilinx-CNS/onload@7764b68 |
||
| else | ||
| st_nic->rx_prefix_len = ef_vi_receive_prefix_len(&st_nic->vi); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm confused in this case. You've set pio_available to 0, but we still try
ef_pio_allocif!(attr->pio >= PIO_MUST_USE). I think we may as well exit here ifef_pio_allocwill always fail for x3 - which it should right? That said, I see that you're trying to preserve previous behaviour so maybe you can keep it as isUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes sorry, I pushed it but hadn't finished working on this. Either way I see two ways of proceeding with this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't mind either option. If we always fail
ef_pio_allocwhen the PIO capability is not supported, I would rather we not make the additional call. But it doesn't matter that we do, it's just more work.Slightly related, this error message only seems to refer to the
-ENOSYScase - "the API does not know how to retrieve support for the supplied capability". I think this may be a tad misleading when reporting-EOPNOTSUPP. You have reported the rc which would dispel some confusion.