Changes in 4.9.190 usb: usbfs: fix double-free of usb memory upon submiturb error usb: iowarrior: fix deadlock on disconnect sound: fix a memory leak bug x86/mm: Check for pfn instead of page in vmalloc_sync_one() x86/mm: Sync also unmappings in vmalloc_sync_all() mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy() perf record: Fix wrong size in perf_record_mmap for last kernel module perf db-export: Fix thread__exec_comm() perf record: Fix module size on s390 usb: yurex: Fix use-after-free in yurex_delete can: peak_usb: fix potential double kfree_skb() netfilter: nfnetlink: avoid deadlock due to synchronous request_module iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND mac80211: don't warn about CW params when not using them hwmon: (nct6775) Fix register address and added missed tolerance for nct6106 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init() s390/qdio: add sanity checks to the fast-requeue path ALSA: compress: Fix regression on compressed capture streams ALSA: compress: Prevent bypasses of set_params ALSA: compress: Don't allow paritial drain operations on capture streams ALSA: compress: Be more restrictive about when a drain is allowed perf probe: Avoid calling freeing routine multiple times for same pointer drbd: dynamically allocate shash descriptor ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() ARM: davinci: fix sleep.S build error on ARMv4 scsi: megaraid_sas: fix panic on loading firmware crashdump scsi: ibmvfc: fix WARN_ON during event pool release scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop perf/core: Fix creating kernel counters for PMUs that override event->cpu can: peak_usb: pcan_usb_pro: Fix info-leaks to USB devices can: peak_usb: pcan_usb_fd: Fix info-leaks to USB devices hwmon: (nct7802) Fix wrong detection of in4 presence ALSA: firewire: fix a memory leak bug ALSA: hda - Don't override global PCM hw info flag mac80211: don't WARN on short WMM parameters from AP SMB3: Fix deadlock in validate negotiate hits reconnect smb3: send CAP_DFS capability during session setup mwifiex: fix 802.11n/WPA detection iwlwifi: don't unmap as page memory that was mapped as single scsi: mpt3sas: Use 63-bit DMA addressing on SAS35 HBA sh: kernel: hw_breakpoint: Fix missing break in switch statement mm/usercopy: use memory range to be accessed for wraparound check mm/memcontrol.c: fix use after free in mem_cgroup_iter() bpf: get rid of pure_initcall dependency to enable jits bpf: restrict access to core bpf sysctls bpf: add bpf_jit_limit knob to restrict unpriv allocations vhost-net: set packet weight of tx polling to 2 * vq size vhost_net: use packet weight for rx handler, too vhost_net: introduce vhost_exceeds_weight() vhost: introduce vhost_exceeds_weight() vhost_net: fix possible infinite loop vhost: scsi: add weight support siphash: add cryptographically secure PRF siphash: implement HalfSipHash1-3 for hash tables inet: switch IP ID generator to siphash netfilter: ctnetlink: don't use conntrack/expect object addresses as id xtensa: add missing isync to the cpu_reset TLB code ALSA: hda - Fix a memory leak bug ALSA: hda - Add a generic reboot_notify ALSA: hda - Let all conexant codec enter D3 when rebooting HID: holtek: test for sanity of intfdata HID: hiddev: avoid opening a disconnected device HID: hiddev: do cleanup in failure of opening a device Input: kbtab - sanity check for endpoint type Input: iforce - add sanity checks net: usb: pegasus: fix improper read if get_registers() fail xen/pciback: remove set but not used variable 'old_state' irqchip/irq-imx-gpcv2: Forward irq type to parent perf header: Fix divide by zero error if f_header.attr_size==0 perf header: Fix use of unitialized value warning libata: zpodd: Fix small read overflow in zpodd_get_mech_type() scsi: hpsa: correct scsi command status issue after reset ata: libahci: do not complain in case of deferred probe kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules arm64/efi: fix variable 'si' set but not used arm64/mm: fix variable 'pud' set but not used IB/core: Add mitigation for Spectre V1 IB/mad: Fix use-after-free in ib mad completion handling ocfs2: remove set but not used variable 'last_hash' staging: comedi: dt3000: Fix signed integer overflow 'divider * base' staging: comedi: dt3000: Fix rounding up of timer divisor USB: core: Fix races in character device registration and deregistraion usb: cdc-acm: make sure a refcount is taken early enough USB: CDC: fix sanity checks in CDC union parser USB: serial: option: add D-Link DWM-222 device ID USB: serial: option: Add support for ZTE MF871A USB: serial: option: add the BroadMobi BM818 card USB: serial: option: Add Motorola modem UARTs asm-generic: fix -Wtype-limits compiler warnings bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K arm64: compat: Allow single-byte watchpoints on all addresses netfilter: conntrack: Use consistent ct id hash calculation Input: psmouse - fix build error of multiple definition iommu/amd: Move iommu_init_pci() to .init section bnx2x: Fix VF's VLAN reconfiguration in reload. net/packet: fix race in tpacket_snd() sctp: fix the transport error_count check xen/netback: Reset nr_frags before freeing skb net/mlx5e: Only support tx/rx pause setting for port owner net/mlx5e: Use flow keys dissector to parse packets for ARFS team: Add vlan tx offload to hw_enc_features bonding: Add vlan tx offload to hw_enc_features Linux 4.9.190 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
* helpers for managing a buffer for many packets
|
|
*
|
|
* Copyright (c) Clemens Ladisch <clemens@ladisch.de>
|
|
* Licensed under the terms of the GNU General Public License, version 2.
|
|
*/
|
|
|
|
#include <linux/firewire.h>
|
|
#include <linux/export.h>
|
|
#include <linux/slab.h>
|
|
#include "packets-buffer.h"
|
|
|
|
/**
|
|
* iso_packets_buffer_init - allocates the memory for packets
|
|
* @b: the buffer structure to initialize
|
|
* @unit: the device at the other end of the stream
|
|
* @count: the number of packets
|
|
* @packet_size: the (maximum) size of a packet, in bytes
|
|
* @direction: %DMA_TO_DEVICE or %DMA_FROM_DEVICE
|
|
*/
|
|
int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit,
|
|
unsigned int count, unsigned int packet_size,
|
|
enum dma_data_direction direction)
|
|
{
|
|
unsigned int packets_per_page, pages;
|
|
unsigned int i, page_index, offset_in_page;
|
|
void *p;
|
|
int err;
|
|
|
|
b->packets = kmalloc(count * sizeof(*b->packets), GFP_KERNEL);
|
|
if (!b->packets) {
|
|
err = -ENOMEM;
|
|
goto error;
|
|
}
|
|
|
|
packet_size = L1_CACHE_ALIGN(packet_size);
|
|
packets_per_page = PAGE_SIZE / packet_size;
|
|
if (WARN_ON(!packets_per_page)) {
|
|
err = -EINVAL;
|
|
goto err_packets;
|
|
}
|
|
pages = DIV_ROUND_UP(count, packets_per_page);
|
|
|
|
err = fw_iso_buffer_init(&b->iso_buffer, fw_parent_device(unit)->card,
|
|
pages, direction);
|
|
if (err < 0)
|
|
goto err_packets;
|
|
|
|
for (i = 0; i < count; ++i) {
|
|
page_index = i / packets_per_page;
|
|
p = page_address(b->iso_buffer.pages[page_index]);
|
|
offset_in_page = (i % packets_per_page) * packet_size;
|
|
b->packets[i].buffer = p + offset_in_page;
|
|
b->packets[i].offset = page_index * PAGE_SIZE + offset_in_page;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_packets:
|
|
kfree(b->packets);
|
|
error:
|
|
return err;
|
|
}
|
|
EXPORT_SYMBOL(iso_packets_buffer_init);
|
|
|
|
/**
|
|
* iso_packets_buffer_destroy - frees packet buffer resources
|
|
* @b: the buffer structure to free
|
|
* @unit: the device at the other end of the stream
|
|
*/
|
|
void iso_packets_buffer_destroy(struct iso_packets_buffer *b,
|
|
struct fw_unit *unit)
|
|
{
|
|
fw_iso_buffer_destroy(&b->iso_buffer, fw_parent_device(unit)->card);
|
|
kfree(b->packets);
|
|
}
|
|
EXPORT_SYMBOL(iso_packets_buffer_destroy);
|