Skip to contentSkip to conversation

linux-next: Tree for Sep 27

DISCUSSION [email protected] 3 participants 7 messages Sep 27, 2022 – Sep 28, 2022

Subsystems (3)
Linux-next tree User-mode Linux (UML) Sleepable read-copy update (SRCU)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

Hi all,

Changes since 20220923:

The vfs tree gained a conflict with the ext3 tree.

The bluetooth tree gained conflict with the net tree.

The various DRM trees gained even more conflicts with each other.

The drivers-misc tree gained a conflict against the jc_docs tree.

The drivers-misc tree gained a conflict against the drm tree.

The v4l tree gained a conflict with the v4l-dvb-fixes tree.

The net-next tree gained a conflict against the i2c tree.

The kspp tree gained a conflict against the arm64 tree.

The kspp tree gained a conflict against the arm64-fixes tree.

The kspp tree gained a conflict against the bpf-next tree.

The mm-stable tree gained a conflict against the bitmap tree.

Non-merge commits (relative to Linus' tree): 9849

 10393 files changed, 558039 insertions(+), 213574 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master.

You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 362 trees (counting Linus' and 100 trees of bug fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.

Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes.

#1 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:
../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe
Signature · 6 lines
~Randy

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
maintainer
#2 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Quoted 18 lines · Randy Dunlap
Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:

../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]

Quoted 8 lines
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe

Could you please send your .config or tell me how you generated it?

Thanx, Paul

#3 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Quoted 28 lines · Paul E. McKenney
Quoted 18 lines · Randy Dunlap
Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:

../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]

Quoted 8 lines
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe
Quoted 1 line

Could you please send your .config or tell me how you generated it?

For x86_64 SUBARCH, ARCH=um:

mkdir UML64
make ARCH=um SUBARCH=x86_64 O=UML64 tinyconfig
make ARCH=um SUBARCH=x86_64 O=UML64 all

Signature · 6 lines
~Randy

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
maintainer
#4 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Quoted 31 lines · Randy Dunlap
Quoted 28 lines · Paul E. McKenney
Quoted 26 lines · Randy Dunlap
Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:
../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe
Quoted 8 lines
Quoted 1 line

Could you please send your .config or tell me how you generated it?

For x86_64 SUBARCH, ARCH=um:

mkdir UML64
make ARCH=um SUBARCH=x86_64 O=UML64 tinyconfig
make ARCH=um SUBARCH=x86_64 O=UML64 all

Thank you! The diff shown below clears it up for me. Does it cover it for you as well?

Thanx, Paul

------------------------------------------------------------------------

include/linux/srcu.h +2 -0
index 274d7200ce4e..565f60d57484 100644
@@ -52,6 +52,8 @@ int init_srcu_struct(struct srcu_struct *ssp);
 #else
 /* Dummy definition for things like notifiers.  Actual use gets link error. */
 struct srcu_struct { };
+int __srcu_read_lock_nmisafe(struct srcu_struct *ssp, bool chknmisafe) __acquires(ssp);
+void __srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx, bool chknmisafe) __releases(ssp);
 #endif
 
 void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um

Acked-by
#5 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Hi Paul,

Quoted 35 lines · Paul E. McKenney
Quoted 34 lines · Randy Dunlap
Quoted 29 lines · Paul E. McKenney
Quoted 18 lines · Randy Dunlap
Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:

../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]

Quoted 8 lines
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe

Could you please send your .config or tell me how you generated it?

Quoted 8 lines
Quoted 5 lines

For x86_64 SUBARCH, ARCH=um:

mkdir UML64
make ARCH=um SUBARCH=x86_64 O=UML64 tinyconfig
make ARCH=um SUBARCH=x86_64 O=UML64 all

Thank you! The diff shown below clears it up for me. Does it cover it for you as well?

Works for me. Thanks.

Acked-by Randy Dunlap <[email protected]> # build-tested
Quoted 15 lines

------------------------------------------------------------------------

include/linux/srcu.h +2 -0
index 274d7200ce4e..565f60d57484 100644
@@ -52,6 +52,8 @@ int init_srcu_struct(struct srcu_struct *ssp);
 #else
 /* Dummy definition for things like notifiers.  Actual use gets link error. */
 struct srcu_struct { };
+int __srcu_read_lock_nmisafe(struct srcu_struct *ssp, bool chknmisafe) __acquires(ssp);
+void __srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx, bool chknmisafe) __releases(ssp);
 #endif
 
 void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,
Signature · 6 lines
~Randy

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
maintainer
#6 lore raw

Re: linux-next: Tree for Sep 27 (uml 64-bit or 32-bit: tinyconfig)

Quoted 44 lines · Randy Dunlap

Hi Paul,

Quoted 41 lines · Paul E. McKenney
Quoted 39 lines · Randy Dunlap
Quoted 28 lines · Paul E. McKenney
Quoted 18 lines · Randy Dunlap
Quoted 4 lines · On 9/27/22 13:10, [email protected] wrote:

Hi all,

Changes since 20220923:

In file included from ../include/linux/notifier.h:16,

                 from ../include/linux/memory_hotplug.h:7,
                 from ../include/linux/mmzone.h:1244,
                 from ../include/linux/gfp.h:7,
                 from ../include/linux/slab.h:15,
                 from ../include/linux/crypto.h:20,
                 from ../arch/x86/um/shared/sysdep/kernel-offsets.h:5,
                 from ../arch/um/kernel/asm-offsets.c:1:

../include/linux/srcu.h: In function ‘srcu_read_lock_nmisafe’:
../include/linux/srcu.h:181:26: error: implicit declaration of function ‘__srcu_read_lock_nmisafe’; did you mean ‘srcu_read_lock_nmisafe’? [-Werror=implicit-function-declaration]

Quoted 8 lines
  181 |                 retval = __srcu_read_lock_nmisafe(ssp, true);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~
      |                          srcu_read_lock_nmisafe
../include/linux/srcu.h: In function ‘srcu_read_unlock_nmisafe’:
../include/linux/srcu.h:226:17: error: implicit declaration of function ‘__srcu_read_unlock_nmisafe’; did you mean ‘srcu_read_unlock_nmisafe’? [-Werror=implicit-function-declaration]
  226 |                 __srcu_read_unlock_nmisafe(ssp, idx, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 srcu_read_unlock_nmisafe
Quoted 1 line

Could you please send your .config or tell me how you generated it?

For x86_64 SUBARCH, ARCH=um:

mkdir UML64
make ARCH=um SUBARCH=x86_64 O=UML64 tinyconfig
make ARCH=um SUBARCH=x86_64 O=UML64 all

Quoted 5 lines
Quoted 2 lines

Thank you! The diff shown below clears it up for me. Does it cover it for you as well?

Works for me. Thanks.

Acked-by Randy Dunlap <[email protected]> # build-tested

Thank you, Randy!

Thanx, Paul

Quoted 14 lines
Quoted 14 lines

------------------------------------------------------------------------

include/linux/srcu.h +2 -0
index 274d7200ce4e..565f60d57484 100644
@@ -52,6 +52,8 @@ int init_srcu_struct(struct srcu_struct *ssp);
 #else
 /* Dummy definition for things like notifiers.  Actual use gets link error. */
 struct srcu_struct { };
+int __srcu_read_lock_nmisafe(struct srcu_struct *ssp, bool chknmisafe) __acquires(ssp);
+void __srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx, bool chknmisafe) __releases(ssp);
 #endif
Quoted 4 lines
Quoted 1 line
include/linux/srcu.h +0 -0
 void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,
Signature · 1 line
~Randy

_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um