1135017 - emulator-l: Update kernel

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Emulator, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

We have a number of extra patches in our emulator kernel. Some of them are probably required for emulator-l.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Shawn, Jed, Henry,

There are several patches in our emulator kernel for Bluetooth, Seccomp and Networking. Could you go through the list at [1] and provide some feedback about which of these patches are required by later emulator kernels? Thanks!

[1] https://github.com/mozilla-b2g/kernel_goldfish/commits/b2g-goldfish-2.6.29

Comment 2

[Jed Davis [:jld] ⟨⏰|UTC-7⟩ ⟦he/him⟧]

It looks like this is a 3.4 kernel, so you'll need the seccomp-bpf patches from https://github.com/mozilla-b2g/kernel_goldfish/pull/9 (note that there's a merge commit bracketing the backported patches; this is clearer with "git log --graph" than GitHub's UI).

The upstream android-goldfish-3.4 branch already has the PR_SET_VMA_ANON_NAME patch (useful for Memshrink), so we don't need that one.

Comment 3

[Shawn Huang [:shawnjohnjr][:shuang] (as a happy gecko contributor)]

I think Bluetooth flags and rfkill are required.
https://github.com/mozilla-b2g/kernel_goldfish/commit/8194a786096f9465cf4d65370347046e06bdaee2
https://github.com/mozilla-b2g/kernel_goldfish/commit/701690d86e58c51c4fccff823921e3f0d5608585

As for PR in Bug 852583, there are so many flags that I'm not sure it's related to bluetooth.

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Github branch for kernel_goldfish

Comment 5

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Hal,

for landing the kernel patches, I'll need a new branch b2g-goldfish-3.4.67 in kernel_goldfish [1] and have it mirrored on git.mozilla.org. Can I simply push the branch into [1] and the rest will happen automatically, or is there more effort required?

[1] https://github.com/mozilla-b2g/kernel_goldfish

Comment 6

[hwine]

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #5)
> for landing the kernel patches, I'll need a new branch b2g-goldfish-3.4.67
> in kernel_goldfish [1] and have it mirrored on git.mozilla.org. Can I simply
> push the branch into [1] and the rest will happen automatically, or is there
> more effort required?
> 
> [1] https://github.com/mozilla-b2g/kernel_goldfish

There are 2 separate requests here:
1. All branching for repos in the github.com/mozilla-b2g are handled by the b2g build team. Check with them (:mwu) on that.

2. Start mirroring kernel_goldfish. (If it were already mirrored, no changes would have been needed.)

Comment 7

[hwine]

(In reply to Hal Wine [:hwine] (use needinfo) from comment #6)
> 2. Start mirroring kernel_goldfish. 

Done - in production on gd1 via:
 http://hg.mozilla.org/users/hwine_mozilla.com/repo-sync-configs/rev/ee7ac10e729f

details at: http://git.mozilla.org/?p=b2g/kernel_goldfish.git

Comment 8

[Henry Chang [:hchang]]

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #1)
> Shawn, Jed, Henry,
> 
> There are several patches in our emulator kernel for Bluetooth, Seccomp and
> Networking. Could you go through the list at [1] and provide some feedback
> about which of these patches are required by later emulator kernels? Thanks!
> 
> [1]
> https://github.com/mozilla-b2g/kernel_goldfish/commits/b2g-goldfish-2.6.29

Hi Thomas,

Flags related to multi-table/advance-route are required for wifi tethering
test. However, I assume the new kernel would already have them enabled.

Thanks :)

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

I created a branch named 'b2g-goldfish-3.4.67', which is based on the upstream android branch. Patches can be pulled into this branch.

Comment 10

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Github pull request for kernel_goldfish

Jed,

these patches comes from Kitkat's kernel at [1]. Most of them are part of our seccomp port. Can you take a look?

[1] https://github.com/mozilla-b2g/kernel_goldfish/commits/b2g-goldfish-3.4

Comment 11

[Thomas Zimmermann [:tzimmermann] [:tdz]]

s/comes/come

Comment 12

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Github pull request for platform_prebuilts_qemu-kernel

Prebuilts for the kernel pull request.

I think I created b2g-5.0.0_r6 from the wrong branch, but git.mozilla.org already mirrored the branch before I could fix my mistake. Is it possible to re-create this branch without breaking git.mozilla.org?

Otherwise it's just prebuilt binaries. So the commit history doesn't really matter.

Comment 13

[Jed Davis [:jld] ⟨⏰|UTC-7⟩ ⟦he/him⟧]

Comment on attachment 8571912 [details] [review]
Github pull request for kernel_goldfish

The interdiff looks good.

In the original branch I had a [merge commit][] wrapped around the seccomp-bpf backport, which listed the original (in the ChromeOS branch) commit IDs of the cherry-picked patches.  git-rebase --preserve-merges should be able to do something useful with it, but I don't think we actually need it for anything, so I don't really care.

[merge commit]: https://github.com/mozilla-b2g/kernel_goldfish/commit/0aa6f3d6a7ab45652e0879dd368bff137bdeb029

Comment 14

[Michael Wu [:mwu]]

Comment on attachment 8571951 [details] [review]
Github pull request for platform_prebuilts_qemu-kernel

nit: If you can, update your commit message with the toolchains you used to build the kernel. https://github.com/mozilla-b2g/platform_prebuilts_qemu-kernel/commit/ccdf130bcfa33b72242cbea3d58154ae25788935 for an example

Comment 15

[Michael Wu [:mwu]]

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #12)
> I think I created b2g-5.0.0_r6 from the wrong branch, but git.mozilla.org
> already mirrored the branch before I could fix my mistake. Is it possible to
> re-create this branch without breaking git.mozilla.org?
> 
> Otherwise it's just prebuilt binaries. So the commit history doesn't really
> matter.

Oops - I didn't notice your question here. I have no idea - I don't know how the mirror side of things work. Maybe hwine knows. I don't mind redoing this branch since it's a new one and never got off to a good start.

Comment 16

[hwine]

Since this is a new repo, not yet referenced in any manifests, we can muck with it.

The mirror code should faithfully replicate (mirror) the upstream - if you don't see that behavior, holler in #vcs and/or file a bug against developer-services and we'll fix it.

Comment 17

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8571951 [details] [review]
Github pull request for platform_prebuilts_qemu-kernel

Updated Github pull request

  - added toolchains to the commit message

Comment 18

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Github has a 100 MiB file-size limit, which prevents me from uploading the new base branch. Let's just use the current base branch.

Comment 19

[Ryan VanderMeulen [:RyanVM]]

b2g-goldfish-3.4.67: https://github.com/mozilla-b2g/kernel_goldfish/commit/50900d19cc7015e3bbdf3b06fb64d6dfcba140a8

b2g-5.0.0_r6: https://github.com/mozilla-b2g/platform_prebuilts_qemu-kernel/commit/2c0d193349c55337e37196a7f2d5cef37753ed3e