commits December 2020

commits@lists.open-mesh.org

1 participants
18 discussions

[linux-merge]linux integration; annotated tag, v5.10, created. v5.10
by postmaster＠open-mesh.org 13 Dec '20

13 Dec '20

The annotated tag, v5.10 has been created at 3f995f8e0b540342612d3f6b1fc299f5bf486987 (tag) tagging 2c85ebc57b3e1817b6ce1a6b703928e113a90442 (commit) replaces v5.10-rc7 tagged by Linus Torvalds on Sun Dec 13 14:41:30 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl/WmJoeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGv1oH+wUPC+TflsJyjjG4 /UrmkfQGkMJlUuZbiuLSgLys2AxpiKE81qKpqi9+Fgv3TLZs1WZbWB4Aspj1SM9d dVHNz1RXqUKZVNLrBdB/NyiBDWO/XJyNe14DFJa7VQJzlPYheIr7Nij5MPt0ipEQ ZXNiXrVSC511fvLJ+74kQFXKohJ1LvxKO9tXHwn+RnTdQf+Rdat17BKEkxgjzEJr JV8KpzXeUHfAJInNye9YaZFSy2IY7PDBFbR4BAd/jRnqY58q71w0pVb7k1hWphT8 XtzJbR1CHpriBuTG5YrFtSPUbkkPNIXcXa7v1Jo7kscJypjoIYbkfVDU++UbN9j/ ipzLI5o= =MX0J -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[doc] master: Merge branch 'backup-redmine/2020-12-12' (4c59db4)
by postmaster＠open-mesh.org 12 Dec '20

12 Dec '20

Repository : ssh://git@diktynna/doc On branch : master >--------------------------------------------------------------- commit 4c59db4092266bebe89e51d0453737637249f6b3 Merge: 3845c7d ab0d7d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 12 10:00:48 2020 +0100 Merge branch 'backup-redmine/2020-12-12' >--------------------------------------------------------------- 4c59db4092266bebe89e51d0453737637249f6b3 open-mesh/Kernel_hacking_Debian_image.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc open-mesh/Kernel_hacking_Debian_image.rst index 91624a9,0000000..7224cf1 mode 100644,000000..100644 --- a/open-mesh/Kernel_hacking_Debian_image.rst +++ b/open-mesh/Kernel_hacking_Debian_image.rst @@@ -1,441 -1,0 +1,441 @@@ +.. SPDX-License-Identifier: GPL-2.0 + +Kernel hacking Debian image +=========================== + +The :doc:`OpenWrt image <OpenWrt_in_QEMU>` is an easy way to start multiple +virtual instances. But these instances usually don��t provide the +required infrastructure to test kernel modules extensively. And it also +depends on special toolchains to prepare the used tools/modules which +should tested. + +It is often easier to use the same operating system in the virtual +environment and on the host. Only the kernel is modified here to provide +the necessary helpers for in-kernel development. + +An interested reader might even extend this further to only provide a +modified kernel and use the currently running rootfs also in the virtual +environment. Such an approach is used in `hostap��s test +vm <https://w1.fi/cgit/hostap/tree/tests/hwsim/vm>`__ but it is out of +scope for this document. + +Create an Image +--------------- + +The debian root filesystem is used here to a minimal system to boot and +run the test programs. It is a simple ext4 filesystem with only +userspace components from Debian. The configuration is changed to: + +* automatically mount the shared folder +* automatically set up a static IPv4 address and hostname on bootup +* start a test-init.sh script from the shared folder on bootup +* disable root password +* prefer batctl binary from shared folder��s batctl subdirectory instead + of virtual environment binary + +The installation is also cleaned up at the end to reduce the required +storage space + +.. code-block:: sh + + qemu-img create debian.img 8G + sudo mkfs.ext4 -O '^has_journal' -F debian.img + sudo mkdir debian + sudo mount -o loop debian.img debian + sudo debootstrap buster debian + sudo systemd-nspawn -D debian apt update + udo systemd-nspawn -D debian debian apt install --no-install-recommends build-essential vim openssh-server less \ + pkg-config libnl-3-dev libnl-genl-3-dev libcap-dev tcpdump rng-tools5 \ + trace-cmd flex bison libelf-dev libdw-dev binutils-dev libunwind-dev libssl-dev libslang2-dev liblzma-dev libperl-dev + + sudo mkdir debian/root/.ssh/ + ssh-add -L | sudo tee debian/root/.ssh/authorized_keys + + sudo mkdir debian/host + sudo sh -c 'cat > debian/etc/fstab << EOF - host /host 9p trans=virtio,version=9p2000.L 0 0 ++ host /host 9p trans=virtio,version=9p2000.L,posixacl,msize=524288 0 0 + EOF' + + sudo sh -c 'cat > debian/etc/rc.local << "EOF" + #!/bin/sh -e + + MAC_PART="$(ip link show enp0s1 | awk "/ether/ {print \$2}"| sed -e "s/.*://" -e "s/[\\n\\ ].*//"|awk "{print (\"0x\"\$1)*1 }")" + IP_PART="$(echo $MAC_PART|awk "{ print \$1+50 }")" + NODE_NR="$(echo $MAC_PART|awk "{ printf(\"%02d\", \$1) }")" + ip addr add 192.168.251.${IP_PART}/24 dev enp0s1 + ip link set up dev enp0s1 + hostname "node"$NODE_NR + ip link set up dev lo + [ ! -x /host/test-init.sh ] || /host/test-init.sh + exit 0 + EOF' + sudo chmod a+x debian/etc/rc.local + + sudo sed -i 's/^root:[^:]*:/root::/' debian/etc/shadow + + ## optionally: allow ssh logins without passwords + # sudo sed -i 's/^#PermitRootLogin.*/PermitRootLogin yes/' debian/etc/ssh/sshd_config + # sudo sed -i 's/^#PermitEmptyPasswords.*/PermitEmptyPasswords yes/' debian/etc/ssh/sshd_config + # sudo sed -i 's/^UsePAM.*/UsePAM no/' debian/etc/ssh/sshd_config + + ## optionally: enable autologin for user root + #sudo mkdir debian/etc/systemd/system/serial-getty(a)hvc0.service.d/ + #sudo sh -c 'cat > debian/etc/systemd/system/serial-getty(a)hvc0.service.d/autologin.conf << EOF + #[Service] + #ExecStart= + #ExecStart=-/sbin/agetty --autologin root -s %I 115200,38400,9600 vt102 + #EOF' + + sudo sh -c 'echo '\''PATH="/host/batctl/:$PATH"'\'' >> debian/etc/profile' + sudo rm debian/var/cache/apt/archives/*.deb + sudo rm debian/var/lib/apt/lists/* + sudo e4defrag -v debian/ + sudo umount debian + sudo fsck.ext4 -fD debian.img + sudo zerofree -v debian.img + sudo fallocate --dig-holes debian.img + + + ## optionally: convert image to qcow2 + #sudo qemu-img convert -c -f raw -O qcow2 debian.img debian.qcow2 + #sudo mv debian.qcow2 debian.img + +Kernel compile +-------------- + +Any recent kernel can be used for the setup. We will use linux-next here +to get the most recent development kernels. It is also assumed that the +sources are copied to the same directory as the debian.img and a x86_64 +image will be used. + +The kernel will be build to enhance the virtualization and debugging +experience. It is configured with: + +* basic kernel features +* support for necessary drivers +* kernel hacking helpers +* kernel address + undefined sanitizers +* support for hwsim + +.. code-block:: sh + + # make sure that libelf-dev is installed or module build will fail with something like "No rule to make target 'net/batman-adv/bat_algo.o'" + + git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git + cd linux-next + + make allnoconfig + cat >> .config << EOF + + # small configuration + CONFIG_SMP=y + CONFIG_EMBEDDED=n + # CONFIG_EXPERT is not set + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y + CONFIG_64BIT=y + CONFIG_X86_VSYSCALL_EMULATION=n + CONFIG_IA32_EMULATION=n + CONFIG_VOP_BUS=y + CONFIG_VOP=y + CONFIG_HW_RANDOM_VIRTIO=y + CONFIG_NET_9P_VIRTIO=y + CONFIG_VIRTIO_MENU=y + CONFIG_SCSI_VIRTIO=y + CONFIG_VIRTIO_BALLOON=y + CONFIG_VIRTIO_BLK=y + CONFIG_VIRTIO_CONSOLE=y + CONFIG_VIRTIO_INPUT=y + CONFIG_VIRTIO_NET=y + CONFIG_VIRTIO_PCI=y + CONFIG_VIRTIO_PCI_LEGACY=y + CONFIG_VIRTIO_BALLOON=y + CONFIG_VIRTIO_BLK_SCSI=y + CONFIG_VIRTIO_INPUT=y + CONFIG_VIRTIO_MMIO=y + CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + CONFIG_RPMSG_VIRTIO=y + CONFIG_VSOCKETS=y + CONFIG_VIRTIO_VSOCKETS=y + CONFIG_DRM=y + CONFIG_DRM_VIRTIO_GPU=y + CONFIG_CAIF=y + CONFIG_CAIF_VIRTIO=y + CONFIG_CRYPTO_DEV_VIRTIO=y + CONFIG_FUSE_FS=y + CONFIG_VIRTIO_FS=y + CONFIG_IOMMU_SUPPORT=y + CONFIG_VIRTIO_IOMMU=y + CONFIG_LIBNVDIMM=y + CONFIG_VIRTIO_PMEM=y + CONFIG_CRC16=y + CONFIG_LIBCRC32C=y + CONFIG_CRYPTO_SHA512=y + CONFIG_NET=y + CONFIG_INET=y + CONFIG_DEBUG_FS=y + CONFIG_IPV6=y + CONFIG_BRIDGE=y + CONFIG_VLAN_8021Q=y + CONFIG_WIRELESS=n + CONFIG_NET_9P=y + CONFIG_NETWORK_FILESYSTEMS=y + CONFIG_9P_FS=y + CONFIG_9P_FS_POSIX_ACL=y + CONFIG_9P_FS_SECURITY=y + CONFIG_BLOCK=y + CONFIG_BLK_DEV=y + CONFIG_EXT4_FS=y + CONFIG_EXT4_USE_FOR_EXT23=y + CONFIG_TTY=y + CONFIG_HW_RANDOM=y + CONFIG_VHOST_RING=y + CONFIG_GENERIC_ALLOCATOR=y + CONFIG_SCSI_LOWLEVEL=y + CONFIG_SCSI=y + CONFIG_NETDEVICES=y + CONFIG_NET_CORE=y + CONFIG_DEVTMPFS=y + CONFIG_HYPERVISOR_GUEST=y + CONFIG_PVH=y + CONFIG_PARAVIRT=y + CONFIG_PARAVIRT_TIME_ACCOUNTING=y + CONFIG_PARAVIRT_SPINLOCKS=y + CONFIG_KVM_GUEST=y + CONFIG_BINFMT_ELF=y + CONFIG_BINFMT_SCRIPT=y + CONFIG_BINFMT_MISC=y + CONFIG_PCI=y + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y + CONFIG_CROSS_MEMORY_ATTACH=y + CONFIG_UNIX=y + CONFIG_TMPFS=y + CONFIG_CGROUPS=y + CONFIG_BLK_CGROUP=y + CONFIG_CGROUP_CPUACCT=y + CONFIG_CGROUP_DEVICE=y + CONFIG_CGROUP_FREEZER=y + CONFIG_CGROUP_HUGETLB=y + CONFIG_CGROUP_NET_CLASSID=y + CONFIG_CGROUP_NET_PRIO=y + CONFIG_CGROUP_PERF=y + CONFIG_CGROUP_SCHED=y + CONFIG_DEVPTS_MULTIPLE_INSTANCES=y + CONFIG_INOTIFY_USER=y + CONFIG_FHANDLE=y + CONFIG_CFG80211=y + CONFIG_DUMMY=y + CONFIG_PACKET=y + CONFIG_VETH=y + CONFIG_IP_MULTICAST=y + CONFIG_NET_IPGRE_DEMUX=y + CONFIG_NET_IP_TUNNEL=y + CONFIG_NET_IPGRE=y + CONFIG_NET_IPGRE_BROADCAST=y + # CONFIG_LEGACY_PTYS is not set + CONFIG_NO_HZ_IDLE=y + CONFIG_CPU_IDLE_GOV_HALTPOLL=y + CONFIG_PVPANIC=y + + # makes boot a lot slower but required for shutdown + CONFIG_ACPI=y + + + #debug stuff + CONFIG_CC_STACKPROTECTOR_STRONG=y + CONFIG_LOCKUP_DETECTOR=y + CONFIG_DETECT_HUNG_TASK=y + CONFIG_SCHED_STACK_END_CHECK=y + CONFIG_DEBUG_RT_MUTEXES=y + CONFIG_DEBUG_SPINLOCK=y + CONFIG_DEBUG_MUTEXES=y + CONFIG_PROVE_LOCKING=y + CONFIG_LOCK_STAT=y + CONFIG_DEBUG_LOCKDEP=y + CONFIG_DEBUG_ATOMIC_SLEEP=y + CONFIG_DEBUG_LIST=y + CONFIG_DEBUG_PI_LIST=y + CONFIG_DEBUG_SG=y + CONFIG_DEBUG_NOTIFIERS=y + CONFIG_PROVE_RCU_REPEATEDLY=y + CONFIG_SPARSE_RCU_POINTER=y + CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y + CONFIG_X86_VERBOSE_BOOTUP=y + CONFIG_DEBUG_RODATA=y + CONFIG_DEBUG_RODATA_TEST=n + CONFIG_DEBUG_SET_MODULE_RONX=y + CONFIG_PAGE_EXTENSION=y + CONFIG_DEBUG_PAGEALLOC=y + CONFIG_DEBUG_OBJECTS=y + CONFIG_DEBUG_OBJECTS_FREE=y + CONFIG_DEBUG_OBJECTS_TIMERS=y + CONFIG_DEBUG_OBJECTS_WORK=y + CONFIG_DEBUG_OBJECTS_RCU_HEAD=y + CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y + CONFIG_DEBUG_KMEMLEAK=y + CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=8000 + CONFIG_DEBUG_STACK_USAGE=y + CONFIG_DEBUG_STACKOVERFLOW=y + CONFIG_DEBUG_INFO=y + CONFIG_DEBUG_INFO_DWARF4=y + CONFIG_GDB_SCRIPTS=y + CONFIG_READABLE_ASM=y + CONFIG_STACK_VALIDATION=y + CONFIG_WQ_WATCHDOG=y + CONFIG_DEBUG_KOBJECT_RELEASE=y + CONFIG_DEBUG_WQ_FORCE_RR_CPU=y + CONFIG_OPTIMIZE_INLINING=y + CONFIG_ENABLE_MUST_CHECK=y + CONFIG_ENABLE_WARN_DEPRECATED=y + CONFIG_DEBUG_SECTION_MISMATCH=y + CONFIG_UNWINDER_ORC=y + CONFIG_FTRACE=y + CONFIG_FUNCTION_TRACER=y + CONFIG_FUNCTION_GRAPH_TRACER=y + CONFIG_FTRACE_SYSCALLS=y + CONFIG_TRACER_SNAPSHOT=y + CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y + CONFIG_STACK_TRACER=y + CONFIG_UPROBE_EVENTS=y + CONFIG_DYNAMIC_FTRACE=y + CONFIG_FUNCTION_PROFILER=y + CONFIG_HIST_TRIGGERS=y + CONFIG_SYMBOLIC_ERRNAME=y + CONFIG_DYNAMIC_DEBUG=y + CONFIG_PRINTK_TIME=y + CONFIG_PRINTK_CALLER=y + CONFIG_DEBUG_MISC=y + CONFIG_PROVE_RCU_LIST=y + CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B=y + + # for GCC 5+ + CONFIG_KASAN=y + CONFIG_KASAN_INLINE=y + CONFIG_UBSAN_SANITIZE_ALL=y + CONFIG_UBSAN=y + CONFIG_UBSAN_NULL=y + EOF + make olddefconfig + + cat >> .config << EOF + # allow to use unsigned regdb with hwsim + CONFIG_EXPERT=y + CONFIG_CFG80211_CERTIFICATION_ONUS=y + # CONFIG_CFG80211_REQUIRE_SIGNED_REGDB is not set + EOF + make olddefconfig + + make all -j$(nproc || echo 1) + +Build the BIOS +-------------- + +The (sea)bios used by qemu is nice to boot all kind of legacy images but +reduces the performance for booting a paravirtualized Linux system. +Something like qboot works better for this purpose: + +.. code-block:: sh + + git clone https://github.com/bonzini/qboot.git + cd qboot + meson build && ninja -C build + cd .. + +.. _open-mesh-kernel-hacking-debian-image-building-the-batman-adv-module: + +Building the batman-adv module +------------------------------ + +The kernel module can be build outside the virtual environment and +shared over the 9p mount. The path to the kernel sources have to be +provided to the make process + +.. code-block:: sh + + make KERNELPATH="$(pwd)/../linux-next" + +The kernel module can also be compiled in a way which creates better +stack traces and increases the usability with (k)gdb: + +.. code-block:: sh + + make EXTRA_CFLAGS="-fno-inline -Og -fno-optimize-sibling-calls" KERNELPATH="$(pwd)/../linux-next" V=1 + +Start of the environment +------------------------ + +virtual network initialization +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The +:ref:`virtual-network.sh from the OpenWrt environment <open-mesh-openwrt-in-qemu-virtual-network-initialization>` +can be reused again. + +VM instances bringup +~~~~~~~~~~~~~~~~~~~~ + +The +:ref:`run.sh from the OpenWrt environment <open-mesh-openwrt-in-qemu-vm-instances-bringup>` +can mostly be reused. There are only minimal +adjustments required. + +The BASE_IMG is of course no longer the same because a new image +��debian.img�� was created for our new environment. The image also doesn��t +contain a bootloader or kernel anymore. The kernel must now be supplied +manually to qemu. + +.. code-block:: sh + + BASE_IMG=debian.img + BOOTARGS+=("-bios" "qboot/build/bios.bin") + BOOTARGS+=("-kernel" "linux-next/arch/x86/boot/bzImage") + BOOTARGS+=("-append" "root=/dev/vda rw console=hvc0 nokaslr tsc=reliable no_timer_check noreplace-smp rootfstype=ext4 rcupdate.rcu_expedited=1 reboot=t pci=lastbus=0 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1") + BOOTARGS+=("-device" "virtconsole,chardev=charconsole0,id=console0") + +It is also recommended to use linux-next/vmlinux instead of bzImage with +qemu 4.0.0 (or later) + +Automatic test initialization +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The +:ref:`test-init.sh from the OpenWrt environment <open-mesh-openwrt-in-qemu-automatic-test-initialization>` +is always test specific. But its main +functionality is still the same as before. A simple example would be: + +.. code-block:: sh + + cat > test-init.sh << "EOF" + #! /bin/sh + + set -e + + ## get internet access + dhclient enp0s2 + + ## Simple batman-adv setup + + # ip link add dummy0 type dummy + ip link set up dummy0 + + rmmod batman-adv || true + insmod /host/batman-adv/net/batman-adv/batman-adv.ko + /host/batctl/batctl routing_algo BATMAN_IV + /host/batctl/batctl if add dummy0 + /host/batctl/batctl it 5000 + /host/batctl/batctl if add enp0s1 + ip link set up dev enp0s1 + ip link set up dev bat0 + EOF + + chmod +x test-init.sh + +Start +----- + +The startup method +:ref:`from the OpenWrt environment <open-mesh-openwrt-in-qemu-start>` +should be used here.

1 0

[doc] backup-redmine/2020-12-12,master: doc: open-mesh/Kernel_hacking_Debian_image: improving 9p performance for large files by increasing packet size from 8KB to 512KB (200x of this value or more can be used when only having a very low number of instances) (ab0d7d5)
by postmaster＠open-mesh.org 12 Dec '20

12 Dec '20

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2020-12-12,master >--------------------------------------------------------------- commit ab0d7d58d344b7efe6589e04a5caade4e81311ed Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 6 20:10:31 2020 +0000 doc: open-mesh/Kernel_hacking_Debian_image: improving 9p performance for large files by increasing packet size from 8KB to 512KB (200x of this value or more can be used when only having a very low number of instances) >--------------------------------------------------------------- ab0d7d58d344b7efe6589e04a5caade4e81311ed open-mesh/Kernel_hacking_Debian_image.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/Kernel_hacking_Debian_image.textile b/open-mesh/Kernel_hacking_Debian_image.textile index 7ae22f1..ddb5cb6 100644 --- a/open-mesh/Kernel_hacking_Debian_image.textile +++ b/open-mesh/Kernel_hacking_Debian_image.textile @@ -34,7 +34,7 @@ ssh-add -L | sudo tee debian/root/.ssh/authorized_keys sudo mkdir debian/host sudo sh -c 'cat > debian/etc/fstab << EOF -host /host 9p trans=virtio,version=9p2000.L 0 0 +host /host 9p trans=virtio,version=9p2000.L,posixacl,msize=524288 0 0 EOF' sudo sh -c 'cat > debian/etc/rc.local << "EOF"

1 0

[linux-merge]linux integration; annotated tag, v5.10-rc7, created. v5.10-rc7
by postmaster＠open-mesh.org 06 Dec '20

06 Dec '20

The annotated tag, v5.10-rc7 has been created at dd0039844c8b2b960d0e0175923da0135f87c392 (tag) tagging 0477e92881850d44910a7e94fc2c46f96faa131f (commit) replaces v5.10-rc6 tagged by Linus Torvalds on Sun Dec 6 14:25:12 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl/NWkgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGnJ8H/jgoYRF1gGici+B/ 7r0B5cr1K4kTTSY8wazW6fCK80axCJNTPT1OS6MtY6P1tuFf++bGZMgK4V4wQ1/h rQn2hRJm44FkG8/+T/yL+93+gwV4vfMlXO9lXStnIcRjt5tvM93WZ7uDplud5Y2o lMOLglPMDvhqbvlCgMBX/lZ4BQPA9a0qiiKvWfgZnYJ7z3NTyRnKU23amqT0lTID 9bK0AdKEZyObqKFpIn5/+V0FtbioOz1ANPaFNlHkR9Ii4KfuIGRciRX++tTtegcW cC1HK6OLWYr50WInWf3n+tabHvgNUfCae0I/ovPhMbHw830mcFyPbrmY69bDAV/k vEmH7fM= =Kdl5 -----END PGP SIGNATURE----- Sven Eckelmann (3): batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Drop unused soft-interface.h include in fragmentation.c (47df68d0)
by postmaster＠open-mesh.org 06 Dec '20

