5.15.33-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 840/913 net: hns3: fix the concurrency between functions reading debugfs
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
commit 9c9a04212fa380d2e7d1412bb281309955c0a781 upstream.
Currently, the debugfs mechanism is that all functions share a global variable to save the pointer for obtaining data. When different functions concurrently access the same file node, repeated release exceptions occur. Therefore, the granularity of the pointer for storing the obtained data is adjusted to be private for each function.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 15 +++++++++++---- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 - 3 files changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -0
@@ -835,6 +835,7 @@ struct hnae3_handle {struct dentry *hnae3_dbgfs;/* protects concurrent contention between debugfs commands */ struct mutex dbgfs_lock; +char **dbgfs_buf;/* Network interface message level enabled bits */ u32 msg_enable;
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +11 -4
@@ -1022,7 +1022,7 @@ static ssize_t hns3_dbg_read(struct filereturn ret;mutex_lock (&handle->dbgfs_lock); - save_buf = &hns3_dbg_cmd[index].buf; + save_buf = &handle->dbgfs_buf[index];if (!test_bit (HNS3_NIC_STATE_INITED , &priv->state) ||test_bit (HNS3_NIC_STATE_RESETTING , &priv->state)) {
@@ -1127,6 +1127,13 @@ int hns3_dbg_init(struct hnae3_handle *hint ret;u32 i; + handle->dbgfs_buf =devm_kcalloc (&handle->pdev->dev, +ARRAY_SIZE (hns3_dbg_cmd), +sizeof (*handle->dbgfs_buf), +GFP_KERNEL ); +if (!handle->dbgfs_buf) +return -ENOMEM ; + hns3_dbg_dentry[HNS3_DBG_DENTRY_COMMON ].dentry =debugfs_create_dir (name, hns3_dbgfs_root); handle->hnae3_dbgfs = hns3_dbg_dentry[HNS3_DBG_DENTRY_COMMON ].dentry;
@@ -1175,9 +1182,9 @@ void hns3_dbg_uninit(struct hnae3_handleu32 i;for (i =0 ; i <ARRAY_SIZE (hns3_dbg_cmd); i++) -if (hns3_dbg_cmd[i].buf) { -kvfree (hns3_dbg_cmd[i].buf); - hns3_dbg_cmd[i].buf =NULL ; +if (handle->dbgfs_buf[i]) { +kvfree (handle->dbgfs_buf[i]); + handle->dbgfs_buf[i] =NULL ; }mutex_destroy (&handle->dbgfs_lock);
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h +0 -1
@@ -47,7 +47,6 @@ struct hns3_dbg_cmd_info {enum hnae3_dbg_cmd cmd;enum hns3_dbg_dentry_type dentry;u32 buf_len; -char *buf;int (*init)(struct hnae3_handle *handle,unsigned int cmd); };
Greg Kroah-Hartman
maintainerPATCH 841/913 net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
commit 7ed258f12ec5ce855f15cdfb5710361dc82fe899 upstream.
When user delete vlan 0, as driver will not delete vlan 0 for hardware in function hclge_set_vlan_filter_hw(), so vlan 0 in software vlan talbe should not be deleted.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -3
@@ -10595,11 +10595,11 @@ int hclge_set_vlan_filter(struct hnae3_h }if (!ret) { -if (is_kill) -hclge_rm_vport_vlan_table (vport, vlan_id, false); -else +if (!is_kill)hclge_add_vport_vlan_table (vport, vlan_id, writen_to_tbl); +else if (is_kill && vlan_id !=0 ) +hclge_rm_vport_vlan_table (vport, vlan_id, false); }else if (is_kill) {/* when remove hw vlan filter failed, record the vlan id, * and try to remove it from hw later, to be consistence
Greg Kroah-Hartman
maintainerPATCH 842/913 rxrpc: fix some null-ptr-deref bugs in server_key.c
In reply to Greg Kroah-HartmanFrom: Xiaolong Huang <[email protected]>
commit ff8376ade4f668130385839cef586a0990f8ef87 upstream.
Some function calls are not implemented in rxrpc_no_security, there are preparse_server_key, free_preparse_server_key and destroy_server_key. When rxrpc security type is rxrpc_no_security, user can easily trigger a null-ptr-deref bug via ioctl. So judgment should be added to prevent it
The crash log:
user@syzkaller:~$ ./rxrpc_preparse_s [ 37.956878][T15626] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 37.957645][T15626] #PF: supervisor instruction fetch in kernel mode [ 37.958229][T15626] #PF: error_code(0x0010) - not-present page [ 37.958762][T15626] PGD 4aadf067 P4D 4aadf067 PUD 4aade067 PMD 0 [ 37.959321][T15626] Oops: 0010 [#1] PREEMPT SMP [ 37.959739][T15626] CPU: 0 PID: 15626 Comm: rxrpc_preparse_ Not tainted 5.17.0-01442-gb47d5a4f6b8d #43 [ 37.960588][T15626] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1 04/01/2014 [ 37.961474][T15626] RIP: 0010:0x0 [ 37.961787][T15626] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. [ 37.962480][T15626] RSP: 0018:ffffc9000d9abdc0 EFLAGS: 00010286 [ 37.963018][T15626] RAX: ffffffff84335200 RBX: ffff888012a1ce80 RCX: 0000000000000000 [ 37.963727][T15626] RDX: 0000000000000000 RSI: ffffffff84a736dc RDI: ffffc9000d9abe48 [ 37.964425][T15626] RBP: ffffc9000d9abe48 R08: 0000000000000000 R09: 0000000000000002 [ 37.965118][T15626] R10: 000000000000000a R11: f000000000000000 R12: ffff888013145680 [ 37.965836][T15626] R13: 0000000000000000 R14: ffffffffffffffec R15: ffff8880432aba80 [ 37.966441][T15626] FS: 00007f2177907700(0000) GS:ffff88803ec00000(0000) knlGS:0000000000000000 [ 37.966979][T15626] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 37.967384][T15626] CR2: ffffffffffffffd6 CR3: 000000004aaf1000 CR4: 00000000000006f0 [ 37.967864][T15626] Call Trace: [ 37.968062][T15626] <TASK> [ 37.968240][T15626] rxrpc_preparse_s+0x59/0x90 [ 37.968541][T15626] key_create_or_update+0x174/0x510 [ 37.968863][T15626] __x64_sys_add_key+0x139/0x1d0 [ 37.969165][T15626] do_syscall_64+0x35/0xb0 [ 37.969451][T15626] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 37.969824][T15626] RIP: 0033:0x43a1f9
--- net/rxrpc/server_key.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/rxrpc/server_key.c +5 -2
@@ -84,6 +84,9 @@ static int rxrpc_preparse_s(struct key_p prep->payload.data[1 ] = (struct rxrpc_security *)sec; +if (!sec->preparse_server_key) +return -EINVAL ; +return sec->preparse_server_key (prep); }
@@ -91,7 +94,7 @@ static void rxrpc_free_preparse_s(struct {const struct rxrpc_security *sec = prep->payload.data[1 ]; -if (sec) +if (sec && sec->free_preparse_server_key) sec->free_preparse_server_key (prep); }
@@ -99,7 +102,7 @@ static void rxrpc_destroy_s(struct key * {const struct rxrpc_security *sec = key->payload.data[1 ]; -if (sec) +if (sec && sec->destroy_server_key) sec->destroy_server_key (key); }
Greg Kroah-Hartman
maintainerPATCH 843/913 rxrpc: Fix call timer start racing with call destruction
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit 4a7f62f91933c8ae5308f9127fd8ea48188b6bc3 upstream.
The rxrpc_call struct has a timer used to handle various timed events relating to a call. This timer can get started from the packet input routines that are run in softirq mode with just the RCU read lock held. Unfortunately, because only the RCU read lock is held - and neither ref or other lock is taken - the call can start getting destroyed at the same time a packet comes in addressed to that call. This causes the timer - which was already stopped - to get restarted. Later, the timer dispatch code may then oops if the timer got deallocated first.
Fix this by trying to take a ref on the rxrpc_call struct and, if successful, passing that ref along to the timer. If the timer was already running, the ref is discarded.
The timer completion routine can then pass the ref along to the call's work item when it queues it. If the timer or work item where already queued/running, the extra ref is discarded.
--- include/trace/events/rxrpc.h | 8 +++++++- net/rxrpc/ar-internal.h | 15 +++++++-------- net/rxrpc/call_event.c | 2 +- net/rxrpc/call_object.c | 40 +++++++++++++++++++++++++++++++++++----- 4 files changed, 50 insertions(+), 15 deletions(-)
include/trace/events/rxrpc.h +7 -1
@@ -83,12 +83,15 @@ enum rxrpc_call_trace { rxrpc_call_error, rxrpc_call_got, rxrpc_call_got_kernel, + rxrpc_call_got_timer, rxrpc_call_got_userid, rxrpc_call_new_client, rxrpc_call_new_service, rxrpc_call_put, rxrpc_call_put_kernel, rxrpc_call_put_noqueue, + rxrpc_call_put_notimer, + rxrpc_call_put_timer, rxrpc_call_put_userid, rxrpc_call_queued, rxrpc_call_queued_ref,
@@ -278,12 +281,15 @@ enum rxrpc_tx_point { EM(rxrpc_call_error, "*E*") \ EM(rxrpc_call_got, "GOT") \ EM(rxrpc_call_got_kernel, "Gke") \ + EM(rxrpc_call_got_timer, "GTM") \ EM(rxrpc_call_got_userid, "Gus") \ EM(rxrpc_call_new_client, "NWc") \ EM(rxrpc_call_new_service, "NWs") \ EM(rxrpc_call_put, "PUT") \ EM(rxrpc_call_put_kernel, "Pke") \ - EM(rxrpc_call_put_noqueue, "PNQ") \ + EM(rxrpc_call_put_noqueue, "PnQ") \ + EM(rxrpc_call_put_notimer, "PnT") \ + EM(rxrpc_call_put_timer, "PTM") \ EM(rxrpc_call_put_userid, "Pus") \ EM(rxrpc_call_queued, "QUE") \EM (rxrpc_call_queued_ref,"QUR" ) \
net/rxrpc/ar-internal.h +7 -8
@@ -777,14 +777,12 @@ void rxrpc_propose_ACK(struct rxrpc_call enum rxrpc_propose_ack_trace);void rxrpc_process_call (struct work_struct *); -static inline void rxrpc_reduce_call_timer (struct rxrpc_call *call, -unsigned long expire_at, -unsigned long now, -enum rxrpc_timer_trace why) -{ -trace_rxrpc_timer (call, why, now); -timer_reduce (&call->timer, expire_at); -} +void rxrpc_reduce_call_timer (struct rxrpc_call *call, +unsigned long expire_at, +unsigned long now, +enum rxrpc_timer_trace why); + +void rxrpc_delete_call_timer (struct rxrpc_call *call);/* * call_object.c
@@ -808,6 +806,7 @@ void rxrpc_release_calls_on_socket(strucbool __rxrpc_queue_call (struct rxrpc_call *);bool rxrpc_queue_call (struct rxrpc_call *);void rxrpc_see_call (struct rxrpc_call *); +bool rxrpc_try_get_call (struct rxrpc_call *call,enum rxrpc_call_trace op);void rxrpc_get_call (struct rxrpc_call *,enum rxrpc_call_trace );void rxrpc_put_call (struct rxrpc_call *,enum rxrpc_call_trace );void rxrpc_cleanup_call (struct rxrpc_call *);
net/rxrpc/call_event.c +1 -1
@@ -310,7 +310,7 @@ recheck_state: }if (call->state ==RXRPC_CALL_COMPLETE ) { -del_timer_sync (&call->timer); +rxrpc_delete_call_timer (call); goto out_put; }
net/rxrpc/call_object.c +35 -5
@@ -53,10 +53,30 @@ static void rxrpc_call_timer_expired(strif (call->state <RXRPC_CALL_COMPLETE ) {trace_rxrpc_timer (call, rxrpc_timer_expired, jiffies); -rxrpc_queue_call (call); +__rxrpc_queue_call (call); + }else { +rxrpc_put_call (call, rxrpc_call_put); + } +} + +void rxrpc_reduce_call_timer (struct rxrpc_call *call, +unsigned long expire_at, +unsigned long now, +enum rxrpc_timer_trace why) +{ +if (rxrpc_try_get_call (call, rxrpc_call_got_timer)) { +trace_rxrpc_timer (call, why, now); +if (timer_reduce (&call->timer, expire_at)) +rxrpc_put_call (call, rxrpc_call_put_notimer); } } +void rxrpc_delete_call_timer (struct rxrpc_call *call) +{ +if (del_timer_sync (&call->timer)) +rxrpc_put_call (call, rxrpc_call_put_timer); +} +static struct lock_class_key rxrpc_call_user_mutex_lock_class_key;/*
@@ -463,6 +483,17 @@ void rxrpc_see_call(struct rxrpc_call *c } } +bool rxrpc_try_get_call (struct rxrpc_call *call,enum rxrpc_call_trace op) +{ +const void *here =__builtin_return_address (0 ); +int n =atomic_fetch_add_unless (&call->usage,1 ,0 ); + +if (n ==0 ) +return false; +trace_rxrpc_call (call->debug_id, op, n, here,NULL ); +return true; +} +/* * Note the addition of a ref on a call. */
@@ -510,8 +541,7 @@ void rxrpc_release_call(struct rxrpc_socspin_unlock_bh (&call->lock);rxrpc_put_call_slot (call); - -del_timer_sync (&call->timer); +rxrpc_delete_call_timer (call);/* Make sure we don't get any more notifications */ write_lock_bh (&rx->recvmsg_lock);
@@ -618,6 +648,8 @@ static void rxrpc_destroy_call(struct wo struct rxrpc_call *call = container_of(work, struct rxrpc_call, processor);struct rxrpc_net *rxnet = call->rxnet; +rxrpc_delete_call_timer (call); +rxrpc_put_connection (call->conn);rxrpc_put_peer (call->peer);kfree (call->rxtx_buffer);
@@ -652,8 +684,6 @@ void rxrpc_cleanup_call(struct rxrpc_calmemset (&call->sock_node,0xcd ,sizeof (call->sock_node)); -del_timer_sync (&call->timer); - ASSERTCMP(call->state, ==, RXRPC_CALL_COMPLETE);ASSERT (test_bit (RXRPC_CALL_RELEASED , &call->flags));
Greg Kroah-Hartman
maintainerPATCH 844/913 mailbox: imx: fix wakeup failure from freeze mode
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
commit 892cb524ae8a27bf5e42f711318371acd9a9f74a upstream.
Since IRQF_NO_SUSPEND used for imx mailbox driver, that means this irq can't be used for wakeup source so that can't wakeup from freeze mode. Add pm_system_wakeup() to wakeup from freeze mode.
--- drivers/mailbox/imx-mailbox.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mailbox/imx-mailbox.c +9 -0
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> +#include <linux/suspend.h> #include <linux/slab.h> #define IMX_MU_CHANS 16
@@ -67,6 +68,7 @@ struct imx_mu_priv {const struct imx_mu_dcfg *dcfg;struct clk *clk;int irq; +bool suspend;u32 xcr[4 ];
@@ -307,6 +309,9 @@ static irqreturn_t imx_mu_isr(int irq, vreturn IRQ_NONE ; } +if (priv->suspend) +pm_system_wakeup (); +return IRQ_HANDLED ; }
@@ -652,6 +657,8 @@ static int __maybe_unused imx_mu_suspend priv->xcr[i] =imx_mu_read (priv, priv->dcfg->xCR[i]); } + priv->suspend = true; +return 0 ; }
@@ -673,6 +680,8 @@ static int __maybe_unused imx_mu_resume_imx_mu_write (priv, priv->xcr[i], priv->dcfg->xCR[i]); } + priv->suspend = false; +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 845/913 crypto: arm/aes-neonbs-cbc - Select generic cbc and aes
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
commit c8bd296cca3434b13b28b074eaeb78a23284de77 upstream.
The algorithm __cbc-aes-neonbs requires a fallback so we need to select the config options for them or otherwise it will fail to register on boot-up.
--- arch/arm/crypto/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/crypto/Kconfig +2 -0
@@ -102,6 +102,8 @@ config CRYPTO_AES_ARM_BS depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER select CRYPTO_LIB_AES + select CRYPTO_AES + select CRYPTO_CBC select CRYPTO_SIMD help Use a faster and more secure NEON based implementation of AES in CBC,
Greg Kroah-Hartman
maintainerPATCH 846/913 watch_queue: Free the page array when watch_queue is dismantled
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit b490207017ba237d97b735b2aa66dc241ccd18f5 upstream.
Commit 7ea1a0124b6d ("watch_queue: Free the alloc bitmap when the watch_queue is torn down") took care of the bitmap, but not the page array.
BUG: memory leak
unreferenced object 0xffff88810d9bc140 (size 32):
comm "syz-executor335", pid 3603, jiffies 4294946994 (age 12.840s)
hex dump (first 32 bytes):
40 a7 40 04 00 ea ff ff 00 00 00 00 00 00 00 00 @.@.............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
kmalloc_array include/linux/slab.h:621 [inline]
kcalloc include/linux/slab.h:652 [inline]
watch_queue_set_size+0x12f/0x2e0 kernel/watch_queue.c:251
pipe_ioctl+0x82/0x140 fs/pipe.c:632
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:874 [inline]
__se_sys_ioctl fs/ioctl.c:860 [inline]
__x64_sys_ioctl+0xfc/0x140 fs/ioctl.c:860
do_syscall_x64 arch/x86/entry/common.c:50 [inline]--- kernel/watch_queue.c | 1 + 1 file changed, 1 insertion(+)
kernel/watch_queue.c +1 -0
@@ -373,6 +373,7 @@ static void __put_watch_queue(struct krefor (i =0 ; i < wqueue->nr_pages; i++)__free_page (wqueue->notes[i]); +kfree (wqueue->notes);bitmap_free (wqueue->notes_bitmap); wfilter =rcu_access_pointer (wqueue->filter);
Greg Kroah-Hartman
maintainerPATCH 847/913 pinctrl: pinconf-generic: Print arguments for bias-pull-*
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 188e5834b930acd03ad3cf7c5e7aa24db9665a29 upstream.
The bias-pull-* properties, or PIN_CONFIG_BIAS_PULL_* pin config parameters, accept optional arguments in ohms denoting the strength of the pin bias.
Print these values out in debugfs as well.
--- drivers/pinctrl/pinconf-generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/pinconf-generic.c +3 -3
@@ -30,10 +30,10 @@ static const struct pin_config_item confPCONFDUMP (PIN_CONFIG_BIAS_BUS_HOLD ,"input bias bus hold" ,NULL , false),PCONFDUMP (PIN_CONFIG_BIAS_DISABLE ,"input bias disabled" ,NULL , false),PCONFDUMP (PIN_CONFIG_BIAS_HIGH_IMPEDANCE ,"input bias high impedance" ,NULL , false), -PCONFDUMP (PIN_CONFIG_BIAS_PULL_DOWN ,"input bias pull down" ,NULL , false), +PCONFDUMP (PIN_CONFIG_BIAS_PULL_DOWN ,"input bias pull down" ,"ohms" , true),PCONFDUMP (PIN_CONFIG_BIAS_PULL_PIN_DEFAULT , -"input bias pull to pin specific state" ,NULL , false), -PCONFDUMP (PIN_CONFIG_BIAS_PULL_UP ,"input bias pull up" ,NULL , false), +"input bias pull to pin specific state" ,"ohms" , true), +PCONFDUMP (PIN_CONFIG_BIAS_PULL_UP ,"input bias pull up" ,"ohms" , true),PCONFDUMP (PIN_CONFIG_DRIVE_OPEN_DRAIN ,"output drive open drain" ,NULL , false),PCONFDUMP (PIN_CONFIG_DRIVE_OPEN_SOURCE ,"output drive open source" ,NULL , false), PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false),
Greg Kroah-Hartman
maintainerPATCH 848/913 watchdog: rti-wdt: Add missing pm_runtime_disable() in probe function
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit d055ef3a2c6919cff504ae3b710c96318d545fd2 upstream.
If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable().
--- drivers/watchdog/rti_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/rti_wdt.c +1 -0
@@ -229,6 +229,7 @@ static int rti_wdt_probe(struct platform ret =pm_runtime_get_sync (dev);if (ret) {pm_runtime_put_noidle (dev); +pm_runtime_disable (&pdev->dev);return dev_err_probe (dev, ret,"runtime pm failed\n" ); }
Greg Kroah-Hartman
maintainerPATCH 849/913 net: sparx5: uses, depends on BRIDGE or !BRIDGE
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit f9512d654f62604664251dedd437a22fe484974a upstream.
Fix build errors when BRIDGE=m and SPARX5_SWITCH=y:
riscv64-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.o: in function `.L305':
sparx5_switchdev.c:(.text+0xdb0): undefined reference to `br_vlan_enabled'
riscv64-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.o: in function `.L283':
sparx5_switchdev.c:(.text+0xee0): undefined reference to `br_vlan_enabled'
--- drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/microchip/sparx5/Kconfig +1 -0
@@ -5,6 +5,7 @@ config SPARX5_SWITCH depends on OF depends on ARCH_SPARX5 || COMPILE_TEST depends on PTP_1588_CLOCK_OPTIONAL + depends on BRIDGE || BRIDGE=n select PHYLINK select PHY_SPARX5_SERDES select RESET_CONTROLLER
Greg Kroah-Hartman
maintainerPATCH 850/913 pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR()
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
commit 603501c16431c56f74eaef1ee1390f60a30c2187 upstream.
The name "DS" is defined in arch/x86/um/shared/sysdep/ptrace_64.h, which results in a compiler warning when build-testing on ARCH=um. Rename this driver's "DS" macro to DSTR so avoid this collision.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 156 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 78 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +78 -78
@@ -904,7 +904,7 @@ static struct npcm7xx_func npcm7xx_funcs#define DRIVE_STRENGTH_HI_SHIFT 12#define DRIVE_STRENGTH_MASK 0x0000FF00 -#define DS (lo, hi) (((lo) << DRIVE_STRENGTH_LO_SHIFT) | \ +#define DSTR (lo, hi) (((lo) << DRIVE_STRENGTH_LO_SHIFT) | \ ((hi) << DRIVE_STRENGTH_HI_SHIFT))#define DSLO (x) (((x) >> DRIVE_STRENGTH_LO_SHIFT) & 0xF)#define DSHI (x) (((x) >> DRIVE_STRENGTH_HI_SHIFT) & 0xF)
@@ -924,31 +924,31 @@ struct npcm7xx_pincfg {static const struct npcm7xx_pincfg pincfg[] = {/* PIN FUNCTION 1 FUNCTION 2 FUNCTION 3 FLAGS */ NPCM7XX_PINCFG (0 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (1 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (2 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (1 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (2 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (3 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (4 , iox2,MFSEL3 ,14 , smb1d,I2CSEGSEL ,7 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (5 , iox2,MFSEL3 ,14 , smb1d,I2CSEGSEL ,7 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (6 , iox2,MFSEL3 ,14 , smb2d,I2CSEGSEL ,10 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (7 , iox2,MFSEL3 ,14 , smb2d,I2CSEGSEL ,10 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (8 , lkgpo1,FLOCKR1 ,4 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (9 , lkgpo2,FLOCKR1 ,8 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (10 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (11 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (8 , lkgpo1,FLOCKR1 ,4 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (9 , lkgpo2,FLOCKR1 ,8 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (10 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (11 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (12 , gspi,MFSEL1 ,24 , smb5b,I2CSEGSEL ,19 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (13 , gspi,MFSEL1 ,24 , smb5b,I2CSEGSEL ,19 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (14 , gspi,MFSEL1 ,24 , smb5c,I2CSEGSEL ,20 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (15 , gspi,MFSEL1 ,24 , smb5c,I2CSEGSEL ,20 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (16 , lkgpo0,FLOCKR1 ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (17 , pspi2,MFSEL3 ,13 , smb4den,I2CSEGSEL ,23 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (18 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (19 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (16 , lkgpo0,FLOCKR1 ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (17 , pspi2,MFSEL3 ,13 , smb4den,I2CSEGSEL ,23 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (18 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (19 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (20 , smb4c,I2CSEGSEL ,15 , smb15,MFSEL3 ,8 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (21 , smb4c,I2CSEGSEL ,15 , smb15,MFSEL3 ,8 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (22 , smb4d,I2CSEGSEL ,16 , smb14,MFSEL3 ,7 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (23 , smb4d,I2CSEGSEL ,16 , smb14,MFSEL3 ,7 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (24 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (25 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (24 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (25 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (26 , smb5,MFSEL1 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (27 , smb5,MFSEL1 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (28 , smb4,MFSEL1 ,1 , none,NONE ,0 , none,NONE ,0 ,0 ),
@@ -964,12 +964,12 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (39 , smb3b,I2CSEGSEL ,11 , none,NONE ,0 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (40 , smb3b,I2CSEGSEL ,11 , none,NONE ,0 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (41 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (42 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 ) |GPO ), +NPCM7XX_PINCFG (42 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 ) |GPO ),NPCM7XX_PINCFG (43 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , bmcuart1,MFSEL3 ,24 ,0 ),NPCM7XX_PINCFG (44 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , bmcuart1,MFSEL3 ,24 ,0 ),NPCM7XX_PINCFG (45 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (46 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DS (2 ,8 )), -NPCM7XX_PINCFG (47 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DS (2 ,8 )), +NPCM7XX_PINCFG (46 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DSTR (2 ,8 )), +NPCM7XX_PINCFG (47 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DSTR (2 ,8 )),NPCM7XX_PINCFG (48 , uart2,MFSEL1 ,11 , bmcuart0b,MFSEL4 ,1 , none,NONE ,0 ,GPO ),NPCM7XX_PINCFG (49 , uart2,MFSEL1 ,11 , bmcuart0b,MFSEL4 ,1 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(50, uart2, MFSEL1, 11, none, NONE, 0, none, NONE, 0, 0),
@@ -979,8 +979,8 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (54 , uart2,MFSEL1 ,11 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (55 , uart2,MFSEL1 ,11 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (56 , r1err,MFSEL1 ,12 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (57 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (58 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), +NPCM7XX_PINCFG (57 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (58 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )),NPCM7XX_PINCFG (59 , smb3d,I2CSEGSEL ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (60 , smb3d,I2CSEGSEL ,13 , none,NONE ,0 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(61, uart1, MFSEL1, 10, none, NONE, 0, none, NONE, 0, GPO),
@@ -1003,19 +1003,19 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (77 , fanin13,MFSEL2 ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (78 , fanin14,MFSEL2 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (79 , fanin15,MFSEL2 ,15 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (80 , pwm0,MFSEL2 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (81 , pwm1,MFSEL2 ,17 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (82 , pwm2,MFSEL2 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (83 , pwm3,MFSEL2 ,19 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (84 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (85 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (86 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (80 , pwm0,MFSEL2 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (81 , pwm1,MFSEL2 ,17 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (82 , pwm2,MFSEL2 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (83 , pwm3,MFSEL2 ,19 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (84 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (85 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (86 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (87 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (88 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (89 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (90 , r2err,MFSEL1 ,15 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (91 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (92 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), +NPCM7XX_PINCFG (91 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (92 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )),NPCM7XX_PINCFG (93 , ga20kbc,MFSEL1 ,17 , smb5d,I2CSEGSEL ,21 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (94 , ga20kbc,MFSEL1 ,17 , smb5d,I2CSEGSEL ,21 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(95, lpc, NONE, 0, espi, MFSEL4, 8, gpio, MFSEL1, 26, 0),
@@ -1061,34 +1061,34 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (133 , smb10,MFSEL4 ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (134 , smb11,MFSEL4 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (135 , smb11,MFSEL4 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (136 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (137 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (138 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (139 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (140 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (136 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (137 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (138 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (139 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (140 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (141 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (142 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (142 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (143 , sd1,MFSEL3 ,12 , sd1pwr,MFSEL4 ,5 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (144 , pwm4,MFSEL2 ,20 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (145 , pwm5,MFSEL2 ,21 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (146 , pwm6,MFSEL2 ,22 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (147 , pwm7,MFSEL2 ,23 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (148 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (149 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (150 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (151 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (152 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (144 , pwm4,MFSEL2 ,20 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (145 , pwm5,MFSEL2 ,21 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (146 , pwm6,MFSEL2 ,22 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (147 , pwm7,MFSEL2 ,23 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (148 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (149 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (150 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (151 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (152 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (153 , mmcwp,FLOCKR1 ,24 , none,NONE ,0 , none,NONE ,0 ,0 ),/* Z1/A1 */ -NPCM7XX_PINCFG (154 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (154 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (155 , mmccd,MFSEL3 ,25 , mmcrst,MFSEL4 ,6 , none,NONE ,0 ,0 ),/* Z1/A1 */ -NPCM7XX_PINCFG (156 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (157 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (158 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (159 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), - -NPCM7XX_PINCFG (160 , clkout,MFSEL1 ,21 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (161 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,DS (8 ,12 )), -NPCM7XX_PINCFG (162 , serirq,NONE ,0 , gpio,MFSEL1 ,31 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (156 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (157 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (158 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (159 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), + +NPCM7XX_PINCFG (160 , clkout,MFSEL1 ,21 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (161 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (162 , serirq,NONE ,0 , gpio,MFSEL1 ,31 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (163 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,0 ),NPCM7XX_PINCFG (164 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,SLEWLPC ), NPCM7XX_PINCFG(165, lpc, NONE, 0, espi, MFSEL4, 8, gpio, MFSEL1, 26, SLEWLPC),
@@ -1101,25 +1101,25 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (172 , smb6,MFSEL3 ,1 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (173 , smb7,MFSEL3 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (174 , smb7,MFSEL3 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (175 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (176 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (177 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (178 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (179 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (180 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (175 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (176 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (177 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (178 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (179 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (180 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (181 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (182 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (183 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (184 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (185 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (186 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (187 , spi3cs1,MFSEL4 ,17 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (188 , spi3quad,MFSEL4 ,20 , spi3cs2,MFSEL4 ,18 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (189 , spi3quad,MFSEL4 ,20 , spi3cs3,MFSEL4 ,19 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (190 , gpio,FLOCKR1 ,20 , nprd_smi,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (191 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )),/* XX */ +NPCM7XX_PINCFG (183 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (184 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (185 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (186 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (187 , spi3cs1,MFSEL4 ,17 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (188 , spi3quad,MFSEL4 ,20 , spi3cs2,MFSEL4 ,18 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (189 , spi3quad,MFSEL4 ,20 , spi3cs3,MFSEL4 ,19 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (190 , gpio,FLOCKR1 ,20 , nprd_smi,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (191 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),/* XX */ -NPCM7XX_PINCFG (192 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )),/* XX */ +NPCM7XX_PINCFG (192 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),/* XX */ NPCM7XX_PINCFG (193 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (194 , smb0b,I2CSEGSEL ,0 , none,NONE ,0 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(195, smb0b, I2CSEGSEL, 0, none, NONE, 0, none, NONE, 0, 0),
@@ -1130,11 +1130,11 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (200 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (201 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (202 , smb0c,I2CSEGSEL ,1 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (203 , faninx,MFSEL3 ,3 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (203 , faninx,MFSEL3 ,3 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (204 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (205 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (206 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (207 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DS (4 ,8 )), +NPCM7XX_PINCFG (206 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (207 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DSTR (4 ,8 )),NPCM7XX_PINCFG (208 , rg2,MFSEL4 ,24 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (209 , rg2,MFSEL4 ,24 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(210, rg2, MFSEL4, 24, ddr, MFSEL3, 26, none, NONE, 0, 0),
@@ -1146,20 +1146,20 @@ static const struct npcm7xx_pincfg pincfNPCM7XX_PINCFG (216 , rg2mdio,MFSEL4 ,23 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (217 , rg2mdio,MFSEL4 ,23 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (218 , wdog1,MFSEL3 ,19 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (219 , wdog2,MFSEL3 ,20 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), +NPCM7XX_PINCFG (219 , wdog2,MFSEL3 ,20 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )),NPCM7XX_PINCFG (220 , smb12,MFSEL3 ,5 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (221 , smb12,MFSEL3 ,5 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (222 , smb13,MFSEL3 ,6 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (223 , smb13,MFSEL3 ,6 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (224 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (225 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (226 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (227 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (228 , spixcs1,MFSEL4 ,28 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (229 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (230 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (231 , clkreq,MFSEL4 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (225 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (226 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (227 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (228 , spixcs1,MFSEL4 ,28 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (229 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (230 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (231 , clkreq,MFSEL4 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (253 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,GPI ),/* SDHC1 power */ NPCM7XX_PINCFG (254 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,GPI ),/* SDHC2 power */ NPCM7XX_PINCFG(255, none, NONE, 0, none, NONE, 0, none, NONE, 0, GPI), /* DACOSEL */
Greg Kroah-Hartman
maintainerPATCH 851/913 pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
commit 9d0f18bca3b557ae5d2128661ac06d33b3f45c0a upstream.
When compile-testing on 64-bit architectures, GCC complains about the mismatch of types between the %d format specifier and value returned by ARRAY_LENGTH(). Use %zu, which is correct everywhere.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +1 -1
@@ -1560,7 +1560,7 @@ static int npcm7xx_get_groups_count(stru {struct npcm7xx_pinctrl *npcm =pinctrl_dev_get_drvdata (pctldev); -dev_dbg (npcm->dev,"group size: %d\n" ,ARRAY_SIZE (npcm7xx_groups)); +dev_dbg (npcm->dev,"group size: %zu\n" ,ARRAY_SIZE (npcm7xx_groups));return ARRAY_SIZE (npcm7xx_groups); }
Greg Kroah-Hartman
maintainerPATCH 852/913 ASoC: mediatek: mt6358: add missing EXPORT_SYMBOLs
In reply to Greg Kroah-HartmanFrom: Jiaxin Yu <[email protected]>
commit a7663c89f4193dbf717572e46e5a3251940dbdc8 upstream.
Fixes the following build errors when mt6358 is configured as module:
Quoted 4 lines
Quoted 4 lines
ERROR: modpost: "
mt6358_set_mtkaif_protocol" [sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.ko] undefined!
ERROR: modpost: "mt6358_set_mtkaif_protocol" [sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.ko] undefined!
--- sound/soc/codecs/mt6358.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/mt6358.c +4 -0
@@ -107,6 +107,7 @@ int mt6358_set_mtkaif_protocol(struct sn priv->mtkaif_protocol = mtkaif_protocol;return 0 ; } +EXPORT_SYMBOL_GPL (mt6358_set_mtkaif_protocol);static void playback_gpio_set (struct mt6358_priv *priv) {
@@ -273,6 +274,7 @@ int mt6358_mtkaif_calibration_enable(str 1 << RG_AUD_PAD_TOP_DAT_MISO_LOOPBACK_SFT);return 0 ; } +EXPORT_SYMBOL_GPL (mt6358_mtkaif_calibration_enable);int mt6358_mtkaif_calibration_disable (struct snd_soc_component *cmpnt) {
@@ -296,6 +298,7 @@ int mt6358_mtkaif_calibration_disable(stcapture_gpio_reset (priv);return 0 ; } +EXPORT_SYMBOL_GPL (mt6358_mtkaif_calibration_disable);int mt6358_set_mtkaif_calibration_phase (struct snd_soc_component *cmpnt,int phase_1,int phase_2)
@@ -310,6 +313,7 @@ int mt6358_set_mtkaif_calibration_phase( phase_2 << RG_AUD_PAD_TOP_PHASE_MODE2_SFT);return 0 ; } +EXPORT_SYMBOL_GPL (mt6358_set_mtkaif_calibration_phase);/* dl pga gain */ enum {
Greg Kroah-Hartman
maintainerPATCH 853/913 ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 3cbf0e392f173ba0ce425968c8374a6aa3e90f2e upstream.
Hulk Robot reported a KASAN report about use-after-free:
==================================================================
BUG: KASAN: use-after-free in __list_del_entry_valid+0x13d/0x160 Read of size 8 at addr ffff888035e37d98 by task ubiattach/1385 [...] Call Trace: klist_dec_and_del+0xa7/0x4a0 klist_put+0xc7/0x1a0 device_del+0x4d4/0xed0 cdev_device_del+0x1a/0x80 ubi_attach_mtd_dev+0x2951/0x34b0 [ubi] ctrl_cdev_ioctl+0x286/0x2f0 [ubi] Allocated by task 1414: device_add+0x60a/0x18b0 cdev_device_add+0x103/0x170 ubi_create_volume+0x1118/0x1a10 [ubi] ubi_cdev_ioctl+0xb7f/0x1ba0 [ubi] Freed by task 1385: cdev_device_del+0x1a/0x80 ubi_remove_volume+0x438/0x6c0 [ubi] ubi_cdev_ioctl+0xbf4/0x1ba0 [ubi] [...] ==================================================================
The lock held by ctrl_cdev_ioctl is ubi_devices_mutex, but the lock held by ubi_cdev_ioctl is ubi->device_mutex. Therefore, the two locks can be concurrent.
ctrl_cdev_ioctl contains two operations: ubi_attach and ubi_detach. ubi_detach is bug-free because it uses reference counting to prevent concurrency. However, uif_init and uif_close in ubi_attach may race with ubi_cdev_ioctl.
uif_init will race with ubi_cdev_ioctl as in the following stack.
cpu1 cpu2 cpu3
_______________________|________________________|______________________ ctrl_cdev_ioctl
ubi_attach_mtd_dev
uif_init
ubi_cdev_ioctl
ubi_create_volume
cdev_device_add
ubi_add_volume
// sysfs exist
kill_volumes
ubi_cdev_ioctl
ubi_remove_volume
cdev_device_del
// first free
ubi_free_volume
cdev_del
// double free cdev_device_del
And uif_close will race with ubi_cdev_ioctl as in the following stack.
cpu1 cpu2 cpu3
_______________________|________________________|______________________ ctrl_cdev_ioctl
ubi_attach_mtd_dev
uif_init
ubi_cdev_ioctl
ubi_create_volume
cdev_device_add
ubi_debugfs_init_dev
//error goto out_uif;
uif_close
kill_volumes
ubi_cdev_ioctl
ubi_remove_volume
cdev_device_del
// first free
ubi_free_volume
// double freeThe cause of this problem is that commit 714fb87e8bc0 make device "available" before it becomes accessible via sysfs. Therefore, we roll back the modification. We will fix the race condition between ubi device creation and udev by removing ubi_get_device in vol_attribute_show and dev_attribute_show.This avoids accessing uninitialized ubi_devices[ubi_num].
ubi_get_device is used to prevent devices from being deleted during sysfs execution. However, now kernfs ensures that devices will not be deleted before all reference counting are released. The key process is shown in the following stack.
device_del
device_remove_attrs
device_remove_groups
sysfs_remove_groups
sysfs_remove_group
remove_files
kernfs_remove_by_name
kernfs_remove_by_name_ns
__kernfs_remove
kernfs_drain
--- drivers/mtd/ubi/build.c | 9 +-------- drivers/mtd/ubi/vmt.c | 8 +------- 2 files changed, 2 insertions(+), 15 deletions(-)
drivers/mtd/ubi/build.c +1 -8
@@ -351,9 +351,6 @@ static ssize_t dev_attribute_show(struct* we still can use 'ubi->ubi_num'. */ ubi = container_of(dev, struct ubi_device, dev); - ubi =ubi_get_device (ubi->ubi_num); -if (!ubi) -return -ENODEV ;if (attr == &dev_eraseblock_size) ret =sprintf (buf,"%d\n" , ubi->leb_size);
@@ -382,7 +379,6 @@ static ssize_t dev_attribute_show(structelse ret = -EINVAL ; -ubi_put_device (ubi);return ret; }
@@ -979,9 +975,6 @@ int ubi_attach_mtd_dev(struct mtd_info * goto out_detach; } -/* Make device "available" before it becomes accessible via sysfs */ - ubi_devices[ubi_num] = ubi; - err =uif_init (ubi);if (err) goto out_detach;
@@ -1026,6 +1019,7 @@ int ubi_attach_mtd_dev(struct mtd_info *wake_up_process (ubi->bgt_thread);spin_unlock (&ubi->wl_lock); + ubi_devices[ubi_num] = ubi;ubi_notify_all (ubi,UBI_VOLUME_ADDED ,NULL );return ubi_num;
@@ -1034,7 +1028,6 @@ out_debugfs: out_uif:uif_close (ubi); out_detach: - ubi_devices[ubi_num] =NULL ;ubi_wl_close (ubi);ubi_free_all_volumes (ubi);vfree (ubi->vtbl);
drivers/mtd/ubi/vmt.c +1 -7
@@ -56,16 +56,11 @@ static ssize_t vol_attribute_show(struct {int ret; struct ubi_volume *vol = container_of(dev, struct ubi_volume, dev); -struct ubi_device *ubi; - - ubi =ubi_get_device (vol->ubi->ubi_num); -if (!ubi) -return -ENODEV ; +struct ubi_device *ubi = vol->ubi;spin_lock (&ubi->volumes_lock);if (!ubi->volumes[vol->vol_id]) {spin_unlock (&ubi->volumes_lock); -ubi_put_device (ubi);return -ENODEV ; }/* Take a reference to prevent volume removal */
@@ -103,7 +98,6 @@ static ssize_t vol_attribute_show(struct vol->ref_count -=1 ;ubi_assert (vol->ref_count >=0 );spin_unlock (&ubi->volumes_lock); -ubi_put_device (ubi);return ret; }
Greg Kroah-Hartman
maintainerPATCH 854/913 ARM: iop32x: offset IRQ numbers by 1
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 9d67412f24cc3a2c05f35f7c856addb07a2960ce upstream.
iop32x is one of the last platforms to use IRQ 0, and this has apparently stopped working in a 2014 cleanup without anyone noticing. This interrupt is used for the DMA engine, so most likely this has not actually worked in the past 7 years, but it's also not essential for using this board.
I'm splitting out this change from my GENERIC_IRQ_MULTI_HANDLER conversion so it can be backported if anyone cares.
--- arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 arch/arm/mach-iop32x/include/mach/irqs.h | 2 arch/arm/mach-iop32x/irq.c | 6 +- arch/arm/mach-iop32x/irqs.h | 60 ++++++++++++------------ 4 files changed, 37 insertions(+), 33 deletions(-)
arch/arm/mach-iop32x/include/mach/entry-macro.S +1 -1
@@ -20,7 +20,7 @@ mrc p6, 0, \irqstat, c8, c0, 0 @ Read IINTSRC cmp \irqstat, #0 clzne \irqnr, \irqstat - rsbne \irqnr, \irqnr, #31 + rsbne \irqnr, \irqnr, #32 .endm .macro arch_ret_to_user, tmp1, tmp2
arch/arm/mach-iop32x/include/mach/irqs.h +1 -1
@@ -9,6 +9,6 @@#ifndef __IRQS_H#define __IRQS_H -#define NR_IRQS 32 +#define NR_IRQS 33#endif
arch/arm/mach-iop32x/irq.c +3 -3
@@ -32,14 +32,14 @@ static void intstr_write(u32 val)static void iop32x_irq_mask (struct irq_data *d) { - iop32x_mask &= ~(1 << d->irq); + iop32x_mask &= ~(1 << (d->irq -1 ));intctl_write (iop32x_mask); }static void iop32x_irq_unmask (struct irq_data *d) { - iop32x_mask |=1 << d->irq; + iop32x_mask |=1 << (d->irq -1 );intctl_write (iop32x_mask); }
@@ -65,7 +65,7 @@ void __init iop32x_init_irq(void) machine_is_em7210()) *IOP3XX_PCIIRSR =0x0f ; -for (i =0 ; i <NR_IRQS ; i++) { +for (i =1 ; i <NR_IRQS ; i++) {irq_set_chip_and_handler (i, &ext_chip, handle_level_irq);irq_clear_status_flags (i,IRQ_NOREQUEST |IRQ_NOPROBE ); }
arch/arm/mach-iop32x/irqs.h +32 -28
68 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 855/913 block: Fix the maximum minor value is blk_alloc_ext_minor()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit d1868328dec5ae2cf210111025fcbc71f78dd5ca upstream.
ida_alloc_range(..., min, max, ...) returns values from min to max, inclusive.
So, NR_EXT_DEVT is a valid idx returned by blk_alloc_ext_minor().
This is an issue because in device_add_disk(), this value is used in:
ddev->devt = MKDEV(disk->major, disk->first_minor);
and NR_EXT_DEVT is '(1 << MINORBITS)'.
So, should 'disk->first_minor' be NR_EXT_DEVT, it would overflow.
--- block/genhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/genhd.c +1 -1
@@ -324,7 +324,7 @@ int blk_alloc_ext_minor(void) {int idx; - idx =ida_alloc_range (&ext_devt_ida,0 ,NR_EXT_DEVT ,GFP_KERNEL ); + idx =ida_alloc_range (&ext_devt_ida,0 ,NR_EXT_DEVT -1 ,GFP_KERNEL );if (idx == -ENOSPC )return -EBUSY ;return idx;
Greg Kroah-Hartman
maintainerPATCH 856/913 io_uring: fix memory leak of uid in files registration
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit c86d18f4aa93e0e66cda0e55827cd03eea6bc5f8 upstream.
When there are no files for __io_sqe_files_scm() to process in the range, it'll free everything and return. However, it forgets to put uid.
--- fs/io_uring.c | 1 + 1 file changed, 1 insertion(+)
fs/io_uring.c +1 -0
@@ -8130,6 +8130,7 @@ static int __io_sqe_files_scm(struct io_fput (fpl->fp[i]); }else {kfree_skb (skb); +free_uid (fpl->user);kfree (fpl); }
Greg Kroah-Hartman
maintainerPATCH 857/913 riscv module: remove (NOLOAD)
In reply to Greg Kroah-HartmanFrom: Fangrui Song <[email protected]>
commit 60210a3d86dc57ce4a76a366e7841dda746a33f7 upstream.
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt, .got, and .got.plt sections which are always SHT_PROGBITS.
In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report a section type mismatch error (later changed to a warning). Just remove (NOLOAD) to fix the warning.
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
--- arch/riscv/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/riscv/include/asm/module.lds.h +3 -3
@@ -2,8 +2,8 @@/* Copyright (C) 2017 Andes Technology Corporation */ #ifdef CONFIG_MODULE_SECTIONS SECTIONS { - .plt (NOLOAD) : { BYTE(0) } - .got (NOLOAD) : { BYTE(0) } - .got.plt (NOLOAD) : { BYTE(0) } + .plt : { BYTE(0) } + .got : { BYTE(0) } + .got.plt : { BYTE(0) } } #endif
Greg Kroah-Hartman
maintainerPATCH 858/913 ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 40d8abf364bcab23bc715a9221a3c8623956257b upstream.
If the NumEntries field in the _CPC return package is less than 2, do not attempt to access the "Revision" element of that package, because it may not be present then.
--- drivers/acpi/cppc_acpi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/acpi/cppc_acpi.c +5 -0
@@ -703,6 +703,11 @@ int acpi_cppc_processor_probe(struct acp cpc_obj = &out_obj->package.elements[0 ];if (cpc_obj->type ==ACPI_TYPE_INTEGER ) { num_ent = cpc_obj->integer.value; +if (num_ent <=1 ) { +pr_debug ("Unexpected _CPC NumEntries value (%d) for CPU:%d\n" , + num_ent, pr->id); + goto out_free; + } }else {pr_debug ("Unexpected entry type(%d) for NumEntries\n" , cpc_obj->type);
Greg Kroah-Hartman
maintainerPATCH 859/913 vhost: handle error while adding split ranges to iotlb
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
commit 03a91c9af2c42ae14afafb829a4b7e6589ab5892 upstream.
vhost_iotlb_add_range_ctx() handles the range [0, ULONG_MAX] by splitting it into two ranges and adding them separately. The return value of adding the first range to the iotlb is currently ignored. Check the return value and bail out in case of an error.
--- drivers/vhost/iotlb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/vhost/iotlb.c +5 -1
@@ -62,8 +62,12 @@ int vhost_iotlb_add_range_ctx(struct vho*/ if (start ==0 && last ==ULONG_MAX ) {u64 mid = last /2 ; +int err =vhost_iotlb_add_range_ctx (iotlb, start, mid, addr, + perm, opaque); + +if (err) +return err; -vhost_iotlb_add_range_ctx (iotlb, start, mid, addr, perm, opaque); addr += mid +1 ; start = mid +1 ; }
Greg Kroah-Hartman
maintainerPATCH 860/913 spi: Fix Tegra QSPI example
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
commit 320689a1b543ca1396b3ed43bb18045e4a7ffd79 upstream.
When running dt_binding_check on the nvidia,tegra210-quad.yaml binding document the following error is reported ...
nvidia,tegra210-quad.example.dt.yaml:0:0: /example-0/spi@70410000/flash@0:
failed to match any schema with compatible: ['spi-nor']
Update the example in the binding document to fix the above error.
--- Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml +1 -1
@@ -106,7 +106,7 @@ examples: dma-names = "rx", "tx"; flash@0 { - compatible = "spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <104000000>; spi-tx-bus-width = <2>;
Greg Kroah-Hartman
maintainerPATCH 861/913 platform/chrome: cros_ec_typec: Check for EC device
In reply to Greg Kroah-HartmanFrom: Prashant Malani <[email protected]>
commit ffebd90532728086007038986900426544e3df4e upstream.
The Type C ACPI device on older Chromebooks is not generated correctly (since their EC firmware doesn't support the new commands required). In such cases, the crafted ACPI device doesn't have an EC parent, and it is therefore not useful (it shouldn't be generated in the first place since the EC firmware doesn't support any of the Type C commands).
To handle devices which use these older firmware revisions, check for the parent EC device handle, and fail the probe if it's not found.
--- drivers/platform/chrome/cros_ec_typec.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/chrome/cros_ec_typec.c +6 -0
@@ -1106,7 +1106,13 @@ static int cros_typec_probe(struct platfreturn -ENOMEM ; typec->dev = dev; + typec->ec =dev_get_drvdata (pdev->dev.parent); +if (!typec->ec) { +dev_err (dev,"couldn't find parent EC device\n" ); +return -ENODEV ; + } +platform_set_drvdata (pdev, typec); ret =cros_typec_get_cmd_version (typec);
Greg Kroah-Hartman
maintainerPATCH 862/913 can: isotp: restore accidentally removed MSG_PEEK feature
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
[ Upstream commit e382fea8ae54f5bb62869c6b69b33993d43adeca ]
In commit 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when reading from socket") a new check for recvmsg flags has been introduced that only checked for the flags that are handled in isotp_recvmsg() itself.
This accidentally removed the MSG_PEEK feature flag which is processed later in the call chain in __skb_try_recv_from_queue().
Add MSG_PEEK to the set of valid flags to restore the feature.
--- net/can/isotp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/can/isotp.c +1 -1
@@ -1009,7 +1009,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock = flags &MSG_DONTWAIT ;int ret =0 ; -if (flags & ~(MSG_DONTWAIT |MSG_TRUNC )) +if (flags & ~(MSG_DONTWAIT |MSG_TRUNC |MSG_PEEK ))return -EINVAL ;if (!so->bound)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 863/913 proc: bootconfig: Add null pointer check
In reply to Greg Kroah-HartmanFrom: Lv Ruyi <[email protected]>
commit bed5b60bf67ccd8957b8c0558fead30c4a3f5d3f upstream.
kzalloc is a memory allocation function which can return NULL when some internal memory errors happen. It is safer to add null pointer check.
--- fs/proc/bootconfig.c | 2 ++ 1 file changed, 2 insertions(+)
fs/proc/bootconfig.c +2 -0
@@ -32,6 +32,8 @@ static int __init copy_xbc_key_value_lisint ret =0 ; key =kzalloc (XBC_KEYLEN_MAX ,GFP_KERNEL ); +if (!key) +return -ENOMEM ;xbc_for_each_key_value (leaf, val) { ret =xbc_node_compose_key (leaf, key,XBC_KEYLEN_MAX );
Greg Kroah-Hartman
maintainerPATCH 864/913 drm/connector: Fix typo in documentation
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
commit dca384a3bf5af1c781cfa6aec63904bdb5018c36 upstream.
Commit 4adc33f36d80 ("drm/edid: Split deep color modes between RGB and YUV444") introduced two new variables in struct drm_display_info and their documentation, but the documentation part had a typo resulting in a doc build warning.
--- include/drm/drm_connector.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/drm/drm_connector.h +2 -2
@@ -566,13 +566,13 @@ struct drm_display_info {bool rgb_quant_range_selectable;/** -* @edid_hdmi_dc_rgb444_modes: Mask of supported hdmi deep color modes +* @edid_hdmi_rgb444_dc_modes: Mask of supported hdmi deep color modes * in RGB 4:4:4. Even more stuff redundant with @bus_formats. */ u8 edid_hdmi_rgb444_dc_modes;/** -* @edid_hdmi_dc_ycbcr444_modes: Mask of supported hdmi deep color +* @edid_hdmi_ycbcr444_dc_modes: Mask of supported hdmi deep color * modes in YCbCr 4:4:4. Even more stuff redundant with @bus_formats. */ u8 edid_hdmi_ycbcr444_dc_modes;
Greg Kroah-Hartman
maintainerPATCH 865/913 scsi: qla2xxx: Add qla2x00_async_done() for async routines
In reply to Greg Kroah-HartmanFrom: Saurav Kashyap <[email protected]>
commit 49b729f58e7a98a006a8a0c1dcca8a1a4f58d2a8 upstream.
This done routine will delete the timer and check for its return value and decrease the reference count accordingly. This prevents boot hangs reported after commit 31e6cdbe0eae ("scsi: qla2xxx: Implement ref count for SRB") was merged.
--- drivers/scsi/qla2xxx/qla_iocb.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_iocb.c +16 -1
@@ -2560,6 +2560,20 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mg } } +static void +qla2x00_async_done (struct srb *sp,int res) +{ +if (del_timer (&sp->u.iocb_cmd.timer)) { +/* +* Successfully cancelled the timeout handler +* ref: TMR +*/ +if (kref_put (&sp->cmd_kref, qla2x00_sp_release)) +return ; + } + sp->async_done (sp, res); +} +void qla2x00_sp_release (struct kref *kref) {
@@ -2573,7 +2587,8 @@ qla2x00_init_async_sp(srb_t *sp, unsigne void (*done)(struct srb *sp, int res)) {timer_setup (&sp->u.iocb_cmd.timer, qla2x00_sp_timeout,0 ); - sp->done = done; + sp->done = qla2x00_async_done; + sp->async_done = done; sp->free = qla2x00_sp_free; sp->u.iocb_cmd.timeout = qla2x00_async_iocb_timeout; sp->u.iocb_cmd.timer.expires = jiffies + tmo *HZ ;
Greg Kroah-Hartman
maintainerPATCH 866/913 staging: mt7621-dts: fix pinctrl-0 items to be size-1 items on ethernet
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
commit 25e4f5220efead592c83200241e098e757d37e1f upstream.
Fix pinctrl-0 items under the ethernet node to be size-1 items. Current notation would be used on specifications with non-zero cells.
--- drivers/staging/mt7621-dts/mt7621.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/mt7621-dts/mt7621.dtsi +1 -1
@@ -392,7 +392,7 @@ mediatek,ethsys = <&sysc>; pinctrl-names = "default"; - pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>, <&rgmii2_pins>; gmac0: mac@0 { compatible = "mediatek,eth-mac";
Greg Kroah-Hartman
maintainerPATCH 867/913 arm64: mm: Drop const from conditional arm64_dma_phys_limit definition
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 770093459b9b333380aa71f2c31c60b14895c1df upstream.
Commit 031495635b46 ("arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones") introduced different definitions for 'arm64_dma_phys_limit' depending on CONFIG_ZONE_DMA{,32} based on a late suggestion from Pasha. Sadly, this results in a build error when passing W=1:
| arch/arm64/mm/init.c:90:19: error: conflicting type qualifiers for 'arm64_dma_phys_limit'
Drop the 'const' for now and use '__ro_after_init' consistently.
--- arch/arm64/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/mm/init.c +1 -1
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(memstart_addr);#if IS_ENABLED (CONFIG_ZONE_DMA ) ||IS_ENABLED (CONFIG_ZONE_DMA32 )phys_addr_t __ro_after_init arm64_dma_phys_limit;#else -const phys_addr_t arm64_dma_phys_limit =PHYS_MASK +1 ; +phys_addr_t __ro_after_init arm64_dma_phys_limit =PHYS_MASK +1 ;#endif #ifdef CONFIG_KEXEC_CORE
Greg Kroah-Hartman
maintainerPATCH 868/913 ASoC: soc-compress: Change the check for codec_dai
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
commit ccb4214f7f2a8b75acf493f31128e464ee1a3536 upstream.
It should be better to reverse the check on codec_dai and returned early in order to be easier to understand.
--- sound/soc/soc-compress.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
sound/soc/soc-compress.c +11 -8
@@ -534,16 +534,19 @@ int snd_soc_new_compress(struct snd_soc_return -EINVAL ; } -/* check client and interface hw capabilities */ -if (codec_dai) { -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) - playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) - capture =1 ; +if (!codec_dai) { +dev_err (rtd->card->dev,"Missing codec\n" ); +return -EINVAL ; } +/* check client and interface hw capabilities */ +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) + playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) + capture =1 ; +/* * Compress devices are unidirectional so only one of the directions * should be set, check for that (xor)
Greg Kroah-Hartman
maintainerPATCH 869/913 Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 901c7280ca0d5e2b4a8929fbe0bfb007ac2a6544 upstream.
Halil Pasic points out [1] that the full revert of that commit (revert in bddac7c1e02b), and that a partial revert that only reverts the problematic case, but still keeps some of the cleanups is probably better. 
And that partial revert [2] had already been verified by Oleksandr Natalenko to also fix the issue, I had just missed that in the long discussion.
So let's reinstate the cleanups from commit aa6f8dcbab47 ("swiotlb:
rework "fix info leak with DMA_FROM_DEVICE""), and effectively only revert the part that caused problems.
--- Documentation/core-api/dma-attributes.rst | 8 -------- include/linux/dma-mapping.h | 8 -------- kernel/dma/swiotlb.c | 12 ++++++++---- 3 files changed, 8 insertions(+), 20 deletions(-)
Documentation/core-api/dma-attributes.rst +0 -8
@@ -130,11 +130,3 @@ accesses to DMA buffers in both privileg subsystem that the buffer is fully accessible at the elevated privilege level (and ideally inaccessible or at least read-only at the lesser-privileged levels). - -DMA_ATTR_OVERWRITE ------------------- - -This is a hint to the DMA-mapping subsystem that the device is expected to -overwrite the entire mapped size, thus the caller does not require any of the -previous buffer contents to be preserved. This allows bounce-buffering -implementations to optimise DMA_FROM_DEVICE transfers.
include/linux/dma-mapping.h +0 -8
@@ -62,14 +62,6 @@#define DMA_ATTR_PRIVILEGED (1UL << 9)/* -* This is a hint to the DMA-mapping subsystem that the device is expected -* to overwrite the entire mapped size, thus the caller does not require any -* of the previous buffer contents to be preserved. This allows -* bounce-buffering implementations to optimise DMA_FROM_DEVICE transfers. -*/ -#define DMA_ATTR_OVERWRITE (1UL << 10) - -/* * A dma_addr_t can hold any valid DMA or bus address for the platform. It can * be given to a device to use as a DMA source or target. It is specific to a * given device and there may be a translation between the CPU physical address
kernel/dma/swiotlb.c +8 -4
@@ -578,10 +578,14 @@ phys_addr_t swiotlb_tbl_map_single(strucfor (i =0 ; i <nr_slots (alloc_size + offset); i++) mem->slots[index + i].orig_addr =slot_addr (orig_addr, i); tlb_addr =slot_addr (mem->start, index) + offset; -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && - (!(attrs &DMA_ATTR_OVERWRITE ) || dir ==DMA_TO_DEVICE || - dir ==DMA_BIDIRECTIONAL )) -swiotlb_bounce (dev, tlb_addr, mapping_size,DMA_TO_DEVICE ); +/* +* When dir == DMA_FROM_DEVICE we could omit the copy from the orig +* to the tlb buffer, if we knew for sure the device will +* overwirte the entire current content. But we don't. Thus +* unconditional bounce may prevent leaking swiotlb content (i.e. +* kernel memory) to user-space. +*/ +swiotlb_bounce (dev, tlb_addr, mapping_size,DMA_TO_DEVICE );return tlb_addr; }
Greg Kroah-Hartman
maintainerPATCH 870/913 tracing: Have type enum modifications copy the strings
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
commit 795301d3c28996219d555023ac6863401b6076bc upstream.
When an enum is used in the visible parts of a trace event that is exported to user space, the user space applications like perf and trace-cmd do not have a way to know what the value of the enum is. To solve this, at boot up (or module load) the printk formats are modified to replace the enum with their numeric value in the string output.
Array fields of the event are defined by [<nr-elements>] in the type portion of the format file so that the user space parsers can correctly parse the array into the appropriate size chunks. But in some trace events, an enum is used in defining the size of the array, which once again breaks the parsing of user space tooling.
This was solved the same way as the print formats were, but it modified the type strings of the trace event. This caused crashes in some architectures because, as supposed to the print string, is a const string value. This was not detected on x86, as it appears that const strings are still writable (at least in boot up), but other architectures this is not the case, and writing to a const string will cause a kernel fault.
To fix this, use kstrdup() to copy the type before modifying it. If the trace event is for the core kernel there's no need to free it because the string will be in use for the life of the machine being on line. For modules, create a link list to store all the strings being allocated for modules and when the module is removed, free them.
--- kernel/trace/trace_events.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-)
kernel/trace/trace_events.c +61 -1
@@ -40,6 +40,14 @@ static LIST_HEAD(ftrace_generic_fields);static LIST_HEAD (ftrace_common_fields);static bool eventdir_initialized; +static LIST_HEAD (module_strings); + +struct module_string { +struct list_head next; +struct module *module; +char *str; +}; +#define GFP_TRACE (GFP_KERNEL | __GFP_ZERO)static struct kmem_cache *field_cachep;
@@ -2637,14 +2645,40 @@ static void update_event_printk(struct t } } +static void add_str_to_module (struct module *module,char *str) +{ +struct module_string *modstr; + + modstr =kmalloc (sizeof (*modstr),GFP_KERNEL ); + +/* +* If we failed to allocate memory here, then we'll just +* let the str memory leak when the module is removed. +* If this fails to allocate, there's worse problems than +* a leaked string on module removal. +*/ +if (WARN_ON_ONCE (!modstr)) +return ; + + modstr->module = module; + modstr->str = str; + +list_add (&modstr->next, &module_strings); +} +static void update_event_fields (struct trace_event_call *call,struct trace_eval_map *map) {struct ftrace_event_field *field;struct list_head *head;char *ptr; +char *str;int len =strlen (map->eval_string); +/* Dynamic events should never have field maps */ +if (WARN_ON_ONCE (call->flags &TRACE_EVENT_FL_DYNAMIC )) +return ; + head =trace_get_fields (call);list_for_each_entry (field, head, link) { ptr =strchr (field->type,'[' );
@@ -2658,9 +2692,26 @@ static void update_event_fields(struct tif (strncmp (map->eval_string, ptr, len) !=0 )continue ; + str =kstrdup (field->type,GFP_KERNEL ); +if (WARN_ON_ONCE (!str)) +return ; + ptr = str + (ptr - field->type); ptr =eval_replace (ptr, map, len);/* enum/sizeof string smaller than value */ -WARN_ON_ONCE (!ptr); +if (WARN_ON_ONCE (!ptr)) { +kfree (str); +continue ; + } + +/* +* If the event is part of a module, then we need to free the string +* when the module is removed. Otherwise, it will stay allocated +* until a reboot. +*/ +if (call->module) +add_str_to_module (call->module, str); + + field->type = str; } }
@@ -2883,6 +2934,7 @@ static void trace_module_add_events(strustatic void trace_module_remove_events (struct module *mod) {struct trace_event_call *call, *p; +struct module_string *modstr, *m;down_write (&trace_event_sem);list_for_each_entry_safe (call, p, &ftrace_events, list) {
@@ -2891,6 +2943,14 @@ static void trace_module_remove_events(sif (call->module == mod)__trace_remove_event_call (call); } +/* Check for any strings allocade for this module */ +list_for_each_entry_safe (modstr, m, &module_strings, next) { +if (modstr->module != mod) +continue ; +list_del (&modstr->next); +kfree (modstr->str); +kfree (modstr); + }up_write (&trace_event_sem);/*
Greg Kroah-Hartman
maintainerPATCH 871/913 net: add skb_set_end_offset() helper
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 763087dab97547230a6807c865a6a5ae53a59247 upstream.
We have multiple places where this helper is convenient, and plan using it in the following patch.
--- include/linux/skbuff.h | 10 ++++++++++ net/core/skbuff.c | 19 +++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-)
include/linux/skbuff.h +10 -0
@@ -1436,6 +1436,11 @@ static inline unsigned int skb_end_offse {return skb->end; } + +static inline void skb_set_end_offset (struct sk_buff *skb,unsigned int offset) +{ + skb->end = offset; +}#else static inline unsigned char *skb_end_pointer (const struct sk_buff *skb) {
@@ -1446,6 +1451,11 @@ static inline unsigned int skb_end_offse {return skb->end - skb->head; } + +static inline void skb_set_end_offset (struct sk_buff *skb,unsigned int offset) +{ + skb->end = skb->head + offset; +}#endif /* Internal */
net/core/skbuff.c +5 -14
@@ -203,7 +203,7 @@ static void __build_skb_around(struct sk skb->head = data; skb->data = data;skb_reset_tail_pointer (skb); - skb->end = skb->tail + size; +skb_set_end_offset (skb, size); skb->mac_header = (typeof(skb->mac_header))~0U; skb->transport_header = (typeof(skb->transport_header))~0U;
@@ -1738,11 +1738,10 @@ int pskb_expand_head(struct sk_buff *skb skb->head = data; skb->head_frag =0 ; skb->data += off; + +skb_set_end_offset (skb, size);#ifdef NET_SKBUFF_DATA_USES_OFFSET - skb->end = size; off = nhead; -#else - skb->end = skb->head + size;#endif skb->tail += off;skb_headers_offset_update (skb, nhead);
@@ -6159,11 +6158,7 @@ static int pskb_carve_inside_header(stru skb->head = data; skb->data = data; skb->head_frag =0 ; -#ifdef NET_SKBUFF_DATA_USES_OFFSET - skb->end = size; -#else - skb->end = skb->head + size; -#endif +skb_set_end_offset (skb, size);skb_set_tail_pointer (skb,skb_headlen (skb));skb_headers_offset_update (skb,0 ); skb->cloned =0 ;
@@ -6301,11 +6296,7 @@ static int pskb_carve_inside_nonlinear(s skb->head = data; skb->head_frag =0 ; skb->data = data; -#ifdef NET_SKBUFF_DATA_USES_OFFSET - skb->end = size; -#else - skb->end = skb->head + size; -#endif +skb_set_end_offset (skb, size);skb_reset_tail_pointer (skb);skb_headers_offset_update (skb,0 ); skb->cloned =0 ;
Greg Kroah-Hartman
maintainerPATCH 872/913 net: preserve skb_end_offset() in skb_unclone_keeptruesize()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 2b88cba55883eaafbc9b7cbff0b2c7cdba71ed01 upstream.
syzbot found another way to trigger the infamous WARN_ON_ONCE(delta < len) in skb_try_coalesce() [1]
I was able to root cause the issue to kfence.
When kfence is in action, the following assertion is no longer true:
int size = xxxx;
void *ptr1 = kmalloc(size, gfp);
void *ptr2 = kmalloc(size, gfp);
if (ptr1 && ptr2)
ASSERT(ksize(ptr1) == ksize(ptr2));
We attempted to fix these issues in the blamed commits, but forgot that TCP was possibly shifting data after skb_unclone_keeptruesize() has been used, notably from tcp_retrans_try_collapse().
So we not only need to keep same skb->truesize value, we also need to make sure TCP wont fill new tailroom that pskb_expand_head() was able to get from a addr = kmalloc(...) followed by ksize(addr)
Split skb_unclone_keeptruesize() into two parts:
1) Inline skb_unclone_keeptruesize() for the common case, when skb is not cloned.
2) Out of line __skb_unclone_keeptruesize() for the 'slow path'.
WARNING: CPU: 1 PID: 6490 at net/core/skbuff.c:5295 skb_try_coalesce+0x1235/0x1560 net/core/skbuff.c:5295 Modules linked in: CPU: 1 PID: 6490 Comm: syz-executor161 Not tainted 5.17.0-rc4-syzkaller-00229-g4f12b742eb2b #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:skb_try_coalesce+0x1235/0x1560 net/core/skbuff.c:5295 Code: bf 01 00 00 00 0f b7 c0 89 c6 89 44 24 20 e8 62 24 4e fa 8b 44 24 20 83 e8 01 0f 85 e5 f0 ff ff e9 87 f4 ff ff e8 cb 20 4e fa <0f> 0b e9 06 f9 ff ff e8 af b2 95 fa e9 69 f0 ff ff e8 95 b2 95 fa RSP: 0018:ffffc900063af268 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 00000000ffffffd5 RCX: 0000000000000000 RDX: ffff88806fc05700 RSI: ffffffff872abd55 RDI: 0000000000000003 RBP: ffff88806e675500 R08: 00000000ffffffd5 R09: 0000000000000000 R10: ffffffff872ab659 R11: 0000000000000000 R12: ffff88806dd554e8 R13: ffff88806dd9bac0 R14: ffff88806dd9a2c0 R15: 0000000000000155 FS: 00007f18014f9700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020002000 CR3: 000000006be7a000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> tcp_try_coalesce net/ipv4/tcp_input.c:4651 [inline] tcp_try_coalesce+0x393/0x920 net/ipv4/tcp_input.c:4630 tcp_queue_rcv+0x8a/0x6e0 net/ipv4/tcp_input.c:4914 tcp_data_queue+0x11fd/0x4bb0 net/ipv4/tcp_input.c:5025 tcp_rcv_established+0x81e/0x1ff0 net/ipv4/tcp_input.c:5947 tcp_v4_do_rcv+0x65e/0x980 net/ipv4/tcp_ipv4.c:1719 sk_backlog_rcv include/net/sock.h:1037 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2779 release_sock+0x54/0x1b0 net/core/sock.c:3311 sk_wait_data+0x177/0x450 net/core/sock.c:2821 tcp_recvmsg_locked+0xe28/0x1fd0 net/ipv4/tcp.c:2457 tcp_recvmsg+0x137/0x610 net/ipv4/tcp.c:2572 inet_recvmsg+0x11b/0x5e0 net/ipv4/af_inet.c:850 sock_recvmsg_nosec net/socket.c:948 [inline] sock_recvmsg net/socket.c:966 [inline] sock_recvmsg net/socket.c:962 [inline] ____sys_recvmsg+0x2c4/0x600 net/socket.c:2632 ___sys_recvmsg+0x127/0x200 net/socket.c:2674 __sys_recvmsg+0xe2/0x1a0 net/socket.c:2704 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- include/linux/skbuff.h | 18 +++++++++--------- net/core/skbuff.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-)
include/linux/skbuff.h +9 -9
@@ -1684,19 +1684,19 @@ static inline int skb_unclone(struct sk_return 0 ; } -/* This variant of skb_unclone() makes sure skb->truesize is not changed */ +/* This variant of skb_unclone() makes sure skb->truesize +* and skb_end_offset() are not changed, whenever a new skb->head is needed. +* +* Indeed there is no guarantee that ksize(kmalloc(X)) == ksize(kmalloc(X)) +* when various debugging features are in place. +*/ +int __skb_unclone_keeptruesize (struct sk_buff *skb,gfp_t pri);static inline int skb_unclone_keeptruesize (struct sk_buff *skb,gfp_t pri) {might_sleep_if (gfpflags_allow_blocking (pri)); -if (skb_cloned (skb)) { -unsigned int save = skb->truesize; -int res; - - res =pskb_expand_head (skb,0 ,0 , pri); - skb->truesize = save; -return res; - } +if (skb_cloned (skb)) +return __skb_unclone_keeptruesize (skb, pri);return 0 ; }
net/core/skbuff.c +32 -0
@@ -1789,6 +1789,38 @@ struct sk_buff *skb_realloc_headroom(str }EXPORT_SYMBOL (skb_realloc_headroom); +int __skb_unclone_keeptruesize (struct sk_buff *skb,gfp_t pri) +{ +unsigned int saved_end_offset, saved_truesize; +struct skb_shared_info *shinfo; +int res; + + saved_end_offset =skb_end_offset (skb); + saved_truesize = skb->truesize; + + res =pskb_expand_head (skb,0 ,0 , pri); +if (res) +return res; + + skb->truesize = saved_truesize; + +if (likely (skb_end_offset (skb) == saved_end_offset)) +return 0 ; + + shinfo =skb_shinfo (skb); + +/* We are about to change back skb->end, +* we need to move skb_shinfo() to its new location. +*/ +memmove (skb->head + saved_end_offset, + shinfo, + offsetof(struct skb_shared_info, frags[shinfo->nr_frags])); + +skb_set_end_offset (skb, saved_end_offset); + +return 0 ; +} +/** * skb_expand_head - reallocate header of &sk_buff * @skb: buffer to reallocate
Greg Kroah-Hartman
maintainerPATCH 873/913 mm/mmap: return 1 from stack_guard_gap __setup() handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit e6d094936988910ce6e8197570f2753898830081 upstream.
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment). This prevents:
Unknown kernel command line parameters \ "BOOT_IMAGE=/boot/bzImage-517rc5 stack_guard_gap=100", will be \ passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
stack_guard_gap=100Return 1 to indicate that the boot option has been handled.
Note that there is no warning message if someone enters:
stack_guard_gap=anything_invalid
and 'val' and stack_guard_gap are both set to 0 due to the use of simple_strtoul(). This could be improved by using kstrtoxxx() and checking for an error.
It appears that having stack_guard_gap == 0 is valid (if unexpected) since using "stack_guard_gap=0" on the kernel command line does that.
--- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mmap.c +1 -1
@@ -2551,7 +2551,7 @@ static int __init cmdline_parse_stack_guif (!*endptr) stack_guard_gap = val <<PAGE_SHIFT ; -return 0 ; +return 1 ; }__setup ("stack_guard_gap=" , cmdline_parse_stack_guard_gap);
Greg Kroah-Hartman
maintainerPATCH 874/913 ARM: 9187/1: JIVE: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 8b2360c7157b462c4870d447d1e65d30ef31f9aa upstream.
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from jive_mtdset().
--- arch/arm/mach-s3c/mach-jive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-s3c/mach-jive.c +3 -3
@@ -236,11 +236,11 @@ static int __init jive_mtdset(char *optiunsigned long set;if (options ==NULL || options[0 ] =='\0' ) -return 0 ; +return 1 ;if (kstrtoul (options,10 , &set)) {printk (KERN_ERR "failed to parse mtdset=%s\n" , options); -return 0 ; +return 1 ; }switch (set) {
@@ -255,7 +255,7 @@ static int __init jive_mtdset(char *opti "using default.", set); } -return 0 ; +return 1 ; }/* parse the mtdset= option given to the kernel command line */
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 875/913 mm/memcontrol: return 1 from cgroup.memory __setup() handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 460a79e18842caca6fa0c415de4a3ac1e671ac50 upstream.
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment).
The only reason that this particular __setup handler does not pollute init's environment is that the setup string contains a '.', as in "cgroup.memory". This causes init/main.c::unknown_boottoption() to consider it to be an "Unused module parameter" and ignore it. (This is for parsing of loadable module parameters any time after kernel init.) Otherwise the string "cgroup.memory=whatever" would be added to init's environment strings.
Instead of relying on this '.' quirk, just return 1 to indicate that the boot option has been handled.
Note that there is no warning message if someone enters:
cgroup.memory=anything_invalid
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol.c +1 -1
@@ -7105,7 +7105,7 @@ static int __init cgroup_memory(char *s)if (!strcmp (token,"nokmem" )) cgroup_memory_nokmem = true; } -return 0 ; +return 1 ; }__setup ("cgroup.memory=" , cgroup_memory);
Greg Kroah-Hartman
maintainerPATCH 876/913 mm/usercopy: return 1 from hardened_usercopy __setup() handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 05fe3c103f7e6b8b4fca8a7001dfc9ed4628085b upstream.
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment). This prevents:
Unknown kernel command line parameters \ "BOOT_IMAGE=/boot/bzImage-517rc5 hardened_usercopy=off", will be \ passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
hardened_usercopy=offor
hardened_usercopy=on
but when "hardened_usercopy=foo" is used, there is no Unknown kernel command line parameter.
Return 1 to indicate that the boot option has been handled. Print a warning if strtobool() returns an error on the option string, but do not mark this as in unknown command line option and do not cause init's environment to be polluted with this string.
--- mm/usercopy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/usercopy.c +4 -1
@@ -294,7 +294,10 @@ static bool enable_checks __initdata = tstatic int __init parse_hardened_usercopy (char *str) { -return strtobool (str, &enable_checks); +if (strtobool (str, &enable_checks)) +pr_warn ("Invalid option string for hardened_usercopy: '%s'\n" , + str); +return 1 ; }__setup ("hardened_usercopy=" , parse_hardened_usercopy);
Greg Kroah-Hartman
maintainerPATCH 877/913 af_unix: Support POLLPRI for OOB.
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
commit d9a232d435dcc966738b0f414a86f7edf4f4c8c4 upstream.
The commit 314001f0bf92 ("af_unix: Add OOB support") introduced OOB for AF_UNIX, but it lacks some changes for POLLPRI. Let's add the missing piece.
In the selftest, normal datagrams are sent followed by OOB data, so this commit replaces POLLIN | POLLPRI with just POLLPRI in the first test case.
--- net/unix/af_unix.c | 4 ++++ tools/testing/selftests/net/af_unix/test_unix_oob.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)
net/unix/af_unix.c +4 -0
@@ -3049,6 +3049,10 @@ static __poll_t unix_poll(struct file *f mask |=EPOLLIN |EPOLLRDNORM ;if (sk_is_readable (sk)) mask |=EPOLLIN |EPOLLRDNORM ; +#if IS_ENABLED (CONFIG_AF_UNIX_OOB ) +if (READ_ONCE (unix_sk (sk)->oob_skb)) + mask |=EPOLLPRI ; +#endif /* Connection-based need to check for termination and startup */ if ((sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) &&
tools/testing/selftests/net/af_unix/test_unix_oob.c +3 -3
@@ -218,10 +218,10 @@ main(int argc, char **argv)/* Test 1: * veriyf that SIGURG is -* delivered and 63 bytes are -* read and oob is '@' +* delivered, 63 bytes are +* read, oob is '@', and POLLPRI works. */ -wait_for_data (pfd,POLLIN |POLLPRI ); +wait_for_data (pfd,POLLPRI );read_oob (pfd, &oob); len =read_data (pfd, buf,1024 );if (!signal_recvd || len !=63 || oob !='@' ) {
Greg Kroah-Hartman
maintainerPATCH 878/913 bpf: Adjust BPF stack helper functions to accommodate skip > 0
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
commit ee2a098851bfbe8bcdd964c0121f4246f00ff41e upstream.
Let's say that the caller has storage for num_elem stack frames. Then, the BPF stack helper functions walk the stack for only num_elem frames. This means that if skip > 0, one keeps only 'num_elem - skip' frames.
This is because it sets init_nr in the perf_callchain_entry to the end of the buffer to save num_elem entries only. I believe it was because the perf callchain code unwound the stack frames until it reached the global max size (sysctl_perf_event_max_stack).
However it now has perf_callchain_entry_ctx.max_stack to limit the iteration locally. This simplifies the code to handle init_nr in the BPF callstack entries and removes the confusion with the perf_event's __PERF_SAMPLE_CALLCHAIN_EARLY which sets init_nr to 0.
Also change the comment on bpf_get_stack() in the header file to be more explicit what the return value means.
--- include/uapi/linux/bpf.h | 8 +++--- kernel/bpf/stackmap.c | 56 ++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 36 deletions(-)
include/uapi/linux/bpf.h +4 -4
@@ -2965,8 +2965,8 @@ union bpf_attr {* * # sysctl kernel.perf_event_max_stack=<new value> * Return -* A non-negative value equal to or less than *size* on success, -* or a negative error in case of failure. +* The non-negative copied *buf* length equal to or less than +* *size* on success, or a negative error in case of failure. * * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header) * Description
@@ -4269,8 +4269,8 @@ union bpf_attr {* * # sysctl kernel.perf_event_max_stack=<new value> * Return -* A non-negative value equal to or less than *size* on success, -* or a negative error in case of failure. +* The non-negative copied *buf* length equal to or less than +* *size* on success, or a negative error in case of failure. * * long bpf_load_hdr_opt(struct bpf_sock_ops *skops, void *searchby_res, u32 len, u64 flags) * Description
kernel/bpf/stackmap.c +24 -32
127 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 879/913 bpf: Fix comment for helper bpf_current_task_under_cgroup()
In reply to Greg Kroah-HartmanFrom: Hengqi Chen <[email protected]>
commit 58617014405ad5c9f94f464444f4972dabb71ca7 upstream.
Fix the descriptions of the return values of helper bpf_current_task_under_cgroup().
--- include/uapi/linux/bpf.h | 4 ++-- tools/include/uapi/linux/bpf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/uapi/linux/bpf.h +2 -2
@@ -2276,8 +2276,8 @@ union bpf_attr {* Return * The return value depends on the result of the test, and can be: * -* * 0, if current task belongs to the cgroup2. -* * 1, if current task does not belong to the cgroup2. +* * 1, if current task belongs to the cgroup2. +* * 0, if current task does not belong to the cgroup2. * * A negative error code, if an error occurred. * * long bpf_skb_change_tail(struct sk_buff *skb, u32 len, u64 flags)
tools/include/uapi/linux/bpf.h +2 -2
@@ -2276,8 +2276,8 @@ union bpf_attr {* Return * The return value depends on the result of the test, and can be: * -* * 0, if current task belongs to the cgroup2. -* * 1, if current task does not belong to the cgroup2. +* * 1, if current task belongs to the cgroup2. +* * 0, if current task does not belong to the cgroup2. * * A negative error code, if an error occurred. * * long bpf_skb_change_tail(struct sk_buff *skb, u32 len, u64 flags)
Greg Kroah-Hartman
maintainerPATCH 880/913 mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 7499b529d97f752124fa62fefa1d6d44b371215a upstream.
Commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") doesn't use pm_runtime_{get,put}() helpers when it should, so the RPM refcount keeps at zero, hence its parent driver, rtsx_pci, has to do lots of weird tricks to keep it from runtime suspending.
So use those helpers at right places to properly manage runtime PM.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 44 ++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +33 -11
@@ -806,6 +806,7 @@ static void sd_request(struct work_strucstruct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; +struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -822,6 +823,7 @@ static void sd_request(struct work_struc }mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -858,6 +860,8 @@ static void sd_request(struct work_struc data->bytes_xfered = data->blocks * data->blksz; } +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1080,6 +1084,7 @@ static void sdmmc_set_ios(struct mmc_hos {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1088,6 +1093,7 @@ static void sdmmc_set_ios(struct mmc_hosreturn ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1121,6 +1127,8 @@ static void sdmmc_set_ios(struct mmc_hosrtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1128,6 +1136,7 @@ static int sdmmc_get_ro(struct mmc_host {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1135,6 +1144,7 @@ static int sdmmc_get_ro(struct mmc_hostreturn -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1144,6 +1154,8 @@ static int sdmmc_get_ro(struct mmc_hostif (val &SD_WRITE_PROTECT ) ro =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1153,6 +1165,7 @@ static int sdmmc_get_cd(struct mmc_host {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1160,6 +1173,7 @@ static int sdmmc_get_cd(struct mmc_hostreturn cd;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1169,6 +1183,8 @@ static int sdmmc_get_cd(struct mmc_hostif (val &SD_EXIST ) cd =1 ; +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1251,6 +1267,7 @@ static int sdmmc_switch_voltage(struct m {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1265,6 +1282,7 @@ static int sdmmc_switch_voltage(struct mreturn err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1294,6 +1312,8 @@ out: err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1303,6 +1323,7 @@ static int sdmmc_execute_tuning(struct m {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; +struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
@@ -1313,6 +1334,7 @@ static int sdmmc_execute_tuning(struct mreturn err;mutex_lock (&pcr->pcr_mutex); +pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1345,6 +1367,8 @@ static int sdmmc_execute_tuning(struct m err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1495,12 +1519,12 @@ static int rtsx_pci_sdmmc_drv_probe(strurealtek_init_host (host); -if (pcr->rtd3_en) { -pm_runtime_set_autosuspend_delay (&pdev->dev,5000 ); -pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev); - } - +pm_runtime_no_callbacks (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev); +pm_runtime_set_autosuspend_delay (&pdev->dev,200 ); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_use_autosuspend (&pdev->dev);mmc_add_host (mmc);
@@ -1521,11 +1545,6 @@ static int rtsx_pci_sdmmc_drv_remove(str pcr->slots[RTSX_SD_CARD ].card_event =NULL ; mmc = host->mmc; -if (pcr->rtd3_en) { -pm_runtime_dont_use_autosuspend (&pdev->dev); -pm_runtime_disable (&pdev->dev); - } -cancel_work_sync (&host->work);mutex_lock (&host->host_mutex);
@@ -1548,6 +1567,9 @@ static int rtsx_pci_sdmmc_drv_remove(strflush_work (&host->work); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); dev_dbg(&(pdev->dev),
Greg Kroah-Hartman
maintainerPATCH 881/913 dt-bindings: mtd: nand-controller: Fix the reg property description
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 93f2ec9e401276fb4ea9903194a5bfcf175f9a2c upstream.
The reg property of a NAND device always references the chip-selects. The ready/busy lines are described in the nand-rb property. I believe this was a harmless copy/paste error during the conversion to yaml.
--- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/nand-controller.yaml +1 -1
@@ -55,7 +55,7 @@ patternProperties: properties: reg: description: - Contains the native Ready/Busy IDs. + Contains the chip-select IDs. nand-ecc-engine: allOf:
Greg Kroah-Hartman
maintainerPATCH 882/913 dt-bindings: mtd: nand-controller: Fix a comment in the examples
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 0e7f1b557974ce297e5e4c9d4245720fbb489886 upstream.
The controller properties should be in the controller 'parent' node, while properties in the children nodes are specific to the NAND *chip*. This error was already present during the yaml conversion.
--- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/nand-controller.yaml +1 -1
@@ -184,7 +184,7 @@ examples: nand-use-soft-ecc-engine; nand-ecc-algo = "bch"; - /* controller specific properties */ + /* NAND chip specific properties */ }; nand@1 {
Greg Kroah-Hartman
maintainerPATCH 883/913 dt-bindings: spi: mxic: The interrupt property is not mandatory
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 90c204d3195a795f77f5bce767e311dd1c59ca17 upstream.
The interrupt property is not mandatory at all, this property should not be part of the required properties list, so move it into the optional properties list.
--- Documentation/devicetree/bindings/spi/spi-mxic.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/spi/spi-mxic.txt +3 -1
@@ -8,11 +8,13 @@ Required properties: - reg: should contain 2 entries, one for the registers and one for the direct mapping area - reg-names: should contain "regs" and "dirmap" -- interrupts: interrupt line connected to the SPI controller - clock-names: should contain "ps_clk", "send_clk" and "send_dly_clk" - clocks: should contain 3 entries for the "ps_clk", "send_clk" and "send_dly_clk" clocks +Optional properties: +- interrupts: interrupt line connected to the SPI controller + Example: spi@43c30000 {
Greg Kroah-Hartman
maintainerPATCH 884/913 dt-bindings: memory: mtk-smi: No need mediatek,larb-id for mt8167
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
commit ddc3a324889686ec9b358de20fdeec0d2668c7a8 upstream.
Mute the warning from "make dtbs_check":
larb@14016000: 'mediatek,larb-id' is a required property
arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dt.yaml larb@15001000: 'mediatek,larb-id' is a required property arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dt.yaml larb@16010000: 'mediatek,larb-id' is a required property arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dt.yaml
As the description of mediatek,larb-id, the property is only required when the larbid is not consecutive from its IOMMU point of view.
Also, from the description of mediatek,larbs in Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml, all the larbs must sort by the larb index.
In mt8167, there is only one IOMMU HW and three larbs. The drivers already know its larb index from the mediatek,larbs property of IOMMU, thus no need this property.
--- Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml | 1 - 1 file changed, 1 deletion(-)
Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +0 -1
@@ -106,7 +106,6 @@ allOf: - mediatek,mt2701-smi-larb - mediatek,mt2712-smi-larb - mediatek,mt6779-smi-larb - - mediatek,mt8167-smi-larb - mediatek,mt8192-smi-larb then:
Greg Kroah-Hartman
maintainerPATCH 885/913 dt-bindings: pinctrl: pinctrl-microchip-sgpio: Fix example
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
commit a6ff90f3fbd4d902aad8777f0329cef3a2768bde upstream.
The blamed commit adds support for irq, but the reqisters for irq are outside of the memory size. They are at address 0x108. Therefore update the memory size to cover all the registers used by the device.
--- Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml +1 -1
@@ -138,7 +138,7 @@ examples: clocks = <&sys_clk>; pinctrl-0 = <&sgpio2_pins>; pinctrl-names = "default"; - reg = <0x1101059c 0x100>; + reg = <0x1101059c 0x118>; microchip,sgpio-port-ranges = <0 0>, <16 18>, <28 31>; bus-frequency = <25000000>; sgpio_in2: gpio@0 {
Greg Kroah-Hartman
maintainerPATCH 886/913 ubi: fastmap: Return error code if memory allocation fails in add_aeb()
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit c3c07fc25f37c157fde041b3a0c3dfcb1590cbce upstream.
Abort fastmap scanning and return error code if memory allocation fails in add_aeb(). Otherwise ubi will get wrong peb statistics information after scanning.
--- drivers/mtd/ubi/fastmap.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/mtd/ubi/fastmap.c +19 -9
@@ -468,7 +468,9 @@ static int scan_pool(struct ubi_device *if (err ==UBI_IO_FF_BITFLIPS ) scrub =1 ; -add_aeb (ai, free, pnum, ec, scrub); + ret =add_aeb (ai, free, pnum, ec, scrub); +if (ret) + goto out;continue ; }else if (err ==0 || err ==UBI_IO_BITFLIPS ) {dbg_bld ("Found non empty PEB:%i in pool" , pnum);
@@ -638,8 +640,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &ai->free,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),0 ); + ret =add_aeb (ai, &ai->free,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),0 ); +if (ret) + goto fail; }/* read EC values from used list */
@@ -649,8 +653,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &used,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),0 ); + ret =add_aeb (ai, &used,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),0 ); +if (ret) + goto fail; }/* read EC values from scrub list */
@@ -660,8 +666,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &used,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),1 ); + ret =add_aeb (ai, &used,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),1 ); +if (ret) + goto fail; }/* read EC values from erase list */
@@ -671,8 +679,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &ai->erase,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),1 ); + ret =add_aeb (ai, &ai->erase,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),1 ); +if (ret) + goto fail; } ai->mean_ec =div_u64 (ai->ec_sum, ai->ec_count);
Greg Kroah-Hartman
maintainerPATCH 887/913 ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV
In reply to Greg Kroah-HartmanFrom: Zheng Bin <[email protected]>
commit 664d66dc0a64b32e60a5ad59a9aebb08676a612b upstream.
If SND_SOC_SOF_PCI_DEV is n, bulding fails:
sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to sof_pci_probe' sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to sof_pci_remove' sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to sof_pci_shutdown' sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to sof_pci_pm'
Make SND_SOC_SOF_MERRIFIELD select SND_SOC_SOF_PCI_DEV to fix this.
--- sound/soc/sof/intel/Kconfig | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/intel/Kconfig +1 -0
@@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI config SND_SOC_SOF_MERRIFIELD tristate "SOF support for Tangier/Merrifield" default SND_SOC_SOF_PCI + select SND_SOC_SOF_PCI_DEV select SND_SOC_SOF_INTEL_ATOM_HIFI_EP help This adds support for Sound Open Firmware for Intel(R) platforms
Greg Kroah-Hartman
maintainerPATCH 888/913 ASoC: topology: Allow TLV control to be either read or write
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit feb00b736af64875560f371fe7f58b0b7f239046 upstream.
There is no reason to force readwrite access on TLV controls. It can be either read, write or both. This is further evidenced in code where it performs following checks:
if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ) && !sbe->get)
return -EINVAL;
if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) && !sbe->put)
return -EINVAL;--- sound/soc/soc-topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-topology.c +2 -1
@@ -510,7 +510,8 @@ static int soc_tplg_kcontrol_bind_io(strif (le32_to_cpu (hdr->ops.info) ==SND_SOC_TPLG_CTL_BYTES && k->iface &SNDRV_CTL_ELEM_IFACE_MIXER - && k->access &SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE + && (k->access &SNDRV_CTL_ELEM_ACCESS_TLV_READ + || k->access &SNDRV_CTL_ELEM_ACCESS_TLV_WRITE ) && k->access &SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK ) {struct soc_bytes_ext *sbe;struct snd_soc_tplg_bytes_control *be;
Greg Kroah-Hartman
maintainerPATCH 889/913 perf vendor events: Update metrics for SkyLake Server
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
commit 3bad20d7d129c3b3063658a0f83974dfe6dac5c4 upstream.
Based on TMA_metrics-full.csv version 4.3 at 01.org:
https://download.01.org/perfmon/ Events are updated to version 1.26: https://download.01.org/perfmon/SKX
Json files generated by:
https://github.com/intel/event-converter-for-linux-perf
Fixes were made that allow the skx-metrics.json to successfully generate, bringing back TopdownL1 metrics.
Tested:
$ perf test
...
6: Parse event definition strings : Ok
7: Simple expression parser : Ok
...
9: Parse perf pmu format : Ok
10: PMU events :
10.1: PMU event table sanity : Ok
10.2: PMU event map aliases : Ok
10.3: Parsing of PMU event table metrics : Ok
10.4: Parsing of PMU event table metrics with fake PMUs : Ok
...
68: Parse and process metrics : Ok
...
88: perf stat metrics (shadow stat) test : Ok
89: perf all metricgroups test : Ok
90: perf all metrics test : Skip
91: perf all PMU test : Ok
...90 skips due to a lack of floating point samples, which is understandable.
--- tools/perf/pmu-events/arch/x86/skylakex/cache.json | 111 +- tools/perf/pmu-events/arch/x86/skylakex/floating-point.json | 24 tools/perf/pmu-events/arch/x86/skylakex/frontend.json | 18 tools/perf/pmu-events/arch/x86/skylakex/memory.json | 96 +- tools/perf/pmu-events/arch/x86/skylakex/pipeline.json | 11 tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json | 461 ++++++++++-- tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json | 23 7 files changed, 591 insertions(+), 153 deletions(-)
tools/perf/pmu-events/arch/x86/skylakex/cache.json +63 -48
@@ -315,6 +315,19 @@ "UMask": "0x82" }, { + "BriefDescription": "All retired memory instructions.", + "Counter": "0,1,2,3", + "CounterHTOff": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xD0", + "EventName": "MEM_INST_RETIRED.ANY", + "L1_Hit_Indication": "1", + "PEBS": "1", + "PublicDescription": "Counts all retired memory instructions - loads and stores.", + "SampleAfterValue": "2000003", + "UMask": "0x83" + }, + { "BriefDescription": "Retired load instructions with locked access.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3",
@@ -358,6 +371,7 @@ "EventCode": "0xD0", "EventName": "MEM_INST_RETIRED.STLB_MISS_LOADS", "PEBS": "1", + "PublicDescription": "Number of retired load instructions that (start a) miss in the 2nd-level TLB (STLB).", "SampleAfterValue": "100003", "UMask": "0x11" },
@@ -370,6 +384,7 @@ "EventName": "MEM_INST_RETIRED.STLB_MISS_STORES", "L1_Hit_Indication": "1", "PEBS": "1", + "PublicDescription": "Number of retired store instructions that (start a) miss in the 2nd-level TLB (STLB).", "SampleAfterValue": "100003", "UMask": "0x12" },
@@ -733,7 +748,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_DATA_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010491", + "MSRValue": "0x10491", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -772,7 +787,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_DATA_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0491", + "MSRValue": "0x4003C0491", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -785,7 +800,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_DATA_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0491", + "MSRValue": "0x1003C0491", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -798,7 +813,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0491", + "MSRValue": "0x8003C0491", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -811,7 +826,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_DATA_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010490", + "MSRValue": "0x10490", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -850,7 +865,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_DATA_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0490", + "MSRValue": "0x4003C0490", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -863,7 +878,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_DATA_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0490", + "MSRValue": "0x1003C0490", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -876,7 +891,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0490", + "MSRValue": "0x8003C0490", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -889,7 +904,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_RFO.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010120", + "MSRValue": "0x10120", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -928,7 +943,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_RFO.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0120", + "MSRValue": "0x4003C0120", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -941,7 +956,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_RFO.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0120", + "MSRValue": "0x1003C0120", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -954,7 +969,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_PF_RFO.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0120", + "MSRValue": "0x8003C0120", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -967,7 +982,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_RFO.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010122", + "MSRValue": "0x10122", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1006,7 +1021,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_RFO.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0122", + "MSRValue": "0x4003C0122", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1019,7 +1034,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_RFO.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0122", + "MSRValue": "0x1003C0122", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1032,7 +1047,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.ALL_RFO.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0122", + "MSRValue": "0x8003C0122", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1045,7 +1060,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_CODE_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010004", + "MSRValue": "0x10004", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1084,7 +1099,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_CODE_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0004", + "MSRValue": "0x4003C0004", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1097,7 +1112,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_CODE_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0004", + "MSRValue": "0x1003C0004", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1110,7 +1125,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_CODE_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0004", + "MSRValue": "0x8003C0004", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1123,7 +1138,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_DATA_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010001", + "MSRValue": "0x10001", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1162,7 +1177,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_DATA_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0001", + "MSRValue": "0x4003C0001", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1175,7 +1190,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_DATA_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0001", + "MSRValue": "0x1003C0001", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1188,7 +1203,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0001", + "MSRValue": "0x8003C0001", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1201,7 +1216,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_RFO.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010002", + "MSRValue": "0x10002", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1240,7 +1255,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_RFO.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0002", + "MSRValue": "0x4003C0002", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1253,7 +1268,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_RFO.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0002", + "MSRValue": "0x1003C0002", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1266,7 +1281,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.DEMAND_RFO.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0002", + "MSRValue": "0x8003C0002", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1279,7 +1294,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L1D_AND_SW.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010400", + "MSRValue": "0x10400", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1318,7 +1333,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L1D_AND_SW.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0400", + "MSRValue": "0x4003C0400", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1331,7 +1346,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L1D_AND_SW.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0400", + "MSRValue": "0x1003C0400", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1344,7 +1359,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L1D_AND_SW.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0400", + "MSRValue": "0x8003C0400", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1357,7 +1372,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_DATA_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010010", + "MSRValue": "0x10010", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1396,7 +1411,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_DATA_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0010", + "MSRValue": "0x4003C0010", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1409,7 +1424,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_DATA_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0010", + "MSRValue": "0x1003C0010", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1422,7 +1437,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0010", + "MSRValue": "0x8003C0010", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1435,7 +1450,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_RFO.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010020", + "MSRValue": "0x10020", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1474,7 +1489,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_RFO.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0020", + "MSRValue": "0x4003C0020", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1487,7 +1502,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_RFO.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0020", + "MSRValue": "0x1003C0020", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1500,7 +1515,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L2_RFO.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0020", + "MSRValue": "0x8003C0020", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1513,7 +1528,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_DATA_RD.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010080", + "MSRValue": "0x10080", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1552,7 +1567,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_DATA_RD.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0080", + "MSRValue": "0x4003C0080", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1565,7 +1580,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_DATA_RD.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0080", + "MSRValue": "0x1003C0080", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1578,7 +1593,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0080", + "MSRValue": "0x8003C0080", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1591,7 +1606,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_RFO.ANY_RESPONSE", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x0000010100", + "MSRValue": "0x10100", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1630,7 +1645,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_RFO.L3_HIT.HIT_OTHER_CORE_NO_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x04003C0100", + "MSRValue": "0x4003C0100", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1643,7 +1658,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_RFO.L3_HIT.NO_SNOOP_NEEDED", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x01003C0100", + "MSRValue": "0x1003C0100", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
@@ -1656,7 +1671,7 @@ "EventCode": "0xB7, 0xBB", "EventName": "OFFCORE_RESPONSE.PF_L3_RFO.L3_HIT.SNOOP_HIT_WITH_FWD", "MSRIndex": "0x1a6,0x1a7", - "MSRValue": "0x08003C0100", + "MSRValue": "0x8003C0100", "Offcore": "1", "PublicDescription": "Offcore response can be programmed only with a specific pair of event select and counter MSR, and with specific event codes and predefine mask bit value in a dedicated MSR to specify attributes of the offcore transaction.", "SampleAfterValue": "100003",
tools/perf/pmu-events/arch/x86/skylakex/floating-point.json +16 -8
@@ -1,73 +1,81 @@ [ { - "BriefDescription": "Number of SSE/AVX computational 128-bit packed double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 2 computation operations, one for each element. Applies to SSE* and AVX* packed double precision floating-point instructions: ADD SUB HADD HSUB SUBADD MUL DIV MIN MAX SQRT RSQRT14 RCP14 DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD 128-bit packed computational double precision floating-point instructions retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE", + "PublicDescription": "Counts once for most SIMD 128-bit packed computational double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 2 computation operations, one for each element. Applies to packed double precision floating-point instructions: ADD SUB HADD HSUB SUBADD MUL DIV MIN MAX SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x4" }, { - "BriefDescription": "Number of SSE/AVX computational 128-bit packed single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 4 computation operations, one for each element. Applies to SSE* and AVX* packed single precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD 128-bit packed computational single precision floating-point instruction retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE", + "PublicDescription": "Counts once for most SIMD 128-bit packed computational single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 4 computation operations, one for each element. Applies to packed single precision floating-point instructions: ADD SUB HADD HSUB SUBADD MUL DIV MIN MAX SQRT RSQRT RCP DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x8" }, { - "BriefDescription": "Number of SSE/AVX computational 256-bit packed double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 4 computation operations, one for each element. Applies to SSE* and AVX* packed double precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD 256-bit packed double computational precision floating-point instructions retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE", + "PublicDescription": "Counts once for most SIMD 256-bit packed double computational precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 4 computation operations, one for each element. Applies to packed double precision floating-point instructions: ADD SUB HADD HSUB SUBADD MUL DIV MIN MAX SQRT FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x10" }, { - "BriefDescription": "Number of SSE/AVX computational 256-bit packed single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 8 computation operations, one for each element. Applies to SSE* and AVX* packed single precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD 256-bit packed single computational precision floating-point instructions retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE", + "PublicDescription": "Counts once for most SIMD 256-bit packed single computational precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 8 computation operations, one for each element. Applies to packed single precision floating-point instructions: ADD SUB HADD HSUB SUBADD MUL DIV MIN MAX SQRT RSQRT RCP DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x20" }, { - "BriefDescription": "Number of SSE/AVX computational 512-bit packed double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 8 computation operations, one for each element. Applies to SSE* and AVX* packed double precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 8 calculations per element.", + "BriefDescription": "Counts number of SSE/AVX computational 512-bit packed double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 8 computation operations, one for each element. Applies to SSE* and AVX* packed double precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT RSQRT14 RCP14 FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.512B_PACKED_DOUBLE", + "PublicDescription": "Number of SSE/AVX computational 512-bit packed double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 8 computation operations, one for each element. Applies to SSE* and AVX* packed double precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT RSQRT14 RCP14 FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x40" }, { - "BriefDescription": "Number of SSE/AVX computational 512-bit packed single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 16 computation operations, one for each element. Applies to SSE* and AVX* packed single precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 16 calculations per element.", + "BriefDescription": "Counts number of SSE/AVX computational 512-bit packed single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 16 computation operations, one for each element. Applies to SSE* and AVX* packed single precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT RSQRT14 RCP14 FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.512B_PACKED_SINGLE", + "PublicDescription": "Number of SSE/AVX computational 512-bit packed single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 16 computation operations, one for each element. Applies to SSE* and AVX* packed single precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT RSQRT14 RCP14 FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x80" }, { - "BriefDescription": "Number of SSE/AVX computational scalar double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 1 computation. Applies to SSE* and AVX* scalar double precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD scalar computational double precision floating-point instructions retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.SCALAR_DOUBLE", + "PublicDescription": "Counts once for most SIMD scalar computational double precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 1 computational operation. Applies to SIMD scalar double precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x1" }, { - "BriefDescription": "Number of SSE/AVX computational scalar single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 1 computation. Applies to SSE* and AVX* scalar single precision floating-point instructions: ADD SUB MUL DIV MIN MAX RCP14 RSQRT14 SQRT DPP FM(N)ADD/SUB. DPP and FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element.", + "BriefDescription": "Counts once for most SIMD scalar computational single precision floating-point instructions retired. Counts twice for DPP and FM(N)ADD/SUB instructions retired.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3,4,5,6,7", "EventCode": "0xC7", "EventName": "FP_ARITH_INST_RETIRED.SCALAR_SINGLE", + "PublicDescription": "Counts once for most SIMD scalar computational single precision floating-point instructions retired; some instructions will count twice as noted below. Each count represents 1 computational operation. Applies to SIMD scalar single precision floating-point instructions: ADD SUB MUL DIV MIN MAX SQRT RSQRT RCP FM(N)ADD/SUB. FM(N)ADD/SUB instructions count twice as they perform 2 calculations per element. The DAZ and FTZ flags in the MXCSR register need to be set when using these events.", "SampleAfterValue": "2000003", "UMask": "0x2" },
tools/perf/pmu-events/arch/x86/skylakex/frontend.json +16 -2
@@ -30,7 +30,21 @@ "UMask": "0x2" }, { - "BriefDescription": "Retired Instructions who experienced decode stream buffer (DSB - the decoded instruction-cache) miss.", + "BriefDescription": "Retired Instructions who experienced DSB miss.", + "Counter": "0,1,2,3", + "CounterHTOff": "0,1,2,3", + "EventCode": "0xC6", + "EventName": "FRONTEND_RETIRED.ANY_DSB_MISS", + "MSRIndex": "0x3F7", + "MSRValue": "0x1", + "PEBS": "1", + "PublicDescription": "Counts retired Instructions that experienced DSB (Decode stream buffer i.e. the decoded instruction-cache) miss.", + "SampleAfterValue": "100007", + "TakenAlone": "1", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired Instructions who experienced a critical DSB miss.", "Counter": "0,1,2,3", "CounterHTOff": "0,1,2,3", "EventCode": "0xC6",
@@ -38,7 +52,7 @@ "MSRIndex": "0x3F7", "MSRValue": "0x11", "PEBS": "1", - "PublicDescription": "Counts retired Instructions that experienced DSB (Decode stream buffer i.e. the decoded instruction-cache) miss.", + "PublicDescription": "Number of retired Instructions that experienced a critical DSB (Decode stream buffer i.e. the decoded instruction-cache) miss. Critical means stalls were exposed to the back-end as a result of the DSB miss.", "SampleAfterValue": "100007", "TakenAlone": "1", "UMask": "0x1"
tools/perf/pmu-events/arch/x86/skylakex/memory.json +48 -48
384 lines not on this page · raw message
tools/perf/pmu-events/arch/x86/skylakex/pipeline.json +11 -0
@@ -436,6 +436,17 @@ "SampleAfterValue": "2000003" }, { + "BriefDescription": "Number of all retired NOP instructions.", + "Counter": "0,1,2,3", + "CounterHTOff": "0,1,2,3,4,5,6,7", + "Errata": "SKL091, SKL044", + "EventCode": "0xC0", + "EventName": "INST_RETIRED.NOP", + "PEBS": "1", + "SampleAfterValue": "2000003", + "UMask": "0x2" + }, + { "BriefDescription": "Precise instruction retired event with HW to reduce effect of PEBS shadow in IP distribution", "Counter": "1", "CounterHTOff": "1",
tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json +414 -47
647 lines not on this page · raw message
tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json +23 -0
@@ -538,6 +538,18 @@ "Unit": "IIO" }, { + "BriefDescription": "PCIe Completion Buffer Inserts of completions with data: Part 0-3", + "Counter": "0,1,2,3", + "EventCode": "0xC2", + "EventName": "UNC_IIO_COMP_BUF_INSERTS.CMPD.ALL_PARTS", + "FCMask": "0x4", + "PerPkg": "1", + "PortMask": "0x0f", + "PublicDescription": "PCIe Completion Buffer Inserts of completions with data: Part 0-3", + "UMask": "0x03", + "Unit": "IIO" + }, + { "BriefDescription": "PCIe Completion Buffer Inserts of completions with data: Part 0", "Counter": "0,1,2,3", "EventCode": "0xC2",
@@ -586,6 +598,17 @@ "Unit": "IIO" }, { + "BriefDescription": "PCIe Completion Buffer occupancy of completions with data: Part 0-3", + "Counter": "2,3", + "EventCode": "0xD5", + "EventName": "UNC_IIO_COMP_BUF_OCCUPANCY.CMPD.ALL_PARTS", + "FCMask": "0x04", + "PerPkg": "1", + "PublicDescription": "PCIe Completion Buffer occupancy of completions with data: Part 0-3", + "UMask": "0x0f", + "Unit": "IIO" + }, + { "BriefDescription": "PCIe Completion Buffer occupancy of completions with data: Part 0", "Counter": "2,3", "EventCode": "0xD5",
Greg Kroah-Hartman
maintainerPATCH 890/913 media: ov6650: Add try support to selection API operations
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
commit c74052646496ffe0bc606152e6b9653137020cbf upstream.
Try requests are now only supported by format processing pad operations implemented by the driver. The driver selection API operations currently respond to them with -EINVAL. While that is correct, it constraints video device drivers to not use subdevice cropping at all while processing user requested active frame size, otherwise their set try format results might differ from active. As a consequence, we can't fix set format pad operation as not to touch crop rectangle since that would affect users not being able to set arbitrary frame sizes. Moreover, without a working set try selection support we are not able to use pad config crop rectangle as a reference while processing set try format requests.
Implement missing try selection support. Moreover, as it will be now possible to maintain the pad config crop rectangle via selection API, start using it instead of the active one as a reference while processing set try format requests.
is_unscaled_ok() helper, now also called from set selection operation, has been just moved up in the source file to avoid a prototype, with no functional changes.
[Sakari Ailus: Rebase on subdev state patches]
--- drivers/media/i2c/ov6650.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-)
drivers/media/i2c/ov6650.c +43 -11
@@ -472,9 +472,16 @@ static int ov6650_get_selection(struct v {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); +struct v4l2_rect *rect; -if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE ) -return -EINVAL ; +if (sel->which ==V4L2_SUBDEV_FORMAT_TRY ) { +/* pre-select try crop rectangle */ + rect = &sd_state->pads->try_crop; + + }else { +/* pre-select active crop rectangle */ + rect = &priv->rect; + }switch (sel->target) {case V4L2_SEL_TGT_CROP_BOUNDS :
@@ -483,14 +490,22 @@ static int ov6650_get_selection(struct v sel->r.width =W_CIF ; sel->r.height =H_CIF ;return 0 ; +case V4L2_SEL_TGT_CROP : - sel->r = priv->rect; +/* use selected crop rectangle */ + sel->r = *rect;return 0 ; +default :return -EINVAL ; } } +static bool is_unscaled_ok (int width,int height,struct v4l2_rect *rect) +{ +return width > rect->width >>1 || height > rect->height >>1 ; +} +static void ov6650_bind_align_crop_rectangle (struct v4l2_rect *rect) { v4l_bound_align_image(&rect->width, 2, W_CIF, 1,
@@ -510,12 +525,30 @@ static int ov6650_set_selection(struct vstruct ov6650 *priv =to_ov6650 (client);int ret; -if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE || - sel->target !=V4L2_SEL_TGT_CROP ) +if (sel->target !=V4L2_SEL_TGT_CROP )return -EINVAL ;ov6650_bind_align_crop_rectangle (&sel->r); +if (sel->which ==V4L2_SUBDEV_FORMAT_TRY ) { +struct v4l2_rect *crop = &sd_state->pads->try_crop; +struct v4l2_mbus_framefmt *mf = &sd_state->pads->try_fmt; +/* detect current pad config scaling factor */ +bool half_scale = !is_unscaled_ok (mf->width, mf->height, crop); + +/* store new crop rectangle */ + *crop = sel->r; + +/* adjust frame size */ + mf->width = crop->width >> half_scale; + mf->height = crop->height >> half_scale; + +return 0 ; + } + +/* V4L2_SUBDEV_FORMAT_ACTIVE */ + +/* apply new crop rectangle */ ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) { priv->rect.width += priv->rect.left - sel->r.left;
@@ -567,11 +600,6 @@ static int ov6650_get_fmt(struct v4l2_sureturn 0 ; } -static bool is_unscaled_ok (int width,int height,struct v4l2_rect *rect) -{ -return width > rect->width >>1 || height > rect->height >>1 ; -} -#define to_clkrc (div) ((div) - 1)/* set the format we will capture in */
@@ -692,7 +720,11 @@ static int ov6650_set_fmt(struct v4l2_subreak ; } - *crop = priv->rect; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) + *crop = sd_state->pads->try_crop; +else + *crop = priv->rect; + half_scale = !is_unscaled_ok (mf->width, mf->height, crop);/* adjust new crop rectangle position against its current center */
Greg Kroah-Hartman
maintainerPATCH 891/913 media: ov6650: Fix crop rectangle affected by set format
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
commit 985d2d7a482e9b64ef9643702b066da9cbd6ae8e upstream.
According to subdevice interface specification found in V4L2 API documentation, set format pad operations should not affect image geometry set in preceding image processing steps. Unfortunately, that requirement is not respected by the driver implementation of set format as it was not the case when that code was still implementing a pair of now obsolete .s_mbus_fmt() / .try_mbus_fmt() video operations before they have been merged and reused as an implementation of .set_fmt() pad operation by commit 717fd5b4907a ("[media] v4l2: replace try_mbus_fmt by set_fmt").
Exclude non-compliant crop rectangle adjustments from set format try, as well as a call to .set_selection() from set format active processing path, so only frame scaling is applied as needed and crop rectangle is no longer modified.
[Sakari Ailus: Rebase on subdev state patches]
--- drivers/media/i2c/ov6650.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-)
drivers/media/i2c/ov6650.c +4 -24
@@ -693,11 +693,7 @@ static int ov6650_set_fmt(struct v4l2_sustruct v4l2_mbus_framefmt *mf = &format->format;struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_subdev_selection sel = { - .which =V4L2_SUBDEV_FORMAT_ACTIVE , - .target =V4L2_SEL_TGT_CROP , - }; -struct v4l2_rect *crop = &sel.r; +struct v4l2_rect *crop;bool half_scale;if (format->pad)
@@ -721,24 +717,13 @@ static int ov6650_set_fmt(struct v4l2_su }if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) - *crop = sd_state->pads->try_crop; + crop = &sd_state->pads->try_crop;else - *crop = priv->rect; + crop = &priv->rect; half_scale = !is_unscaled_ok (mf->width, mf->height, crop); -/* adjust new crop rectangle position against its current center */ - crop->left += (crop->width - (mf->width << half_scale)) /2 ; - crop->top += (crop->height - (mf->height << half_scale)) /2 ; -/* adjust new crop rectangle size */ - crop->width = mf->width << half_scale; - crop->height = mf->height << half_scale; -if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { -/* store new crop rectangle, hadware bound, in pad config */ -ov6650_bind_align_crop_rectangle (crop); - sd_state->pads->try_crop = *crop; -/* store new mbus frame format code and size in pad config */ sd_state->pads->try_fmt.width = crop->width >> half_scale; sd_state->pads->try_fmt.height = crop->height >> half_scale;
@@ -751,12 +736,7 @@ static int ov6650_set_fmt(struct v4l2_su mf->code = sd_state->pads->try_fmt.code; }else { -int ret; - -/* apply new crop rectangle */ - ret =ov6650_set_selection (sd,NULL , &sel); -if (ret) -return ret; +int ret =0 ;/* apply new media bus frame format and scaling if changed */ if (mf->code != priv->code || half_scale != priv->half_scale)
Greg Kroah-Hartman
maintainerPATCH 892/913 spi: mediatek: support tick_delay without enhance_timing
In reply to Greg Kroah-HartmanFrom: Leilk Liu <[email protected]>
commit 03b1be379dcee2e9c866c2a455a1a4a9581b3efd upstream.
this patch support tick_delay bit[31:30] without enhance_timing feature.
--- drivers/spi/spi-mt65xx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/spi/spi-mt65xx.c +12 -3
@@ -43,8 +43,11 @@#define SPI_CFG1_PACKET_LOOP_OFFSET 8#define SPI_CFG1_PACKET_LENGTH_OFFSET 16#define SPI_CFG1_GET_TICK_DLY_OFFSET 29 +#define SPI_CFG1_GET_TICK_DLY_OFFSET_V1 30#define SPI_CFG1_GET_TICK_DLY_MASK 0xe0000000 +#define SPI_CFG1_GET_TICK_DLY_MASK_V1 0xc0000000 +#define SPI_CFG1_CS_IDLE_MASK 0xff#define SPI_CFG1_PACKET_LOOP_MASK 0xff00#define SPI_CFG1_PACKET_LENGTH_MASK 0x3ff0000
@@ -346,9 +349,15 @@ static int mtk_spi_prepare_message(struc/* tick delay */ reg_val =readl (mdata->base +SPI_CFG1_REG ); - reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK ; - reg_val |= ((chip_config->tick_delay &0x7 ) - <<SPI_CFG1_GET_TICK_DLY_OFFSET ); +if (mdata->dev_comp->enhance_timing) { + reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK ; + reg_val |= ((chip_config->tick_delay &0x7 ) + <<SPI_CFG1_GET_TICK_DLY_OFFSET ); + }else { + reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK_V1 ; + reg_val |= ((chip_config->tick_delay &0x3 ) + <<SPI_CFG1_GET_TICK_DLY_OFFSET_V1 ); + }writel (reg_val, mdata->base +SPI_CFG1_REG );/* set hw cs timing */
Greg Kroah-Hartman
maintainerPATCH 893/913 ARM: dts: spear1340: Update serial node properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit 583d6b0062640def86f3265aa1042ecb6672516e upstream.
Reorder dma and dma-names property for serial node to make it compliant with bindings.
--- arch/arm/boot/dts/spear1340.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear1340.dtsi +3 -3
@@ -136,9 +136,9 @@ reg = <0xb4100000 0x1000>; interrupts = <0 105 0x4>; status = "disabled"; - dmas = <&dwdma0 12 0 1>, - <&dwdma0 13 1 0>; - dma-names = "tx", "rx"; + dmas = <&dwdma0 13 0 1>, + <&dwdma0 12 1 0>; + dma-names = "rx", "tx"; }; thermal@e07008c4 {
Greg Kroah-Hartman
maintainerPATCH 894/913 ARM: dts: spear13xx: Update SPI dma properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit 31d3687d6017c7ce6061695361598d9cda70807a upstream.
Reorder dmas and dma-names property for spi controller node to make it compliant with bindings.
--- arch/arm/boot/dts/spear13xx.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear13xx.dtsi +3 -3
@@ -284,9 +284,9 @@ #size-cells = <0>; interrupts = <0 31 0x4>; status = "disabled"; - dmas = <&dwdma0 4 0 0>, - <&dwdma0 5 0 0>; - dma-names = "tx", "rx"; + dmas = <&dwdma0 5 0 0>, + <&dwdma0 4 0 0>; + dma-names = "rx", "tx"; }; rtc@e0580000 {
Greg Kroah-Hartman
maintainerPATCH 895/913 arm64: dts: ls1043a: Update i2c dma properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit aa4df840d1c5eab2bb33695efe4409b3e5526749 upstream.
Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.
--- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +3 -3
@@ -536,9 +536,9 @@ clock-names = "i2c"; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL QORIQ_CLK_PLL_DIV(1)>; - dmas = <&edma0 1 39>, - <&edma0 1 38>; - dma-names = "tx", "rx"; + dmas = <&edma0 1 38>, + <&edma0 1 39>; + dma-names = "rx", "tx"; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 896/913 arm64: dts: ls1046a: Update i2c node dma properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit eeeb4f1075d71d67083c75f69247206e9b3d9f4a upstream.
Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.
--- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +3 -3
@@ -499,9 +499,9 @@ interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL QORIQ_CLK_PLL_DIV(2)>; - dmas = <&edma0 1 39>, - <&edma0 1 38>; - dma-names = "tx", "rx"; + dmas = <&edma0 1 38>, + <&edma0 1 39>; + dma-names = "rx", "tx"; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 897/913 um: Fix uml_mconsole stop/go
In reply to Greg Kroah-HartmanFrom: Anton Ivanov <[email protected]>
commit 1a3a6a2a035bb6c3a7ef4c788d8fd69a7b2d6284 upstream.
Moving to an EPOLL based IRQ controller broke uml_mconsole stop/go commands. This fixes it and restores stop/go functionality.
--- arch/um/drivers/mconsole_kern.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/um/drivers/mconsole_kern.c +2 -1
@@ -224,7 +224,7 @@ void mconsole_go(struct mc_request *req)void mconsole_stop (struct mc_request *req) { -deactivate_fd (req->originating_fd,MCONSOLE_IRQ ); +block_signals ();os_set_fd_block (req->originating_fd,1 );mconsole_reply (req,"stopped" ,0 ,0 );for (;;) {
@@ -247,6 +247,7 @@ void mconsole_stop(struct mc_request *re }os_set_fd_block (req->originating_fd,0 );mconsole_reply (req,"" ,0 ,0 ); +unblock_signals (); }static DEFINE_SPINLOCK (mc_devices_lock);
Greg Kroah-Hartman
maintainerPATCH 898/913 docs: sysctl/kernel: add missing bit to panic_print
In reply to Greg Kroah-HartmanFrom: Guilherme G. Piccoli <[email protected]>
commit a1ff1de00db21ecb956213f046b79741b64c6b65 upstream.
Patch series "Some improvements on panic_print".
This is a mix of a documentation fix with some additions to the "panic_print" syscall / parameter. The goal here is being able to collect all CPUs backtraces during a panic event and also to enable "panic_print" in a kdump event - details of the reasoning and design choices in the patches.
This patch (of 3):
Commit de6da1e8bcf0 ("panic: add an option to replay all the printk message in buffer") added a new bit to the sysctl/kernel parameter "panic_print", but the documentation was added only in kernel-parameters.txt, not in the sysctl guide.
Fix it here by adding bit 5 to sysctl admin-guide documentation.
--- Documentation/admin-guide/sysctl/kernel.rst | 1 + 1 file changed, 1 insertion(+)
Documentation/admin-guide/sysctl/kernel.rst +1 -0
@@ -795,6 +795,7 @@ bit 1 print system memory info bit 2 print timer info bit 3 print locks info if ``CONFIG_LOCKDEP`` is on bit 4 print ftrace buffer +bit 5 print all printk messages in buffer ===== ============================================ So for example to print tasks and memory info on panic, user can::
Greg Kroah-Hartman
maintainerPATCH 899/913 openvswitch: Fixed nd target mask field in the flow dump.
In reply to Greg Kroah-HartmanFrom: Martin Varghese <[email protected]>
commit f19c44452b58a84d95e209b847f5495d91c9983a upstream.
IPv6 nd target mask was not getting populated in flow dump.
In the function __ovs_nla_put_key the icmp code mask field was checked instead of icmp code key field to classify the flow as neighbour discovery.
ufid:bdfbe3e5-60c2-43b0-a5ff-dfcac1c37328, recirc_id(0),dp_hash(0/0), skb_priority(0/0),in_port(ovs-nm1),skb_mark(0/0),ct_state(0/0), ct_zone(0/0),ct_mark(0/0),ct_label(0/0), eth(src=00:00:00:00:00:00/00:00:00:00:00:00, dst=00:00:00:00:00:00/00:00:00:00:00:00),eth_type(0x86dd), ipv6(src=::/::,dst=::/::,label=0/0,proto=58,tclass=0/0,hlimit=0/0,frag=no), icmpv6(type=135,code=0),
nd(target=2001::2/::,
sll=00:00:00:00:00:00/00:00:00:00:00:00, tll=00:00:00:00:00:00/00:00:00:00:00:00),
packets:10, bytes:860, used:0.504s, dp:ovs, actions:ovs-nm2
--- net/openvswitch/flow_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/openvswitch/flow_netlink.c +2 -2
@@ -2201,8 +2201,8 @@ static int __ovs_nla_put_key(const struc icmpv6_key->icmpv6_type =ntohs (output->tp.src); icmpv6_key->icmpv6_code =ntohs (output->tp.dst); -if (icmpv6_key->icmpv6_type ==NDISC_NEIGHBOUR_SOLICITATION || - icmpv6_key->icmpv6_type ==NDISC_NEIGHBOUR_ADVERTISEMENT ) { +if (swkey->tp.src ==htons (NDISC_NEIGHBOUR_SOLICITATION ) || + swkey->tp.src ==htons (NDISC_NEIGHBOUR_ADVERTISEMENT )) {struct ovs_key_nd *nd_key; nla =nla_reserve (skb,OVS_KEY_ATTR_ND ,sizeof (*nd_key));
Greg Kroah-Hartman
maintainerPATCH 900/913 torture: Make torture.sh help message match reality
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
commit f233673cd32a048f2eed69e56b61174c33fb740b upstream.
This commit fixes a couple of typos: s/--doall/--do-all/ and s/--doallmodconfig/--do-allmodconfig/.
[ paulmck: Add Fixes: supplied by Paul Menzel. ]
--- tools/testing/selftests/rcutorture/bin/torture.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/rcutorture/bin/torture.sh +2 -2
@@ -71,8 +71,8 @@ usage () { echo " --configs-rcutorture \"config-file list w/ repeat factor (3*TINY01)\"" echo " --configs-locktorture \"config-file list w/ repeat factor (10*LOCK01)\"" echo " --configs-scftorture \"config-file list w/ repeat factor (2*CFLIST)\"" - echo " --doall" - echo " --doallmodconfig / --do-no-allmodconfig" + echo " --do-all" + echo " --do-allmodconfig / --do-no-allmodconfig" echo " --do-clocksourcewd / --do-no-clocksourcewd" echo " --do-kasan / --do-no-kasan" echo " --do-kcsan / --do-no-kcsan"
Greg Kroah-Hartman
maintainerPATCH 901/913 n64cart: convert bi_disk to bi_bdev->bd_disk fix build
In reply to Greg Kroah-HartmanFrom: Jackie Liu <[email protected]>
commit b2479de38d8fc7ef13d5c78ff5ded6e5a1a4eac0 upstream.
My kernel robot report below:
drivers/block/n64cart.c: In function ‘n64cart_submit_bio’:
drivers/block/n64cart.c:91:26: error: ‘struct bio’ has no member named ‘bi_disk’
91 | struct device *dev = bio->bi_disk->private_data;
| ^~
CC drivers/slimbus/qcom-ctrl.o
CC drivers/auxdisplay/hd44780.o
CC drivers/watchdog/watchdog_core.o
CC drivers/nvme/host/fault_inject.o
AR drivers/accessibility/braille/built-in.a make[2]: *** [scripts/Makefile.build:288: drivers/block/n64cart.o] Error 1
--- drivers/block/n64cart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/n64cart.c +1 -1
@@ -88,7 +88,7 @@ static blk_qc_t n64cart_submit_bio(struc {struct bio_vec bvec;struct bvec_iter iter; -struct device *dev = bio->bi_disk->private_data; +struct device *dev = bio->bi_bdev->bd_disk->private_data;u32 pos = bio->bi_iter.bi_sector <<SECTOR_SHIFT ;bio_for_each_segment (bvec, bio, iter) {
Greg Kroah-Hartman
maintainerPATCH 902/913 mmc: rtsx: Let MMC core handle runtime PM
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 7570fb41e450ba37bf9335fe3751fa9f502c30fa upstream.
Since MMC core handles runtime PM reference counting, we can avoid doing redundant runtime PM work in the driver. That means the only thing commit 5b4258f6721f ("misc: rtsx: rts5249 support runtime PM") misses is to always enable runtime PM, to let its parent driver enable ASPM in the runtime idle routine.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +0 -18
@@ -823,7 +823,6 @@ static void sd_request(struct work_struc }mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -860,8 +859,6 @@ static void sd_request(struct work_struc data->bytes_xfered = data->blocks * data->blksz; } -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); finish:
@@ -1093,7 +1090,6 @@ static void sdmmc_set_ios(struct mmc_hosreturn ;mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1127,8 +1123,6 @@ static void sdmmc_set_ios(struct mmc_hosrtsx_pci_switch_clock (pcr, ios->clock, host->ssc_depth, host->initial_mode, host->double_clk, host->vpclk); -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex); }
@@ -1144,7 +1138,6 @@ static int sdmmc_get_ro(struct mmc_hostreturn -ENOMEDIUM ;mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1154,8 +1147,6 @@ static int sdmmc_get_ro(struct mmc_hostif (val &SD_WRITE_PROTECT ) ro =1 ; -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return ro;
@@ -1173,7 +1164,6 @@ static int sdmmc_get_cd(struct mmc_hostreturn cd;mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1183,8 +1173,6 @@ static int sdmmc_get_cd(struct mmc_hostif (val &SD_EXIST ) cd =1 ; -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return cd;
@@ -1282,7 +1270,6 @@ static int sdmmc_switch_voltage(struct mreturn err;mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1312,8 +1299,6 @@ out: err =rtsx_pci_write_register (pcr,SD_BUS_STAT ,SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
@@ -1334,7 +1319,6 @@ static int sdmmc_execute_tuning(struct mreturn err;mutex_lock (&pcr->pcr_mutex); -pm_runtime_get_sync (dev);rtsx_pci_start_run (pcr);
@@ -1367,8 +1351,6 @@ static int sdmmc_execute_tuning(struct m err =sd_change_phase (host,DDR50_RX_PHASE (pcr), true); out: -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev);mutex_unlock (&pcr->pcr_mutex);return err;
Greg Kroah-Hartman
maintainerPATCH 903/913 mmc: rtsx: Fix build errors/warnings for unused variable
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
commit 3dd9a926ec2308e49445f22abef149fc64e9332e upstream.
The struct device *dev, is no longer needed at various functions, let's therefore drop it to fix the build errors/warnings.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +0 -6
@@ -806,7 +806,6 @@ static void sd_request(struct work_strucstruct mmc_request *mrq = host->mrq;struct mmc_command *cmd = mrq->cmd;struct mmc_data *data = mrq->data; -struct device *dev = &host->pdev->dev;unsigned int data_size =0 ;int err;
@@ -1081,7 +1080,6 @@ static void sdmmc_set_ios(struct mmc_hos {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; -struct device *dev = &host->pdev->dev;if (host->eject)return ;
@@ -1130,7 +1128,6 @@ static int sdmmc_get_ro(struct mmc_host {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; -struct device *dev = &host->pdev->dev;int ro =0 ;u32 val;
@@ -1156,7 +1153,6 @@ static int sdmmc_get_cd(struct mmc_host {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; -struct device *dev = &host->pdev->dev;int cd =0 ;u32 val;
@@ -1255,7 +1251,6 @@ static int sdmmc_switch_voltage(struct m {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; -struct device *dev = &host->pdev->dev;int err =0 ;u8 voltage;
@@ -1308,7 +1303,6 @@ static int sdmmc_execute_tuning(struct m {struct realtek_pci_sdmmc *host =mmc_priv (mmc);struct rtsx_pcr *pcr = host->pcr; -struct device *dev = &host->pdev->dev;int err =0 ;if (host->eject)
Greg Kroah-Hartman
maintainerPATCH 904/913 KVM: x86/mmu: do compare-and-exchange of gPTE via the user address
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 2a8859f373b0a86f0ece8ec8312607eacf12485d upstream.
FNAME(cmpxchg_gpte) is an inefficient mess. It is at least decent if it can go through get_user_pages_fast(), but if it cannot then it tries to use memremap(); that is not just terribly slow, it is also wrong because it assumes that the VM_PFNMAP VMA is contiguous.
The right way to do it would be to do the same thing as hva_to_pfn_remapped() does since commit add6a0cd1c5b ("KVM: MMU: try to fix up page faults before giving up", 2016-07-05), using follow_pte() and fixup_user_fault() to determine the correct address to use for memremap(). To do this, one could for example extract hva_to_pfn() for use outside virt/kvm/kvm_main.c. But really there is no reason to do that either, because there is already a perfectly valid address to do the cmpxchg() on, only it is a userspace address. That means doing user_access_begin()/user_access_end() and writing the code in assembly to handle exceptions correctly. Worse, the guest PTE can be 8-byte even on i686 so there is the extra complication of using cmpxchg8b to account for. But at least it is an efficient mess.
(Thanks to Linus for suggesting improvement on the inline assembly).
--- arch/x86/kvm/mmu/paging_tmpl.h | 77 +++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 40 deletions(-)
arch/x86/kvm/mmu/paging_tmpl.h +37 -40
@@ -34,9 +34,8 @@#define PT_HAVE_ACCESSED_DIRTY (mmu) true#ifdef CONFIG_X86_64 #define PT_MAX_FULL_LEVELS PT64_ROOT_MAX_LEVEL -#define CMPXCHG cmpxchg +#define CMPXCHG "cmpxchgq"#else -#define CMPXCHG cmpxchg64#define PT_MAX_FULL_LEVELS 2#endif #elif PTTYPE ==32
@@ -52,7 +51,7 @@#define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT#define PT_GUEST_ACCESSED_SHIFT PT_ACCESSED_SHIFT#define PT_HAVE_ACCESSED_DIRTY (mmu) true -#define CMPXCHG cmpxchg +#define CMPXCHG "cmpxchgl"#elif PTTYPE ==PTTYPE_EPT #define pt_element_t u64#define guest_walker guest_walkerEPT
@@ -65,7 +64,9 @@#define PT_GUEST_DIRTY_SHIFT 9#define PT_GUEST_ACCESSED_SHIFT 8#define PT_HAVE_ACCESSED_DIRTY (mmu) ((mmu)->ept_ad) -#define CMPXCHG cmpxchg64 +#ifdef CONFIG_X86_64 +#define CMPXCHG "cmpxchgq" +#endif #define PT_MAX_FULL_LEVELS PT64_ROOT_MAX_LEVEL#else #error Invalid PTTYPE value
@@ -147,43 +148,39 @@ static int FNAME(cmpxchg_gpte)(struct kv pt_element_t __user *ptep_user, unsigned index, pt_element_t orig_pte, pt_element_t new_pte) { - int npages; -pt_element_t ret; -pt_element_t *table; -struct page *page; - - npages =get_user_pages_fast ((unsigned long )ptep_user,1 ,FOLL_WRITE , &page); -if (likely (npages ==1 )) { - table =kmap_atomic (page); - ret =CMPXCHG (&table[index], orig_pte, new_pte); -kunmap_atomic (table); - -kvm_release_page_dirty (page); - }else { -struct vm_area_struct *vma; -unsigned long vaddr = (unsigned long )ptep_user &PAGE_MASK ; -unsigned long pfn; -unsigned long paddr; - -mmap_read_lock (current->mm); - vma =find_vma_intersection (current->mm, vaddr, vaddr +PAGE_SIZE ); -if (!vma || !(vma->vm_flags &VM_PFNMAP )) { -mmap_read_unlock (current->mm); -return -EFAULT ; - } - pfn = ((vaddr - vma->vm_start) >>PAGE_SHIFT ) + vma->vm_pgoff; - paddr = pfn <<PAGE_SHIFT ; - table =memremap (paddr,PAGE_SIZE ,MEMREMAP_WB ); -if (!table) { -mmap_read_unlock (current->mm); -return -EFAULT ; - } - ret =CMPXCHG (&table[index], orig_pte, new_pte); -memunmap (table); -mmap_read_unlock (current->mm); - } + int r = -EFAULT; + +if (!user_access_begin (ptep_user,sizeof (pt_element_t))) +return -EFAULT ; + +#ifdef CMPXCHG + asmvolatile ("1:" LOCK_PREFIX CMPXCHG " %[new], %[ptr]\n" +"mov $0, %[r]\n" +"setnz %b[r]\n" +"2:" + _ASM_EXTABLE_UA(1b, 2b) + : [ptr] "+m" (*ptep_user), + [old] "+a" (orig_pte), + [r] "+q" (r) + : [new] "r" (new_pte) + : "memory"); +#else + asmvolatile ("1:" LOCK_PREFIX "cmpxchg8b %[ptr]\n" +"movl $0, %[r]\n" +"jz 2f\n" +"incl %[r]\n" +"2:" + _ASM_EXTABLE_UA(1b, 2b) + : [ptr] "+m" (*ptep_user), + [old] "+A" (orig_pte), + [r] "+rm" (r) + : [new_lo] "b" ((u32)new_pte), + [new_hi] "c" ((u32)(new_pte >> 32)) + : "memory"); +#endif -return (ret != orig_pte); +user_access_end (); +return r; } static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu,
Greg Kroah-Hartman
maintainerPATCH 905/913 iommu/dma: Skip extra sync during unmap w/swiotlb
In reply to Greg Kroah-HartmanFrom: David Stevens <[email protected]>
commit ee9d4097cc145dcaebedf6b113d17c91c21333a0 upstream.
Calling the iommu_dma_sync_*_for_cpu functions during unmap can cause two copies out of the swiotlb buffer. Do the arch sync directly in __iommu_dma_unmap_swiotlb instead to avoid this. This makes the call to iommu_dma_sync_sg_for_cpu for untrusted devices in iommu_dma_unmap_sg no longer necessary, so move that invocation later in the function.
--- drivers/iommu/dma-iommu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/dma-iommu.c +6 -5
@@ -521,6 +521,9 @@ static void __iommu_dma_unmap_swiotlb(stif (WARN_ON (!phys))return ; +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && !dev_is_dma_coherent (dev)) +arch_sync_dma_for_cpu (phys, size, dir); +__iommu_dma_unmap (dev, dma_addr, size);if (unlikely (is_swiotlb_buffer (dev, phys)))
@@ -871,8 +874,6 @@ static dma_addr_t iommu_dma_map_page(strstatic void iommu_dma_unmap_page (struct device *dev,dma_addr_t dma_handle,size_t size,enum dma_data_direction dir,unsigned long attrs) { -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -iommu_dma_sync_single_for_cpu (dev, dma_handle, size, dir);__iommu_dma_unmap_swiotlb (dev, dma_handle, size, dir, attrs); }
@@ -1089,14 +1090,14 @@ static void iommu_dma_unmap_sg(struct destruct scatterlist *tmp;int i; -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -iommu_dma_sync_sg_for_cpu (dev, sg, nents, dir); -if (dev_is_untrusted (dev)) {iommu_dma_unmap_sg_swiotlb (dev, sg, nents, dir, attrs);return ; } +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) +iommu_dma_sync_sg_for_cpu (dev, sg, nents, dir); +/* * The scatterlist segments are mapped into a single * contiguous IOVA allocation, so this is incredibly easy.
Greg Kroah-Hartman
maintainerPATCH 906/913 iommu/dma: Fold _swiotlb helpers into callers
In reply to Greg Kroah-HartmanFrom: David Stevens <[email protected]>
commit 9b49bbc2c4dfd0431bf7ff4e862171189cf94b7e upstream.
Fold the _swiotlb helper functions into the respective _page functions, since recent fixes have moved all logic from the _page functions to the _swiotlb functions.
--- drivers/iommu/dma-iommu.c | 135 ++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 76 deletions(-)
drivers/iommu/dma-iommu.c +59 -76
@@ -510,26 +510,6 @@ static void __iommu_dma_unmap(struct deviommu_dma_free_iova (cookie, dma_addr, size, &iotlb_gather); } -static void __iommu_dma_unmap_swiotlb (struct device *dev,dma_addr_t dma_addr, -size_t size,enum dma_data_direction dir, -unsigned long attrs) -{ -struct iommu_domain *domain =iommu_get_dma_domain (dev); -phys_addr_t phys; - - phys =iommu_iova_to_phys (domain, dma_addr); -if (WARN_ON (!phys)) -return ; - -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && !dev_is_dma_coherent (dev)) -arch_sync_dma_for_cpu (phys, size, dir); - -__iommu_dma_unmap (dev, dma_addr, size); - -if (unlikely (is_swiotlb_buffer (dev, phys))) -swiotlb_tbl_unmap_single (dev, phys, size, dir, attrs); -} -static dma_addr_t __iommu_dma_map (struct device *dev,phys_addr_t phys,size_t size,int prot,u64 dma_mask) {
@@ -556,55 +536,6 @@ static dma_addr_t __iommu_dma_map(structreturn iova + iova_off; } -static dma_addr_t __iommu_dma_map_swiotlb (struct device *dev,phys_addr_t phys, -size_t org_size,dma_addr_t dma_mask,bool coherent, -enum dma_data_direction dir,unsigned long attrs) -{ -int prot =dma_info_to_prot (dir, coherent, attrs); -struct iommu_domain *domain =iommu_get_dma_domain (dev); -struct iommu_dma_cookie *cookie = domain->iova_cookie; -struct iova_domain *iovad = &cookie->iovad; -size_t aligned_size = org_size; -void *padding_start; -size_t padding_size; -dma_addr_t iova; - -/* -* If both the physical buffer start address and size are -* page aligned, we don't need to use a bounce page. -*/ -if (IS_ENABLED (CONFIG_SWIOTLB ) &&dev_is_untrusted (dev) && -iova_offset (iovad, phys | org_size)) { - aligned_size =iova_align (iovad, org_size); - phys =swiotlb_tbl_map_single (dev, phys, org_size, - aligned_size, dir, attrs); - -if (phys ==DMA_MAPPING_ERROR ) -return DMA_MAPPING_ERROR ; - -/* Cleanup the padding area. */ - padding_start =phys_to_virt (phys); - padding_size = aligned_size; - -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && - (dir ==DMA_TO_DEVICE || - dir ==DMA_BIDIRECTIONAL )) { - padding_start += org_size; - padding_size -= org_size; - } - -memset (padding_start,0 , padding_size); - } - -if (!coherent && !(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -arch_sync_dma_for_device (phys, org_size, dir); - - iova =__iommu_dma_map (dev, phys, aligned_size, prot, dma_mask); -if (iova ==DMA_MAPPING_ERROR &&is_swiotlb_buffer (dev, phys)) -swiotlb_tbl_unmap_single (dev, phys, org_size, dir, attrs); -return iova; -} -static void __iommu_dma_free_pages (struct page **pages,int count) {while (count--)
@@ -866,15 +797,68 @@ static dma_addr_t iommu_dma_map_page(str {phys_addr_t phys =page_to_phys (page) + offset;bool coherent =dev_is_dma_coherent (dev); +int prot =dma_info_to_prot (dir, coherent, attrs); +struct iommu_domain *domain =iommu_get_dma_domain (dev); +struct iommu_dma_cookie *cookie = domain->iova_cookie; +struct iova_domain *iovad = &cookie->iovad; +size_t aligned_size = size; +dma_addr_t iova, dma_mask =dma_get_mask (dev); + +/* +* If both the physical buffer start address and size are +* page aligned, we don't need to use a bounce page. +*/ +if (IS_ENABLED (CONFIG_SWIOTLB ) &&dev_is_untrusted (dev) && +iova_offset (iovad, phys | size)) { +void *padding_start; +size_t padding_size; + + aligned_size =iova_align (iovad, size); + phys =swiotlb_tbl_map_single (dev, phys, size, + aligned_size, dir, attrs); + +if (phys ==DMA_MAPPING_ERROR ) +return DMA_MAPPING_ERROR ; -return __iommu_dma_map_swiotlb (dev, phys, size,dma_get_mask (dev), - coherent, dir, attrs); +/* Cleanup the padding area. */ + padding_start =phys_to_virt (phys); + padding_size = aligned_size; + +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && + (dir ==DMA_TO_DEVICE || dir ==DMA_BIDIRECTIONAL )) { + padding_start += size; + padding_size -= size; + } + +memset (padding_start,0 , padding_size); + } + +if (!coherent && !(attrs &DMA_ATTR_SKIP_CPU_SYNC )) +arch_sync_dma_for_device (phys, size, dir); + + iova =__iommu_dma_map (dev, phys, aligned_size, prot, dma_mask); +if (iova ==DMA_MAPPING_ERROR &&is_swiotlb_buffer (dev, phys)) +swiotlb_tbl_unmap_single (dev, phys, size, dir, attrs); +return iova; }static void iommu_dma_unmap_page (struct device *dev,dma_addr_t dma_handle,size_t size,enum dma_data_direction dir,unsigned long attrs) { -__iommu_dma_unmap_swiotlb (dev, dma_handle, size, dir, attrs); +struct iommu_domain *domain =iommu_get_dma_domain (dev); +phys_addr_t phys; + + phys =iommu_iova_to_phys (domain, dma_handle); +if (WARN_ON (!phys)) +return ; + +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && !dev_is_dma_coherent (dev)) +arch_sync_dma_for_cpu (phys, size, dir); + +__iommu_dma_unmap (dev, dma_handle, size); + +if (unlikely (is_swiotlb_buffer (dev, phys))) +swiotlb_tbl_unmap_single (dev, phys, size, dir, attrs); }/*
@@ -959,7 +943,7 @@ static void iommu_dma_unmap_sg_swiotlb(sint i;for_each_sg (sg, s, nents, i) -__iommu_dma_unmap_swiotlb (dev,sg_dma_address (s), +iommu_dma_unmap_page (dev,sg_dma_address (s),sg_dma_len (s), dir, attrs); }
@@ -970,9 +954,8 @@ static int iommu_dma_map_sg_swiotlb(struint i;for_each_sg (sg, s, nents, i) { -sg_dma_address (s) =__iommu_dma_map_swiotlb (dev,sg_phys (s), - s->length,dma_get_mask (dev), -dev_is_dma_coherent (dev), dir, attrs); +sg_dma_address (s) =iommu_dma_map_page (dev,sg_page (s), + s->offset, s->length, dir, attrs);if (sg_dma_address (s) ==DMA_MAPPING_ERROR ) goto out_unmap;sg_dma_len (s) = s->length;
Greg Kroah-Hartman
maintainerPATCH 907/913 iommu/dma: Check CONFIG_SWIOTLB more broadly
In reply to Greg Kroah-HartmanFrom: David Stevens <[email protected]>
commit 2e727bffbe93750a13d2414f3ce43de2f21600d2 upstream.
Introduce a new dev_use_swiotlb function to guard swiotlb code, instead of overloading dev_is_untrusted. This allows CONFIG_SWIOTLB to be checked more broadly, so the swiotlb related code can be removed more aggressively.
--- drivers/iommu/dma-iommu.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/iommu/dma-iommu.c +12 -8
@@ -317,6 +317,11 @@ static bool dev_is_untrusted(struct devireturn dev_is_pci (dev) &&to_pci_dev (dev)->untrusted; } +static bool dev_use_swiotlb (struct device *dev) +{ +return IS_ENABLED (CONFIG_SWIOTLB ) &&dev_is_untrusted (dev); +} +/* sysfs updates are serialised by the mutex of the group owning @domain */ int iommu_dma_init_fq (struct iommu_domain *domain) {
@@ -731,7 +736,7 @@ static void iommu_dma_sync_single_for_cp {phys_addr_t phys; -if (dev_is_dma_coherent (dev) && !dev_is_untrusted (dev)) +if (dev_is_dma_coherent (dev) && !dev_use_swiotlb (dev))return ; phys =iommu_iova_to_phys (iommu_get_dma_domain (dev), dma_handle);
@@ -747,7 +752,7 @@ static void iommu_dma_sync_single_for_de {phys_addr_t phys; -if (dev_is_dma_coherent (dev) && !dev_is_untrusted (dev)) +if (dev_is_dma_coherent (dev) && !dev_use_swiotlb (dev))return ; phys =iommu_iova_to_phys (iommu_get_dma_domain (dev), dma_handle);
@@ -765,7 +770,7 @@ static void iommu_dma_sync_sg_for_cpu(ststruct scatterlist *sg;int i; -if (dev_is_untrusted (dev)) +if (dev_use_swiotlb (dev))for_each_sg (sgl, sg, nelems, i)iommu_dma_sync_single_for_cpu (dev,sg_dma_address (sg), sg->length, dir);
@@ -781,7 +786,7 @@ static void iommu_dma_sync_sg_for_devicestruct scatterlist *sg;int i; -if (dev_is_untrusted (dev)) +if (dev_use_swiotlb (dev))for_each_sg (sgl, sg, nelems, i) iommu_dma_sync_single_for_device(dev, sg_dma_address(sg),
@@ -808,8 +813,7 @@ static dma_addr_t iommu_dma_map_page(str* If both the physical buffer start address and size are * page aligned, we don't need to use a bounce page. */ -if (IS_ENABLED (CONFIG_SWIOTLB ) &&dev_is_untrusted (dev) && -iova_offset (iovad, phys | size)) { +if (dev_use_swiotlb (dev) &&iova_offset (iovad, phys | size)) {void *padding_start;size_t padding_size;
@@ -995,7 +999,7 @@ static int iommu_dma_map_sg(struct devic goto out; } -if (dev_is_untrusted (dev)) +if (dev_use_swiotlb (dev))return iommu_dma_map_sg_swiotlb (dev, sg, nents, dir, attrs);if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ))
@@ -1073,7 +1077,7 @@ static void iommu_dma_unmap_sg(struct destruct scatterlist *tmp;int i; -if (dev_is_untrusted (dev)) { +if (dev_use_swiotlb (dev)) {iommu_dma_unmap_sg_swiotlb (dev, sg, nents, dir, attrs);return ; }
Greg Kroah-Hartman
maintainerPATCH 908/913 swiotlb: Support aligned swiotlb buffers
In reply to Greg Kroah-HartmanFrom: David Stevens <[email protected]>
commit e81e99bacc9f9347bda7808a949c1ce9fcc2bbf4 upstream.
Add an argument to swiotlb_tbl_map_single that specifies the desired alignment of the allocated buffer. This is used by dma-iommu to ensure the buffer is aligned to the iova granule size when using swiotlb with untrusted sub-granule mappings. This addresses an issue where adjacent slots could be exposed to the untrusted device if IO_TLB_SIZE < iova granule < PAGE_SIZE.
--- drivers/iommu/dma-iommu.c | 4 ++-- drivers/xen/swiotlb-xen.c | 2 +- include/linux/swiotlb.h | 3 ++- kernel/dma/swiotlb.c | 13 ++++++++----- 4 files changed, 13 insertions(+), 9 deletions(-)
drivers/iommu/dma-iommu.c +2 -2
@@ -818,8 +818,8 @@ static dma_addr_t iommu_dma_map_page(strsize_t padding_size; aligned_size =iova_align (iovad, size); - phys =swiotlb_tbl_map_single (dev, phys, size, - aligned_size, dir, attrs); + phys =swiotlb_tbl_map_single (dev, phys, size, aligned_size, +iova_mask (iovad), dir, attrs);if (phys ==DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
drivers/xen/swiotlb-xen.c +1 -1
@@ -380,7 +380,7 @@ static dma_addr_t xen_swiotlb_map_page(s*/ trace_swiotlb_bounced (dev, dev_addr, size, swiotlb_force); - map =swiotlb_tbl_map_single (dev, phys, size, size, dir, attrs); + map =swiotlb_tbl_map_single (dev, phys, size, size,0 , dir, attrs);if (map == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
include/linux/swiotlb.h +2 -1
@@ -45,7 +45,8 @@ extern void __init swiotlb_update_mem_atphys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t phys,size_t mapping_size,size_t alloc_size, -enum dma_data_direction dir,unsigned long attrs); +unsigned int alloc_aligned_mask,enum dma_data_direction dir, +unsigned long attrs); extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
kernel/dma/swiotlb.c +8 -5
@@ -459,7 +459,7 @@ static unsigned int wrap_index(struct io* allocate a buffer from that IO TLB pool. */ static int swiotlb_find_slots (struct device *dev,phys_addr_t orig_addr, -size_t alloc_size) +size_t alloc_size,unsigned int alloc_align_mask) {struct io_tlb_mem *mem = dev->dma_io_tlb_mem;unsigned long boundary_mask =dma_get_seg_boundary (dev);
@@ -483,6 +483,7 @@ static int swiotlb_find_slots(struct dev stride = (iotlb_align_mask >>IO_TLB_SHIFT ) +1 ;if (alloc_size >=PAGE_SIZE ) stride =max (stride, stride << (PAGE_SHIFT -IO_TLB_SHIFT )); + stride =max (stride, (alloc_align_mask >>IO_TLB_SHIFT ) +1 );spin_lock_irqsave (&mem->lock, flags);if (unlikely (nslots > mem->nslabs - mem->used))
@@ -541,7 +542,8 @@ found:phys_addr_t swiotlb_tbl_map_single (struct device *dev,phys_addr_t orig_addr,size_t mapping_size,size_t alloc_size, -enum dma_data_direction dir,unsigned long attrs) +unsigned int alloc_align_mask,enum dma_data_direction dir, +unsigned long attrs) {struct io_tlb_mem *mem = dev->dma_io_tlb_mem;unsigned int offset =swiotlb_align_offset (dev, orig_addr);
@@ -561,7 +563,8 @@ phys_addr_t swiotlb_tbl_map_single(strucreturn (phys_addr_t )DMA_MAPPING_ERROR ; } - index =swiotlb_find_slots (dev, orig_addr, alloc_size + offset); + index =swiotlb_find_slots (dev, orig_addr, + alloc_size + offset, alloc_align_mask);if (index ==-1 ) {if (!(attrs &DMA_ATTR_NO_WARN )) dev_warn_ratelimited(dev,
@@ -680,7 +683,7 @@ dma_addr_t swiotlb_map(struct device *detrace_swiotlb_bounced (dev,phys_to_dma (dev, paddr), size, swiotlb_force); - swiotlb_addr =swiotlb_tbl_map_single (dev, paddr, size, size, dir, + swiotlb_addr =swiotlb_tbl_map_single (dev, paddr, size, size,0 , dir, attrs);if (swiotlb_addr == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
@@ -764,7 +767,7 @@ struct page *swiotlb_alloc(struct deviceif (!mem)return NULL ; - index =swiotlb_find_slots (dev,0 , size); + index =swiotlb_find_slots (dev,0 , size,0 );if (index ==-1 )return NULL ;
Greg Kroah-Hartman
maintainerPATCH 909/913 iommu/dma: Account for min_align_mask w/swiotlb
In reply to Greg Kroah-HartmanFrom: David Stevens <[email protected]>
commit 2cbc61a1b1665c84282dbf2b1747ffa0b6248639 upstream.
Pass the non-aligned size to __iommu_dma_map when using swiotlb bounce buffers in iommu_dma_map_page, to account for min_align_mask.
To deal with granule alignment, __iommu_dma_map maps iova_align(size + iova_off) bytes starting at phys - iova_off. If iommu_dma_map_page passes aligned size when using swiotlb, then this becomes iova_align(iova_align(orig_size) + iova_off). Normally iova_off will be zero when using swiotlb. However, this is not the case for devices that set min_align_mask. When iova_off is non-zero, __iommu_dma_map ends up mapping an extra page at the end of the buffer. Beyond just being a security issue, the extra page is not cleaned up by __iommu_dma_unmap. This causes problems when the IOVA is reused, due to collisions in the iommu driver. Just passing the original size is sufficient, since __iommu_dma_map will take care of granule alignment.
--- drivers/iommu/dma-iommu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iommu/dma-iommu.c +2 -3
@@ -806,7 +806,6 @@ static dma_addr_t iommu_dma_map_page(strstruct iommu_domain *domain =iommu_get_dma_domain (dev);struct iommu_dma_cookie *cookie = domain->iova_cookie;struct iova_domain *iovad = &cookie->iovad; -size_t aligned_size = size;dma_addr_t iova, dma_mask =dma_get_mask (dev);/*
@@ -815,7 +814,7 @@ static dma_addr_t iommu_dma_map_page(str*/ if (dev_use_swiotlb (dev) &&iova_offset (iovad, phys | size)) {void *padding_start; -size_t padding_size; +size_t padding_size, aligned_size; aligned_size =iova_align (iovad, size); phys = swiotlb_tbl_map_single(dev, phys, size, aligned_size,
@@ -840,7 +839,7 @@ static dma_addr_t iommu_dma_map_page(strif (!coherent && !(attrs &DMA_ATTR_SKIP_CPU_SYNC ))arch_sync_dma_for_device (phys, size, dir); - iova =__iommu_dma_map (dev, phys, aligned_size, prot, dma_mask); + iova =__iommu_dma_map (dev, phys, size, prot, dma_mask);if (iova ==DMA_MAPPING_ERROR &&is_swiotlb_buffer (dev, phys))swiotlb_tbl_unmap_single (dev, phys, size, dir, attrs);return iova;
Greg Kroah-Hartman
maintainerPATCH 910/913 coredump: Snapshot the vmas in do_coredump
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 95c5436a4883841588dae86fb0b9325f47ba5ad3 upstream.
Move the call of dump_vma_snapshot and kvfree(vma_meta) out of the individual coredump routines into do_coredump itself. This makes the code less error prone and easier to maintain.
Make the vma snapshot available to the coredump routines in struct coredump_params. This makes it easier to change and update what is captures in the vma snapshot and will be needed for fixing fill_file_notes.
--- fs/binfmt_elf.c | 20 +++++++------------- fs/binfmt_elf_fdpic.c | 18 ++++++------------ fs/coredump.c | 41 +++++++++++++++++++++++------------------ include/linux/binfmts.h | 3 +++ include/linux/coredump.h | 3 --- 5 files changed, 39 insertions(+), 46 deletions(-)
fs/binfmt_elf.c +7 -13
@@ -2168,8 +2168,7 @@ static void fill_extnum_info(struct elfhstatic int elf_core_dump (struct coredump_params *cprm) {int has_dumped =0 ; -int vma_count, segs, i; -size_t vma_data_size; +int segs, i;struct elfhdr elf;loff_t offset =0 , dataoff;struct elf_note_info info = { };
@@ -2177,16 +2176,12 @@ static int elf_core_dump(struct coredumpstruct elf_shdr *shdr4extnum =NULL ;Elf_Half e_phnum;elf_addr_t e_shoff; -struct core_vma_metadata *vma_meta; - -if (dump_vma_snapshot (cprm, &vma_count, &vma_meta, &vma_data_size)) -return 0 ;/* * The number of segs are recored into ELF header as 16bit value. * Please check DEFAULT_MAX_MAP_COUNT definition when you modify here. */ - segs = vma_count +elf_core_extra_phdrs (); + segs = cprm->vma_count +elf_core_extra_phdrs ();/* for notes section */ segs++;
@@ -2225,7 +2220,7 @@ static int elf_core_dump(struct coredump dataoff = offset =roundup (offset,ELF_EXEC_PAGESIZE ); - offset += vma_data_size; + offset += cprm->vma_data_size; offset +=elf_core_extra_data_size (); e_shoff = offset;
@@ -2245,8 +2240,8 @@ static int elf_core_dump(struct coredump goto end_coredump;/* Write program headers for segments dump */ -for (i =0 ; i < vma_count; i++) { -struct core_vma_metadata *meta = vma_meta + i; +for (i =0 ; i < cprm->vma_count; i++) { +struct core_vma_metadata *meta = cprm->vma_meta + i;struct elf_phdr phdr; phdr.p_type =PT_LOAD ;
@@ -2283,8 +2278,8 @@ static int elf_core_dump(struct coredump/* Align to page */ dump_skip_to (cprm, dataoff); -for (i =0 ; i < vma_count; i++) { -struct core_vma_metadata *meta = vma_meta + i; +for (i =0 ; i < cprm->vma_count; i++) { +struct core_vma_metadata *meta = cprm->vma_meta + i;if (!dump_user_range (cprm, meta->start, meta->dump_size)) goto end_coredump;
@@ -2301,7 +2296,6 @@ static int elf_core_dump(struct coredump end_coredump:free_note_info (&info);kfree (shdr4extnum); -kvfree (vma_meta);kfree (phdr4note);return has_dumped; }
fs/binfmt_elf_fdpic.c +6 -12
@@ -1465,7 +1465,7 @@ static bool elf_fdpic_dump_segments(strustatic int elf_fdpic_core_dump (struct coredump_params *cprm) {int has_dumped =0 ; -int vma_count, segs; +int segs;int i;struct elfhdr *elf =NULL ;loff_t offset =0 , dataoff;
@@ -1480,8 +1480,6 @@ static int elf_fdpic_core_dump(struct coelf_addr_t e_shoff;struct core_thread *ct;struct elf_thread_status *tmp; -struct core_vma_metadata *vma_meta =NULL ; -size_t vma_data_size;/* alloc memory for large data structures: too large to be on stack */ elf =kmalloc (sizeof (*elf),GFP_KERNEL );
@@ -1491,9 +1489,6 @@ static int elf_fdpic_core_dump(struct coif (!psinfo) goto end_coredump; -if (dump_vma_snapshot (cprm, &vma_count, &vma_meta, &vma_data_size)) - goto end_coredump; -for (ct = current->mm->core_state->dumper.next; ct; ct = ct->next) { tmp = elf_dump_thread_status(cprm->siginfo->si_signo,
@@ -1513,7 +1508,7 @@ static int elf_fdpic_core_dump(struct co tmp->next = thread_list; thread_list = tmp; - segs = vma_count +elf_core_extra_phdrs (); + segs = cprm->vma_count +elf_core_extra_phdrs ();/* for notes section */ segs++;
@@ -1558,7 +1553,7 @@ static int elf_fdpic_core_dump(struct co/* Page-align dumped data */ dataoff = offset =roundup (offset,ELF_EXEC_PAGESIZE ); - offset += vma_data_size; + offset += cprm->vma_data_size; offset +=elf_core_extra_data_size (); e_shoff = offset;
@@ -1578,8 +1573,8 @@ static int elf_fdpic_core_dump(struct co goto end_coredump;/* write program headers for segments dump */ -for (i =0 ; i < vma_count; i++) { -struct core_vma_metadata *meta = vma_meta + i; +for (i =0 ; i < cprm->vma_count; i++) { +struct core_vma_metadata *meta = cprm->vma_meta + i;struct elf_phdr phdr;size_t sz;
@@ -1628,7 +1623,7 @@ static int elf_fdpic_core_dump(struct codump_skip_to (cprm, dataoff); -if (!elf_fdpic_dump_segments (cprm, vma_meta, vma_count)) +if (!elf_fdpic_dump_segments (cprm, cprm->vma_meta, cprm->vma_count)) goto end_coredump;if (!elf_core_write_extra_data (cprm))
@@ -1652,7 +1647,6 @@ end_coredump: thread_list = thread_list->next;kfree (tmp); } -kvfree (vma_meta);kfree (phdr4note);kfree (elf);kfree (psinfo);
fs/coredump.c +23 -18
103 lines not on this page · raw message
include/linux/binfmts.h +3 -0
@@ -87,6 +87,9 @@ struct coredump_params {loff_t written;loff_t pos;loff_t to_skip; +int vma_count; +size_t vma_data_size; +struct core_vma_metadata *vma_meta; };/*
include/linux/coredump.h +0 -3
@@ -29,9 +29,6 @@ extern int dump_emit(struct coredump_parextern int dump_align (struct coredump_params *cprm,int align);int dump_user_range (struct coredump_params *cprm,unsigned long start,unsigned long len); -int dump_vma_snapshot (struct coredump_params *cprm,int *vma_count, -struct core_vma_metadata **vma_meta, -size_t *vma_data_size_ptr);extern void do_coredump (const kernel_siginfo_t *siginfo);#else static inline void do_coredump (const kernel_siginfo_t *siginfo) {}
Greg Kroah-Hartman
maintainerPATCH 911/913 coredump: Remove the WARN_ON in dump_vma_snapshot
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 49c1866348f364478a0c4d3dd13fd08bb82d3a5b upstream.
The condition is impossible and to the best of my knowledge has never triggered.
We are in deep trouble if that conditions happens and we walk past the end of our allocated array.
So delete the WARN_ON and the code that makes it look like the kernel can handle the case of walking past the end of it's vma_meta array.
--- fs/coredump.c | 6 ------ 1 file changed, 6 deletions(-)
fs/coredump.c +0 -6
@@ -1151,12 +1151,6 @@ static bool dump_vma_snapshot(struct cormmap_write_unlock (mm); -if (WARN_ON (i != cprm->vma_count)) { -kvfree (cprm->vma_meta); -return false; - } - -for (i =0 ; i < cprm->vma_count; i++) {struct core_vma_metadata *m = cprm->vma_meta + i;
Greg Kroah-Hartman
maintainerPATCH 912/913 coredump/elf: Pass coredump_params into fill_note_info
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 9ec7d3230717b4fe9b6c7afeb4811909c23fa1d7 upstream.
Instead of individually passing cprm->siginfo and cprm->regs into fill_note_info pass all of struct coredump_params.
This is preparation to allow fill_files_note to use the existing vma snapshot.
--- fs/binfmt_elf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
fs/binfmt_elf.c +11 -11
@@ -1799,7 +1799,7 @@ static int fill_thread_core_info(structstatic int fill_note_info (struct elfhdr *elf,int phdrs,struct elf_note_info *info, -const kernel_siginfo_t *siginfo,struct pt_regs *regs) +struct coredump_params *cprm) {struct task_struct *dump_task = current;const struct user_regset_view *view =task_user_regset_view (dump_task);
@@ -1871,7 +1871,7 @@ static int fill_note_info(struct elfhdr* Now fill in each thread's information. */ for (t = info->thread; t !=NULL ; t = t->next) -if (!fill_thread_core_info (t, view, siginfo->si_signo, &info->size)) +if (!fill_thread_core_info (t, view, cprm->siginfo->si_signo, &info->size))return 0 ;/*
@@ -1880,7 +1880,7 @@ static int fill_note_info(struct elfhdrfill_psinfo (psinfo, dump_task->group_leader, dump_task->mm); info->size +=notesize (&info->psinfo); -fill_siginfo_note (&info->signote, &info->csigdata, siginfo); +fill_siginfo_note (&info->signote, &info->csigdata, cprm->siginfo); info->size +=notesize (&info->signote);fill_auxv_note (&info->auxv, current->mm);
@@ -2028,7 +2028,7 @@ static int elf_note_info_init(struct elfstatic int fill_note_info (struct elfhdr *elf,int phdrs,struct elf_note_info *info, -const kernel_siginfo_t *siginfo,struct pt_regs *regs) +struct coredump_params *cprm) {struct core_thread *ct;struct elf_thread_status *ets;
@@ -2049,13 +2049,13 @@ static int fill_note_info(struct elfhdrlist_for_each_entry (ets, &info->thread_list, list) {int sz; - sz =elf_dump_thread_status (siginfo->si_signo, ets); + sz =elf_dump_thread_status (cprm->siginfo->si_signo, ets); info->thread_status_size += sz; }/* now collect the dump for the current */ memset (info->prstatus,0 ,sizeof (*info->prstatus)); -fill_prstatus (&info->prstatus->common, current, siginfo->si_signo); -elf_core_copy_regs (&info->prstatus->pr_reg, regs); +fill_prstatus (&info->prstatus->common, current, cprm->siginfo->si_signo); +elf_core_copy_regs (&info->prstatus->pr_reg, cprm->regs);/* Set up header */ fill_elf_header (elf, phdrs,ELF_ARCH ,ELF_CORE_EFLAGS );
@@ -2071,7 +2071,7 @@ static int fill_note_info(struct elfhdrfill_note (info->notes +1 ,"CORE" ,NT_PRPSINFO ,sizeof (*info->psinfo), info->psinfo); -fill_siginfo_note (info->notes +2 , &info->csigdata, siginfo); +fill_siginfo_note (info->notes +2 , &info->csigdata, cprm->siginfo);fill_auxv_note (info->notes +3 , current->mm); info->numnote =4 ;
@@ -2081,8 +2081,8 @@ static int fill_note_info(struct elfhdr }/* Try to dump the FPU. */ - info->prstatus->pr_fpvalid =elf_core_copy_task_fpregs (current, regs, - info->fpu); + info->prstatus->pr_fpvalid = +elf_core_copy_task_fpregs (current, cprm->regs, info->fpu);if (info->prstatus->pr_fpvalid)fill_note (info->notes + info->numnote++,"CORE" ,NT_PRFPREG ,sizeof (*info->fpu), info->fpu);
@@ -2195,7 +2195,7 @@ static int elf_core_dump(struct coredump* Collect all the non-memory information about the process for the * notes. This also sets up the file header. */ -if (!fill_note_info (&elf, e_phnum, &info, cprm->siginfo, cprm->regs)) +if (!fill_note_info (&elf, e_phnum, &info, cprm)) goto end_coredump; has_dumped =1 ;
Greg Kroah-Hartman
maintainerPATCH 913/913 coredump: Use the vma snapshot in fill_files_note
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 390031c942116d4733310f0684beb8db19885fe6 upstream.
Matthew Wilcox reported that there is a missing mmap_lock in file_files_note that could possibly lead to a user after free.
Solve this by using the existing vma snapshot for consistency and to avoid the need to take the mmap_lock anywhere in the coredump code except for dump_vma_snapshot.
Update the dump_vma_snapshot to capture vm_pgoff and vm_file that are neeeded by fill_files_note.
Add free_vma_snapshot to free the captured values of vm_file.
--- fs/binfmt_elf.c | 24 ++++++++++++------------ fs/coredump.c | 22 +++++++++++++++++++++- include/linux/coredump.h | 2 ++ 3 files changed, 35 insertions(+), 13 deletions(-)
fs/binfmt_elf.c +12 -12
@@ -1618,17 +1618,16 @@ static void fill_siginfo_note(struct mem* long file_ofs * followed by COUNT filenames in ASCII: "FILE1" NUL "FILE2" NUL... */ -static int fill_files_note (struct memelfnote *note) +static int fill_files_note (struct memelfnote *note,struct coredump_params *cprm) { -struct mm_struct *mm = current->mm; -struct vm_area_struct *vma;unsigned count, size, names_ofs, remaining, n;user_long_t *data;user_long_t *start_end_ofs;char *name_base, *name_curpos; +int i;/* *Estimated* file count and total data size needed */ - count = mm->map_count; + count = cprm->vma_count;if (count >UINT_MAX /64 )return -EINVAL ; size = count *64 ;
@@ -1650,11 +1649,12 @@ static int fill_files_note(struct memelf name_base = name_curpos = ((char *)data) + names_ofs; remaining = size - names_ofs; count =0 ; -for (vma = mm->mmap; vma !=NULL ; vma = vma->vm_next) { +for (i =0 ; i < cprm->vma_count; i++) { +struct core_vma_metadata *m = &cprm->vma_meta[i];struct file *file;const char *filename; - file = vma->vm_file; + file = m->file;if (!file)continue ; filename =file_path (file, name_curpos, remaining);
@@ -1674,9 +1674,9 @@ static int fill_files_note(struct memelfmemmove (name_curpos, filename, n); name_curpos += n; - *start_end_ofs++ = vma->vm_start; - *start_end_ofs++ = vma->vm_end; - *start_end_ofs++ = vma->vm_pgoff; + *start_end_ofs++ = m->start; + *start_end_ofs++ = m->end; + *start_end_ofs++ = m->pgoff; count++; }
@@ -1687,7 +1687,7 @@ static int fill_files_note(struct memelf* Count usually is less than mm->map_count, * we need to move filenames down. */ - n = mm->map_count - count; + n = cprm->vma_count - count;if (n !=0 ) {unsigned shift_bytes = n *3 *sizeof (data[0 ]); memmove(name_base - shift_bytes, name_base,
@@ -1886,7 +1886,7 @@ static int fill_note_info(struct elfhdrfill_auxv_note (&info->auxv, current->mm); info->size +=notesize (&info->auxv); -if (fill_files_note (&info->files) ==0 ) +if (fill_files_note (&info->files, cprm) ==0 ) info->size +=notesize (&info->files);return 1 ;
@@ -2075,7 +2075,7 @@ static int fill_note_info(struct elfhdrfill_auxv_note (info->notes +3 , current->mm); info->numnote =4 ; -if (fill_files_note (info->notes + info->numnote) ==0 ) { +if (fill_files_note (info->notes + info->numnote, cprm) ==0 ) { info->notes_files = info->notes + info->numnote; info->numnote++; }
fs/coredump.c +21 -1
@@ -54,6 +54,7 @@#include <trace/events/sched.h> static bool dump_vma_snapshot (struct coredump_params *cprm); +static void free_vma_snapshot (struct coredump_params *cprm);int core_uses_pid;unsigned int core_pipe_limit;
@@ -834,7 +835,7 @@ void do_coredump(const kernel_siginfo_tdump_emit (&cprm,"" ,1 ); }file_end_write (cprm.file); -kvfree (cprm.vma_meta); +free_vma_snapshot (&cprm); }if (ispipe && core_pipe_limit)wait_for_dump_helpers (cprm.file);
@@ -1111,6 +1112,20 @@ static struct vm_area_struct *next_vma(sreturn gate_vma; } +static void free_vma_snapshot (struct coredump_params *cprm) +{ +if (cprm->vma_meta) { +int i; +for (i =0 ; i < cprm->vma_count; i++) { +struct file *file = cprm->vma_meta[i].file; +if (file) +fput (file); + } +kvfree (cprm->vma_meta); + cprm->vma_meta =NULL ; + } +} +/* * Under the mmap_lock, take a snapshot of relevant information about the task's * VMAs.
@@ -1147,6 +1162,11 @@ static bool dump_vma_snapshot(struct cor m->end = vma->vm_end; m->flags = vma->vm_flags; m->dump_size =vma_dump_size (vma, cprm->mm_flags); + m->pgoff = vma->vm_pgoff; + + m->file = vma->vm_file; +if (m->file) +get_file (m->file); }mmap_write_unlock (mm);
include/linux/coredump.h +2 -0
@@ -12,6 +12,8 @@ struct core_vma_metadata {unsigned long start, end;unsigned long flags;unsigned long dump_size; +unsigned long pgoff; +struct file *file; };extern int core_uses_pid;
(cc'ing Valentin)
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
This locks up immediately when trying to use tracepoints, due to:
"sched-tracing-don-t-re-read-p-state-when-emitting-sc.patch" aka "sched/tracing: Don't re-read p->state when emitting sched_switch event"
Reverting this patch makes things work again, at least for 5.15.x; don't know about other series.
cheers
Holger
Greg Kroah-Hartman
maintainerQuoted 8 lines · Holger Hoffstätte
(cc'ing Valentin)
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 6 lines
This locks up immediately when trying to use tracepoints, due to:
"sched-tracing-don-t-re-read-p-state-when-emitting-sc.patch" aka "sched/tracing: Don't re-readp->statewhen emittingsched_switchevent"Reverting this patch makes things work again, at least for 5.15.x; don't know about other series.
Thanks for letting me know, I've now dropped it from all of the queues.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
5.15.33-rc1 compiled and booted with no errors or regressions on my x86_64 test system.
Cheers,
Slade
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Build failed on my system. The following is the problem commit. There are no changes to the config between 5.15.32 and this build.
Ranjani Sridharan <[email protected]>
ASoC: SOF: Intel: hda: Remove link assignment limitation
CC [M] sound/soc/sof/intel/hda-dai.osound/soc/sof/intel/hda-dai.c: In function ‘hda_link_stream_assign’:sound/soc/sof/intel/hda-dai.c:86:24: error: implicit declaration of function ‘get_chip_info’; did you mean ‘get_group_info’? [-Werror=implicit-function-declaration]
86 | chip = get_chip_info(sdev->pdata);
| ^~~~~~~~~~~~~
| get_group_infosound/soc/sof/intel/hda-dai.c:86:22: error: assignment to ‘const struct sof_intel_dsp_desc *’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
86 | chip = get_chip_info(sdev->pdata);
| ^sound/soc/sof/intel/hda-dai.c:94:35: error: ‘const struct sof_intel_dsp_desc’ has no member named ‘quirks’
94 | if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
| ^~sound/soc/sof/intel/hda-dai.c:94:46: error: ‘SOF_INTEL_PROCEN_FMT_QUIRK’ undeclared (first use in this function)
94 | if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~sound/soc/sof/intel/hda-dai.c:94:46: note: each undeclared identifier is reported only once for each function it appears in
cc1: all warnings being treated as errors
make[4]: *** [scripts/Makefile.build:287: sound/soc/sof/intel/hda-dai.o] Error 1
make[3]: *** [scripts/Makefile.build:549: sound/soc/sof/intel] Error 2
make[2]: *** [scripts/Makefile.build:549: sound/soc/sof] Error 2
make[1]: *** [scripts/Makefile.build:549: sound/soc] Error 2
make: *** [Makefile:1846: sound] Error 2
thanks,
-- Shuah
Quoted 18 lines · Shuah Khan
Quoted 16 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
Quoted 8 lines
Quoted 2 lines
greg k-h
Build failed on my system. The following is the problem commit. There are no changes to the config between 5.15.32 and this build.
Ranjani Sridharan <[email protected]>
ASoC: SOF: Intel: hda: Remove link assignment limitation
I saw the same build error, after applying the following patches it builds fine again.
a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround") 81ed6770ba67 ("ASoC: SOF: Intel: hda: expose get_chip_info()")
Cheers,
Anders
Quoted 26 lines
CC [M]
sound/soc/sof/intel/hda-dai.osound/soc/sof/intel/hda-dai.c: In function ‘hda_link_stream_assign’:sound/soc/sof/intel/hda-dai.c:86:24: error: implicit declaration of function ‘get_chip_info’; did you mean ‘get_group_info’? [-Werror=implicit-function-declaration]86 | chip = get_chip_info(sdev->pdata); | ^~~~~~~~~~~~~ | get_group_info sound/soc/sof/intel/hda-dai.c:86:22: error: assignment to ‘const struct sof_intel_dsp_desc *’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion] 86 | chip = get_chip_info(sdev->pdata); | ^ sound/soc/sof/intel/hda-dai.c:94:35: error: ‘const struct sof_intel_dsp_desc’ has no member named ‘quirks’ 94 | if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) { | ^~ sound/soc/sof/intel/hda-dai.c:94:46: error: ‘SOF_INTEL_PROCEN_FMT_QUIRK’ undeclared (first use in this function) 94 | if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/sof/intel/hda-dai.c:94:46: note: each undeclared identifier is reported only once for each function it appears in
cc1: all warnings being treated as errors
make[4]: *** [scripts/Makefile.build:287:sound/soc/sof/intel/hda-dai.o] Error 1
make[3]: *** [scripts/Makefile.build:549:sound/soc/sof/intel] Error 2
make[2]: *** [scripts/Makefile.build:549:sound/soc/sof] Error 2
make[1]: *** [scripts/Makefile.build:549:sound/soc] Error 2
make: *** [Makefile:1846: sound] Error 2thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 25 lines · Anders Roxell
Quoted 24 lines · Shuah Khan
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Build failed on my system. The following is the problem commit. There are no changes to the config between 5.15.32 and this build.
Quoted 8 lines
Quoted 2 lines
Ranjani Sridharan <[email protected]>
ASoC: SOF: Intel: hda: Remove link assignment limitationI saw the same build error, after applying the following patches it builds fine again.
a792bfc1c2bc("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")81ed6770ba67("ASoC: SOF: Intel: hda: exposeget_chip_info()")
Thanks, but I'll just go drop the offending commit here. If this is still needed in the stable trees, can someone email stable@vger with the needed information and I will be glad to reconsider it.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
114 tests: 114 pass, 0 failLinux version: 5.15.33-rc1-g841880eaff92
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
Build test:
mips (gcc version 11.2.1 20220314): 62 configs -> no failure arm (gcc version 11.2.1 20220314): 100 configs -> no new failure arm64 (gcc version 11.2.1 20220314): 3 configs -> no failure x86_64 (gcc version 11.2.1 20220314): 4 configs -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
mips: Booted on ci20 board. No regression. [3]
[1]. https://openqa.qa.codethink.co.uk/tests/980
[2]. https://openqa.qa.codethink.co.uk/tests/982
[3]. https://openqa.qa.codethink.co.uk/tests/984
--
Regards
Sudip
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 488 pass: 488 fail: 0
Guenter
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
Anders enabled extra kconfigs to reproduce Shuah reported build regression and proposed two additional two commits for the fix.
## Build
* kernel: 5.15.33-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git branch: linux-5.15.y
* git commit: 841880eaff92b260de5b0fe749c05c6371bcc78c
* git describe: v5.15.32-914-g841880eaff92
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.32-914-g841880eaff92
## Test Regressions (compared to v5.15.32-902-g1a1c2efda160) No test regressions found.
## Metric Regressions (compared to v5.15.32-902-g1a1c2efda160) No metric regressions found.
## Test Fixes (compared to v5.15.32-902-g1a1c2efda160) No test fixes found.
## Metric Fixes (compared to v5.15.32-902-g1a1c2efda160) No metric fixes found.
## Test result summary
total: 101817, pass: 85899, fail: 973, skip: 13901, xfail: 1044
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 291 total, 291 passed, 0 failed
* arm64: 41 total, 41 passed, 0 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 40 total, 40 passed, 0 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 37 total, 37 passed, 0 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 60 total, 54 passed, 6 failed
* riscv: 27 total, 22 passed, 5 failed
* s390: 21 total, 21 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 41 total, 41 passed, 0 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-
* kselftest-android
* kselftest-arm64
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* perf/Zstd-perf.data-compression
* rcutorture
* ssuite
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Successfully cross-compiled for arm64 (bcm2711_defconfig, gcc 10.2.0) and powerpc (ps3_defconfig, gcc 11.2.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
5.15.33-rc1 Successfully Compiled and booted on my Raspberry PI 4b (8g) (bcm2711)
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.33 release. There are 913 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 07 Apr 2022 07:01:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.33-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).