Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kmesh: repair kmesh manager not effect in sockops on oe 23.03 #301

Merged
merged 1 commit into from
May 8, 2024

Conversation

bitcoffeeiux
Copy link
Contributor

@bitcoffeeiux bitcoffeeiux commented May 8, 2024

sockops port is not same as other linux vendor. We need to adapt oe 23.03.

What type of PR is this?

/kind bug
What this PR does / why we need it:
repair issue #298
Which issue(s) this PR fixes:
Fixes #
#298
Special notes for your reviewer:
NA
Does this PR introduce a user-facing change?:
NA

NA

sockops port is not same as other linux vendor. We need to adapt
oe 23.03.

Signed-off-by: bitcoffee <liuxin350@huawei.com>
@kmesh-bot kmesh-bot added the kind/bug Something isn't working label May 8, 2024
@@ -155,15 +155,19 @@ static inline bool conn_from_cni_sim_add(struct bpf_sock_ops *skops)
#if !OE_23_03
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a1));
#else
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0xa1030000));
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a10000));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this only OE2303 behaves like this? And how about the other os releases?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is a bug in OE2303. However, OE2303 has only a half-year maintenance period. Now OE2303 is no longer updated. Therefore, we need to determine the OE2303 policy and whether to continue the maintenance support.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to know. We can discuss on community meeting.

But this fix makes sense

@hzxuzhonghu
Copy link
Member

/cherry-pick release-0.3

@kmesh-bot
Copy link
Collaborator

@hzxuzhonghu: once the present PR merges, I will cherry-pick it on top of release-0.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bitcoffeeiux
Copy link
Contributor Author

/cherry-pick release-0.3

The context of release 0.3 is not completely consistent, and cherry-pick may fail.

Copy link
Member

@hzxuzhonghu hzxuzhonghu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@kmesh-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hzxuzhonghu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kmesh-bot kmesh-bot merged commit 98922f0 into kmesh-net:main May 8, 2024
3 checks passed
@kmesh-bot
Copy link
Collaborator

@hzxuzhonghu: #301 failed to apply on top of branch "release-0.3":

Applying: Kmesh: repair kmesh manager not effect in sockops on oe 23.03
Using index info to reconstruct a base tree...
M	bpf/kmesh/workload/sockops_tuple.c
Falling back to patching base and 3-way merge...
Auto-merging bpf/kmesh/workload/sockops_tuple.c
CONFLICT (content): Merge conflict in bpf/kmesh/workload/sockops_tuple.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Kmesh: repair kmesh manager not effect in sockops on oe 23.03
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kmesh-bot
Copy link
Collaborator

@hzxuzhonghu: new issue created for failed cherrypick: #304

In response to this:

/cherry-pick release-0.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants