Skip to content
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

4.18-rc1 #30

Merged
merged 10,000 commits into from
Jun 17, 2018
Merged
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
3fb61ec
netfilter: nft_socket: fix module autoload
ummakynes Jun 7, 2018
215a31f
netfilter: nft_dynset: do not reject set updates with NFT_SET_EVAL
ummakynes Jun 11, 2018
71ad00c
netfilter: nf_tables: fix module unload race
Jun 11, 2018
0a2cf5e
netfilter: nf_tables: close race between netns exit and rmmod
Jun 11, 2018
adc972c
netfilter: nf_tables: use WARN_ON_ONCE instead of BUG_ON in nft_do_ch…
TaeheeYoo Jun 11, 2018
c05a45c
netfilter: ctnetlink: avoid null pointer dereference
Jun 11, 2018
fc6ddbe
netfilter: xt_connmark: fix list corruption on rmmod
Jun 12, 2018
21ba884
netfilter: nf_conncount: Fix garbage collection with zones
YiHungWei Jun 12, 2018
cdb8744
Revert "net: do not allow changing SO_REUSEADDR/SO_REUSEPORT on bound…
KAGA-KOKO Jun 12, 2018
b357bf6
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Jun 12, 2018
ea8781e
autofs: Fix typo s/thenew new/the new/ in AUTOFS4_FS description
geertu Jun 12, 2018
763f969
Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/gi…
torvalds Jun 12, 2018
467590e
Merge tag 'vfio-v4.18-rc1' of git://github.com/awilliam/linux-vfio
torvalds Jun 12, 2018
7259f64
Merge tag 'ntb-4.18' of git://github.com/jonmason/ntb
torvalds Jun 12, 2018
98db5e5
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…
torvalds Jun 12, 2018
19785cf
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git…
torvalds Jun 12, 2018
38da0d6
Merge tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux…
torvalds Jun 12, 2018
f8d0efb
nfp: don't pad strings in nfp_cpp_resource_find() to avoid gcc 8 warning
Jun 12, 2018
29f534c
nfp: include all ring counters in interface stats
Jun 12, 2018
fe06a64
nfp: remove phys_port_name on flower's vNIC
Jun 12, 2018
e62e51a
nfp: flower: free dst_entry in route table
pjvuuren Jun 12, 2018
01a1a17
Merge branch 'nfp-fixes'
davem330 Jun 12, 2018
8cde8f0
hv_netvsc: drop common code until callback model fixed
shemminger Jun 11, 2018
7bf7bb3
hv_netvsc: fix network namespace issues with VF support
shemminger Jun 11, 2018
c0a41b8
hv_netvsc: move VF to same namespace as netvsc device
shemminger Jun 11, 2018
bfc17d0
Merge branch 'hv_netvsc-notification-and-namespace-fixes'
davem330 Jun 12, 2018
909f1ed
net: phy: mdio-gpio: Cut surplus includes
linusw Jun 11, 2018
469998c
net: thunderx: prevent concurrent data re-writing by nicvf_set_rx_mode
Jun 8, 2018
31962c8
tc-testing: ife: fix wrong teardown command in test b7b8
dcaratti Jun 11, 2018
760a6ed
net: stmmac: dwmac-meson8b: Fix an error handling path in 'meson8b_dw…
tititiou36 Jun 11, 2018
c0129a0
smc: convert to ->poll_mask
congwang Jun 11, 2018
57f230a
xen/netfront: raise max number of slots in xennet_get_responses()
jgross1 Jun 12, 2018
a205f0c
Merge tag 'xfs-4.18-merge-10' of git://git.kernel.org/pub/scm/fs/xfs/…
torvalds Jun 12, 2018
8958fd4
test_overflow: fix an IS_ERR() vs NULL bug
Jun 12, 2018
5b572e2
Convert virtio_console to struct_size
Jun 7, 2018
7654cb1
Convert infiniband uverbs to struct_size
Jun 7, 2018
c817e6c
Convert v4l2 event to struct_size
Jun 7, 2018
b2303d7
Convert vhost to struct_size
Jun 7, 2018
a3ac973
Convert jffs2 acl to struct_size
Jun 7, 2018
6566f90
Convert intel uncore to struct_size
Jun 7, 2018
f3278e3
leds: Use struct_size() in allocation
kees Jun 11, 2018
353748a
UBIFS: Fix potential integer overflow in allocation
silviocesare May 4, 2018
9f645bc
video: uvesafb: Fix integer overflow in allocation
kees May 11, 2018
1c542f3
mm: Introduce kvcalloc()
kees Jun 11, 2018
6da2ec5
treewide: kmalloc() -> kmalloc_array()
kees Jun 12, 2018
6396bb2
treewide: kzalloc() -> kcalloc()
kees Jun 12, 2018
590b5b7
treewide: kzalloc_node() -> kcalloc_node()
kees Jun 12, 2018
344476e
treewide: kvmalloc() -> kvmalloc_array()
kees Jun 12, 2018
778e1cd
treewide: kvzalloc() -> kvcalloc()
kees Jun 12, 2018
3c4211b
treewide: devm_kmalloc() -> devm_kmalloc_array()
kees Jun 12, 2018
a86854d
treewide: devm_kzalloc() -> devm_kcalloc()
kees Jun 12, 2018
42bc47b
treewide: Use array_size() in vmalloc()
kees Jun 12, 2018
fad953c
treewide: Use array_size() in vzalloc()
kees Jun 12, 2018
fd7bece
treewide: Use array_size() in vzalloc_node()
kees Jun 12, 2018
84ca176
treewide: Use array_size() in kvzalloc_node()
kees Jun 12, 2018
76e43e3
treewide: Use array_size() in sock_kmalloc()
kees Jun 12, 2018
c860659
treewide: Use array_size() in f2fs_kmalloc()
kees Jun 12, 2018
026f050
treewide: Use array_size() in f2fs_kzalloc()
kees Jun 12, 2018
9d2a789
treewide: Use array_size in f2fs_kvzalloc()
kees Jun 12, 2018
b71dc51
KVM: PPC: Book3S PR: Handle additional interrupt types
Jun 5, 2018
916ccad
KVM: PPC: Book3S PR: Fix MSR setting when delivering interrupts
paulusmack Jun 7, 2018
a50623f
KVM: PPC: Book3S PR: Fix failure status setting in treclaim. emulation
paulusmack Jun 7, 2018
4f169d2
KVM: PPC: Book3S PR: Don't let PAPR guest set MSR hypervisor bit
paulusmack Jun 7, 2018
db96a04
KVM: PPC: Book3S PR: Enable use on POWER9 bare-metal hosts in HPT mode
paulusmack Jun 7, 2018
f61e0d3
KVM: PPC: Book3S PR: Fix failure status setting in tabort. emulation
justdoitqd Jun 8, 2018
4597fcf
Merge tag 'for-4.18/dm-changes-v2' of git://git.kernel.org/pub/scm/li…
torvalds Jun 13, 2018
b08fc52
Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/…
torvalds Jun 13, 2018
dbee3d0
KVM: x86: VMX: fix build without hyper-v
torvalds Jun 13, 2018
f5b7769
Revert "debugfs: inode: debugfs_create_dir uses mode permission from …
torvalds Jun 13, 2018
c7273bd
ALSA: hda/realtek - Add shutup hint
tiwai Jun 12, 2018
3a572d9
ALSA: usb-audio: Add native DSD support for Mytek DACs
jlaako Jun 12, 2018
f332485
ALSA: usb-audio: Generic DSD detection for XMOS-based implementations
jlaako Jun 12, 2018
d9d5ed1
ALSA: usb-audio: Remove explicitly listed Mytek devices
jlaako Jun 13, 2018
f493af3
nvme: don't rely on the changed namespace list log
Jun 7, 2018
2652df3
Merge branch 'pm-cpufreq'
rafaeljw Jun 13, 2018
6a900f8
Merge branches 'pm-domains' and 'pm-tools'
rafaeljw Jun 13, 2018
6744553
Merge branch 'acpica'
rafaeljw Jun 13, 2018
d09fcec
Merge tag 'pm-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Jun 13, 2018
d290ef9
Merge tag 'acpi-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jun 13, 2018
be779f0
Merge tag 'kbuild-v4.18-2' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Jun 13, 2018
a0b2ac2
drm/amdgpu: fix the missed vcn fw version report
huangrui May 23, 2018
2352939
drm/amdgpu: add checking for sos version
huangrui May 12, 2018
387f49e
drm/amdgpu: fix clear_all and replace handling in the VM (v2)
Jun 5, 2018
06b18f6
drm/amdgpu: fix CG enabling hang with gfxoff enabled
huangrui Jun 1, 2018
7584498
drm/amd/powerplay: fix missed hwmgr check warning before call gfx_off…
huangrui May 18, 2018
9702803
drm/amdgpu: Grab/put runtime PM references in atomic_commit_tail()
Lyude Jun 4, 2018
c3dade5
drm/amd/powerplay: fix wrong clock adjust sequence
Jun 6, 2018
c4ff91d
drm/amd/pp: initialize result to before or'ing in data
Jun 6, 2018
4b3c641
drm/amd/display: Fix stale buffer object (bo) use
Jun 7, 2018
f8a5de4
drm/amd/pp: Fix OD feature enable failed on Vega10 workstation cards
Jun 12, 2018
b0f6b80
drm/amd/include: Update df 3.6 mask and shift definition
Jun 12, 2018
cb5ed37
drm/amdgpu: fix parsing indirect register list v2
May 29, 2018
333c8d3
drm/amd/powerplay: remove uncessary extra gfxoff control call
Jun 12, 2018
60d061e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
davem330 Jun 13, 2018
050e9ba
Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables
torvalds Jun 14, 2018
463f202
Merge tag 'apparmor-pr-2018-06-13' of git://git.kernel.org/pub/scm/li…
torvalds Jun 14, 2018
9bca19a
Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jun 14, 2018
4b4bb99
Merge tag 'pwm/for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Jun 14, 2018
f3b5020
Merge tag 'platform-drivers-x86-v4.18-1' of git://git.infradead.org/l…
torvalds Jun 14, 2018
2837461
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Jun 14, 2018
4c98415
nvme-fc: change controllers first connect to use reconnect path
jsmart-gh Jun 13, 2018
5c16f36
drm/amd/powerplay: Set higher SCLK&MCLK frequency than dpm7 in OD (v2)
Jun 12, 2018
15eefe2
Merge branch 'vfs_timespec64' of https://github.com/deepa-hub/vfs int…
arndb Jun 14, 2018
e264abe
pstore: Remove bogus format string definition
arndb May 30, 2018
da66126
blk-mq: don't time out requests again that are in the timeout handler
Jun 14, 2018
587331f
nvme-fc: remove reinit_request routine
jsmart-gh Jun 13, 2018
3e493c0
nvme-fc: fix nulling of queue data on reconnect
jsmart-gh Jun 13, 2018
14dfa40
nvme: remove nvme_reinit_tagset
Jun 14, 2018
e6c3456
blk-mq: remove blk_mq_tagset_iter
Jun 14, 2018
273ba45
KVM: x86: fix typo at kvm_arch_hardware_setup comment
matosatti Jun 11, 2018
09027ab
Merge tag 'kvm-ppc-next-4.18-2' of git://git.kernel.org/pub/scm/linux…
bonzini Jun 14, 2018
41538f2
ALSA: sonicvibes: add error handling for snd_ctl_add
ZhouyangJia Jun 14, 2018
4a23fc8
ALSA: lx6464es: add error handling for pci_ioremap_bar
ZhouyangJia Jun 14, 2018
2dd5aa1
ALSA: usb-audio: Add bi-directional terminal types
Jun 14, 2018
167e1fb
ALSA: usb-audio: Change in connectors control creation interface
Jun 14, 2018
3528cd8
ALSA: usb-audio: Add insertion control for UAC3 BADD
Jun 14, 2018
ad6baae
ALSA: usb-audio: Always create the interrupt pipe for the mixer
Jun 14, 2018
1f008e1
KVM: x86: VMX: redo fix for link error without CONFIG_HYPERV
arndb May 25, 2018
9951912
sctp: define sctp_packet_gso_append to build GSO frames
lxin Jun 13, 2018
8458f8c
x86: fix dependency of X86_32_LAZY_GS
masahir0y Jun 14, 2018
a0f8c29
kconfig: tinyconfig: remove stale stack protector fixups
masahir0y Jun 14, 2018
d148eac
Kbuild: rename HAVE_CC_STACKPROTECTOR config variable
masahir0y Jun 14, 2018
e7655d2
Merge tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/…
torvalds Jun 14, 2018
dc594c3
Merge tag 'ceph-for-4.18-rc1' of git://github.com/ceph/ceph-client
torvalds Jun 14, 2018
7a93251
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Jun 14, 2018
1105a2f
mm/ksm.c: ignore STABLE_FLAG of rmap_item->address in rmap_walk_ksm()
Jun 14, 2018
df2a419
mm: fix null pointer dereference in mem_cgroup_protected
rgushchin Jun 14, 2018
955c97f
mm/swapfile.c: fix swap_count comment about nonexistent SWAP_HAS_CONT
danieljordan10 Jun 14, 2018
2bdce74
mm: fix devmem_is_allowed() for sub-page System RAM intersections
djbw Jun 14, 2018
92ee383
mm: fix race between kmem_cache destroy, create and deactivate
shakeelb Jun 14, 2018
a8311f6
kexec: yield to scheduler when loading kimage segments
Jun 14, 2018
655c79b
mm: check for SIGKILL inside dup_mmap() loop
Jun 14, 2018
69b5086
mm/memblock: add missing include <linux/bootmem.h>
malaterre Jun 14, 2018
37a4094
mremap: remove LATENCY_LIMIT from mremap to reduce the number of TLB …
gormanm Jun 14, 2018
26b9513
proc: skip branch in /proc/*/* lookup
Jun 14, 2018
c2574aa
fat: use fat_fs_error() instead of BUG_ON() in __fat_get_block()
OGAWAHirofumi Jun 14, 2018
86a2bb5
coredump: fix spam with zero VMA process
Jun 14, 2018
20fe935
exofs: avoid VLA in structures
kees Jun 14, 2018
3fb3894
kernel/relay.c: change return type to vm_fault_t
Jun 14, 2018
c9484b9
kcov: ensure irq code sees a valid area
Jun 14, 2018
dc55daf
kcov: prefault the kcov_area
Jun 14, 2018
0ed557a
sched/core / kcov: avoid kcov_area during task switch
Jun 14, 2018
7585172
arm: port KCOV to arm
dvyukov Jun 14, 2018
f1b4bd0
fault-injection: reorder config entries
Jun 14, 2018
ec67aaa
sysvipc/sem: mitigate semnum index against spectre v1
Jun 14, 2018
14f28f5
ipc: use new return type vm_fault_t
Jun 14, 2018
0825a6f
mm: use octal not symbolic permissions
JoePerches Jun 14, 2018
d7dc899
treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX
agners Jun 14, 2018
fe6bdfc
mm: fix oom_kill event handling
rgushchin Jun 14, 2018
2738f35
hexagon: fix printk format warning in setup.c
rddunlap Jun 14, 2018
608dbdf
hexagon: drop the unused variable zero_page_mask
Jun 14, 2018
ee410f1
lib/test_printf.c: call wait_for_random_bytes() before plain %p tests
Jun 14, 2018
b5d903c
Merge branch 'akpm' (patches from Andrew)
torvalds Jun 14, 2018
bdf767c
net: qcom/emac: Add missing of_node_put()
Jun 11, 2018
4fd44a9
tcp: verify the checksum of the first data segment in a new connection
fllinden Jun 12, 2018
94aefd3
aio: mark __aio_sigset::sigmask const
avikivity Jun 8, 2018
4d572d9
eventfd: only return events requested in poll_mask()
avikivity Jun 8, 2018
087fca5
net: emaclite: Fix position of lp->mii_bus assignment
radheyxilinx Jun 13, 2018
27cad00
net: emaclite: Fix MDIO bus unregister bug
radheyxilinx Jun 13, 2018
bd45cbf
net: emaclite: Remove unused 'has_mdio' flag.
radheyxilinx Jun 13, 2018
560c5bd
net: emaclite: Remove xemaclite_mdio_setup return check
radheyxilinx Jun 13, 2018
aeddb6d
Merge branch 'emaclite-fixes'
davem330 Jun 15, 2018
2739b80
aio: only return events requested in poll_mask() for IOCB_CMD_POLL
Jun 11, 2018
11c5ad0
eventpoll: switch to ->poll_mask
bnoordhuis Jun 14, 2018
90904ff
l2tp: fix pseudo-wire type for sessions created by pppol2tp_connect()
Jun 13, 2018
7ac6ab1
l2tp: only accept PPP sessions in pppol2tp_connect()
Jun 13, 2018
3e1bc8b
l2tp: prevent pppol2tp_connect() from creating kernel sockets
Jun 13, 2018
bda06be
l2tp: clean up stale tunnel or session in pppol2tp_connect's error path
Jun 13, 2018
7f6afc3
Merge branch 'l2tp-fixes'
davem330 Jun 15, 2018
daf0678
Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/l…
airlied Jun 15, 2018
f1693c6
rds: avoid unenecessary cong_update in loop transport
SantoshShilimkar Jun 14, 2018
06bdf28
hv_netvsc: Fix the variable sizes in ipsecv2 and rsc offload
haiyangz Jun 15, 2018
5ed0127
signalfd: lift sigmask copyin and size checks to callers of do_signal…
May 27, 2018
430ff79
orangefs: simplify compat ioctl handling
May 27, 2018
24074a3
proc: Make inline name size calculation automatic
dhowells Jun 13, 2018
b6cfbec
afs: Handle CONFIG_PROC_FS=n
dhowells Jun 5, 2018
0aac4bc
afs: Show all of a server's addresses in /proc/fs/afs/servers
dhowells Jun 2, 2018
becfc5e
Merge tag 'drm-next-2018-06-15' of git://anongit.freedesktop.org/drm/drm
torvalds Jun 15, 2018
2f6e24d
Merge tag 'sound-fix-4.18-rc1' of git://git.kernel.org/pub/scm/linux/…
torvalds Jun 15, 2018
4c5e8fc
Merge tag 'linux-kselftest-4.18-rc1-2' of git://git.kernel.org/pub/sc…
torvalds Jun 15, 2018
3bc32bb
nvme-fabrics: refactor queue ready check
Jun 11, 2018
278ab37
nvme-fabrics: handle the admin-only case properly in nvmf_check_ready
Jun 11, 2018
35897b9
nvme-fabrics: fix and refine state checks in __nvmf_check_ready
Jun 11, 2018
badbc27
nl80211: fix some kernel doc tag mistakes
lucacoelho Jun 8, 2018
3c12d04
cfg80211: initialize sinfo in cfg80211_get_station
ecsv Jun 6, 2018
3f61b7a
mac80211_hwsim: fix module init error paths
jmberg-intel May 29, 2018
dc8b274
mac80211: Move up init of TXQs
tohojo May 25, 2018
bf2b61a
cfg80211: fix rcu in cfg80211_unregister_wdev
Jun 15, 2018
95c7c09
Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus
axboe Jun 15, 2018
be7f99c
block: remov blk_queue_invalidate_tags
Jun 15, 2018
d6c7396
bsg: fix race of bsg_open and bsg_unregister
glagolig Jun 13, 2018
c88d5a7
afs: Enable IPv6 DNS lookups
dhowells Jun 15, 2018
0da0b7f
afs: Display manually added cells in dynamic root mount
dhowells Jun 15, 2018
47ea0f2
afs: Optimise callback breaking by not repeating volume lookup
dhowells Jun 15, 2018
b701745
docs: can.rst: fix a footnote reference
mchehab May 6, 2018
2fab301
docs: crypto_engine.rst: Fix two parse warnings
mchehab May 6, 2018
ecf3867
arch/*: Kconfig: fix documentation for NMI watchdog
mchehab May 9, 2018
ab188e8
stmmac: added support for 802.1ad vlan stripping
Jun 15, 2018
41f9ba6
Merge tag 'mac80211-for-davem-2018-06-15' of git://git.kernel.org/pub…
davem330 Jun 15, 2018
6eba08c
ipv6: Only emit append events for appended routes
idosch Jun 15, 2018
53b562d
mlxsw: spectrum_router: Allow appending to dev-only routes
idosch Jun 15, 2018
ce45bde
mlxsw: spectrum_router: Align with new route replace logic
idosch Jun 15, 2018
9e25826
mlxsw: spectrum_switchdev: Fix port_vlan refcounting
pmachata Jun 15, 2018
eab9a2d
Merge branch 'mlxsw-IPv6-and-reference-counting-fixes'
davem330 Jun 15, 2018
de9bada
l2tp: reject creation of non-PPP sessions on L2TPv2 tunnels
Jun 15, 2018
ecd012e
l2tp: filter out non-PPP sessions in pppol2tp_tunnel_ioctl()
Jun 15, 2018
695ad87
Merge branch 'l2tp-l2tp_ppp-must-ignore-non-PPP-sessions'
davem330 Jun 15, 2018
a447da7
tls: fix use-after-free in tls_push_record
borkmann Jun 15, 2018
06030db
tls: fix waitall behavior in tls_sw_recvmsg
borkmann Jun 15, 2018
c14a024
Merge branch 'tls-fixes'
davem330 Jun 15, 2018
7c09977
net: cxgb3: add error handling for sysfs_create_group
ZhouyangJia Jun 15, 2018
f6a6f20
neighbour: skip NTF_EXT_LEARNED entries during forced gc
roopa-prabhu Jun 13, 2018
7cfde0a
net: stmmac: Run HWIF Quirks after getting HW caps
joabreu Jun 15, 2018
ec15872
docs: fix broken references with multiple hints
mchehab May 8, 2018
5fb94e9
docs: Fix some broken references
mchehab May 8, 2018
fe63a1a
media: dvb: fix location of get_dvb_firmware script
mchehab May 8, 2018
670d7ad
media: dvb: point to the location of the old README.dvb-usb file
mchehab May 8, 2018
2ebe0bb
media: v4l: fix broken video4linux docs locations
mchehab May 8, 2018
5044024
scripts/documentation-file-ref-check: accept more wildcards at filenames
mchehab Jun 14, 2018
be600e5
scripts/documentation-file-ref-check: add a fix logic for DT
mchehab Jun 14, 2018
e1f319f
scripts/documentation-file-ref-check: hint: dash or underline
mchehab Jun 14, 2018
2d69708
scripts/documentation-file-ref-check: get rid of false-positives
mchehab Jun 14, 2018
a78513c
scripts/documentation-file-ref-check: check tools/*/Documentation
mchehab Jun 14, 2018
1ca2c80
kernel-parameters.txt: fix pointers to sound parameters
mchehab Jun 14, 2018
2f635cf
MAINTAINERS: fix location of some display DT bindings
mchehab Jun 14, 2018
5efa6f8
MAINTAINERS: fix location of DT npcm files
mchehab Jun 14, 2018
6c79521
devicetree: fix some bindings file names
mchehab Jun 14, 2018
18ba1f9
devicetree: fix name of pinctrl-bindings.txt
mchehab Jun 14, 2018
e5ca425
devicetree: fix a series of wrong file references
mchehab Jun 14, 2018
6ec71b2
ABI: sysfs-devices-system-cpu: remove a broken reference
mchehab Jun 14, 2018
315e6bc
Documentation: rstFlatTable.py: fix a broken reference
mchehab Jun 14, 2018
44348e8
fix a series of Documentation/ broken file name references
mchehab Jun 14, 2018
b698201
media: max2175: fix location of driver's companion documentation
mchehab Jun 14, 2018
40fc3eb
scripts/documentation-file-ref-check: fix help message
mchehab Jun 14, 2018
34962fb
docs: Fix more broken references
mchehab May 8, 2018
042c768
bindings: nvmem/zii: Fix location of nvmem.txt
mchehab Jun 14, 2018
2f3f056
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…
torvalds Jun 15, 2018
8949170
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Jun 15, 2018
6a4d4b3
Merge tag 'riscv-for-linus-4.18-merge_window' of git://git.kernel.org…
torvalds Jun 15, 2018
8d1e513
Merge branch 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/lin…
torvalds Jun 15, 2018
de7f01c
Merge tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/k…
torvalds Jun 15, 2018
9215310
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds Jun 15, 2018
a5b729e
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Jun 16, 2018
29d6849
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Jun 16, 2018
35773c9
Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Jun 16, 2018
644f263
Merge tag 'fbdev-v4.18' of git://github.com/bzolnier/linux
torvalds Jun 16, 2018
dbb2816
Merge tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/li…
torvalds Jun 16, 2018
5e7b921
Merge tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental
torvalds Jun 16, 2018
265c559
Merge tag 'for-linus-20180616' of git://git.kernel.dk/linux-block
torvalds Jun 16, 2018
ce397d2
Linux 4.18-rc1
torvalds Jun 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sctp: define sctp_packet_gso_append to build GSO frames
Now sctp GSO uses skb_gro_receive() to append the data into head
skb frag_list. However it actually only needs very few code from
skb_gro_receive(). Besides, NAPI_GRO_CB has to be set while most
of its members are not needed here.

This patch is to add sctp_packet_gso_append() to build GSO frames
instead of skb_gro_receive(), and it would avoid many unnecessary
checks and make the code clearer.

Note that sctp will use page frags instead of frag_list to build
GSO frames in another patch. But it may take time, as sctp's GSO
frames may have different size. skb_segment() can only split it
into the frags with the same size, which would break the border
of sctp chunks.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
lxin authored and davem330 committed Jun 14, 2018

Verified

This commit was signed with the committer’s verified signature.
jameslamb James Lamb
commit 995191220056300c51ed870a5d5321f91f3eef89
5 changes: 5 additions & 0 deletions include/net/sctp/structs.h
Original file line number Diff line number Diff line change
@@ -1133,6 +1133,11 @@ struct sctp_input_cb {
};
#define SCTP_INPUT_CB(__skb) ((struct sctp_input_cb *)&((__skb)->cb[0]))

struct sctp_output_cb {
struct sk_buff *last;
};
#define SCTP_OUTPUT_CB(__skb) ((struct sctp_output_cb *)&((__skb)->cb[0]))

static inline const struct sk_buff *sctp_gso_headskb(const struct sk_buff *skb)
{
const struct sctp_chunk *chunk = SCTP_INPUT_CB(skb)->chunk;
28 changes: 18 additions & 10 deletions net/sctp/output.c
Original file line number Diff line number Diff line change
@@ -409,6 +409,21 @@ static void sctp_packet_set_owner_w(struct sk_buff *skb, struct sock *sk)
refcount_inc(&sk->sk_wmem_alloc);
}

static void sctp_packet_gso_append(struct sk_buff *head, struct sk_buff *skb)
{
if (SCTP_OUTPUT_CB(head)->last == head)
skb_shinfo(head)->frag_list = skb;
else
SCTP_OUTPUT_CB(head)->last->next = skb;
SCTP_OUTPUT_CB(head)->last = skb;

head->truesize += skb->truesize;
head->data_len += skb->len;
head->len += skb->len;

__skb_header_release(skb);
}

static int sctp_packet_pack(struct sctp_packet *packet,
struct sk_buff *head, int gso, gfp_t gfp)
{
@@ -422,7 +437,7 @@ static int sctp_packet_pack(struct sctp_packet *packet,

if (gso) {
skb_shinfo(head)->gso_type = sk->sk_gso_type;
NAPI_GRO_CB(head)->last = head;
SCTP_OUTPUT_CB(head)->last = head;
} else {
nskb = head;
pkt_size = packet->size;
@@ -503,15 +518,8 @@ static int sctp_packet_pack(struct sctp_packet *packet,
&packet->chunk_list);
}

if (gso) {
if (skb_gro_receive(&head, nskb)) {
kfree_skb(nskb);
return 0;
}
if (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >=
sk->sk_gso_max_segs))
return 0;
}
if (gso)
sctp_packet_gso_append(head, nskb);

pkt_count++;
} while (!list_empty(&packet->chunk_list));