-
Notifications
You must be signed in to change notification settings - Fork 10
[rocky9_5] Histroy Rebuild to kernel-5.14.0-503.38.1.el9_5 #225
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
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
c52f8d5
gve: ignore nonrelevant GSO type bits when processing TSO headers
PlaidCat 1e7a370
gve: Clear napi->skb before dev_kfree_skb_any()
PlaidCat cec3ba0
gve: Fix XDP TX completion handling when counters overflow
PlaidCat 5b073f2
gve: Fix an edge case for TSO skb validity check
PlaidCat 06bf250
gve: guard XDP xmit NDO on existence of xdp queues
PlaidCat 2198ba6
gve: guard XSK operations on the existence of queues
PlaidCat fdbbe54
gve: process XSK TX descriptors as part of RX NAPI
PlaidCat 7841c1e
gve: trigger RX NAPI instead of TX NAPI in gve_xsk_wakeup
PlaidCat 47ce3e8
ice: put Rx buffers after being done with current frame
PlaidCat 260e52c
ice: gather page_count()'s of each frag right before XDP prog call
PlaidCat 46cc5b3
ice: stop storing XDP verdict within ice_rx_buf
PlaidCat 8c8623b
cxgb4: use port number to set mac addr
PlaidCat 6763179
cpufreq: intel_pstate: Support Emerald Rapids OOB mode
PlaidCat 7a9558a
scsi: core: Fix command pass through retry regression
PlaidCat 0b48f83
ALSA: usb-audio: Fix out of bounds reads when finding clock sources
PlaidCat 9e0a22d
Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5
PlaidCat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
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
50 changes: 50 additions & 0 deletions
50
ciq/ciq_backports/kernel-5.14.0-503.38.1.el9_5/7e1c3f58.failed
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 |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| cpufreq: intel_pstate: Support Emerald Rapids OOB mode | ||
|
|
||
| jira LE-2842 | ||
| Rebuild_History Non-Buildable kernel-5.14.0-503.38.1.el9_5 | ||
| commit-author Srinivas Pandruvada <[email protected]> | ||
| commit 7e1c3f584ee78b0d0210fc424420d9529f3ca952 | ||
| Empty-Commit: Cherry-Pick Conflicts during history rebuild. | ||
| Will be included in final tarball splat. Ref for failed cherry-pick at: | ||
| ciq/ciq_backports/kernel-5.14.0-503.38.1.el9_5/7e1c3f58.failed | ||
|
|
||
| Prevent intel_pstate from loading when OOB (Out Of Band) P-states mode is | ||
| enabled in Emerald Rapids. | ||
|
|
||
| The OOB identifying bits are same as for the prior generation CPUs | ||
| like Sapphire Rapids servers, so also add Emerald Rapids to the | ||
| intel_pstate_cpu_oob_ids[] list. | ||
|
|
||
| Signed-off-by: Srinivas Pandruvada <[email protected]> | ||
| Signed-off-by: Rafael J. Wysocki <[email protected]> | ||
| (cherry picked from commit 7e1c3f584ee78b0d0210fc424420d9529f3ca952) | ||
| Signed-off-by: Jonathan Maple <[email protected]> | ||
|
|
||
| # Conflicts: | ||
| # drivers/cpufreq/intel_pstate.c | ||
| diff --cc drivers/cpufreq/intel_pstate.c | ||
| index 3bf476949b3c,efb29a473be2..000000000000 | ||
| --- a/drivers/cpufreq/intel_pstate.c | ||
| +++ b/drivers/cpufreq/intel_pstate.c | ||
| @@@ -2398,11 -2399,12 +2398,20 @@@ MODULE_DEVICE_TABLE(x86cpu, intel_pstat | ||
|
|
||
| #ifdef CONFIG_ACPI | ||
| static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { | ||
| ++<<<<<<< HEAD | ||
| + X86_MATCH(BROADWELL_D, core_funcs), | ||
| + X86_MATCH(BROADWELL_X, core_funcs), | ||
| + X86_MATCH(SKYLAKE_X, core_funcs), | ||
| + X86_MATCH(ICELAKE_X, core_funcs), | ||
| + X86_MATCH(SAPPHIRERAPIDS_X, core_funcs), | ||
| ++======= | ||
| + X86_MATCH(INTEL_BROADWELL_D, core_funcs), | ||
| + X86_MATCH(INTEL_BROADWELL_X, core_funcs), | ||
| + X86_MATCH(INTEL_SKYLAKE_X, core_funcs), | ||
| + X86_MATCH(INTEL_ICELAKE_X, core_funcs), | ||
| + X86_MATCH(INTEL_SAPPHIRERAPIDS_X, core_funcs), | ||
| + X86_MATCH(INTEL_EMERALDRAPIDS_X, core_funcs), | ||
| ++>>>>>>> 7e1c3f584ee7 (cpufreq: intel_pstate: Support Emerald Rapids OOB mode) | ||
| {} | ||
| }; | ||
| #endif | ||
| * Unmerged path drivers/cpufreq/intel_pstate.c | ||
136 changes: 136 additions & 0 deletions
136
ciq/ciq_backports/kernel-5.14.0-503.38.1.el9_5/ba0925c3.failed
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 |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| gve: process XSK TX descriptors as part of RX NAPI | ||
|
|
||
| jira LE-2842 | ||
| Rebuild_History Non-Buildable kernel-5.14.0-503.38.1.el9_5 | ||
| commit-author Joshua Washington <[email protected]> | ||
| commit ba0925c34e0fa6fe02d3d642bc02ab099ab312c7 | ||
| Empty-Commit: Cherry-Pick Conflicts during history rebuild. | ||
| Will be included in final tarball splat. Ref for failed cherry-pick at: | ||
| ciq/ciq_backports/kernel-5.14.0-503.38.1.el9_5/ba0925c3.failed | ||
|
|
||
| When busy polling is enabled, xsk_sendmsg for AF_XDP zero copy marks | ||
| the NAPI ID corresponding to the memory pool allocated for the socket. | ||
| In GVE, this NAPI ID will never correspond to a NAPI ID of one of the | ||
| dedicated XDP TX queues registered with the umem because XDP TX is not | ||
| set up to share a NAPI with a corresponding RX queue. | ||
|
|
||
| This patch moves XSK TX descriptor processing from the TX NAPI to the RX | ||
| NAPI, and the gve_xsk_wakeup callback is updated to use the RX NAPI | ||
| instead of the TX NAPI, accordingly. The branch on if the wakeup is for | ||
| TX is removed, as the NAPI poll should be invoked whether the wakeup is | ||
| for TX or for RX. | ||
|
|
||
| Fixes: fd8e40321a12 ("gve: Add AF_XDP zero-copy support for GQI-QPL format") | ||
| Cc: [email protected] | ||
| Signed-off-by: Praveen Kaligineedi <[email protected]> | ||
| Signed-off-by: Joshua Washington <[email protected]> | ||
| Reviewed-by: Willem de Bruijn <[email protected]> | ||
| Signed-off-by: David S. Miller <[email protected]> | ||
| (cherry picked from commit ba0925c34e0fa6fe02d3d642bc02ab099ab312c7) | ||
| Signed-off-by: Jonathan Maple <[email protected]> | ||
|
|
||
| # Conflicts: | ||
| # drivers/net/ethernet/google/gve/gve.h | ||
| diff --cc drivers/net/ethernet/google/gve/gve.h | ||
| index ccf05b7e32f6,8167cc5fb0df..000000000000 | ||
| --- a/drivers/net/ethernet/google/gve/gve.h | ||
| +++ b/drivers/net/ethernet/google/gve/gve.h | ||
| @@@ -1050,8 -1140,13 +1050,18 @@@ int gve_xdp_xmit_one(struct gve_priv *p | ||
| void gve_xdp_tx_flush(struct gve_priv *priv, u32 xdp_qid); | ||
| bool gve_tx_poll(struct gve_notify_block *block, int budget); | ||
| bool gve_xdp_poll(struct gve_notify_block *block, int budget); | ||
| ++<<<<<<< HEAD | ||
| +int gve_tx_alloc_rings(struct gve_priv *priv, int start_id, int num_rings); | ||
| +void gve_tx_free_rings_gqi(struct gve_priv *priv, int start_id, int num_rings); | ||
| ++======= | ||
| + int gve_xsk_tx_poll(struct gve_notify_block *block, int budget); | ||
| + int gve_tx_alloc_rings_gqi(struct gve_priv *priv, | ||
| + struct gve_tx_alloc_rings_cfg *cfg); | ||
| + void gve_tx_free_rings_gqi(struct gve_priv *priv, | ||
| + struct gve_tx_alloc_rings_cfg *cfg); | ||
| + void gve_tx_start_ring_gqi(struct gve_priv *priv, int idx); | ||
| + void gve_tx_stop_ring_gqi(struct gve_priv *priv, int idx); | ||
| ++>>>>>>> ba0925c34e0f (gve: process XSK TX descriptors as part of RX NAPI) | ||
| u32 gve_tx_load_event_counter(struct gve_priv *priv, | ||
| struct gve_tx_ring *tx); | ||
| bool gve_tx_clean_pending(struct gve_priv *priv, struct gve_tx_ring *tx); | ||
| * Unmerged path drivers/net/ethernet/google/gve/gve.h | ||
| diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c | ||
| index d08547d76637..74d4db8931ab 100644 | ||
| --- a/drivers/net/ethernet/google/gve/gve_main.c | ||
| +++ b/drivers/net/ethernet/google/gve/gve_main.c | ||
| @@ -275,6 +275,14 @@ static int gve_napi_poll(struct napi_struct *napi, int budget) | ||
|
|
||
| if (block->rx) { | ||
| work_done = gve_rx_poll(block, budget); | ||
| + | ||
| + /* Poll XSK TX as part of RX NAPI. Setup re-poll based on max of | ||
| + * TX and RX work done. | ||
| + */ | ||
| + if (priv->xdp_prog) | ||
| + work_done = max_t(int, work_done, | ||
| + gve_xsk_tx_poll(block, budget)); | ||
| + | ||
| reschedule |= work_done == budget; | ||
| } | ||
|
|
||
| diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c | ||
| index afbd9b43e57b..08db7c81ea69 100644 | ||
| --- a/drivers/net/ethernet/google/gve/gve_tx.c | ||
| +++ b/drivers/net/ethernet/google/gve/gve_tx.c | ||
| @@ -921,33 +921,41 @@ static int gve_xsk_tx(struct gve_priv *priv, struct gve_tx_ring *tx, | ||
| return sent; | ||
| } | ||
|
|
||
| +int gve_xsk_tx_poll(struct gve_notify_block *rx_block, int budget) | ||
| +{ | ||
| + struct gve_rx_ring *rx = rx_block->rx; | ||
| + struct gve_priv *priv = rx->gve; | ||
| + struct gve_tx_ring *tx; | ||
| + int sent = 0; | ||
| + | ||
| + tx = &priv->tx[gve_xdp_tx_queue_id(priv, rx->q_num)]; | ||
| + if (tx->xsk_pool) { | ||
| + sent = gve_xsk_tx(priv, tx, budget); | ||
| + | ||
| + u64_stats_update_begin(&tx->statss); | ||
| + tx->xdp_xsk_sent += sent; | ||
| + u64_stats_update_end(&tx->statss); | ||
| + if (xsk_uses_need_wakeup(tx->xsk_pool)) | ||
| + xsk_set_tx_need_wakeup(tx->xsk_pool); | ||
| + } | ||
| + | ||
| + return sent; | ||
| +} | ||
| + | ||
| bool gve_xdp_poll(struct gve_notify_block *block, int budget) | ||
| { | ||
| struct gve_priv *priv = block->priv; | ||
| struct gve_tx_ring *tx = block->tx; | ||
| u32 nic_done; | ||
| - bool repoll; | ||
| u32 to_do; | ||
|
|
||
| /* Find out how much work there is to be done */ | ||
| nic_done = gve_tx_load_event_counter(priv, tx); | ||
| to_do = min_t(u32, (nic_done - tx->done), budget); | ||
| gve_clean_xdp_done(priv, tx, to_do); | ||
| - repoll = nic_done != tx->done; | ||
| - | ||
| - if (tx->xsk_pool) { | ||
| - int sent = gve_xsk_tx(priv, tx, budget); | ||
| - | ||
| - u64_stats_update_begin(&tx->statss); | ||
| - tx->xdp_xsk_sent += sent; | ||
| - u64_stats_update_end(&tx->statss); | ||
| - repoll |= (sent == budget); | ||
| - if (xsk_uses_need_wakeup(tx->xsk_pool)) | ||
| - xsk_set_tx_need_wakeup(tx->xsk_pool); | ||
| - } | ||
|
|
||
| /* If we still have work we want to repoll */ | ||
| - return repoll; | ||
| + return nic_done != tx->done; | ||
| } | ||
|
|
||
| bool gve_tx_poll(struct gve_notify_block *block, int budget) |
20 changes: 20 additions & 0 deletions
20
ciq/ciq_backports/kernel-5.14.0-503.38.1.el9_5/rebuild.details.txt
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| Rebuild_History BUILDABLE | ||
| Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% | ||
| Number of commits in upstream range v5.14~1..kernel-mainline: 295501 | ||
| Number of commits in rpm: 17 | ||
| Number of commits matched with upstream: 15 (88.24%) | ||
| Number of commits in upstream but not in rpm: 295486 | ||
| Number of commits NOT found in upstream: 2 (11.76%) | ||
|
|
||
| Rebuilding Kernel on Branch rocky9_5_rebuild_kernel-5.14.0-503.38.1.el9_5 for kernel-5.14.0-503.38.1.el9_5 | ||
| Clean Cherry Picks: 13 (86.67%) | ||
| Empty Cherry Picks: 2 (13.33%) | ||
| _______________________________ | ||
|
|
||
| __EMPTY COMMITS__________________________ | ||
| ba0925c34e0fa6fe02d3d642bc02ab099ab312c7 gve: process XSK TX descriptors as part of RX NAPI | ||
| 7e1c3f584ee78b0d0210fc424420d9529f3ca952 cpufreq: intel_pstate: Support Emerald Rapids OOB mode | ||
|
|
||
| __CHANGES NOT IN UPSTREAM________________ | ||
| Porting to Rocky Linux 9, debranding and Rocky branding' | ||
| Ensure aarch64 kernel is not compressed' |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.