| Message ID | 20241113021755.11125-1-jdamato@fastly.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Fix rcu_read_lock issues in netdev-genl | expand |
On Wed, 13 Nov 2024 02:17:50 +0000 Joe Damato wrote:
> base-commit: a58f00ed24b849d449f7134fd5d86f07090fe2f5
which is a net-next commit.. please rebase on net
On Wed, Nov 13, 2024 at 06:47:35PM -0800, Jakub Kicinski wrote: > On Wed, 13 Nov 2024 02:17:50 +0000 Joe Damato wrote: > > base-commit: a58f00ed24b849d449f7134fd5d86f07090fe2f5 > > which is a net-next commit.. please rebase on net I thought I asked about this in the previous thread, but I probably wasn't clear with my question. Let me try again: Patch 1 will apply to net and is a fixes and CC's stable, and fixes a similar issue to the one Paolo reported, not the exact same path, though. Patch 2 will not apply to net, because the code it fixes is not in net yet. This fixes the splat Paolo reported. So... back to the question in the cover letter from the RFC :) I suppose the right thing to do is split the series: - Rebase patch 1 on net (it applies as is) and send it on its own - Send patch 2 on its own against net-next Or... something else ?
On 11/14/24 07:29, Joe Damato wrote: > On Wed, Nov 13, 2024 at 06:47:35PM -0800, Jakub Kicinski wrote: >> On Wed, 13 Nov 2024 02:17:50 +0000 Joe Damato wrote: >>> base-commit: a58f00ed24b849d449f7134fd5d86f07090fe2f5 >> >> which is a net-next commit.. please rebase on net > > I thought I asked about this in the previous thread, but I probably > wasn't clear with my question. > > Let me try again: > > Patch 1 will apply to net and is a fixes and CC's stable, and fixes > a similar issue to the one Paolo reported, not the exact same path, > though. > > Patch 2 will not apply to net, because the code it fixes is not in > net yet. This fixes the splat Paolo reported. > > So... back to the question in the cover letter from the RFC :) I > suppose the right thing to do is split the series: > > - Rebase patch 1 on net (it applies as is) and send it on its own > - Send patch 2 on its own against net-next > > Or... something else ? I'm sorry for the late reply. Please send the two patch separately, patch 1 targeting (and rebased on) net and patch 2 targeting (and based on) net-next. Thanks! Paolo
On Thu, Nov 14, 2024 at 10:06:02AM +0100, Paolo Abeni wrote: > > > On 11/14/24 07:29, Joe Damato wrote: > > On Wed, Nov 13, 2024 at 06:47:35PM -0800, Jakub Kicinski wrote: > >> On Wed, 13 Nov 2024 02:17:50 +0000 Joe Damato wrote: > >>> base-commit: a58f00ed24b849d449f7134fd5d86f07090fe2f5 > >> > >> which is a net-next commit.. please rebase on net > > > > I thought I asked about this in the previous thread, but I probably > > wasn't clear with my question. > > > > Let me try again: > > > > Patch 1 will apply to net and is a fixes and CC's stable, and fixes > > a similar issue to the one Paolo reported, not the exact same path, > > though. > > > > Patch 2 will not apply to net, because the code it fixes is not in > > net yet. This fixes the splat Paolo reported. > > > > So... back to the question in the cover letter from the RFC :) I > > suppose the right thing to do is split the series: > > > > - Rebase patch 1 on net (it applies as is) and send it on its own > > - Send patch 2 on its own against net-next > > > > Or... something else ? > > I'm sorry for the late reply. > > Please send the two patch separately, patch 1 targeting (and rebased on) > net and patch 2 targeting (and based on) net-next. > OK, I've done that. I left the fixes tag on patch 2 despite it targeting net-next, but didn't CC stable since the code doesn't need to be backported.
On 11/14/24 18:58, Joe Damato wrote: > On Thu, Nov 14, 2024 at 10:06:02AM +0100, Paolo Abeni wrote: >> Please send the two patch separately, patch 1 targeting (and rebased on) >> net and patch 2 targeting (and based on) net-next. > > OK, I've done that. I left the fixes tag on patch 2 despite it > targeting net-next, but didn't CC stable since the code doesn't need > to be backported. Thanks! FTR the above was the right thing to do. /P
On Wed, 13 Nov 2024 22:29:50 -0800 Joe Damato wrote: > - Rebase patch 1 on net (it applies as is) and send it on its own > - Send patch 2 on its own against net-next My bad, I thought patch 2 is also needed in net, but not in stable.
On Thu, Nov 14, 2024 at 11:31:44AM -0800, Jakub Kicinski wrote: > On Wed, 13 Nov 2024 22:29:50 -0800 Joe Damato wrote: > > - Rebase patch 1 on net (it applies as is) and send it on its own > > - Send patch 2 on its own against net-next > > My bad, I thought patch 2 is also needed in net, but not in stable. No problem; sorry for the noob confusing on my side. Hopefully, I got it right for the v3.
Greetings: Paolo reported a splat [1] when running the new selftest for busy poll. I confirmed and reproduced this splat locally. This series proposes 2 patches: - Patch 1: - Fixes a similar issue in an older commit and CCs stable as this fix could be backported. - Patch 2: - Fixes the issue Paolo hit while running the selftest I retested locally after applying this series and confirmed that the splat is fixed. Thanks, Joe [1]: https://lore.kernel.org/netdev/719083c2-e277-447b-b6ea-ca3acb293a03@redhat.com/ v2: - Removed the helper and simplified to just add a rcu_read_lock / unlock in both patches instead. rfc: https://lore.kernel.org/lkml/20241112181401.9689-1-jdamato@fastly.com/ Joe Damato (2): netdev-genl: Hold rcu_read_lock in napi_get netdev-genl: Hold rcu_read_lock in napi_set net/core/netdev-genl.c | 4 ++++ 1 file changed, 4 insertions(+) base-commit: a58f00ed24b849d449f7134fd5d86f07090fe2f5