06 Dec '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 47df68d079cbcd28987d87e37ccd9b760a86b1b2 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Fri Dec 4 08:41:16 2020 +0100 batman-adv: Drop unused soft-interface.h include in fragmentation.c The commit 992b03b88e36 ("batman-adv: Don't always reallocate the fragmentation skb head") removed the last user of functions from soft-interface.h. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 47df68d079cbcd28987d87e37ccd9b760a86b1b2 net/batman-adv/fragmentation.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 59ebd731..e522f1fc 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -27,7 +27,6 @@ #include "originator.h" #include "routing.h" #include "send.h" -#include "soft-interface.h" /** * batadv_frag_clear_chain() - delete entries in the fragment buffer chain

1 0

[batman-adv] master: batman-adv: Drop legacy code for auto deleting mesh interfaces (43f49a32)
by postmaster＠open-mesh.org 06 Dec '20

06 Dec '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 43f49a32f714f1bfa2d7593dafe1a309976833cc Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 17 14:37:13 2020 +0200 batman-adv: Drop legacy code for auto deleting mesh interfaces The only way to automatically drop batadv mesh interfaces when all soft interfaces were removed was dropped with the sysfs support. It is no longer needed to have them handled by kernel anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 43f49a32f714f1bfa2d7593dafe1a309976833cc net/batman-adv/hard-interface.c | 8 ++------ net/batman-adv/hard-interface.h | 19 +------------------ net/batman-adv/soft-interface.c | 5 ++--- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index bbedb9a4..0f186ddc 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -845,11 +845,8 @@ static size_t batadv_hardif_cnt(const struct net_device *soft_iface) /** * batadv_hardif_disable_interface() - Remove hard interface from soft interface * @hard_iface: hard interface to be removed - * @autodel: whether to delete soft interface when it doesn't contain any other - * slave interfaces */ -void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, - enum batadv_hard_if_cleanup autodel) +void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hard_iface *primary_if = NULL; @@ -953,8 +950,7 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) /* first deactivate interface */ if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) - batadv_hardif_disable_interface(hard_iface, - BATADV_IF_CLEANUP_KEEP); + batadv_hardif_disable_interface(hard_iface); if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) return; diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 1ee45b61..f4b8e9ef 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -67,22 +67,6 @@ enum batadv_hard_if_bcast { BATADV_HARDIF_BCAST_DUPORIG, }; -/** - * enum batadv_hard_if_cleanup - Cleanup modi for soft_iface after slave removal - */ -enum batadv_hard_if_cleanup { - /** - * @BATADV_IF_CLEANUP_KEEP: Don't automatically delete soft-interface - */ - BATADV_IF_CLEANUP_KEEP, - - /** - * @BATADV_IF_CLEANUP_AUTO: Delete soft-interface after last slave was - * removed - */ - BATADV_IF_CLEANUP_AUTO, -}; - extern struct notifier_block batadv_hard_if_notifier; struct net_device *batadv_get_real_netdev(struct net_device *net_device); @@ -92,8 +76,7 @@ struct batadv_hard_iface* batadv_hardif_get_by_netdev(const struct net_device *net_dev); int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, struct net *net, const char *iface_name); -void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, - enum batadv_hard_if_cleanup autodel); +void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface); int batadv_hardif_min_mtu(struct net_device *soft_iface); void batadv_update_min_mtu(struct net_device *soft_iface); void batadv_hardif_release(struct kref *ref); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 6c6a8c6b..97118efb 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -881,7 +881,7 @@ static int batadv_softif_slave_del(struct net_device *dev, if (!hard_iface || hard_iface->soft_iface != dev) goto out; - batadv_hardif_disable_interface(hard_iface, BATADV_IF_CLEANUP_KEEP); + batadv_hardif_disable_interface(hard_iface); ret = 0; out: @@ -1139,8 +1139,7 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, list_for_each_entry(hard_iface, &batadv_hardif_list, list) { if (hard_iface->soft_iface == soft_iface) - batadv_hardif_disable_interface(hard_iface, - BATADV_IF_CLEANUP_KEEP); + batadv_hardif_disable_interface(hard_iface); } /* destroy the "untagged" VLAN */

1 0

[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20201204, updated. batadv-next-pullrequest-20201204
by postmaster＠open-mesh.org 04 Dec '20

04 Dec '20

The annotated tag, batadv-next-pullrequest-20201204 has been updated to e330235c83cf8d696530babd626350b201f359d0 (tag) from c23dea293bb67c049a51797247b59e7997be5419 (which is now obsolete) tagging 34a14c2e6310a348a3f23af6e95bf9ea040f3ec8 (commit) replaces v5.10-rc3 tagged by Simon Wunderlich on Fri Dec 4 16:40:57 2020 +0100 - Shortlog ------------------------------------------------------------ This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - update include for min/max helpers, by Sven Eckelmann - add infrastructure and netlink functions for routing algo selection, by Sven Eckelmann (2 patches) - drop deprecated debugfs and sysfs support and obsoleted functionality, by Sven Eckelmann (3 patches) - drop unused include in fragmentation.c, by Simon Wunderlich -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl/KWIkWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoTrTEACUImdOCWv4+NnEQfChQv6Y3i18 gJABXoOkWLfFpGBUlw/uYzFKpMEWZ0orHig9gucC+rmjNc8veWwAOugJoTPTKQJZ /4yndhM0x39vWex03rdDmyqzCEh1V1Q9VcdEuD6XbJDaK5F4jDu3NQVneOijIkN+ 5PzhlvtUlfe8csykOCOoC9Y5wy82fEhcEvuSq+Z6dU3Cb3EGHtEUtZ4orDkpnnml 7XEcn5C5+OFGlz/ikiszKumTtNK+dmGluOxoyfAzEjQHK7PoTorcXFS2YUoSWeqQ gmYZ56RBqEHjo4eqcaEgcqq5v8cTPCEMCB8UQjAffxrhloRKHRhQOysG1+OnzGA8 IQ2ARHLQCVPVraXF2ixE0D3BvjKmtMmcvZOCXwhCHDajn9jFKAh0+hnInDyv6Fp1 7eUfpHACL9EQDxKWXeQg37X2mk3hHJ+4zgZOYidahVeKbiiexe2heaHTYAbr9rIf 8hvtlgMg4AnwL3IxadrKwsbJ5t7TEPLTInf47hPvpRg7SmthDTcgso4VDwmWgB8W Tlug8/NoXXDCmDhXUpvyi9+idHe0J8xvHl/2xGC7aSsPAbuhqOuefMKr36YhXJTY vBA5Ih5ppylJ8Dzwa0TbonvQbOAinA8YTa6izKxY4e+xTPB2jz/WT2vciEZv2+ig vNIPFrLZ7OFMohCDfQ== =tNKF -----END PGP SIGNATURE----- Simon Wunderlich (2): batman-adv: Start new development cycle batman-adv: Drop unused soft-interface.h include in fragmentation.c Sven Eckelmann (9): batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head batman-adv: Add new include for min/max helpers batman-adv: Prepare infrastructure for newlink settings batman-adv: Allow selection of routing algorithm over rtnetlink batman-adv: Drop deprecated sysfs support batman-adv: Drop deprecated debugfs support batman-adv: Drop legacy code for auto deleting mesh interfaces Taehee Yoo (1): batman-adv: set .owner to THIS_MODULE ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20201204, created. batadv-next-pullrequest-20201204
by postmaster＠open-mesh.org 04 Dec '20

04 Dec '20

The annotated tag, batadv-next-pullrequest-20201204 has been created at c23dea293bb67c049a51797247b59e7997be5419 (tag) tagging 34a14c2e6310a348a3f23af6e95bf9ea040f3ec8 (commit) replaces v5.10-rc3 tagged by Simon Wunderlich on Fri Dec 4 16:36:46 2020 +0100 - Shortlog ------------------------------------------------------------ This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - update include for min/max helpers, by Sven Eckelmann - add infrastructure and netlink functions for routing algo selection, by Sven Eckelmann (2 patches) - drop deprecated debugfs and sysfs support and obsoleted functionality, by Sven Eckelmann (3 patches) - drop unused include in fragmentation.c, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl/KV44WHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoUCREACJ4xVo22pbPb2qHth0P11t3pbK lHgb/Y8BhxrnaFmSTbQ7/mZXIe7usjgieNRbZRUTxmdniCvBPE7NL4LVeo6klG6p lVPM02jAhbEUsujzT673GqS1P04YpPBeSVqJ5MRork/ZCTvTjHrFHwOumhXu0rdo v1ufO297Y7HTAlhb0AlRhyMhPcnXk40uGSOQ4ZAY7sXozRcrN6O5oJ6bdZ3bZeOC gAKaXYNgz3M0TJAMsULojDZWGEwa1De0IbZ3gn6pzh0iIFlCeLBF5rvFvTP0cNHS 5lzjGis8eZNBY9obZLDLlboZEnZ8JoR3o7v9EyFR0+rAcoDFKHEm3dah70/bxlJA IkDBEHkM5V9EUakwXIu/C2xGLCQhU/RTLBkdWyUuF3n8ujFzAmmiSatKBU6fvPtc O/yzFtiDJ3tgEpXW97e7ZLy93CtqBvlEz+2u1foKR+DZSX+Wl+pFLTgKviHV2gfV +iK4KDvS426zhDb/Gt2V6BEmxptJmXLOiPZ/pyaaMu+Xu/8xHXK+Z04cnmPevym7 ZmTaIEOYjm2uGR9bk9A0Pqhw0j9GdDYJmi5pluHlYySWXIw4JhsJYsyBr3YlfPLm Lu1c6zg159f6+YmxaGEJmARVpenero/3TSFbXyECwWrYIs5706W89u60hWr9Al1K ucP9cCo4su8QkAz8HQ== =CKKz -----END PGP SIGNATURE----- Simon Wunderlich (2): batman-adv: Start new development cycle batman-adv: Drop unused soft-interface.h include in fragmentation.c Sven Eckelmann (9): batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head batman-adv: Add new include for min/max helpers batman-adv: Prepare infrastructure for newlink settings batman-adv: Allow selection of routing algorithm over rtnetlink batman-adv: Drop deprecated sysfs support batman-adv: Drop deprecated debugfs support batman-adv: Drop legacy code for auto deleting mesh interfaces Taehee Yoo (1): batman-adv: set .owner to THIS_MODULE ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2020