5.6.14-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 100/194 hwmon: (drivetemp) Fix SCT support if SCT data tables are not supported
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit bcb543cc3d4034da3f3fd8bc4296a26dfeadf47d ]
If SCT is supported but SCT data tables are not, the driver unnecessarily tries to fall back to SMART. Use SCT without data tables instead in this situation.
--- drivers/hwmon/drivetemp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/drivetemp.c +1 -1
@@ -346,7 +346,7 @@ static int drivetemp_identify_sata(struct drivetemp_data *st) st->have_temp_highest =temp_is_valid (buf[SCT_STATUS_TEMP_HIGHEST ]);if (!have_sct_data_table) - goto skip_sct; + goto skip_sct_data;/* Request and read temperature history table */ memset (buf,'\0' ,sizeof (st->smartdata));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/194 NFSv4: Fix fscache cookie aux_data to ensure change_attr is included
In reply to Greg Kroah-HartmanFrom: Dave Wysochanski <[email protected]>
[ Upstream commit 50eaa652b54df1e2b48dc398d9e6114c9ed080eb ]
Commit 402cb8dda949 ("fscache: Attach the index key and aux data to the cookie") added the aux_data and aux_data_len to parameters to fscache_acquire_cookie(), and updated the callers in the NFS client. In the process it modified the aux_data to include the change_attr, but missed adding change_attr to a couple places where aux_data was used. Specifically, when opening a file and the change_attr is not added, the following attempt to lookup an object will fail inside cachefiles_check_object_xattr() = -116 due to nfs_fscache_inode_check_aux() failing memcmp on auxdata and returning FSCACHE_CHECKAUX_OBSOLETE.
Fix this by adding nfs_fscache_update_auxdata() to set the auxdata from all relevant fields in the inode, including the change_attr.
--- fs/nfs/fscache.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
fs/nfs/fscache.c +16 -18
@@ -225,6 +225,19 @@ void nfs_fscache_release_super_cookie(struct super_block *sb) } } +static void nfs_fscache_update_auxdata (struct nfs_fscache_inode_auxdata *auxdata, +struct nfs_inode *nfsi) +{ +memset (auxdata,0 ,sizeof (*auxdata)); + auxdata->mtime_sec = nfsi->vfs_inode.i_mtime.tv_sec; + auxdata->mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec; + auxdata->ctime_sec = nfsi->vfs_inode.i_ctime.tv_sec; + auxdata->ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec; + +if (NFS_SERVER (&nfsi->vfs_inode)->nfs_client->rpc_ops->version ==4 ) + auxdata->change_attr =inode_peek_iversion_raw (&nfsi->vfs_inode); +} +/* * Initialise the per-inode cache cookie pointer for an NFS inode. */
@@ -238,14 +251,7 @@ void nfs_fscache_init_inode(struct inode *inode)if (!(nfss->fscache &&S_ISREG (inode->i_mode)))return ; -memset (&auxdata,0 ,sizeof (auxdata)); - auxdata.mtime_sec = nfsi->vfs_inode.i_mtime.tv_sec; - auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec; - auxdata.ctime_sec = nfsi->vfs_inode.i_ctime.tv_sec; - auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec; - -if (NFS_SERVER (&nfsi->vfs_inode)->nfs_client->rpc_ops->version ==4 ) - auxdata.change_attr =inode_peek_iversion_raw (&nfsi->vfs_inode); +nfs_fscache_update_auxdata (&auxdata, nfsi); nfsi->fscache = fscache_acquire_cookie(NFS_SB(inode->i_sb)->fscache, &nfs_fscache_inode_object_def,
@@ -265,11 +271,7 @@ void nfs_fscache_clear_inode(struct inode *inode)dfprintk (FSCACHE ,"NFS: clear cookie (0x%p/0x%p)\n" , nfsi, cookie); -memset (&auxdata,0 ,sizeof (auxdata)); - auxdata.mtime_sec = nfsi->vfs_inode.i_mtime.tv_sec; - auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec; - auxdata.ctime_sec = nfsi->vfs_inode.i_ctime.tv_sec; - auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec; +nfs_fscache_update_auxdata (&auxdata, nfsi);fscache_relinquish_cookie (cookie, &auxdata, false); nfsi->fscache =NULL ; }
@@ -309,11 +311,7 @@ void nfs_fscache_open_file(struct inode *inode, struct file *filp)if (!fscache_cookie_valid (cookie))return ; -memset (&auxdata,0 ,sizeof (auxdata)); - auxdata.mtime_sec = nfsi->vfs_inode.i_mtime.tv_sec; - auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec; - auxdata.ctime_sec = nfsi->vfs_inode.i_ctime.tv_sec; - auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec; +nfs_fscache_update_auxdata (&auxdata, nfsi);if (inode_is_open_for_write (inode)) {dfprintk (FSCACHE ,"NFS: nfsi 0x%p disabling cache\n" , nfsi);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/194 NFS: Fix fscache super_cookie index_key from changing after umount
In reply to Greg Kroah-HartmanFrom: Dave Wysochanski <[email protected]>
[ Upstream commit d9bfced1fbcb35b28d8fbed4e785d2807055ed2b ]
Commit 402cb8dda949 ("fscache: Attach the index key and aux data to the cookie") added the index_key and index_key_len parameters to fscache_acquire_cookie(), and updated the callers in the NFS client. One of the callers was inside nfs_fscache_get_super_cookie() and was changed to use the full struct nfs_fscache_key as the index_key. However, a couple members of this structure contain pointers and thus will change each time the same NFS share is remounted. Since index_key is used for fscache_cookie->key_hash and this subsequently is used to compare cookies, the effectiveness of fscache with NFS is reduced to the point at which a umount
occurs. Any subsequent remount of the same share will cause a
unique NFS super_block index_key and key_hash to be generated for the same data, rendering any prior fscache data unable to be found. A simple reproducer demonstrates the problem.
1. Mount share with 'fsc', create a file, drop page cache systemctl start cachefilesd
mount -o vers=3,fsc 127.0.0.1:/export /mnt
dd if=/dev/zero of=/mnt/file1.bin bs=4096 count=1 echo 3 > /proc/sys/vm/drop_caches
2. Read file into page cache and fscache, then unmount dd if=/mnt/file1.bin of=/dev/null bs=4096 count=1 umount /mnt
3. Remount and re-read which should come from fscache mount -o vers=3,fsc 127.0.0.1:/export /mnt echo 3 > /proc/sys/vm/drop_caches
dd if=/mnt/file1.bin of=/dev/null bs=4096 count=1
4. Check for READ ops in mountstats - there should be none grep READ: /proc/self/mountstats
Looking at the history and the removed function, nfs_super_get_key(), we should only use nfs_fscache_key.key plus any uniquifier, for the fscache index_key.
--- fs/nfs/fscache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/fscache.c +2 -1
@@ -188,7 +188,8 @@ void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, int/* create a cache index for looking up filehandles */ nfss->fscache =fscache_acquire_cookie (nfss->nfs_client->fscache, &nfs_fscache_super_index_def, - key,sizeof (*key) + ulen, + &key->key, +sizeof (key->key) + ulen,NULL ,0 , nfss,0 , true); dfprintk(FSCACHE, "NFS: get superblock cookie (0x%p/0x%p)\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/194 bpf: Fix error return code in map_lookup_and_delete_elem()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit 7f645462ca01d01abb94d75e6768c8b3ed3a188b ]
Fix to return negative error code -EFAULT from the copy_to_user() error handling case instead of 0, as done elsewhere in this function.
--- kernel/bpf/syscall.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/bpf/syscall.c +3 -1
@@ -1480,8 +1480,10 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr)if (err) goto free_value; -if (copy_to_user (uvalue, value, value_size) !=0 ) +if (copy_to_user (uvalue, value, value_size) !=0 ) { + err = -EFAULT ; goto free_value; + } err =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/194 netprio_cgroup: Fix unlimited memory leak of v2 cgroups
In reply to Greg Kroah-HartmanFrom: Zefan Li <[email protected]>
[ Upstream commit 090e28b229af92dc5b40786ca673999d59e73056 ]
If systemd is configured to use hybrid mode which enables the use of both cgroup v1 and v2, systemd will create new cgroup on both the default root (v2) and netprio_cgroup hierarchy (v1) for a new session and attach task to the two cgroups. If the task does some network thing then the v2 cgroup can never be freed after the session exited.
One of our machines ran into OOM due to this memory leak.
In the scenario described above when sk_alloc() is called cgroup_sk_alloc() thought it's in v2 mode, so it stores the cgroup pointer in sk->sk_cgrp_data and increments the cgroup refcnt, but then sock_update_netprioidx() thought it's in v1 mode, so it stores netprioidx value in sk->sk_cgrp_data, so the cgroup refcnt will never be freed.
Currently we do the mode switch when someone writes to the ifpriomap cgroup control file. The easiest fix is to also do the switch when a task is attached to a new cgroup.
--- net/core/netprio_cgroup.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/netprio_cgroup.c +2 -0
@@ -236,6 +236,8 @@ static void net_prio_attach(struct cgroustruct task_struct *p;struct cgroup_subsys_state *css; +cgroup_sk_alloc_disable (); +cgroup_taskset_for_each (p, css, tset) {void *v = (void *)(unsigned long )css->id;
Greg Kroah-Hartman
maintainerPATCH 90/194 mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10
In reply to Greg Kroah-HartmanFrom: Ben Chuang <[email protected]>
[ Upstream commit b56ff195c317ad28c05d354aeecbb9995b8e08c1 ]
Need to clear some bits in a vendor-defined register after reboot from Windows 10.
--- drivers/mmc/host/sdhci-pci-gli.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +5 -0
@@ -26,6 +26,9 @@#define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)#define GLI_9750_DRIVING_1_VALUE 0xFFF#define GLI_9750_DRIVING_2_VALUE 0x3 +#define SDHCI_GLI_9750_SEL_1 BIT(29) +#define SDHCI_GLI_9750_SEL_2 BIT(31) +#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))#define SDHCI_GLI_9750_PLL 0x864#define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
@@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host) GLI_9750_DRIVING_1_VALUE); driving_value |=FIELD_PREP (SDHCI_GLI_9750_DRIVING_2 ,GLI_9750_DRIVING_2_VALUE ); + driving_value &= ~(SDHCI_GLI_9750_SEL_1 |SDHCI_GLI_9750_SEL_2 |SDHCI_GLI_9750_ALL_RST ); + driving_value |=SDHCI_GLI_9750_SEL_2 ;sdhci_writel (host, driving_value,SDHCI_GLI_9750_DRIVING ); sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/194 pinctrl: qcom: fix wrong write in update_dual_edge
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit 90bcb0c3ca0809d1ed358bfbf838df4b3d4e58e0 ]
Fix a typo in the readl/writel accessor conversion where val is used instead of pol changing the behavior of the original code.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/qcom/pinctrl-msm.c +1 -1
@@ -692,7 +692,7 @@ static void msm_gpio_update_dual_edge_pos(struct msm_pinctrl *pctrl, pol =msm_readl_intr_cfg (pctrl, g); pol ^=BIT (g->intr_polarity_bit); -msm_writel_intr_cfg (val, pctrl, g); +msm_writel_intr_cfg (pol, pctrl, g); val2 =msm_readl_io (pctrl, g) &BIT (g->in_bit); intstat =msm_readl_intr_status (pctrl, g);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/194 pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 6b7275c87717652daace4c0b8131eb184c7d7516 ]
It appears that SPT-H variant has different offset for PAD locking registers. Fix it here.
--- drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/pinctrl/intel/pinctrl-sunrisepoint.c +8 -7
@@ -15,17 +15,18 @@#include "pinctrl-intel.h" -#define SPT_PAD_OWN 0x020 -#define SPT_PADCFGLOCK 0x0a0 -#define SPT_HOSTSW_OWN 0x0d0 -#define SPT_GPI_IS 0x100 -#define SPT_GPI_IE 0x120 +#define SPT_PAD_OWN 0x020 +#define SPT_H_PADCFGLOCK 0x090 +#define SPT_LP_PADCFGLOCK 0x0a0 +#define SPT_HOSTSW_OWN 0x0d0 +#define SPT_GPI_IS 0x100 +#define SPT_GPI_IE 0x120#define SPT_COMMUNITY (b, s, e) \ { \ .barno = (b), \ .padown_offset = SPT_PAD_OWN, \ - .padcfglock_offset = SPT_PADCFGLOCK, \ + .padcfglock_offset = SPT_LP_PADCFGLOCK, \ .hostown_offset = SPT_HOSTSW_OWN, \ .is_offset = SPT_GPI_IS, \ .ie_offset = SPT_GPI_IE, \
@@ -47,7 +48,7 @@ { \ .barno = (b), \ .padown_offset = SPT_PAD_OWN, \ - .padcfglock_offset = SPT_PADCFGLOCK, \ + .padcfglock_offset = SPT_H_PADCFGLOCK, \ .hostown_offset = SPT_HOSTSW_OWN, \ .is_offset = SPT_GPI_IS, \ .ie_offset = SPT_GPI_IE, \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/194 mmc: sdhci-pci-gli: Fix no irq handler from suspend
In reply to Greg Kroah-HartmanFrom: Ben Chuang <[email protected]>
[ Upstream commit 282ede76e47048eebc8ce5324b412890f0ec0a69 ]
The kernel prints a message similar to
"[ 28.881959] do_IRQ: 5.36 No irq handler for vector"
when GL975x resumes from suspend. Implement a resume callback to fix this.
--- drivers/mmc/host/sdhci-pci-gli.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +18 -0
@@ -334,6 +334,18 @@ static u32 sdhci_gl9750_readl(struct sdhci_host *host, int reg)return value; } +#ifdef CONFIG_PM_SLEEP +static int sdhci_pci_gli_resume (struct sdhci_pci_chip *chip) +{ +struct sdhci_pci_slot *slot = chip->slots[0 ]; + +pci_free_irq_vectors (slot->chip->pdev); +gli_pcie_enable_msi (slot); + +return sdhci_pci_resume_host (chip); +} +#endif +static const struct sdhci_ops sdhci_gl9755_ops = { .set_clock = sdhci_set_clock, .enable_dma = sdhci_pci_enable_dma,
@@ -348,6 +360,9 @@ const struct sdhci_pci_fixes sdhci_gl9755 = { .quirks2 = SDHCI_QUIRK2_BROKEN_DDR50, .probe_slot = gli_probe_slot_gl9755, .ops = &sdhci_gl9755_ops, +#ifdef CONFIG_PM_SLEEP + .resume = sdhci_pci_gli_resume, +#endif };static const struct sdhci_ops sdhci_gl9750_ops = {
@@ -366,4 +381,7 @@ const struct sdhci_pci_fixes sdhci_gl9750 = { .quirks2 = SDHCI_QUIRK2_BROKEN_DDR50, .probe_slot = gli_probe_slot_gl9750, .ops = &sdhci_gl9750_ops, +#ifdef CONFIG_PM_SLEEP + .resume = sdhci_pci_gli_resume, +#endif };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/194 ipc/util.c: sysvipc_find_ipc() incorrectly updates position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit 5e698222c70257d13ae0816720dde57c56f81e15 ]
Commit 89163f93c6f9 ("ipc/util.c: sysvipc_find_ipc() should increase position index") is causing this bug (seen on 5.6.8):
# ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages
# ipcmk -Q Message queue id: 0 # ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages 0x82db8127 0 root 644 0 0
# ipcmk -Q Message queue id: 1 # ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages 0x82db8127 0 root 644 0 0 0x76d1fb2a 1 root 644 0 0
# ipcrm -q 0 # ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages 0x76d1fb2a 1 root 644 0 0 0x76d1fb2a 1 root 644 0 0
# ipcmk -Q Message queue id: 2 # ipcrm -q 2 # ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages 0x76d1fb2a 1 root 644 0 0 0x76d1fb2a 1 root 644 0 0
# ipcmk -Q Message queue id: 3 # ipcrm -q 1 # ipcs -q
------ Message Queues --------
key msqid owner perms used-bytes messages 0x7c982867 3 root 644 0 0 0x7c982867 3 root 644 0 0 0x7c982867 3 root 644 0 0 0x7c982867 3 root 644 0 0
Whenever an IPC item with a low id is deleted, the items with higher ids are duplicated, as if filling a hole.
new_pos should jump through hole of unused ids, pos can be updated inside "for" cycle.
--- ipc/util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
ipc/util.c +6 -6
@@ -764,21 +764,21 @@ static struct kern_ipc_perm *sysvipc_find_ipc(struct ipc_ids *ids, loff_t pos, total++; } - *new_pos = pos +1 ; + ipc =NULL ;if (total >= ids->in_use) -return NULL ; + goto out;for (; pos < ipc_mni; pos++) { ipc =idr_find (&ids->ipcs_idr, pos);if (ipc !=NULL ) {rcu_read_lock ();ipc_lock_object (ipc); -return ipc; +break ; } } - -/* Out of range - return NULL to terminate iteration */ -return NULL ; +out: + *new_pos = pos +1 ; +return ipc; }static void *sysvipc_proc_next (struct seq_file *s,void *it,loff_t *pos)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/194 drm/amd/display: Defer cursor update around VUPDATE for all ASIC
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit fdfd2a858590d318cfee483bd1c73e00f77533af ]
[Why]
Fixes the following scenario:
- Flip has been prepared sometime during the frame, update pending
- Cursor update happens right when VUPDATE would happen
- OPTC lock acquired, VUPDATE is blocked until next frame
- Flip is delayed potentially infinitely
With the igt@kms_cursor_legacy cursor-vs-flip-legacy test we can observe nearly *13* frames of delay for some flips on Navi.
[How]
Apply the Raven workaround generically. When close enough to VUPDATE block cursor updates from occurring from the dc_stream_set_cursor_* helpers.
This could perhaps be a little smarter by checking if there were pending updates or flips earlier in the frame on the HUBP side before applying the delay, but this should be fine for now.
This fixes the kms_cursor_legacy test.
--- .../gpu/drm/amd/display/dc/core/dc_stream.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +14 -14
@@ -239,24 +239,24 @@ static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)struct dc_stream_state *stream = pipe_ctx->stream;unsigned int us_per_line; -if (stream->ctx->asic_id.chip_family ==FAMILY_RV && -ASICREV_IS_RAVEN (stream->ctx->asic_id.hw_internal_rev)) { +if (!dc->hwss.get_vupdate_offset_from_vsync) +return ; - vupdate_line = dc->hwss.get_vupdate_offset_from_vsync (pipe_ctx); -if (!dc_stream_get_crtc_position (dc, &stream,1 , &vpos, &nvpos)) -return ; + vupdate_line = dc->hwss.get_vupdate_offset_from_vsync (pipe_ctx); +if (!dc_stream_get_crtc_position (dc, &stream,1 , &vpos, &nvpos)) +return ; -if (vpos >= vupdate_line) -return ; +if (vpos >= vupdate_line) +return ; - us_per_line = stream->timing.h_total *10000 / stream->timing.pix_clk_100hz; - lines_to_vupdate = vupdate_line - vpos; - us_to_vupdate = lines_to_vupdate * us_per_line; + us_per_line = + stream->timing.h_total *10000 / stream->timing.pix_clk_100hz; + lines_to_vupdate = vupdate_line - vpos; + us_to_vupdate = lines_to_vupdate * us_per_line; -/* 70 us is a conservative estimate of cursor update time*/ -if (us_to_vupdate <70 ) -udelay (us_to_vupdate); - } +/* 70 us is a conservative estimate of cursor update time*/ +if (us_to_vupdate <70 ) +udelay (us_to_vupdate);#endif }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/194 drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper()
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit 5b5703dbafae74adfbe298a56a81694172caf5e6 ]
v2: removed TODO reminder
--- drivers/gpu/drm/qxl/qxl_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_image.c +2 -1
@@ -212,7 +212,8 @@ qxl_image_init_helper(struct qxl_device *qdev,break ;default :DRM_ERROR ("unsupported image bit depth\n" ); -return -EINVAL ;/* TODO: cleanup */ +qxl_bo_kunmap_atomic_page (qdev, image_bo, ptr); +return -EINVAL ; } image->u.bitmap.flags =QXL_BITMAP_TOP_DOWN ; image->u.bitmap.x = width;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/194 drm/amd/powerplay: avoid using pm_en before it is initialized revised
In reply to Greg Kroah-HartmanFrom: Tiecheng Zhou <[email protected]>
[ Upstream commit 690ae30be163d5262feae01335b2a6f30569e5aa ]
hwmgr->pm_en is initialized at hwmgr_hw_init.
during amdgpu_device_init, there is amdgpu_asic_reset that calls to soc15_asic_reset (for V320 usecase, Vega10 asic), in which:
1) soc15_asic_reset_method calls to pp_get_asic_baco_capability (pm_en)
2) soc15_asic_baco_reset calls to pp_set_asic_baco_state (pm_en)
pm_en is used in the above two cases while it has not yet been initialized
So avoid using pm_en in the above two functions for V320 passthrough.
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +4 -2
@@ -1435,7 +1435,8 @@ static int pp_get_asic_baco_capability(void *handle, bool *cap)if (!hwmgr)return -EINVAL ; -if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_asic_baco_capability) +if (!(hwmgr->not_vf && amdgpu_dpm) || + !hwmgr->hwmgr_func->get_asic_baco_capability)return 0 ;mutex_lock (&hwmgr->smu_lock);
@@ -1469,7 +1470,8 @@ static int pp_set_asic_baco_state(void *handle, int state)if (!hwmgr)return -EINVAL ; -if (!hwmgr->pm_en || !hwmgr->hwmgr_func->set_asic_baco_state) +if (!(hwmgr->not_vf && amdgpu_dpm) || + !hwmgr->hwmgr_func->set_asic_baco_state)return 0 ;mutex_lock (&hwmgr->smu_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/194 dmaengine: mmp_tdma: Reset channel error on release
In reply to Greg Kroah-HartmanFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 0c89446379218698189a47871336cb30286a7197 ]
When a channel configuration fails, the status of the channel is set to DEV_ERROR so that an attempt to submit it fails. However, this status sticks until the heat end of the universe, making it impossible to recover from the error.
Let's reset it when the channel is released so that further use of the channel with correct configuration is not impacted.
--- drivers/dma/mmp_tdma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma/mmp_tdma.c +2 -0
@@ -363,6 +363,8 @@ static void mmp_tdma_free_descriptor(struct mmp_tdma_chan *tdmac)gen_pool_free (gpool, (unsigned long )tdmac->desc_arr, size); tdmac->desc_arr =NULL ; +if (tdmac->status ==DMA_ERROR ) + tdmac->status =DMA_COMPLETE ;return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/194 riscv: fix vdso build with lld
In reply to Greg Kroah-HartmanFrom: Ilie Halip <[email protected]>
[ Upstream commit 3c1918c8f54166598195d938564072664a8275b1 ]
When building with the LLVM linker this error occurrs:
LD arch/riscv/kernel/vdso/vdso-syms.o
ld.lld: error: no input files
This happens because the lld treats -R as an alias to -rpath, as opposed to ld where -R means --just-symbols.
Use the long option name for compatibility between the two.
--- arch/riscv/kernel/vdso/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/riscv/kernel/vdso/Makefile +3 -3
@@ -33,15 +33,15 @@ $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold) # We also create a special relocatable object that should mirror the symbol -# table and layout of the linked DSO. With ld -R we can then refer to -# these symbols in the kernel code rather than hand-coded addresses. +# table and layout of the linked DSO. With ld --just-symbols we can then +# refer to these symbols in the kernel code rather than hand-coded addresses. SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \ -Wl,--build-id -Wl,--hash-style=both $(obj)/vdso-dummy.o: $(src)/vdso.lds $(obj)/rt_sigreturn.o FORCE $(call if_changed,vdsold) -LDFLAGS_vdso-syms.o := -r -R +LDFLAGS_vdso-syms.o := -r --just-symbols $(obj)/vdso-syms.o: $(obj)/vdso-dummy.o FORCE $(call if_changed,ld)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/194 dmaengine: mmp_tdma: Do not ignore slave config validation errors
In reply to Greg Kroah-HartmanFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 363c32701c7fdc8265a84b21a6a4f45d1202b9ca ]
With an invalid dma_slave_config set previously, mmp_tdma_prep_dma_cyclic() would detect an error whilst configuring the channel, but proceed happily on:
[ 120.756530] mmp-tdma d42a0800.adma: mmp_tdma: unknown burst size.
--- drivers/dma/mmp_tdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/mmp_tdma.c +2 -1
@@ -443,7 +443,8 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(if (!desc) goto err_out; -mmp_tdma_config_write (chan, direction, &tdmac->slave_config); +if (mmp_tdma_config_write (chan, direction, &tdmac->slave_config)) + goto err_out;while (buf < buf_len) { desc = &tdmac->desc_arr[i];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/194 dmaengine: xilinx_dma: Add missing check for empty list
In reply to Greg Kroah-HartmanFrom: Sebastian von Ohr <[email protected]>
[ Upstream commit b269426011bcfd97b7c3101abfe1a99147b6f40b ]
The DMA transfer might finish just after checking the state with dma_cookie_status, but before the lock is acquired. Not checking for an empty list in xilinx_dma_tx_status may result in reading random data or data corruption when desc is written to. This can be reliably triggered by using dma_sync_wait to wait for DMA completion.
--- drivers/dma/xilinx/xilinx_dma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/dma/xilinx/xilinx_dma.c +10 -10
@@ -1229,16 +1229,16 @@ static enum dma_status xilinx_dma_tx_status(struct dma_chan *dchan,return ret;spin_lock_irqsave (&chan->lock, flags); - - desc =list_last_entry (&chan->active_list, - struct xilinx_dma_tx_descriptor, node); -/* -* VDMA and simple mode do not support residue reporting, so the -* residue field will always be 0. -*/ -if (chan->has_sg && chan->xdev->dma_config->dmatype !=XDMA_TYPE_VDMA ) - residue =xilinx_dma_get_residue (chan, desc); - +if (!list_empty (&chan->active_list)) { + desc =list_last_entry (&chan->active_list, + struct xilinx_dma_tx_descriptor, node); +/* +* VDMA and simple mode do not support residue reporting, so the +* residue field will always be 0. +*/ +if (chan->has_sg && chan->xdev->dma_config->dmatype !=XDMA_TYPE_VDMA ) + residue =xilinx_dma_get_residue (chan, desc); + }spin_unlock_irqrestore (&chan->lock, flags);dma_set_residue (txstate, residue);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/194 umh: fix memory leak on execve failure
In reply to Greg Kroah-HartmanFrom: Vincent Minet <[email protected]>
[ Upstream commit db803036ada7d61d096783726f9771b3fc540370 ]
If a UMH process created by fork_usermode_blob() fails to execute, a pair of struct file allocated by umh_pipe_setup() will leak.
Under normal conditions, the caller (like bpfilter) needs to manage the lifetime of the UMH and its two pipes. But when fork_usermode_blob() fails, the caller doesn't really have a way to know what needs to be done. It seems better to do the cleanup ourselves in this case.
--- kernel/umh.c | 6 ++++++ 1 file changed, 6 insertions(+)
kernel/umh.c +6 -0
@@ -475,6 +475,12 @@ static void umh_clean_and_save_pid(struc {struct umh_info *umh_info = info->data; +/* cleanup if umh_pipe_setup() was successful but exec failed */ +if (info->pid && info->retval) { +fput (umh_info->pipe_to_umh); +fput (umh_info->pipe_from_umh); + } +argv_free (info->argv); umh_info->pid = info->pid; }
Greg Kroah-Hartman
maintainerPATCH 47/194 nfp: abm: fix error return code in nfp_abm_vnic_alloc()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit 5099dea0a59f1c89525bb0ceac36689178a4c125 ]
Fix to return negative error code -ENOMEM from the kzalloc() error handling case instead of 0, as done elsewhere in this function.
--- drivers/net/ethernet/netronome/nfp/abm/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/abm/main.c +3 -1
@@ -333,8 +333,10 @@ nfp_abm_vnic_alloc(struct nfp_app *app, goto err_free_alink; alink->prio_map =kzalloc (abm->prio_map_len,GFP_KERNEL ); -if (!alink->prio_map) +if (!alink->prio_map) { + err = -ENOMEM ; goto err_free_alink; + }/* This is a multi-host app, make sure MAC/PHY is up, but don't * make the MAC/PHY state follow the state of any of the ports.
Greg Kroah-Hartman
maintainercover 5.6.14-rc1 review
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +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.6.14-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.6.14-rc1
Sergei Trofimovich <[email protected]>
Makefile: disallow data races on gcc-10 as well
Daniel Borkmann <[email protected]>
bpf: Restrict bpf_trace_printk()'s %s usage and add %pks, %pus specifier
Yonghong Song <[email protected]>
selftests/bpf: Enforce returning 0 for fentry/fexit programs
Yonghong Song <[email protected]>
bpf: Enforce returning 0 for fentry/fexit progs
Jim Mattson <[email protected]>
KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
Kefeng Wang <[email protected]>
riscv: perf: RISCV_BASE_PMU should be independent
Jason Gunthorpe <[email protected]>
RDMA/uverbs: Move IB_EVENT_DEVICE_FATAL to destroy_uobj
Jason Gunthorpe <[email protected]>
RDMA/uverbs: Do not discard the IB_EVENT_DEVICE_FATAL event
Nayna Jain <[email protected]>
powerpc/ima: Fix secure boot rules in ima arch policy
Nicholas Piggin <[email protected]>
powerpc/uaccess: Evaluate macro arguments once, before user access is allowed
Xiyu Yang <[email protected]>
bpf: Fix sk_psock refcnt leak when receiving message
Chuck Lever <[email protected]>
SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()")Michael Walle <[email protected]>
dt-bindings: dma: fsl-edma: fix ls1028a-edma compatible
Geert Uytterhoeven <[email protected]>
ARM: dts: r8a7740: Add missing extal2 to CPG node
Yoshihiro Shimoda <[email protected]>
arm64: dts: renesas: r8a77980: Fix IPMMU VIP[01] nodes
Geert Uytterhoeven <[email protected]>
ARM: dts: r8a73a4: Add missing CMT1 interrupts
Adam Ford <[email protected]>
arm64: dts: imx8mn: Change SDMA1 ahb clock for imx8mn
Chen-Yu Tsai <[email protected]>
arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy
Chen-Yu Tsai <[email protected]>
arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards
Neil Armstrong <[email protected]>
arm64: dts: meson-g12-common: fix dwc2 clock names
Bjorn Andersson <[email protected]>
arm64: dts: qcom: msm8996: Reduce vdd_apc voltage
Neil Armstrong <[email protected]>
arm64: dts: meson-g12b-khadas-vim3: add missing frddr_a status property
Marc Zyngier <[email protected]>
clk: Unlink clock if failed to prepare or enable
Tero Kristo <[email protected]>
clk: ti: clkctrl: Fix Bad of_node_put within clkctrl_get_name
Kai-Heng Feng <[email protected]>
Revert "ALSA: hda/realtek: Fix pop noise on ALC225"
Wei Yongjun <[email protected]>
usb: gadget: legacy: fix error return code in cdc_bind()
Wei Yongjun <[email protected]>
usb: gadget: legacy: fix error return code in gncm_bind()
Christophe JAILLET <[email protected]>
usb: gadget: audio: Fix a missing error return value in audio_bind()
Christophe JAILLET <[email protected]>
usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()'
Thierry Reding <[email protected]>
usb: gadget: tegra-xudc: Fix idle suspend/resume
Neil Armstrong <[email protected]>
arm64: dts: meson-g12b-ugoos-am6: fix usb vbus-supply
Amir Goldstein <[email protected]>
fanotify: fix merging marks masks with FAN_ONDIR
John Stultz <[email protected]>
dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg()
Justin Swartz <[email protected]>
clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks
Eric W. Biederman <[email protected]>
exec: Move would_dump into flush_old_exec
Josh Poimboeuf <[email protected]>
x86/unwind/orc: Fix error handling in __unwind_start()
Borislav Petkov <[email protected]>
x86: Fix early boot crash on gcc-10, third try
Babu Moger <[email protected]>
KVM: x86: Fix pkru save/restore when guest CR4.PKE=0, move it to x86.c
Adam McCoy <[email protected]>
cifs: fix leaked reference on requeued write
Christophe Leroy <[email protected]>
powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG
Christophe Leroy <[email protected]>
powerpc/vdso32: Fallback on getres syscall when clock is unknown
Imre Deak <[email protected]>
drm/i915/tgl+: Fix interrupt handling for DP AUX transactions
Tom St Denis <[email protected]>
drm/amd/amdgpu: add raven1 part to the gfxoff quirk list
Simon Ser <[email protected]>
drm/amd/display: add basic atomic check for cursor plane
Michal Vokáč <[email protected]>
ARM: dts: imx6dl-yapp4: Fix Ursa board Ethernet connection
Fabio Estevam <[email protected]>
ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries
Kishon Vijay Abraham I <[email protected]>
ARM: dts: dra7: Fix bus_dma_limit for PCIe
Peter Jones <[email protected]>
Make the "Reducing compressed framebufer size" message be DRM_INFO_ONCE()
Sriharsha Allenki <[email protected]>
usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list
Kyungtae Kim <[email protected]>
USB: gadget: fix illegal array access in binding with UDC
Peter Chen <[email protected]>
usb: cdns3: gadget: prev_req->trb is NULL for ep0
Li Jun <[email protected]>
usb: host: xhci-plat: keep runtime active when removing host
Eugeniu Rosca <[email protected]>
usb: core: hub: limit HUB_QUIRK_DISABLE_AUTOSUSPEND to USB5534B
Jesus Ramos <[email protected]>
ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset
Takashi Iwai <[email protected]>
ALSA: rawmidi: Fix racy buffer resize under concurrent accesses
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Add COEF workaround for ASUS ZenBook UX431DA
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Limit int mic boost for Thinkpad T530
Greg Kroah-Hartman <[email protected]>
USB: usbfs: fix mmap dma mismatch
Jeremy Linton <[email protected]>
usb: usbfs: correct kernel->user page attribute mismatch
Masami Hiramatsu <[email protected]>
bootconfig: Fix to prevent warning message if no bootconfig option
Masami Hiramatsu <[email protected]>
bootconfig: Fix to remove bootconfig data from initrd while boot
Linus Torvalds <[email protected]>
gcc-10: avoid shadowing standard library 'free()' in crypto
Linus Torvalds <[email protected]>
gcc-10: mark more functions __init to avoid section mismatch warnings
Linus Torvalds <[email protected]>
gcc-10 warnings: fix low-hanging fruit
Linus Torvalds <[email protected]>
gcc-10: disable 'restrict' warning for now
Linus Torvalds <[email protected]>
gcc-10: disable 'stringop-overflow' warning for now
Linus Torvalds <[email protected]>
gcc-10: disable 'array-bounds' warning for now
Linus Torvalds <[email protected]>
gcc-10: disable 'zero-length-bounds' warning for now
Linus Torvalds <[email protected]>
Stop the ad-hoc games with -Wno-maybe-initialized
Jason Gunthorpe <[email protected]>
net/rds: Use ERR_PTR for rds_message_alloc_sgs()
Jason Gunthorpe <[email protected]>
pnp: Use list_for_each_entry() instead of open coding
Olga Kornievskaia <[email protected]>
NFSv3: fix rpc receive buffer size for MOUNT call
Sasha Levin <[email protected]>
bpf: Fix bug in mmap() implementation for BPF array map
Roman Penyaev <[email protected]>
epoll: call final ep_events_available() check under the lock
Yafang Shao <[email protected]>
mm, memcg: fix inconsistent oom event behavior
Chris Wilson <[email protected]>
drm/i915: Handle idling during i915_gem_evict_something busy loops
Wei Yongjun <[email protected]>
s390/ism: fix error return code in ism_probe()
Samu Nuutamo <[email protected]>
hwmon: (da9052) Synchronize access with mfd
Steven Rostedt (VMware) <[email protected]>
x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up
Potnuri Bharat Teja <[email protected]>
RDMA/iw_cxgb4: Fix incorrect function parameters
Maor Gottlieb <[email protected]>
RDMA/core: Fix double put of resource
Jack Morgenstein <[email protected]>
IB/core: Fix potential NULL pointer dereference in pkey cache
Jack Morgenstein <[email protected]>
IB/mlx4: Test return value of calls to ib_get_cached_pkey
Sudip Mukherjee <[email protected]>
RDMA/rxe: Always return ERR_PTR from rxe_create_mmap_info()
Phil Sutter <[email protected]>
netfilter: nft_set_rbtree: Add missing expired checks
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: set NF_FLOW_TEARDOWN flag on entry expiration
Steven Rostedt (VMware) <[email protected]>
tracing: Wait for preempt irq delay thread to execute
Chuck Lever <[email protected]>
SUNRPC: Signalled ASYNC tasks need to exit
J. Bruce Fields <[email protected]>
nfs: fix NULL deference in nfs4_get_valid_delegation
Chris Wilson <[email protected]>
drm/i915: Mark concurrent submissions with a weak-dependency
Florian Westphal <[email protected]>
netfilter: conntrack: fix infinite loop on rmmod
Christoph Hellwig <[email protected]>
arm64: fix the flush_icache_range arguments in machine_kexec
Zhenyu Wang <[email protected]>
drm/i915/gvt: Fix kernel oops for 3-level ppgtt guest
Arnd Bergmann <[email protected]>
netfilter: conntrack: avoid gcc-10 zero-length-bounds warning
Guenter Roeck <[email protected]>
hwmon: (drivetemp) Fix SCT support if SCT data tables are not supported
Dave Wysochanski <[email protected]>
NFSv4: Fix fscache cookie aux_data to ensure change_attr is included
Dave Wysochanski <[email protected]>
NFS: Fix fscache super_cookie allocation
Dave Wysochanski <[email protected]>
NFS: Fix fscache super_cookie index_key from changing after umount
Alex Deucher <[email protected]>
drm/amdgpu: force fbdev into vram
Christian Brauner <[email protected]>
fork: prevent accidental access to clone3 features
Andreas Gruenbacher <[email protected]>
gfs2: More gfs2_find_jhead fixes
Adrian Hunter <[email protected]>
mmc: block: Fix request completion in the CQE timeout path
Sarthak Garg <[email protected]>
mmc: core: Fix recursive locking issue in CQE recovery path
Veerabhadrarao Badiganti <[email protected]>
mmc: core: Check request type before completing the request
Ben Chuang <[email protected]>
mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10
Christophe JAILLET <[email protected]>
mmc: alcor: Fix a resource leak in the error path for ->probe()
Chris Wilson <[email protected]>
drm/i915/gem: Remove object_is_locked assertion from unpin_from_display_plane
John Fastabend <[email protected]>
bpf, sockmap: bpf_tcp_ingress needs to subtract bytes from sg.size
John Fastabend <[email protected]>
bpf, sockmap: msg_pop_data can incorrecty set an sge length
Sultan Alsawaf <[email protected]>
drm/i915: Don't enable WaIncreaseLatencyIPCEnabled when IPC is disabled
Chris Wilson <[email protected]>
drm/i915/gt: Make timeslicing an explicit engine property
Dan Carpenter <[email protected]>
i40iw: Fix error handling in i40iw_manage_arp_cache()
David Howells <[email protected]>
cachefiles: Fix corruption of the return value in cachefiles_read_or_alloc_pages()
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib: fix 'function sizeof not defined' error of tracepoints format
Wei Yongjun <[email protected]>
bpf: Fix error return code in map_lookup_and_delete_elem()
Thierry Reding <[email protected]>
drm/tegra: Fix SMMU support on Tegra124 and Tegra210
Grace Kao <[email protected]>
pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler
Ansuel Smith <[email protected]>
pinctrl: qcom: fix wrong write in update_dual_edge
Andy Shevchenko <[email protected]>
pinctrl: baytrail: Enable pin configuration setting for GPIO chip
Andy Shevchenko <[email protected]>
pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H
Rafael J. Wysocki <[email protected]>
ACPI: EC: PM: Avoid premature returns from acpi_s2idle_wake()
Mike Marciniszyn <[email protected]>
IB/hfi1: Fix another case where pq is left on waitlist
Ben Chuang <[email protected]>
mmc: sdhci-pci-gli: Fix no irq handler from suspend
Andreas Gruenbacher <[email protected]>
gfs2: Another gfs2_walk_metadata fix
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse
Vasily Averin <[email protected]>
ipc/util.c: sysvipc_find_ipc() incorrectly updates position index
Pavel Begunkov <[email protected]>
io_uring: check non-sync defer_list carefully
Xiaoguang Wang <[email protected]>
io_uring: use cond_resched() in io_ring_ctx_wait_and_kill()
Ritesh Harjani <[email protected]>
fibmap: Warn and return an error in case of block > INT_MAX
Vasily Averin <[email protected]>
drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper()
Sung Lee <[email protected]>
drm/amd/display: Update downspread percent to match spreadsheet for DCN2.1
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Defer cursor update around VUPDATE for all ASIC
Dmytro Laktyushkin <[email protected]>
drm/amd/display: check if REFCLK_CNTL register is present
Marek Olšák <[email protected]>
drm/amdgpu: bump version for invalidate L2 before SDMA IBs
Tiecheng Zhou <[email protected]>
drm/amd/powerplay: avoid using pm_en before it is initialized revised
Kai Vehmanen <[email protected]>
ALSA: hda/hdmi: fix race in monitor detection during probe
Chris Wilson <[email protected]>
cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once
Xiao Yang <[email protected]>
selftests/ftrace: Check the first record for kprobe_args_type.tc
Xiaodong Yan <[email protected]>
drm/amd/display: blank dp stream before re-train the link
Lubomir Rintel <[email protected]>
dmaengine: mmp_tdma: Reset channel error on release
Lubomir Rintel <[email protected]>
dmaengine: mmp_tdma: Do not ignore slave config validation errors
Madhuparna Bhowmik <[email protected]>
dmaengine: pch_dma.c: Avoid data race between probe and irq handler
Ilie Halip <[email protected]>
riscv: fix vdso build with lld
Sebastian von Ohr <[email protected]>
dmaengine: xilinx_dma: Add missing check for empty list
Florian Fainelli <[email protected]>
net: broadcom: Select BROADCOM_PHY for BCMGENET
Vincent Minet <[email protected]>
umh: fix memory leak on execve failure
Heiner Kallweit <[email protected]>
r8169: re-establish support for RTL8401 chip version
Wei Yongjun <[email protected]>
nfp: abm: fix error return code in nfp_abm_vnic_alloc()
Kelly Littlepage <[email protected]>
net: tcp: fix rx timestamp behavior for tcp_recvmsg
Zefan Li <[email protected]>
netprio_cgroup: Fix unlimited memory leak of v2 cgroups
Paolo Abeni <[email protected]>
net: ipv4: really enforce backoff for redirects
Florian Fainelli <[email protected]>
net: dsa: loop: Add module soft dependency
Luo bin <[email protected]>
hinic: fix a bug of ndo_stop
Dan Carpenter <[email protected]>
dpaa2-eth: prevent array underflow in update_cls_rule()
Michael S. Tsirkin <[email protected]>
virtio_net: fix lockdep warning on 32 bit
Eric Dumazet <[email protected]>
tcp: fix SO_RCVLOWAT hangs with fat skbs
Eric Dumazet <[email protected]>
tcp: fix error recovery in tcp_zerocopy_receive()
Maciej Żenczykowski <[email protected]>
Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu"
Guillaume Nault <[email protected]>
pppoe: only process PADT targeted at local interfaces
Vinod Koul <[email protected]>
net: stmmac: fix num_por initialization
Heiner Kallweit <[email protected]>
net: phy: fix aneg restart in phy_ethtool_set_eee
Paolo Abeni <[email protected]>
netlabel: cope with NULL catmap
Cong Wang <[email protected]>
net: fix a potential recursive NETDEV_FEAT_CHANGE
Paolo Abeni <[email protected]>
mptcp: set correct vfs info for subflows
Ioana Ciornei <[email protected]>
dpaa2-eth: properly handle buffer size restrictions
Raul E Rangel <[email protected]>
mmc: sdhci-acpi: Add SDHCI_QUIRK2_BROKEN_64_BIT_DMA for AMDI0040
Vladimir Oltean <[email protected]>
net: mscc: ocelot: ANA_AUTOAGE_AGE_PERIOD holds a value in seconds, not ms
Vladimir Oltean <[email protected]>
net: dsa: ocelot: the MAC table on Felix is twice as large
Joerg Roedel <[email protected]>
iommu/amd: Update Device Table in increase_address_space()
Joerg Roedel <[email protected]>
iommu/amd: Fix race in increase_address_space()/fetch_pte()
Colin Ian King <[email protected]>
net: stmmac: gmac5+: fix potential integer overflow on 32 bit multiply
Cong Wang <[email protected]>
net_sched: fix tcm_parent in tc filter dump
Arnd Bergmann <[email protected]>
sun6i: dsi: fix gcc-4.8
Stefan Hajnoczi <[email protected]>
virtio-blk: handle block_device_operations callbacks after hot unplug
Arnd Bergmann <[email protected]>
drop_monitor: work around gcc-10 stringop-overflow warning
Clay McClure <[email protected]>
net: Make PTP-specific drivers depend on PTP_1588_CLOCK
Nathan Chancellor <[email protected]>
hv_netvsc: Fix netvsc_start_xmit's return type
Alan Maguire <[email protected]>
ftrace/selftests: workaround cgroup RT scheduling issues
Christophe JAILLET <[email protected]>
net: moxa: Fix a potential double 'free_irq()'
Christophe JAILLET <[email protected]>
net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'
Chuck Lever <[email protected]>
SUNRPC: Fix GSS privacy computation of auth->au_ralign
Chuck Lever <[email protected]>
SUNRPC: Add "@len" parameter to gss_unwrap()
Adam Ford <[email protected]>
gpio: pca953x: Fix pca953x_gpio_set_config
Marc Zyngier <[email protected]>
KVM: arm: vgic-v2: Only use the virtual state when userspace accesses pending bits
Marc Zyngier <[email protected]>
KVM: arm: vgic: Synchronize the whole guest on GIC{D,R}_I{S,C}ACTIVER read
Yuiko Oshino <[email protected]>
net: phy: microchip_t1: add lan87xx_phy_init to initialize the lan87xx phy.
Hugh Dickins <[email protected]>
shmem: fix possible deadlocks on shmlock_user_lock
José Roberto de Souza <[email protected]>
drm/i915/display: Load DP_TP_CTL/STATUS offset before use it
Matt Roper <[email protected]>
drm/i915/tgl: TBT AUX should use TC power well ops
Matt Roper <[email protected]>
drm/i915/tgl: Add Wa_14010477008:tgl
Chuck Lever <[email protected]>
xprtrdma: Fix trace point use-after-free race
Chuck Lever <[email protected]>
xprtrdma: Clean up the post_send path
Oliver Upton <[email protected]>
kvm: nVMX: reflect MTF VM-exits if injected by L1
Oliver Upton <[email protected]>
KVM: nVMX: Consolidate nested MTF checks to helper function
-------------
Diffstat:
Documentation/core-api/printk-formats.rst | 14 ++ Documentation/devicetree/bindings/dma/fsl-edma.txt | 3 +- Makefile | 20 ++- arch/arm/boot/dts/dra7.dtsi | 4 +- arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 4 +- arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 2 +- arch/arm/boot/dts/r8a73a4.dtsi | 9 +- arch/arm/boot/dts/r8a7740.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 4 +- arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 +- arch/arm64/kernel/machine_kexec.c | 1 + arch/powerpc/include/asm/book3s/32/kup.h | 2 +- arch/powerpc/include/asm/uaccess.h | 49 ++++-- arch/powerpc/kernel/ima_arch.c | 6 +- arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- arch/riscv/include/asm/perf_event.h | 8 +- arch/riscv/kernel/Makefile | 2 +- arch/riscv/kernel/vdso/Makefile | 6 +- arch/x86/include/asm/ftrace.h | 6 + arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/stackprotector.h | 7 +- arch/x86/kernel/ftrace.c | 29 +++- arch/x86/kernel/smpboot.c | 8 + arch/x86/kernel/unwind_orc.c | 16 +- arch/x86/kvm/vmx/nested.c | 19 ++- arch/x86/kvm/vmx/vmx.c | 18 -- arch/x86/kvm/x86.c | 19 ++- arch/x86/mm/init_64.c | 3 + arch/x86/xen/smp_pv.c | 1 + crypto/lrw.c | 4 +- crypto/xts.c | 4 +- drivers/acpi/ec.c | 24 ++- drivers/acpi/internal.h | 1 - drivers/acpi/sleep.c | 14 +- drivers/block/virtio_blk.c | 86 +++++++++- drivers/clk/clk.c | 3 + drivers/clk/rockchip/clk-rk3228.c | 17 +- drivers/clk/ti/clkctrl.c | 1 - drivers/cpufreq/intel_pstate.c | 2 +- drivers/dma/mmp_tdma.c | 5 +- drivers/dma/pch_dma.c | 2 +- drivers/dma/xilinx/xilinx_dma.c | 20 +-- drivers/firmware/efi/tpm.c | 2 +- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 12 ++ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 28 +-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 3 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display_power.c | 12 +- drivers/gpu/drm/i915/display/intel_dp.c | 5 +- drivers/gpu/drm/i915/display/intel_fbc.c | 3 +- drivers/gpu/drm/i915/display/intel_sprite.c | 17 +- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 7 +- drivers/gpu/drm/i915/gt/intel_engine.h | 9 - drivers/gpu/drm/i915/gt/intel_engine_types.h | 18 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 8 +- drivers/gpu/drm/i915/gvt/scheduler.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_evict.c | 26 ++- drivers/gpu/drm/i915/i915_irq.c | 16 +- drivers/gpu/drm/i915/i915_request.c | 8 +- drivers/gpu/drm/i915/i915_scheduler.c | 6 +- drivers/gpu/drm/i915/i915_scheduler.h | 3 +- drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/qxl/qxl_image.c | 3 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- drivers/gpu/drm/tegra/drm.c | 3 +- drivers/gpu/host1x/dev.c | 13 ++ drivers/hwmon/da9052-hwmon.c | 4 +- drivers/hwmon/drivetemp.c | 2 +- drivers/infiniband/core/cache.c | 7 +- drivers/infiniband/core/nldev.c | 3 +- drivers/infiniband/core/rdma_core.c | 3 +- drivers/infiniband/core/uverbs.h | 4 + drivers/infiniband/core/uverbs_main.c | 12 +- .../infiniband/core/uverbs_std_types_async_fd.c | 30 +++- drivers/infiniband/hw/cxgb4/cm.c | 7 +- drivers/infiniband/hw/hfi1/user_sdma.c | 4 - drivers/infiniband/hw/i40iw/i40iw_hw.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 14 +- drivers/infiniband/sw/rxe/rxe_mmap.c | 2 +- drivers/infiniband/sw/rxe/rxe_queue.c | 11 +- drivers/iommu/amd_iommu.c | 175 ++++++++++++++----- drivers/iommu/amd_iommu_types.h | 9 +- drivers/mmc/core/block.c | 3 +- drivers/mmc/core/queue.c | 16 +- drivers/mmc/host/alcor.c | 6 +- drivers/mmc/host/sdhci-acpi.c | 10 +- drivers/mmc/host/sdhci-pci-gli.c | 23 +++ drivers/net/dsa/dsa_loop.c | 1 + drivers/net/dsa/mv88e6xxx/Kconfig | 2 +- drivers/net/dsa/ocelot/felix.c | 1 + drivers/net/dsa/ocelot/felix.h | 1 + drivers/net/dsa/ocelot/felix_vsc9959.c | 1 + drivers/net/dsa/sja1105/Kconfig | 1 + drivers/net/ethernet/broadcom/Kconfig | 1 + drivers/net/ethernet/cadence/Kconfig | 2 +- drivers/net/ethernet/cavium/Kconfig | 2 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 29 ++-- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 16 +- drivers/net/ethernet/huawei/hinic/hinic_main.c | 16 +- drivers/net/ethernet/moxa/moxart_ether.c | 2 +- drivers/net/ethernet/mscc/ocelot.c | 17 +- drivers/net/ethernet/mscc/ocelot_regs.c | 1 + drivers/net/ethernet/natsemi/jazzsonic.c | 6 +- drivers/net/ethernet/netronome/nfp/abm/main.c | 4 +- drivers/net/ethernet/realtek/r8169_main.c | 2 + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 17 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 2 +- drivers/net/ethernet/ti/Kconfig | 3 +- drivers/net/hyperv/netvsc_drv.c | 3 +- drivers/net/phy/microchip_t1.c | 171 +++++++++++++++++++ drivers/net/phy/phy.c | 8 +- drivers/net/ppp/pppoe.c | 3 + drivers/net/virtio_net.c | 6 +- drivers/pinctrl/intel/pinctrl-baytrail.c | 1 + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 15 +- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- drivers/s390/net/ism_drv.c | 4 +- drivers/usb/cdns3/gadget.c | 2 +- drivers/usb/core/devio.c | 19 ++- drivers/usb/core/hub.c | 6 +- drivers/usb/dwc3/gadget.c | 3 - drivers/usb/gadget/configfs.c | 3 + drivers/usb/gadget/legacy/audio.c | 4 +- drivers/usb/gadget/legacy/cdc2.c | 4 +- drivers/usb/gadget/legacy/ncm.c | 4 +- drivers/usb/gadget/udc/net2272.c | 2 + drivers/usb/gadget/udc/tegra-xudc.c | 8 +- drivers/usb/host/xhci-plat.c | 4 +- drivers/usb/host/xhci-ring.c | 4 +- fs/cachefiles/rdwr.c | 10 +- fs/cifs/cifssmb.c | 2 +- fs/eventpoll.c | 48 +++--- fs/exec.c | 4 +- fs/gfs2/bmap.c | 16 +- fs/gfs2/lops.c | 19 ++- fs/io_uring.c | 4 +- fs/ioctl.c | 8 + fs/iomap/fiemap.c | 5 +- fs/nfs/fscache.c | 39 ++--- fs/nfs/mount_clnt.c | 3 +- fs/nfs/nfs4state.c | 2 +- fs/nfs/super.c | 1 - fs/notify/fanotify/fanotify.c | 11 +- include/linux/compiler.h | 6 + include/linux/fs.h | 2 +- include/linux/ftrace.h | 23 +++ include/linux/host1x.h | 3 + include/linux/memcontrol.h | 2 + include/linux/pnp.h | 29 +--- include/linux/skmsg.h | 1 + include/linux/sunrpc/gss_api.h | 3 + include/linux/sunrpc/gss_krb5.h | 6 +- include/linux/sunrpc/xdr.h | 1 + include/linux/tty.h | 2 +- include/net/netfilter/nf_conntrack.h | 2 +- include/net/sch_generic.h | 1 + include/net/tcp.h | 13 ++ include/soc/mscc/ocelot.h | 1 + include/sound/rawmidi.h | 1 + include/trace/events/rpcrdma.h | 12 +- init/Kconfig | 18 -- init/initramfs.c | 2 +- init/main.c | 75 +++++++-- ipc/util.c | 12 +- kernel/bpf/arraymap.c | 7 +- kernel/bpf/syscall.c | 4 +- kernel/bpf/verifier.c | 16 ++ kernel/fork.c | 13 +- kernel/trace/Kconfig | 1 - kernel/trace/bpf_trace.c | 94 +++++++---- kernel/trace/ftrace_internal.h | 22 --- kernel/trace/preemptirq_delay_test.c | 12 +- kernel/umh.c | 6 + lib/vsprintf.c | 12 ++ mm/shmem.c | 7 +- net/core/dev.c | 4 +- net/core/drop_monitor.c | 11 +- net/core/filter.c | 2 +- net/core/netprio_cgroup.c | 2 + net/ipv4/cipso_ipv4.c | 6 +- net/ipv4/route.c | 2 +- net/ipv4/tcp.c | 27 ++- net/ipv4/tcp_bpf.c | 10 +- net/ipv4/tcp_input.c | 3 +- net/ipv6/calipso.c | 3 +- net/ipv6/route.c | 6 +- net/mptcp/subflow.c | 10 ++ net/netfilter/nf_conntrack_core.c | 17 +- net/netfilter/nf_flow_table_core.c | 8 +- net/netfilter/nft_set_rbtree.c | 11 ++ net/netlabel/netlabel_kapi.c | 6 + net/rds/message.c | 19 +-- net/rds/rdma.c | 12 +- net/rds/rds.h | 3 +- net/rds/send.c | 6 +- net/sched/cls_api.c | 8 +- net/sunrpc/auth_gss/auth_gss.c | 12 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 44 +++-- net/sunrpc/auth_gss/gss_mech_switch.c | 3 +- net/sunrpc/auth_gss/svcauth_gss.c | 10 +- net/sunrpc/clnt.c | 5 + net/sunrpc/xdr.c | 41 +++++ net/sunrpc/xprtrdma/backchannel.c | 2 +- net/sunrpc/xprtrdma/frwr_ops.c | 14 +- net/sunrpc/xprtrdma/transport.c | 2 +- net/sunrpc/xprtrdma/verbs.c | 15 +- net/sunrpc/xprtrdma/xprt_rdma.h | 5 +- scripts/kallsyms.c | 2 +- sound/core/rawmidi.c | 31 +++- sound/firewire/amdtp-stream-trace.h | 3 +- sound/pci/hda/patch_hdmi.c | 2 + sound/pci/hda/patch_realtek.c | 41 ++++- sound/usb/quirks.c | 9 +- tools/testing/selftests/bpf/prog_tests/mmap.c | 9 + tools/testing/selftests/bpf/progs/test_overhead.c | 4 +- tools/testing/selftests/ftrace/ftracetest | 22 +++ .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- virt/kvm/arm/vgic/vgic-mmio-v2.c | 10 +- virt/kvm/arm/vgic/vgic-mmio-v3.c | 12 +- virt/kvm/arm/vgic/vgic-mmio.c | 187 ++++++++++++++------- virt/kvm/arm/vgic/vgic-mmio.h | 11 ++ 241 files changed, 1928 insertions(+), 837 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 4/194 xprtrdma: Fix trace point use-after-free race
From: Chuck Lever <[email protected]>
[ Upstream commit bdb2ce82818577ba6e57b7d68b698b8d17329281 ]
It's not safe to use resources pointed to by the @send_wr of ib_post_send() _after_ that function returns. Those resources are typically freed by the Send completion handler, which can run before ib_post_send() returns.
Thus the trace points currently around ib_post_send() in the client's RPC/RDMA transport are a hazard, even when they are disabled. Rearrange them so that they touch the Work Request only _before_ ib_post_send() is invoked.
--- include/trace/events/rpcrdma.h | 12 ++++-------- net/sunrpc/xprtrdma/verbs.c | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-)
include/trace/events/rpcrdma.h +4 -8
@@ -721,11 +721,10 @@ TRACE_EVENT(xprtrdma_prepsend_failed, TRACE_EVENT(xprtrdma_post_send, TP_PROTO( - const struct rpcrdma_req *req, - int status + const struct rpcrdma_req *req ), - TP_ARGS(req, status), + TP_ARGS(req), TP_STRUCT__entry( __field(const void *, req)
@@ -734,7 +733,6 @@ TRACE_EVENT(xprtrdma_post_send, __field(unsigned int, client_id) __field(int, num_sge) __field(int, signaled) - __field(int, status) ), TP_fast_assign(
@@ -747,15 +745,13 @@ TRACE_EVENT(xprtrdma_post_send, __entry->sc = req->rl_sendctx; __entry->num_sge = req->rl_wr.num_sge; __entry->signaled = req->rl_wr.send_flags &IB_SEND_SIGNALED ; - __entry->status = status; ), -TP_printk ("task:%u@%u req=%p sc=%p (%d SGE%s) %sstatus=%d" , +TP_printk ("task:%u@%u req=%p sc=%p (%d SGE%s) %s" , __entry->task_id, __entry->client_id, __entry->req, __entry->sc, __entry->num_sge, (__entry->num_sge ==1 ?"" :"s" ), - (__entry->signaled ?"signaled " :"" ), - __entry->status + (__entry->signaled ?"signaled" :"" ) ) );
net/sunrpc/xprtrdma/verbs.c +1 -1
@@ -1523,8 +1523,8 @@ int rpcrdma_post_sends(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) --ep->rep_send_count; } +trace_xprtrdma_post_send (req); rc =frwr_send (r_xprt, req); -trace_xprtrdma_post_send (req, rc);if (rc)return -ENOTCONN ;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/194 dpaa2-eth: properly handle buffer size restrictions
In reply to Greg Kroah-HartmanFrom: Ioana Ciornei <[email protected]>
[ Upstream commit efa6a7d07523ffbbf6503c1a7eeb52201c15c0e3 ]
Depending on the WRIOP version, the buffer size on the RX path must by a multiple of 64 or 256. Handle this restriction properly by aligning down the buffer size to the necessary value. Also, use the new buffer size dynamically computed instead of the compile time one.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 29 +++++++++++++---------- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 2 files changed, 18 insertions(+), 12 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +17 -12
@@ -86,7 +86,7 @@ static void free_rx_fd(struct dpaa2_eth_for (i =1 ; i <DPAA2_ETH_MAX_SG_ENTRIES ; i++) { addr =dpaa2_sg_get_addr (&sgt[i]); sg_vaddr =dpaa2_iova_to_virt (priv->iommu_domain, addr); -dma_unmap_page (dev, addr,DPAA2_ETH_RX_BUF_SIZE , +dma_unmap_page (dev, addr, priv->rx_buf_size,DMA_BIDIRECTIONAL );free_pages ((unsigned long )sg_vaddr,0 );
@@ -144,7 +144,7 @@ static struct sk_buff *build_frag_skb(st/* Get the address and length from the S/G entry */ sg_addr =dpaa2_sg_get_addr (sge); sg_vaddr =dpaa2_iova_to_virt (priv->iommu_domain, sg_addr); -dma_unmap_page (dev, sg_addr,DPAA2_ETH_RX_BUF_SIZE , +dma_unmap_page (dev, sg_addr, priv->rx_buf_size,DMA_BIDIRECTIONAL ); sg_length =dpaa2_sg_get_len (sge);
@@ -185,7 +185,7 @@ static struct sk_buff *build_frag_skb(st (page_address (page) -page_address (head_page));skb_add_rx_frag (skb, i -1 , head_page, page_offset, - sg_length,DPAA2_ETH_RX_BUF_SIZE ); + sg_length, priv->rx_buf_size); }if (dpaa2_sg_is_final (sge))
@@ -211,7 +211,7 @@ static void free_bufs(struct dpaa2_eth_pfor (i =0 ; i < count; i++) { vaddr =dpaa2_iova_to_virt (priv->iommu_domain, buf_array[i]); -dma_unmap_page (dev, buf_array[i],DPAA2_ETH_RX_BUF_SIZE , +dma_unmap_page (dev, buf_array[i], priv->rx_buf_size,DMA_BIDIRECTIONAL );free_pages ((unsigned long )vaddr,0 ); }
@@ -335,7 +335,7 @@ static u32 run_xdp(struct dpaa2_eth_privbreak ;case XDP_REDIRECT :dma_unmap_page (priv->net_dev->dev.parent, addr, -DPAA2_ETH_RX_BUF_SIZE ,DMA_BIDIRECTIONAL ); + priv->rx_buf_size,DMA_BIDIRECTIONAL ); ch->buf_count--; xdp.data_hard_start = vaddr; err =xdp_do_redirect (priv->net_dev, &xdp, xdp_prog);
@@ -374,7 +374,7 @@ static void dpaa2_eth_rx(struct dpaa2_ettrace_dpaa2_rx_fd (priv->net_dev, fd); vaddr =dpaa2_iova_to_virt (priv->iommu_domain, addr); -dma_sync_single_for_cpu (dev, addr,DPAA2_ETH_RX_BUF_SIZE , +dma_sync_single_for_cpu (dev, addr, priv->rx_buf_size,DMA_BIDIRECTIONAL ); fas =dpaa2_get_fas (vaddr, false);
@@ -393,13 +393,13 @@ static void dpaa2_eth_rx(struct dpaa2_etreturn ; } -dma_unmap_page (dev, addr,DPAA2_ETH_RX_BUF_SIZE , +dma_unmap_page (dev, addr, priv->rx_buf_size,DMA_BIDIRECTIONAL ); skb =build_linear_skb (ch, fd, vaddr); }else if (fd_format == dpaa2_fd_sg) {WARN_ON (priv->xdp_prog); -dma_unmap_page (dev, addr,DPAA2_ETH_RX_BUF_SIZE , +dma_unmap_page (dev, addr, priv->rx_buf_size,DMA_BIDIRECTIONAL ); skb =build_frag_skb (priv, ch, buf_data);free_pages ((unsigned long )vaddr,0 );
@@ -974,7 +974,7 @@ static int add_bufs(struct dpaa2_eth_priif (!page) goto err_alloc; - addr =dma_map_page (dev, page,0 ,DPAA2_ETH_RX_BUF_SIZE , + addr =dma_map_page (dev, page,0 , priv->rx_buf_size,DMA_BIDIRECTIONAL );if (unlikely (dma_mapping_error (dev, addr))) goto err_map;
@@ -984,7 +984,7 @@ static int add_bufs(struct dpaa2_eth_pri/* tracing point */ trace_dpaa2_eth_buf_seed (priv->net_dev, page,DPAA2_ETH_RX_BUF_RAW_SIZE , - addr,DPAA2_ETH_RX_BUF_SIZE , + addr, priv->rx_buf_size, bpid); }
@@ -1715,7 +1715,7 @@ static bool xdp_mtu_valid(struct dpaa2_eint mfl, linear_mfl; mfl =DPAA2_ETH_L2_MAX_FRM (mtu); - linear_mfl =DPAA2_ETH_RX_BUF_SIZE -DPAA2_ETH_RX_HWA_SIZE - + linear_mfl = priv->rx_buf_size -DPAA2_ETH_RX_HWA_SIZE -dpaa2_eth_rx_head_room (priv) -XDP_PACKET_HEADROOM ;if (mfl > linear_mfl) {
@@ -2457,6 +2457,11 @@ static int set_buffer_layout(struct dpaaelse rx_buf_align =DPAA2_ETH_RX_BUF_ALIGN ; +/* We need to ensure that the buffer size seen by WRIOP is a multiple +* of 64 or 256 bytes depending on the WRIOP version. +*/ + priv->rx_buf_size =ALIGN_DOWN (DPAA2_ETH_RX_BUF_SIZE , rx_buf_align); +/* tx buffer */ buf_layout.private_data_size =DPAA2_ETH_SWA_SIZE ; buf_layout.pass_timestamp = true;
@@ -3121,7 +3126,7 @@ static int bind_dpni(struct dpaa2_eth_pr pools_params.num_dpbp =1 ; pools_params.pools[0 ].dpbp_id = priv->dpbp_dev->obj_desc.id; pools_params.pools[0 ].backup_pool =0 ; - pools_params.pools[0 ].buffer_size =DPAA2_ETH_RX_BUF_SIZE ; + pools_params.pools[0 ].buffer_size = priv->rx_buf_size; err =dpni_set_pools (priv->mc_io,0 , priv->mc_token, &pools_params);if (err) {dev_err (dev,"dpni_set_pools() failed\n" );
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +1 -0
@@ -382,6 +382,7 @@ struct dpaa2_eth_priv {u16 tx_data_offset;struct fsl_mc_device *dpbp_dev; +u16 rx_buf_size;u16 bpid;struct iommu_domain *iommu_domain;
Greg Kroah-Hartman
maintainerPATCH 3/194 xprtrdma: Clean up the post_send path
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 97d0de8812a10a66510ff95f8fe6e8d3053fd2ca ]
Clean up: Simplify the synopses of functions in the post_send path by combining the struct rpcrdma_ia and struct rpcrdma_ep arguments.
--- net/sunrpc/xprtrdma/backchannel.c | 2 +- net/sunrpc/xprtrdma/frwr_ops.c | 14 +++++++++----- net/sunrpc/xprtrdma/transport.c | 2 +- net/sunrpc/xprtrdma/verbs.c | 13 +++++-------- net/sunrpc/xprtrdma/xprt_rdma.h | 5 ++--- 5 files changed, 18 insertions(+), 18 deletions(-)
net/sunrpc/xprtrdma/backchannel.c +1 -1
@@ -115,7 +115,7 @@ int xprt_rdma_bc_send_reply(struct rpc_rqst *rqst)if (rc <0 ) goto failed_marshal; -if (rpcrdma_ep_post (&r_xprt->rx_ia, &r_xprt->rx_ep, req)) +if (rpcrdma_post_sends (r_xprt, req)) goto drop_connection;return 0 ;
net/sunrpc/xprtrdma/frwr_ops.c +9 -5
@@ -372,18 +372,22 @@ static void frwr_wc_fastreg(struct ib_cq *cq, struct ib_wc *wc) }/** -* frwr_send - post Send WR containing the RPC Call message -* @ia: interface adapter -* @req: Prepared RPC Call +* frwr_send - post Send WRs containing the RPC Call message +* @r_xprt: controlling transport instance +* @req: prepared RPC Call * * For FRWR, chain any FastReg WRs to the Send WR. Only a * single ib_post_send call is needed to register memory * and then post the Send WR. * -* Returns the result of ib_post_send. +* Returns the return code from ib_post_send. +* +* Caller must hold the transport send lock to ensure that the +* pointers to the transport's rdma_cm_id and QP are stable. */ -int frwr_send (struct rpcrdma_ia *ia,struct rpcrdma_req *req) +int frwr_send (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req) { +struct rpcrdma_ia *ia = &r_xprt->rx_ia;struct ib_send_wr *post_wr;struct rpcrdma_mr *mr;
net/sunrpc/xprtrdma/transport.c +1 -1
@@ -694,7 +694,7 @@ xprt_rdma_send_request(struct rpc_rqst *rqst) goto drop_connection; rqst->rq_xtime =ktime_get (); -if (rpcrdma_ep_post (&r_xprt->rx_ia, &r_xprt->rx_ep, req)) +if (rpcrdma_post_sends (r_xprt, req)) goto drop_connection; rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;
net/sunrpc/xprtrdma/verbs.c +5 -8
@@ -1502,20 +1502,17 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) }/** -* rpcrdma_ep_post - Post WRs to a transport's Send Queue -* @ia: transport's device information -* @ep: transport's RDMA endpoint information +* rpcrdma_post_sends - Post WRs to a transport's Send Queue +* @r_xprt: controlling transport instance * @req: rpcrdma_req containing the Send WR to post * * Returns 0 if the post was successful, otherwise -ENOTCONN * is returned. */ -int -rpcrdma_ep_post (struct rpcrdma_ia *ia, -struct rpcrdma_ep *ep, -struct rpcrdma_req *req) +int rpcrdma_post_sends (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req) {struct ib_send_wr *send_wr = &req->rl_wr; +struct rpcrdma_ep *ep = &r_xprt->rx_ep;int rc;if (!ep->rep_send_count ||kref_read (&req->rl_kref) >1 ) {
@@ -1526,7 +1523,7 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia, --ep->rep_send_count; } - rc =frwr_send (ia, req); + rc =frwr_send (r_xprt, req);trace_xprtrdma_post_send (req, rc);if (rc)return -ENOTCONN ;
net/sunrpc/xprtrdma/xprt_rdma.h +2 -3
@@ -469,8 +469,7 @@ void rpcrdma_ep_destroy(struct rpcrdma_xprt *r_xprt);int rpcrdma_ep_connect (struct rpcrdma_ep *,struct rpcrdma_ia *);void rpcrdma_ep_disconnect (struct rpcrdma_ep *,struct rpcrdma_ia *); -int rpcrdma_ep_post (struct rpcrdma_ia *,struct rpcrdma_ep *, -struct rpcrdma_req *); +int rpcrdma_post_sends (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);void rpcrdma_post_recvs (struct rpcrdma_xprt *r_xprt,bool temp);/*
@@ -544,7 +543,7 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,struct rpcrdma_mr_seg *seg, int nsegs, bool writing, __be32 xid, struct rpcrdma_mr *mr); -int frwr_send (struct rpcrdma_ia *ia,struct rpcrdma_req *req); +int frwr_send (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);void frwr_reminv (struct rpcrdma_rep *rep,struct list_head *mrs);void frwr_unmap_sync (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);void frwr_unmap_async (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/194 net: mscc: ocelot: ANA_AUTOAGE_AGE_PERIOD holds a value in seconds, not ms
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit c0d7eccbc76115b7eb337956c03d47d6a889cf8c ]
One may notice that automatically-learnt entries 'never' expire, even though the bridge configures the address age period at 300 seconds.
Actually the value written to hardware corresponds to a time interval 1000 times higher than intended, i.e. 83 hours.
--- drivers/net/ethernet/mscc/ocelot.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +9 -2
@@ -1444,8 +1444,15 @@ static void ocelot_port_attr_stp_state_svoid ocelot_set_ageing_time (struct ocelot *ocelot,unsigned int msecs) { -ocelot_write (ocelot,ANA_AUTOAGE_AGE_PERIOD (msecs /2 ), -ANA_AUTOAGE ); +unsigned int age_period =ANA_AUTOAGE_AGE_PERIOD (msecs /2000 ); + +/* Setting AGE_PERIOD to zero effectively disables automatic aging, +* which is clearly not what our intention is. So avoid that. +*/ +if (!age_period) + age_period =1 ; + +ocelot_rmw (ocelot, age_period,ANA_AUTOAGE_AGE_PERIOD_M ,ANA_AUTOAGE ); }EXPORT_SYMBOL (ocelot_set_ageing_time);
Re: [PATCH 5.6 019/194] net: Make PTP-specific drivers depend on PTP_1588_CLOCK
In reply to Greg Kroah-HartmanHi Greg,
Quoted 64 lines · Greg Kroah-Hartman
From: Clay McClure <[email protected]>
[ Upstream commit
b6d49cab44b567b3e0a5544b3d61e516a7355fad]Commit
d1cbfd771ce8("ptp_clock: Allow for it to be optional") changed all PTP-capable Ethernet drivers fromselect PTP_1588_CLOCKtoimply PTP_1588_CLOCK, "in order to break the hard dependency between the PTP clock subsystem and ethernet drivers capable of being clock providers." As a result it is possible to build PTP-capable Ethernet drivers without the PTP subsystem by deselectingPTP_1588_CLOCK. Drivers are required to handle the missing dependency gracefully.Some PTP-capable Ethernet drivers (e.g.,
TI_CPSW) factor their PTP code out into separate drivers (e.g.,TI_CPTS_MOD). The above commit also changed these PTP-specific drivers toimply PTP_1588_CLOCK, making it possible to build them without the PTP subsystem. But as Grygorii Strashko noted in [1]:Quoted 3 lines · Grygorii Strashko
Another question is that CPTS completely nonfunctional in this case and it was never expected that somebody will even try to use/run such configuration (except for random build purposes).
In my view, enabling a PTP-specific driver without the PTP subsystem is a configuration error made possible by the above commit.
Kconfigshould not allow users to create a configuration with missing dependencies that results in "completely nonfunctional" drivers.I audited all network drivers that call
ptp_clock_register()but merelyimply PTP_1588_CLOCKand found five PTP-specific drivers that are likely nonfunctional withoutPTP_1588_CLOCK:NET_DSA_MV88E6XXX_PTP NET_DSA_SJA1105_PTP MACB_USE_HWSTAMP CAVIUM_PTP TI_CPTS_MODNote how these symbols all reference PTP or timestamping in their name; this is a clue that they depend on
PTP_1588_CLOCK.Change them from
imply PTP_1588_CLOCK[2] todepends on PTP_1588_CLOCK. I'm not usingselect PTP_1588_CLOCKhere becausePTP_1588_CLOCKhas its own dependencies, whichselectwould not transitively apply.Additionally, remove the
select NET_PTP_CLASSIFYfromCPTS_TI_MOD;PTP_1588_CLOCKalready selects that.[1]: https://lore.kernel.org/lkml/[email protected]/
[2]:
NET_DSA_SJA1105_PTPhad never declared any type of dependency onPTP_1588_CLOCK(implyor otherwise); adding adepends on PTP_1588_CLOCKhere seems appropriate.Cc Arnd Bergmann <[email protected]>Cc Richard Cochran <[email protected]>Cc Nicolas Pitre <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Geert Uytterhoeven <[email protected]>Fixes d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")Signed-off-by Clay McClure <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 1 line
---
Could you drop this patch, pls?
it's not for stable and can cause build failures.
Signature · 2 lines
Best regards, grygorii
Greg Kroah-Hartman
maintainerPATCH 23/194 net_sched: fix tcm_parent in tc filter dump
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit a7df4870d79b00742da6cc93ca2f336a71db77f7 ]
When we tell kernel to dump filters from root (ffff:ffff), those filters on ingress (ffff:0000) are matched, but their true parents must be dumped as they are. However, kernel dumps just whatever we tell it, that is either ffff:ffff or ffff:0000:
$ nl-cls-list --dev=dummy0 --parent=root cls basic dev dummy0 id none parent root prio 49152 protocol ip match-all cls basic dev dummy0 id :1 parent root prio 49152 protocol ip match-all $ nl-cls-list --dev=dummy0 --parent=ffff: cls basic dev dummy0 id none parent ffff: prio 49152 protocol ip match-all cls basic dev dummy0 id :1 parent ffff: prio 49152 protocol ip match-all
This is confusing and misleading, more importantly this is a regression since 4.15, so the old behavior must be restored.
And, when tc filters are installed on a tc class, the parent should be the classid, rather than the qdisc handle. Commit edf6711c9840 ("net: sched: remove classid and q fields from tcf_proto") removed the classid we save for filters, we can just restore this classid in tcf_block.
Steps to reproduce this:
ip li set dev dummy0 up
tc qd add dev dummy0 ingress
tc filter add dev dummy0 parent ffff: protocol arp basic action pass tc filter show dev dummy0 root
Before this patch:
filter protocol arp pref 49152 basic
filter protocol arp pref 49152 basic handle 0x1
action order 1: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
After this patch:
filter parent ffff: protocol arp pref 49152 basic filter parent ffff: protocol arp pref 49152 basic handle 0x1
action order 1: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
--- include/net/sch_generic.h | 1 + net/sched/cls_api.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
include/net/sch_generic.h +1 -0
@@ -407,6 +407,7 @@ struct tcf_block {struct mutex lock;struct list_head chain_list;u32 index;/* block index for shared blocks */ +u32 classid;/* which class this block belongs to */ refcount_t refcnt;struct net *net;struct Qdisc *q;
net/sched/cls_api.c +4 -4
@@ -2005,6 +2005,7 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, err =PTR_ERR (block); goto errout; } + block->classid = parent; chain_index = tca[TCA_CHAIN ] ?nla_get_u32 (tca[TCA_CHAIN ]) :0 ;if (chain_index >TC_ACT_EXT_VAL_MASK ) {
@@ -2547,12 +2548,10 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)return skb->len; parent = tcm->tcm_parent; -if (!parent) { +if (!parent) q = dev->qdisc; - parent = q->handle; - }else { +else q =qdisc_lookup (dev,TC_H_MAJ (tcm->tcm_parent)); - }if (!q) goto out; cops = q->ops->cl_ops;
@@ -2568,6 +2567,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) block = cops->tcf_block (q, cl,NULL );if (!block) goto out; + parent = block->classid;if (tcf_block_shared (block)) q =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/194 net: Make PTP-specific drivers depend on PTP_1588_CLOCK
In reply to Greg Kroah-HartmanFrom: Clay McClure <[email protected]>
[ Upstream commit b6d49cab44b567b3e0a5544b3d61e516a7355fad ]
Commit d1cbfd771ce8 ("ptp_clock: Allow for it to be optional") changed all PTP-capable Ethernet drivers from select PTP_1588_CLOCK to imply PTP_1588_CLOCK, "in order to break the hard dependency between the PTP clock subsystem and ethernet drivers capable of being clock providers." As a result it is possible to build PTP-capable Ethernet drivers without the PTP subsystem by deselecting PTP_1588_CLOCK. Drivers are required to handle the missing dependency gracefully.
Some PTP-capable Ethernet drivers (e.g., TI_CPSW) factor their PTP code out into separate drivers (e.g., TI_CPTS_MOD). The above commit also changed these PTP-specific drivers to imply PTP_1588_CLOCK, making it possible to build them without the PTP subsystem. But as Grygorii Strashko noted in [1]:
Quoted 3 lines · Grygorii Strashko
Another question is that CPTS completely nonfunctional in this case and it was never expected that somebody will even try to use/run such configuration (except for random build purposes).
In my view, enabling a PTP-specific driver without the PTP subsystem is a configuration error made possible by the above commit. Kconfig should not allow users to create a configuration with missing dependencies that results in "completely nonfunctional" drivers.
I audited all network drivers that call ptp_clock_register() but merely imply PTP_1588_CLOCK and found five PTP-specific drivers that are likely nonfunctional without PTP_1588_CLOCK:
NET_DSA_MV88E6XXX_PTP
NET_DSA_SJA1105_PTP
MACB_USE_HWSTAMP
CAVIUM_PTP
TI_CPTS_MODNote how these symbols all reference PTP or timestamping in their name; this is a clue that they depend on PTP_1588_CLOCK.
Change them from imply PTP_1588_CLOCK [2] to depends on PTP_1588_CLOCK. I'm not using select PTP_1588_CLOCK here because PTP_1588_CLOCK has its own dependencies, which select would not transitively apply.
Additionally, remove the select NET_PTP_CLASSIFY from CPTS_TI_MOD; PTP_1588_CLOCK already selects that.
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: NET_DSA_SJA1105_PTP had never declared any type of dependency on PTP_1588_CLOCK (imply or otherwise); adding a depends on PTP_1588_CLOCK here seems appropriate.
--- drivers/net/dsa/mv88e6xxx/Kconfig | 2 +- drivers/net/dsa/sja1105/Kconfig | 1 + drivers/net/ethernet/cadence/Kconfig | 2 +- drivers/net/ethernet/cavium/Kconfig | 2 +- drivers/net/ethernet/ti/Kconfig | 3 +-- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/dsa/mv88e6xxx/Kconfig +1 -1
@@ -24,8 +24,8 @@ config NET_DSA_MV88E6XXX_PTP bool "PTP support for Marvell 88E6xxx" default n depends on NET_DSA_MV88E6XXX_GLOBAL2 + depends on PTP_1588_CLOCK imply NETWORK_PHY_TIMESTAMPING - imply PTP_1588_CLOCK help Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch chips that support it.
drivers/net/dsa/sja1105/Kconfig +1 -0
@@ -20,6 +20,7 @@ tristate "NXP SJA1105 Ethernet switch family support" config NET_DSA_SJA1105_PTP bool "Support for the PTP clock on the NXP SJA1105 Ethernet switch" depends on NET_DSA_SJA1105 + depends on PTP_1588_CLOCK help This enables support for timestamping and PTP clock manipulations in the SJA1105 DSA driver.
drivers/net/ethernet/cadence/Kconfig +1 -1
@@ -35,8 +35,8 @@ config MACB config MACB_USE_HWSTAMP bool "Use IEEE 1588 hwstamp" depends on MACB + depends on PTP_1588_CLOCK default y - imply PTP_1588_CLOCK ---help--- Enable IEEE 1588 Precision Time Protocol (PTP) support for MACB.
drivers/net/ethernet/cavium/Kconfig +1 -1
@@ -54,7 +54,7 @@ config THUNDER_NIC_RGX config CAVIUM_PTP tristate "Cavium PTP coprocessor as PTP clock" depends on 64BIT && PCI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK ---help--- This driver adds support for the Precision Time Protocol Clocks and Timestamping coprocessor (PTP) found on Cavium processors.
drivers/net/ethernet/ti/Kconfig +1 -2
@@ -89,9 +89,8 @@ config TI_CPTS config TI_CPTS_MOD tristate depends on TI_CPTS + depends on PTP_1588_CLOCK default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y - select NET_PTP_CLASSIFY - imply PTP_1588_CLOCK default m config TI_KEYSTONE_NETCP
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/194 kvm: nVMX: reflect MTF VM-exits if injected by L1
In reply to Greg Kroah-HartmanFrom: Oliver Upton <[email protected]>
[ Upstream commit b045ae906b42afb361dc7ecf1a3cea110fb0a65f ]
According to SDM 26.6.2, it is possible to inject an MTF VM-exit via the VM-entry interruption-information field regardless of the 'monitor trap flag' VM-execution control. KVM appropriately copies the VM-entry interruption-information field from vmcs12 to vmcs02. However, if L1 has not set the 'monitor trap flag' VM-execution control, KVM fails to reflect the subsequent MTF VM-exit into L1.
Fix this by consulting the VM-entry interruption-information field of vmcs12 to determine if L1 has injected the MTF VM-exit. If so, reflect the exit, regardless of the 'monitor trap flag' VM-execution control.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx/nested.c +18 -1
@@ -5504,6 +5504,23 @@ static bool nested_vmx_exit_handled_vmcs_access(struct kvm_vcpu *vcpu,return 1 & (b >> (field &7 )); } +static bool nested_vmx_exit_handled_mtf (struct vmcs12 *vmcs12) +{ +u32 entry_intr_info = vmcs12->vm_entry_intr_info_field; + +if (nested_cpu_has_mtf (vmcs12)) +return true; + +/* +* An MTF VM-exit may be injected into the guest by setting the +* interruption-type to 7 (other event) and the vector field to 0. Such +* is the case regardless of the 'monitor trap flag' VM-execution +* control. +*/ +return entry_intr_info == (INTR_INFO_VALID_MASK + |INTR_TYPE_OTHER_EVENT ); +} +/* * Return 1 if we should exit from L2 to L1 to handle an exit, or 0 if we * should handle it ourselves in L0 (and then continue L2). Only call this
@@ -5618,7 +5635,7 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason)case EXIT_REASON_MWAIT_INSTRUCTION :return nested_cpu_has (vmcs12,CPU_BASED_MWAIT_EXITING );case EXIT_REASON_MONITOR_TRAP_FLAG : -return nested_cpu_has_mtf (vmcs12); +return nested_vmx_exit_handled_mtf (vmcs12);case EXIT_REASON_MONITOR_INSTRUCTION :return nested_cpu_has (vmcs12,CPU_BASED_MONITOR_EXITING );case EXIT_REASON_PAUSE_INSTRUCTION :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/194 SUNRPC: Add "@len" parameter to gss_unwrap()
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 31c9590ae468478fe47dc0f5f0d3562b2f69450e ]
Refactor: This is a pre-requisite to fixing the client-side ralign computation in gss_unwrap_resp_priv().
The length value is passed in explicitly rather that as the value of buf->len. This will subsequently allow gss_unwrap_kerberos_v1() to compute a slack and align value, instead of computing it in gss_unwrap_resp_priv().
--- include/linux/sunrpc/gss_api.h | 2 ++ include/linux/sunrpc/gss_krb5.h | 6 +++--- net/sunrpc/auth_gss/auth_gss.c | 4 ++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 ++++---- net/sunrpc/auth_gss/gss_krb5_wrap.c | 26 +++++++++++++++----------- net/sunrpc/auth_gss/gss_mech_switch.c | 3 ++- net/sunrpc/auth_gss/svcauth_gss.c | 8 ++------ 7 files changed, 30 insertions(+), 27 deletions(-)
include/linux/sunrpc/gss_api.h +2 -0
@@ -66,6 +66,7 @@ u32 gss_wrap(u32 gss_unwrap (struct gss_ctx *ctx_id,int offset, +int len,struct xdr_buf *inbuf);u32 gss_delete_sec_context (struct gss_ctx **ctx_id);
@@ -126,6 +127,7 @@ struct gss_api_ops {u32 (*gss_unwrap)(struct gss_ctx *ctx_id,int offset, +int len,struct xdr_buf *buf);void (*gss_delete_sec_context)(void *internal_ctx_id);
include/linux/sunrpc/gss_krb5.h +3 -3
@@ -83,7 +83,7 @@ struct gss_krb5_enctype {u32 (*encrypt_v2) (struct krb5_ctx *kctx,u32 offset,struct xdr_buf *buf,struct page **pages);/* v2 encryption function */ -u32 (*decrypt_v2) (struct krb5_ctx *kctx,u32 offset, +u32 (*decrypt_v2) (struct krb5_ctx *kctx,u32 offset,u32 len,struct xdr_buf *buf,u32 *headskip,u32 *tailskip);/* v2 decryption function */ };
@@ -255,7 +255,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx_id, int offset, struct xdr_buf *outbuf, struct page **pages);u32 -gss_unwrap_kerberos (struct gss_ctx *ctx_id,int offset, +gss_unwrap_kerberos (struct gss_ctx *ctx_id,int offset,int len,struct xdr_buf *buf);
@@ -312,7 +312,7 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset, struct page **pages);u32 -gss_krb5_aes_decrypt (struct krb5_ctx *kctx,u32 offset, +gss_krb5_aes_decrypt (struct krb5_ctx *kctx,u32 offset,u32 len,struct xdr_buf *buf,u32 *plainoffset,u32 *plainlen);
net/sunrpc/auth_gss/auth_gss.c +2 -2
@@ -2041,9 +2041,9 @@ gss_unwrap_resp_priv(struct rpc_task *task, struct rpc_cred *cred, offset = (u8 *)(p) - (u8 *)head->iov_base;if (offset + opaque_len > rcv_buf->len) goto unwrap_failed; - rcv_buf->len = offset + opaque_len; - maj_stat =gss_unwrap (ctx->gc_gss_ctx, offset, rcv_buf); + maj_stat =gss_unwrap (ctx->gc_gss_ctx, offset, + offset + opaque_len, rcv_buf);if (maj_stat ==GSS_S_CONTEXT_EXPIRED )clear_bit (RPCAUTH_CRED_UPTODATE , &cred->cr_flags);if (maj_stat !=GSS_S_COMPLETE )
net/sunrpc/auth_gss/gss_krb5_crypto.c +4 -4
@@ -851,8 +851,8 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset, }u32 -gss_krb5_aes_decrypt (struct krb5_ctx *kctx,u32 offset,struct xdr_buf *buf, -u32 *headskip,u32 *tailskip) +gss_krb5_aes_decrypt (struct krb5_ctx *kctx,u32 offset,u32 len, +struct xdr_buf *buf,u32 *headskip,u32 *tailskip) {struct xdr_buf subbuf;u32 ret =0 ;
@@ -881,7 +881,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf,/* create a segment skipping the header and leaving out the checksum */ xdr_buf_subsegment (buf, &subbuf, offset +GSS_KRB5_TOK_HDR_LEN , - (buf->len - offset -GSS_KRB5_TOK_HDR_LEN - + (len - offset -GSS_KRB5_TOK_HDR_LEN - kctx->gk5e->cksumlength)); nblocks = (subbuf.len + blocksize -1 ) / blocksize;
@@ -926,7 +926,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, goto out_err;/* Get the packet's hmac value */ - ret =read_bytes_from_xdr_buf (buf, buf->len - kctx->gk5e->cksumlength, + ret =read_bytes_from_xdr_buf (buf, len - kctx->gk5e->cksumlength, pkt_hmac, kctx->gk5e->cksumlength);if (ret) goto out_err;
net/sunrpc/auth_gss/gss_krb5_wrap.c +15 -11
@@ -261,7 +261,8 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset, }static u32 -gss_unwrap_kerberos_v1 (struct krb5_ctx *kctx,int offset,struct xdr_buf *buf) +gss_unwrap_kerberos_v1 (struct krb5_ctx *kctx,int offset,int len, +struct xdr_buf *buf) {int signalg;int sealalg;
@@ -284,7 +285,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) ptr = (u8 *)buf->head[0 ].iov_base + offset;if (g_verify_token_header (&kctx->mech_used, &bodysize, &ptr, - buf->len - offset)) + len - offset))return GSS_S_DEFECTIVE_TOKEN ; if ((ptr[0] != ((KG_TOK_WRAP_MSG >> 8) & 0xff)) ||
@@ -324,6 +325,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) (!kctx->initiate && direction != 0))return GSS_S_BAD_SIG ; + buf->len = len;if (kctx->enctype ==ENCTYPE_ARCFOUR_HMAC ) {struct crypto_sync_skcipher *cipher;int err;
@@ -376,7 +378,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) data_len = (buf->head[0 ].iov_base + buf->head[0 ].iov_len) - data_start;memmove (orig_start, data_start, data_len); buf->head[0 ].iov_len -= (data_start - orig_start); - buf->len -= (data_start - orig_start); + buf->len = len - (data_start - orig_start);if (gss_krb5_remove_padding (buf, blocksize))return GSS_S_DEFECTIVE_TOKEN ;
@@ -486,7 +488,8 @@ gss_wrap_kerberos_v2(struct krb5_ctx *kctx, u32 offset, }static u32 -gss_unwrap_kerberos_v2 (struct krb5_ctx *kctx,int offset,struct xdr_buf *buf) +gss_unwrap_kerberos_v2 (struct krb5_ctx *kctx,int offset,int len, +struct xdr_buf *buf) {time64_t now;u8 *ptr;
@@ -532,7 +535,7 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)if (rrc !=0 )rotate_left (offset +16 , buf, rrc); - err = (*kctx->gk5e->decrypt_v2)(kctx, offset, buf, + err = (*kctx->gk5e->decrypt_v2)(kctx, offset, len, buf, &headskip, &tailskip);if (err)return GSS_S_FAILURE ;
@@ -542,7 +545,7 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)* it against the original */ err =read_bytes_from_xdr_buf (buf, - buf->len -GSS_KRB5_TOK_HDR_LEN - tailskip, + len -GSS_KRB5_TOK_HDR_LEN - tailskip, decrypted_hdr,GSS_KRB5_TOK_HDR_LEN );if (err) {dprintk ("%s: error %u getting decrypted_hdr\n" , __func__, err);
@@ -568,14 +571,14 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)* Note that buf->head[0].iov_len may indicate the available * head buffer space rather than that actually occupied. */ - movelen = min_t(unsigned int, buf->head[0].iov_len, buf->len); + movelen = min_t(unsigned int, buf->head[0].iov_len, len); movelen -= offset +GSS_KRB5_TOK_HDR_LEN + headskip;if (offset +GSS_KRB5_TOK_HDR_LEN + headskip + movelen > buf->head[0 ].iov_len)return GSS_S_FAILURE ;memmove (ptr, ptr +GSS_KRB5_TOK_HDR_LEN + headskip, movelen); buf->head[0 ].iov_len -=GSS_KRB5_TOK_HDR_LEN + headskip; - buf->len -=GSS_KRB5_TOK_HDR_LEN + headskip; + buf->len = len -GSS_KRB5_TOK_HDR_LEN + headskip;/* Trim off the trailing "extra count" and checksum blob */ buf->len -= ec +GSS_KRB5_TOK_HDR_LEN + tailskip;
@@ -603,7 +606,8 @@ gss_wrap_kerberos(struct gss_ctx *gctx, int offset, }u32 -gss_unwrap_kerberos (struct gss_ctx *gctx,int offset,struct xdr_buf *buf) +gss_unwrap_kerberos (struct gss_ctx *gctx,int offset, +int len,struct xdr_buf *buf) {struct krb5_ctx *kctx = gctx->internal_ctx_id;
@@ -613,9 +617,9 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)case ENCTYPE_DES_CBC_RAW :case ENCTYPE_DES3_CBC_RAW :case ENCTYPE_ARCFOUR_HMAC : -return gss_unwrap_kerberos_v1 (kctx, offset, buf); +return gss_unwrap_kerberos_v1 (kctx, offset, len, buf);case ENCTYPE_AES128_CTS_HMAC_SHA1_96 :case ENCTYPE_AES256_CTS_HMAC_SHA1_96 : -return gss_unwrap_kerberos_v2 (kctx, offset, buf); +return gss_unwrap_kerberos_v2 (kctx, offset, len, buf); } }
net/sunrpc/auth_gss/gss_mech_switch.c +2 -1
@@ -411,10 +411,11 @@ gss_wrap(struct gss_ctx *ctx_id,u32 gss_unwrap (struct gss_ctx *ctx_id,int offset, +int len,struct xdr_buf *buf) {return ctx_id->mech_type->gm_ops - ->gss_unwrap (ctx_id, offset, buf); + ->gss_unwrap (ctx_id, offset, len, buf); }
net/sunrpc/auth_gss/svcauth_gss.c +2 -6
@@ -928,7 +928,7 @@ static int unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx) { u32 priv_len, maj_stat; -int pad, saved_len, remaining_len, offset; +int pad, remaining_len, offset;clear_bit (RQ_SPLICE_OK , &rqstp->rq_flags);
@@ -948,12 +948,8 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs buf->len -= pad;fix_priv_head (buf, pad); -/* Maybe it would be better to give gss_unwrap a length parameter: */ - saved_len = buf->len; - buf->len = priv_len; - maj_stat =gss_unwrap (ctx,0 , buf); + maj_stat =gss_unwrap (ctx,0 , priv_len, buf); pad = priv_len - buf->len; - buf->len = saved_len; buf->len -= pad;/* The upper layers assume the buffer is aligned on 4-byte boundaries. * In the krb5p case, at least, the data ends up offset, so we need to
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/194 SUNRPC: Fix GSS privacy computation of auth->au_ralign
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit a7e429a6fa6d612d1dacde96c885dc1bb4a9f400 ]
When the au_ralign field was added to gss_unwrap_resp_priv, the wrong calculation was used. Setting au_rslack == au_ralign is probably correct for kerberos_v1 privacy, but kerberos_v2 privacy adds additional GSS data after the clear text RPC message. au_ralign needs to be smaller than au_rslack in that fairly common case.
When xdr_buf_trim() is restored to gss_unwrap_kerberos_v2(), it does exactly what I feared it would: it trims off part of the clear text RPC message. However, that's because rpc_prepare_reply_pages() does not set up the rq_rcv_buf's tail correctly because au_ralign is too large.
Fixing the au_ralign computation also corrects the alignment of rq_rcv_buf->pages so that the client does not have to shift reply data payloads after they are received.
--- include/linux/sunrpc/gss_api.h | 1 + net/sunrpc/auth_gss/auth_gss.c | 8 +++----- net/sunrpc/auth_gss/gss_krb5_wrap.c | 19 +++++++++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-)
include/linux/sunrpc/gss_api.h +1 -0
@@ -21,6 +21,7 @@struct gss_ctx {struct gss_api_mech *mech_type;void *internal_ctx_id; +unsigned int slack, align; };#define GSS_C_NO_BUFFER ((struct xdr_netobj) 0)
net/sunrpc/auth_gss/auth_gss.c +3 -5
@@ -2030,7 +2030,6 @@ gss_unwrap_resp_priv(struct rpc_task *task, struct rpc_cred *cred,struct xdr_buf *rcv_buf = &rqstp->rq_rcv_buf;struct kvec *head = rqstp->rq_rcv_buf.head;struct rpc_auth *auth = cred->cr_auth; -unsigned int savedlen = rcv_buf->len;u32 offset, opaque_len, maj_stat;__be32 *p;
@@ -2057,10 +2056,9 @@ gss_unwrap_resp_priv(struct rpc_task *task, struct rpc_cred *cred,*/ xdr_init_decode (xdr, rcv_buf, p, rqstp); - auth->au_rslack = auth->au_verfsize +2 + -XDR_QUADLEN (savedlen - rcv_buf->len); - auth->au_ralign = auth->au_verfsize +2 + -XDR_QUADLEN (savedlen - rcv_buf->len); + auth->au_rslack = auth->au_verfsize +2 + ctx->gc_gss_ctx->slack; + auth->au_ralign = auth->au_verfsize +2 + ctx->gc_gss_ctx->align; +return 0 ; unwrap_failed:trace_rpcgss_unwrap_failed (task);
net/sunrpc/auth_gss/gss_krb5_wrap.c +15 -4
@@ -262,7 +262,8 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,static u32 gss_unwrap_kerberos_v1 (struct krb5_ctx *kctx,int offset,int len, -struct xdr_buf *buf) +struct xdr_buf *buf,unsigned int *slack, +unsigned int *align) {int signalg;int sealalg;
@@ -280,6 +281,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, int len,u32 conflen = kctx->gk5e->conflen;int crypt_offset;u8 *cksumkey; +unsigned int saved_len = buf->len;dprintk ("RPC: gss_unwrap_kerberos\n" );
@@ -383,6 +385,10 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, int len,if (gss_krb5_remove_padding (buf, blocksize))return GSS_S_DEFECTIVE_TOKEN ; +/* slack must include room for krb5 padding */ + *slack =XDR_QUADLEN (saved_len - buf->len); +/* The GSS blob always precedes the RPC message payload */ + *align = *slack;return GSS_S_COMPLETE ; }
@@ -489,7 +495,8 @@ gss_wrap_kerberos_v2(struct krb5_ctx *kctx, u32 offset,static u32 gss_unwrap_kerberos_v2 (struct krb5_ctx *kctx,int offset,int len, -struct xdr_buf *buf) +struct xdr_buf *buf,unsigned int *slack, +unsigned int *align) {time64_t now;u8 *ptr;
@@ -583,6 +590,8 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, int len,/* Trim off the trailing "extra count" and checksum blob */ buf->len -= ec +GSS_KRB5_TOK_HDR_LEN + tailskip; + *align =XDR_QUADLEN (GSS_KRB5_TOK_HDR_LEN + headskip); + *slack = *align +XDR_QUADLEN (ec +GSS_KRB5_TOK_HDR_LEN + tailskip);return GSS_S_COMPLETE ; }
@@ -617,9 +626,11 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset,case ENCTYPE_DES_CBC_RAW :case ENCTYPE_DES3_CBC_RAW :case ENCTYPE_ARCFOUR_HMAC : -return gss_unwrap_kerberos_v1 (kctx, offset, len, buf); +return gss_unwrap_kerberos_v1 (kctx, offset, len, buf, + &gctx->slack, &gctx->align);case ENCTYPE_AES128_CTS_HMAC_SHA1_96 :case ENCTYPE_AES256_CTS_HMAC_SHA1_96 : -return gss_unwrap_kerberos_v2 (kctx, offset, len, buf); +return gss_unwrap_kerberos_v2 (kctx, offset, len, buf, + &gctx->slack, &gctx->align); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerRe: [PATCH 5.6 019/194] net: Make PTP-specific drivers depend on PTP_1588_CLOCK
In reply to Grygorii StrashkoQuoted 69 lines · Grygorii Strashko
Hi Greg,
Quoted 64 lines · Greg Kroah-Hartman
From: Clay McClure <[email protected]>
[ Upstream commit
b6d49cab44b567b3e0a5544b3d61e516a7355fad]Commit
d1cbfd771ce8("ptp_clock: Allow for it to be optional") changed all PTP-capable Ethernet drivers fromselect PTP_1588_CLOCKtoimply PTP_1588_CLOCK, "in order to break the hard dependency between the PTP clock subsystem and ethernet drivers capable of being clock providers." As a result it is possible to build PTP-capable Ethernet drivers without the PTP subsystem by deselectingPTP_1588_CLOCK. Drivers are required to handle the missing dependency gracefully.Some PTP-capable Ethernet drivers (e.g.,
TI_CPSW) factor their PTP code out into separate drivers (e.g.,TI_CPTS_MOD). The above commit also changed these PTP-specific drivers toimply PTP_1588_CLOCK, making it possible to build them without the PTP subsystem. But as Grygorii Strashko noted in [1]:Quoted 3 lines · Grygorii Strashko
Another question is that CPTS completely nonfunctional in this case and it was never expected that somebody will even try to use/run such configuration (except for random build purposes).
In my view, enabling a PTP-specific driver without the PTP subsystem is a configuration error made possible by the above commit.
Kconfigshould not allow users to create a configuration with missing dependencies that results in "completely nonfunctional" drivers.I audited all network drivers that call
ptp_clock_register()but merelyimply PTP_1588_CLOCKand found five PTP-specific drivers that are likely nonfunctional withoutPTP_1588_CLOCK:NET_DSA_MV88E6XXX_PTP NET_DSA_SJA1105_PTP MACB_USE_HWSTAMP CAVIUM_PTP TI_CPTS_MODNote how these symbols all reference PTP or timestamping in their name; this is a clue that they depend on
PTP_1588_CLOCK.Change them from
imply PTP_1588_CLOCK[2] todepends on PTP_1588_CLOCK. I'm not usingselect PTP_1588_CLOCKhere becausePTP_1588_CLOCKhas its own dependencies, whichselectwould not transitively apply.Additionally, remove the
select NET_PTP_CLASSIFYfromCPTS_TI_MOD;PTP_1588_CLOCKalready selects that.[1]: https://lore.kernel.org/lkml/[email protected]/
[2]:
NET_DSA_SJA1105_PTPhad never declared any type of dependency onPTP_1588_CLOCK(implyor otherwise); adding adepends on PTP_1588_CLOCKhere seems appropriate.Cc Arnd Bergmann <[email protected]>Cc Richard Cochran <[email protected]>Cc Nicolas Pitre <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Geert Uytterhoeven <[email protected]>Fixes d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")Signed-off-by Clay McClure <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 1 line
---
Quoted 2 lines
Could you drop this patch, pls?
it's not for stable and can cause build failures.
My bad - now dropped. Sorry!
Signature · 2 lines
Thanks, Sasha
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +0000. Anything received after that time might be too late.
Quick feedback:
You also need to pull in commit 92db978f0d68 ("net: ethernet: ti: Remove TI_CPTS_MOD workaround") which fixes commit b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK"). This is necessary to avoid various compile errors (see below).
Guenter
---
Building arm:omap2plus_defconfig ... failed
--------------
Error log:
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':drivers/net/ethernet/ti/cpsw.c:886: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_remove':drivers/net/ethernet/ti/cpsw.c:1741: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_rx_handler':drivers/net/ethernet/ti/cpsw.c:437: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_open':drivers/net/ethernet/ti/cpsw.c:840: undefined reference to `cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_probe':drivers/net/ethernet/ti/cpsw.c:1716: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x34): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x194): undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x350): undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0xb20): undefined reference to `cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o: in function `cpsw_tx_handler':drivers/net/ethernet/ti/cpsw_priv.c:68: undefined reference to `cpts_tx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o: in function `cpsw_init_common':drivers/net/ethernet/ti/cpsw_priv.c:525: undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o:(.debug_addr+0xa38): undefined reference to `cpts_tx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o:(.debug_addr+0xc90): undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_ndo_stop':drivers/net/ethernet/ti/cpsw_new.c:814: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_remove':drivers/net/ethernet/ti/cpsw_new.c:2028: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_rx_handler':drivers/net/ethernet/ti/cpsw_new.c:379: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_probe':drivers/net/ethernet/ti/cpsw_new.c:2004: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_ndo_open':drivers/net/ethernet/ti/cpsw_new.c:874: undefined reference to `cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x38): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x158): undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x2c4): undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0xa60): undefined reference to `cpts_register' make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
--------------
Building arm:keystone_defconfig ... failed
--------------
Error log:
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_rxtstamp':drivers/net/ethernet/ti/netcp_ethss.c:2595: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_probe':drivers/net/ethernet/ti/netcp_ethss.c:3719: undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_remove':drivers/net/ethernet/ti/netcp_ethss.c:3812: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_unregister_cpts':drivers/net/ethernet/ti/netcp_ethss.c:2731: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_register_cpts':drivers/net/ethernet/ti/netcp_ethss.c:2714: undefined reference to `cpts_register' make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +0000. Anything received after that time might be too late.
Quick feedback:
You also need to pull in commit 92db978f0d68 ("net: ethernet: ti: Remove TI_CPTS_MOD workaround") which fixes commit b6d49cab44b5 ("net: Make PTP-specific drivers depend on PTP_1588_CLOCK"). This is necessary to avoid compile errors.
Guenter
---
Building arm:omap2plus_defconfig ... failed
--------------
Error log:
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_stop':drivers/net/ethernet/ti/cpsw.c:886: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_remove':drivers/net/ethernet/ti/cpsw.c:1741: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_rx_handler':drivers/net/ethernet/ti/cpsw.c:437: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_ndo_open':drivers/net/ethernet/ti/cpsw.c:840: undefined reference to `cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o: in function `cpsw_probe':drivers/net/ethernet/ti/cpsw.c:1716: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x34): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x194): undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0x350): undefined reference to cpts_rx_timestamp' arm-linkkkkkkkkkkkkkkux-gnueabi-ld: drivers/net/ethernet/ti/cpsw.o:(.debug_addr+0xb20): undefined reference to cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o: in function `cpsw_tx_handler':drivers/net/ethernet/ti/cpsw_priv.c:68: undefined reference to `cpts_tx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o: in function `cpsw_init_common':drivers/net/ethernet/ti/cpsw_priv.c:525: undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o:(.debug_addr+0xa38): undefined reference to `cpts_tx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_priv.o:(.debug_addr+0xc90): undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_ndo_stop':drivers/net/ethernet/ti/cpsw_new.c:814: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_remove':drivers/net/ethernet/ti/cpsw_new.c:2028: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_rx_handler':drivers/net/ethernet/ti/cpsw_new.c:379: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_probe':drivers/net/ethernet/ti/cpsw_new.c:2004: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o: in function `cpsw_ndo_open':drivers/net/ethernet/ti/cpsw_new.c:874: undefined reference to `cpts_register'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x38): undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x158): undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0x2c4): undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/cpsw_new.o:(.debug_addr+0xa60): undefined reference to `cpts_register' make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
--------------
Building arm:keystone_defconfig ... failed
--------------
Error log:
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_rxtstamp':drivers/net/ethernet/ti/netcp_ethss.c:2595: undefined reference to `cpts_rx_timestamp'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_probe':drivers/net/ethernet/ti/netcp_ethss.c:3719: undefined reference to `cpts_create'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_remove':drivers/net/ethernet/ti/netcp_ethss.c:3812: undefined reference to `cpts_release'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_unregister_cpts':drivers/net/ethernet/ti/netcp_ethss.c:2731: undefined reference to `cpts_unregister'
arm-linux-gnueabi-ld: drivers/net/ethernet/ti/netcp_ethss.o: in function `gbe_register_cpts':drivers/net/ethernet/ti/netcp_ethss.c:2714: undefined reference to `cpts_register' make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
Greg Kroah-Hartman
maintainerQuoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +0000. Anything received after that time might be too late.
Quoted 5 lines
Quick feedback:
You also need to pull in commit
92db978f0d68("net: ethernet: ti: RemoveTI_CPTS_MODworkaround") which fixes commitb6d49cab44b5("net: Make PTP-specific drivers depend onPTP_1588_CLOCK"). This is necessary to avoid compile errors.
Sasha has now dropped that original patch, so we should be fine. I'll push out a -rc2 soon with that change.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 5.6 061/194] drm/amdgpu: bump version for invalidate L2 before SDMA IBs
In reply to a message not in the archiveQuoted 5 lines · Marek
[AMD Official Use Only - Internal Distribution Only]
Hi Greg,
I disagree with this. Bumping the driver version will have implications on other new features, because it's like an ABI barrier exposing new functionality.
And yet another reason why driver versions are a total mess and shouldn't be in in-kernel drivers :(
Ugh.
I'll go drop this, thanks.
greg k-h
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +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.6.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.6.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.6:
13 builds: 13 pass, 0 fail
26 boots: 26 pass, 0 fail
42 tests: 42 pass, 0 failLinux version: 5.6.14-rc2-g67346f550ad8
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Greg Kroah-Hartman
maintainerQuoted 27 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +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.6.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.6.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.6:
13 builds: 13 pass, 0 fail 26 boots: 26 pass, 0 fail 42 tests: 42 pass, 0 fail
Quoted 5 lines
Linux version: 5.6.14-rc2-g67346f550ad8
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04
Wonderful, thanks for testing all of these and letting me know.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.6.14 release. There are 194 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 Wed, 20 May 2020 17:32:42 +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.6.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.6.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions. I see rc2, I will test that and let you know the results.
thanks,
-- Shuah