5.15.27-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 12/262 cifs: do not use uninitialized data in the owner/group sid
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit 26d3dadebbcbddfaf1d9caad42527a28a0ed28d8 ]
When idsfromsid is used we create a special SID for owner/group. This structure must be initialized or else the first 5 bytes of the Authority field of the SID will contain uninitialized data and thus not be a valid SID.
--- fs/cifs/cifsacl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/cifsacl.c +2 -2
@@ -1297,7 +1297,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,if (uid_valid (uid)) {/* chown */ uid_t id; - nowner_sid_ptr =kmalloc (sizeof (struct cifs_sid ), + nowner_sid_ptr =kzalloc (sizeof (struct cifs_sid ),GFP_KERNEL );if (!nowner_sid_ptr) { rc = -ENOMEM ;
@@ -1326,7 +1326,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, }if (gid_valid (gid)) {/* chgrp */ gid_t id; - ngroup_sid_ptr =kmalloc (sizeof (struct cifs_sid ), + ngroup_sid_ptr =kzalloc (sizeof (struct cifs_sid ),GFP_KERNEL );if (!ngroup_sid_ptr) { rc = -ENOMEM ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 46/262 tools/resolve_btf_ids: Close ELF file on error
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 1144ab9bdf3430e1b5b3f22741e5283841951add ]
Fix one case where we don't do explicit clean up.
--- tools/bpf/resolve_btfids/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/bpf/resolve_btfids/main.c +3 -2
@@ -166,7 +166,7 @@ static struct btf_id *btf_id__find(struct rb_root *root, const char *name)return NULL ; } -static struct btf_id * +static struct btf_id *btf_id__add (struct rb_root *root,char *name,bool unique) {struct rb_node **p = &root->rb_node;
@@ -720,7 +720,8 @@ int main(int argc, const char **argv)if (no_fail)return 0 ;pr_err ("FAILED to find needed sections\n" ); -return -1 ; + err =0 ; + goto out; }if (symbols_collect (&obj))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 47/262 mtd: spi-nor: Fix mtd size for s3an flashes
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
[ Upstream commit f656b419d41aabafb6b526abc3988dfbf2e5c1ba ]
As it was before the blamed commit, s3an_nor_scan() was called after mtd size was set with params->size, and it overwrote the mtd size value with '8 * nor->page_size * nor->info->n_sectors' when XSR_PAGESIZE was set. With the introduction of s3an_post_sfdp_fixups(), we missed to update the mtd size for the s3an flashes. Fix the mtd size by updating both nor->params->size, (which will update the mtd_info size later on) and nor->mtd.size (which is used in spi_nor_set_addr_width()).
--- drivers/mtd/spi-nor/xilinx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/xilinx.c +2 -1
@@ -66,7 +66,8 @@ static int xilinx_nor_setup(struct spi_nor *nor,/* Flash in Power of 2 mode */ nor->page_size = (nor->page_size ==264 ) ?256 :512 ; nor->mtd.writebufsize = nor->page_size; - nor->mtd.size =8 * nor->page_size * nor->info->n_sectors; + nor->params->size =8 * nor->page_size * nor->info->n_sectors; + nor->mtd.size = nor->params->size; nor->mtd.erasesize =8 * nor->page_size; }else {/* Flash in Default addressing mode */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 26/262 block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
In reply to Greg Kroah-HartmanFrom: Haimin Zhang <[email protected]>
[ Upstream commit cc8f7fe1f5eab010191aa4570f27641876fa1267 ]
Add __GFP_ZERO flag for alloc_page in function bio_copy_kern to initialize the buffer of a bio.
--- block/blk-map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-map.c +1 -1
@@ -446,7 +446,7 @@ static struct bio *bio_copy_kern(struct request_queue *q, void *data,if (bytes > len) bytes = len; - page =alloc_page (GFP_NOIO | gfp_mask); + page =alloc_page (GFP_NOIO | __GFP_ZERO | gfp_mask);if (!page) goto cleanup;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 64/262 Input: ti_am335x_tsc - set ADCREFM for X configuration
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 73cca71a903202cddc8279fc76b2da4995da5bea ]
As reported by the STEPCONFIG[1-16] registered field descriptions of the TI reference manual, for the ADC "in single ended, SEL_INM_SWC_3_0 must be 1xxx".
Unlike the Y and Z coordinates, this bit has not been set for the step configuration registers used to sample the X coordinate.
--- drivers/input/touchscreen/ti_am335x_tsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +2 -1
@@ -131,7 +131,8 @@ static void titsc_step_config(struct titsc *ts_dev)u32 stepenable; config =STEPCONFIG_MODE_HWSYNC | -STEPCONFIG_AVG_16 | ts_dev->bit_xp; +STEPCONFIG_AVG_16 | ts_dev->bit_xp | +STEPCONFIG_INM_ADCREFM ;switch (ts_dev->wires) {case 4 : config |=STEPCONFIG_INP (ts_dev->inp_yp) | ts_dev->bit_xn;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 106/262 octeontx2-af: cn10k: RPM hardware timestamp configuration
In reply to Greg Kroah-HartmanFrom: Hariprasad Kelam <[email protected]>
[ Upstream commit d1489208681dfe432609fdaa49b160219c6e221c ]
MAC on CN10K support hardware timestamping such that 8 bytes addition header is prepended to incoming packets. This patch does necessary configuration to enable Hardware time stamping upon receiving request from PF netdev interfaces.
Timestamp configuration is different on MAC (CGX) Octeontx2 silicon and MAC (RPM) OcteonTX3 CN10k. Based on silicon variant appropriate fn() pointer is called. Refactor MAC specific mbox messages to remove unnecessary gaps in mboxids.
--- .../net/ethernet/marvell/octeontx2/af/cgx.c | 10 ++--- .../marvell/octeontx2/af/lmac_common.h | 5 +++ .../net/ethernet/marvell/octeontx2/af/mbox.h | 41 ++++++++++--------- .../net/ethernet/marvell/octeontx2/af/rpm.c | 17 ++++++++ .../net/ethernet/marvell/octeontx2/af/rpm.h | 3 ++ .../ethernet/marvell/octeontx2/af/rvu_cgx.c | 4 +- .../ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- 7 files changed, 58 insertions(+), 26 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +5 -5
@@ -838,9 +838,6 @@ void cgx_lmac_ptp_config(void *cgxd, int lmac_id, bool enable)if (!cgx)return ; -if (is_dev_rpm (cgx)) -return ; -if (enable) {/* Enable inbound PTP timestamping */ cfg =cgx_read (cgx, lmac_id,CGXX_GMP_GMI_RXX_FRM_CTL );
@@ -1545,9 +1542,11 @@ static int cgx_lmac_exit(struct cgx *cgx)static void cgx_populate_features (struct cgx *cgx) {if (is_dev_rpm (cgx)) - cgx->hw_features = (RVU_MAC_RPM |RVU_LMAC_FEAT_FC ); + cgx->hw_features = (RVU_LMAC_FEAT_DMACF |RVU_MAC_RPM | +RVU_LMAC_FEAT_FC |RVU_LMAC_FEAT_PTP );else - cgx->hw_features = (RVU_LMAC_FEAT_FC |RVU_LMAC_FEAT_PTP ); + cgx->hw_features = (RVU_LMAC_FEAT_FC |RVU_LMAC_FEAT_HIGIG2 | +RVU_LMAC_FEAT_PTP |RVU_LMAC_FEAT_DMACF ); }static struct mac_ops cgx_mac_ops = {
@@ -1571,6 +1570,7 @@ static struct mac_ops cgx_mac_ops = { .mac_get_pause_frm_status = cgx_lmac_get_pause_frm_status, .mac_enadis_pause_frm = cgx_lmac_enadis_pause_frm, .mac_pause_frm_config = cgx_lmac_pause_frm_config, + .mac_enadis_ptp_config = cgx_lmac_ptp_config, };static int cgx_probe (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h +5 -0
@@ -102,6 +102,11 @@ struct mac_ops {void (*mac_pause_frm_config)(void *cgxd,int lmac_id,bool enable); + +/* Enable/Disable Inbound PTP */ +void (*mac_enadis_ptp_config)(void *cgxd, +int lmac_id, +bool enable); };struct cgx {
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +22 -19
55 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +17 -0
@@ -29,6 +29,7 @@ static struct mac_ops rpm_mac_ops = { .mac_get_pause_frm_status = rpm_lmac_get_pause_frm_status, .mac_enadis_pause_frm = rpm_lmac_enadis_pause_frm, .mac_pause_frm_config = rpm_lmac_pause_frm_config, + .mac_enadis_ptp_config = rpm_lmac_ptp_config, };struct mac_ops *rpm_get_mac_ops (void )
@@ -267,3 +268,19 @@ int rpm_lmac_internal_loopback(void *rpmd, int lmac_id, bool enable)return 0 ; } + +void rpm_lmac_ptp_config (void *rpmd,int lmac_id,bool enable) +{ +rpm_t *rpm = rpmd; +u64 cfg; + +if (!is_lmac_valid (rpm, lmac_id)) +return ; + + cfg =rpm_read (rpm, lmac_id,RPMX_CMRX_CFG ); +if (enable) + cfg |=RPMX_RX_TS_PREPEND ; +else + cfg &= ~RPMX_RX_TS_PREPEND ; +rpm_write (rpm, lmac_id,RPMX_CMRX_CFG , cfg); +}
drivers/net/ethernet/marvell/octeontx2/af/rpm.h +3 -0
@@ -14,6 +14,8 @@#define PCI_DEVID_CN10K_RPM 0xA060/* Registers */ +#define RPMX_CMRX_CFG 0x00 +#define RPMX_RX_TS_PREPEND BIT_ULL(22)#define RPMX_CMRX_SW_INT 0x180#define RPMX_CMRX_SW_INT_W1S 0x188#define RPMX_CMRX_SW_INT_ENA_W1S 0x198
@@ -54,4 +56,5 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause);int rpm_get_tx_stats (void *rpmd,int lmac_id,int idx,u64 *tx_stat);int rpm_get_rx_stats (void *rpmd,int lmac_id,int idx,u64 *rx_stat); +void rpm_lmac_ptp_config (void *rpmd,int lmac_id,bool enable);#endif /* RPM_H */
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +3 -1
@@ -696,6 +696,7 @@ static int rvu_cgx_ptp_rx_cfg(struct rvu *rvu, u16 pcifunc, bool enable) {struct rvu_pfvf *pfvf =rvu_get_pfvf (rvu, pcifunc);int pf =rvu_get_pf (pcifunc); +struct mac_ops *mac_ops;u8 cgx_id, lmac_id;void *cgxd;
@@ -712,7 +713,8 @@ static int rvu_cgx_ptp_rx_cfg(struct rvu *rvu, u16 pcifunc, bool enable)rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); cgxd =rvu_cgx_pdata (cgx_id, rvu); -cgx_lmac_ptp_config (cgxd, lmac_id, enable); + mac_ops =get_mac_ops (cgxd); + mac_ops->mac_enadis_ptp_config (cgxd, lmac_id, true);/* If PTP is enabled then inform NPC that packets to be * parsed by this PF will have their data shifted by 8 bytes * and if PTP is disabled then no shift is required
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +3 -1
@@ -4520,6 +4520,7 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int nixlf)struct rvu_pfvf *pfvf =rvu_get_pfvf (rvu, pcifunc);struct hwctx_disable_req ctx_req;int pf =rvu_get_pf (pcifunc); +struct mac_ops *mac_ops;u8 cgx_id, lmac_id;void *cgxd;int err;
@@ -4566,7 +4567,8 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int nixlf)if (pfvf->hw_rx_tstamp_en) {rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); cgxd =rvu_cgx_pdata (cgx_id, rvu); -cgx_lmac_ptp_config (cgxd, lmac_id, false); + mac_ops =get_mac_ops (cgxd); + mac_ops->mac_enadis_ptp_config (cgxd, lmac_id, false);/* Undo NPC config done for PTP */ if (npc_config_ts_kpuaction (rvu, pf, pcifunc, false))dev_err (rvu->dev,"NPC config for PTP failed\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 32/262 arm64: Mark start_backtrace() notrace and NOKPROBE_SYMBOL
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 1e0924bd09916fab795fc2a21ec1d148f24299fd ]
Mark the start_backtrace() as notrace and NOKPROBE_SYMBOL because this function is called from ftrace and lockdep to get the caller address via return_address(). The lockdep is used in kprobes, it should also be NOKPROBE_SYMBOL.
--- arch/arm64/kernel/stacktrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/kernel/stacktrace.c +2 -1
@@ -33,7 +33,7 @@*/ -void start_backtrace (struct stackframe *frame,unsigned long fp, +notrace void start_backtrace(struct stackframe *frame, unsigned long fp,unsigned long pc) { frame->fp = fp;
@@ -55,6 +55,7 @@ void start_backtrace(struct stackframe *frame, unsigned long fp, frame->prev_fp =0 ; frame->prev_type =STACK_TYPE_UNKNOWN ; } +NOKPROBE_SYMBOL (start_backtrace);/* * Unwind from one frame record (A) to the next frame record (B).
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 105/262 octeontx2-af: Reset PTP config in FLR handler
In reply to Greg Kroah-HartmanFrom: Harman Kalra <[email protected]>
[ Upstream commit e37e08fffc373206ad4e905c05729ea6bbdcb22c ]
Upon receiving ptp config request from netdev interface , Octeontx2 MAC block CGX is configured to append timestamp to every incoming packet and NPC config is updated with DMAC offset change.
Currently this configuration is not reset in FLR handler. This patch resets the same.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 3 +++ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
@@ -220,6 +220,7 @@ struct rvu_pfvf {u16 maxlen;u16 minlen; +bool hw_rx_tstamp_en;/* Is rx_tstamp enabled */ u8 mac_addr[ETH_ALEN ];/* MAC address of this PF/VF */ u8 default_mac[ETH_ALEN ];/* MAC address from FWdata */
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +3 -0
@@ -694,6 +694,7 @@ int rvu_mbox_handler_cgx_promisc_disable(struct rvu *rvu, struct msg_req *req,static int rvu_cgx_ptp_rx_cfg (struct rvu *rvu,u16 pcifunc,bool enable) { +struct rvu_pfvf *pfvf =rvu_get_pfvf (rvu, pcifunc);int pf =rvu_get_pf (pcifunc);u8 cgx_id, lmac_id;void *cgxd;
@@ -718,6 +719,8 @@ static int rvu_cgx_ptp_rx_cfg(struct rvu *rvu, u16 pcifunc, bool enable)*/ if (npc_config_ts_kpuaction (rvu, pf, pcifunc, enable))return -EINVAL ; +/* This flag is required to clean up CGX conf if app gets killed */ + pfvf->hw_rx_tstamp_en = enable;return 0 ; }
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +14 -0
@@ -4519,6 +4519,9 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int nixlf) {struct rvu_pfvf *pfvf =rvu_get_pfvf (rvu, pcifunc);struct hwctx_disable_req ctx_req; +int pf =rvu_get_pf (pcifunc); +u8 cgx_id, lmac_id; +void *cgxd;int err; ctx_req.hdr.pcifunc = pcifunc;
@@ -4559,6 +4562,17 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int nixlf)rvu_npc_set_parse_mode (rvu, pcifunc,OTX2_PRIV_FLAGS_DEFAULT , (PKIND_TX |PKIND_RX ),0 ,0 ,0 ,0 ); +/* Disabling CGX and NPC config done for PTP */ +if (pfvf->hw_rx_tstamp_en) { +rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); + cgxd =rvu_cgx_pdata (cgx_id, rvu); +cgx_lmac_ptp_config (cgxd, lmac_id, false); +/* Undo NPC config done for PTP */ +if (npc_config_ts_kpuaction (rvu, pf, pcifunc, false)) +dev_err (rvu->dev,"NPC config for PTP failed\n" ); + pfvf->hw_rx_tstamp_en = false; + } +nix_ctx_free (rvu, pfvf);nix_free_all_bandprof (rvu, pcifunc);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 20/262 selftests/ftrace: Do not trace do_softirq because of PREEMPT_RT
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 6fec1ab67f8d60704cc7de64abcfd389ab131542 ]
The PREEMPT_RT patchset does not use do_softirq() function thus trying to filter for do_softirq fails for such kernel:
echo do_softirq
ftracetest: 81: echo: echo: I/O error
Choose some other visible function for the test. The function does not have to be actually executed during the test, because it is only testing filter API interface.
--- .../selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc +1 -1
@@ -19,7 +19,7 @@ fail() { # mesg FILTER=set_ftrace_filter FUNC1="schedule" -FUNC2="do_softirq" +FUNC2="scheduler_tick" ALL_FUNCS="#### all functions enabled ####"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 3/262 i2c: bcm2835: Avoid clock stretching timeouts
In reply to Greg Kroah-HartmanFrom: Eric Anholt <[email protected]>
[ Upstream commit 9495b9b31abe525ebd93da58de2c88b9f66d3a0e ]
The CLKT register contains at poweron 0x40, which at our typical 100kHz bus rate means .64ms. But there is no specified limit to how long devices should be able to stretch the clocks, so just disable the timeout. We still have a timeout wrapping the entire transfer.
--- drivers/i2c/busses/i2c-bcm2835.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/i2c/busses/i2c-bcm2835.c +11 -0
@@ -23,6 +23,11 @@#define BCM2835_I2C_FIFO 0x10#define BCM2835_I2C_DIV 0x14#define BCM2835_I2C_DEL 0x18 +/* +* 16-bit field for the number of SCL cycles to wait after rising SCL +* before deciding the slave is not responding. 0 disables the +* timeout detection. +*/ #define BCM2835_I2C_CLKT 0x1c#define BCM2835_I2C_C_READ BIT(0)
@@ -477,6 +482,12 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) adap->dev.of_node = pdev->dev.of_node; adap->quirks =of_device_get_match_data (&pdev->dev); +/* +* Disable the hardware clock stretching timeout. SMBUS +* specifies a limit for how long the device can stretch the +* clock, but core I2C doesn't. +*/ +bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_CLKT ,0 );bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_C ,0 ); ret =i2c_add_adapter (adap);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 22/262 i2c: cadence: allow COMPILE_TEST
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 0b0dcb3882c8f08bdeafa03adb4487e104d26050 ]
Driver builds fine with COMPILE_TEST. Enable it for wider test coverage and easier maintenance.
--- drivers/i2c/busses/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +1 -1
@@ -488,7 +488,7 @@ config I2C_BRCMSTB config I2C_CADENCE tristate "Cadence I2C Controller" - depends on ARCH_ZYNQ || ARM64 || XTENSA + depends on ARCH_ZYNQ || ARM64 || XTENSA || COMPILE_TEST help Say yes here to select Cadence I2C Host Controller. This controller is e.g. used by Xilinx Zynq.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 34/262 ext4: drop ineligible txn start stop APIs
In reply to Greg Kroah-HartmanFrom: Harshad Shirwadkar <[email protected]>
[ Upstream commit 7bbbe241ec7ce0def9f71464c878fdbd2b0dcf37 ]
This patch drops ext4_fc_start_ineligible() and ext4_fc_stop_ineligible() APIs. Fast commit ineligible transactions should simply call ext4_fc_mark_ineligible() after starting the trasaction.
--- fs/ext4/ext4.h | 6 ++-- fs/ext4/extents.c | 6 ++-- fs/ext4/fast_commit.c | 79 ++++++++----------------------------------- fs/ext4/ioctl.c | 3 +- fs/ext4/super.c | 1 - 5 files changed, 20 insertions(+), 75 deletions(-)
fs/ext4/ext4.h +2 -4
@@ -1724,9 +1724,9 @@ struct ext4_sb_info {*/ struct work_struct s_error_work; -/* Ext4 fast commit stuff */ +/* Ext4 fast commit sub transaction ID */ atomic_t s_fc_subtid; -atomic_t s_fc_ineligible_updates; +/* * After commit starts, the main queue gets locked, and the further * updates get added in the staging queue.
@@ -2925,8 +2925,6 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode,void ext4_fc_track_create (handle_t *handle,struct dentry *dentry);void ext4_fc_track_inode (handle_t *handle,struct inode *inode);void ext4_fc_mark_ineligible (struct super_block *sb,int reason); -void ext4_fc_start_ineligible (struct super_block *sb,int reason); -void ext4_fc_stop_ineligible (struct super_block *sb);void ext4_fc_start_update (struct inode *inode);void ext4_fc_stop_update (struct inode *inode);void ext4_fc_del (struct inode *inode);
fs/ext4/extents.c +2 -4
@@ -5340,7 +5340,7 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) ret =PTR_ERR (handle); goto out_mmap; } -ext4_fc_start_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE );down_write (&EXT4_I (inode)->i_data_sem);ext4_discard_preallocations (inode,0 );
@@ -5379,7 +5379,6 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) out_stop:ext4_journal_stop (handle); -ext4_fc_stop_ineligible (sb); out_mmap:filemap_invalidate_unlock (mapping); out_mutex:
@@ -5481,7 +5480,7 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) ret =PTR_ERR (handle); goto out_mmap; } -ext4_fc_start_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE );/* Expand file to avoid data loss if there is error while shifting */ inode->i_size += len;
@@ -5556,7 +5555,6 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) out_stop:ext4_journal_stop (handle); -ext4_fc_stop_ineligible (sb); out_mmap:filemap_invalidate_unlock (mapping); out_mutex:
fs/ext4/fast_commit.c +15 -64
116 lines not on this page · raw message
fs/ext4/ioctl.c +1 -2
@@ -169,7 +169,7 @@ static long swap_inode_boot_loader(struct super_block *sb, err = -EINVAL ; goto err_out; } -ext4_fc_start_ineligible (sb,EXT4_FC_REASON_SWAP_BOOT ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_SWAP_BOOT );/* Protect extent tree against block allocations via delalloc */ ext4_double_down_write_data_sem (inode, inode_bl);
@@ -252,7 +252,6 @@ static long swap_inode_boot_loader(struct super_block *sb, err_out1:ext4_journal_stop (handle); -ext4_fc_stop_ineligible (sb);ext4_double_up_write_data_sem (inode, inode_bl); err_out:
fs/ext4/super.c +0 -1
@@ -4613,7 +4613,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)/* Initialize fast commit stuff */ atomic_set (&sbi->s_fc_subtid,0 ); -atomic_set (&sbi->s_fc_ineligible_updates,0 );INIT_LIST_HEAD (&sbi->s_fc_q[FC_Q_MAIN ]);INIT_LIST_HEAD (&sbi->s_fc_q[FC_Q_STAGING ]);INIT_LIST_HEAD (&sbi->s_fc_dentry_q[FC_Q_MAIN ]);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 43/262 NFSD: Have legacy NFSD WRITE decoders use xdr_stream_subsegment()
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit dae9a6cab8009e526570e7477ce858dcdfeb256e ]
Refactor.
Now that the NFSv2 and NFSv3 XDR decoders have been converted to use xdr_streams, the WRITE decoder functions can use xdr_stream_subsegment() to extract the WRITE payload into its own xdr_buf, just as the NFSv4 WRITE XDR decoder currently does.
That makes it possible to pass the first kvec, pages array + length, page_base, and total payload length via a single function parameter.
The payload's page_base is not yet assigned or used, but will be in subsequent patches.
--- fs/nfsd/nfs3proc.c | 3 +-- fs/nfsd/nfs3xdr.c | 12 ++---------- fs/nfsd/nfs4proc.c | 3 +-- fs/nfsd/nfsproc.c | 3 +-- fs/nfsd/nfsxdr.c | 9 +-------- fs/nfsd/xdr.h | 2 +- fs/nfsd/xdr3.h | 2 +- include/linux/sunrpc/svc.h | 3 +-- net/sunrpc/svc.c | 11 ++++++----- 9 files changed, 15 insertions(+), 33 deletions(-)
fs/nfsd/nfs3proc.c +1 -2
@@ -210,8 +210,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp)fh_copy (&resp->fh, &argp->fh); resp->committed = argp->stable; - nvecs =svc_fill_write_vector (rqstp, rqstp->rq_arg.pages, - &argp->first, cnt); + nvecs =svc_fill_write_vector (rqstp, &argp->payload);if (!nvecs) { resp->status = nfserr_io; goto out;
fs/nfsd/nfs3xdr.c +2 -10
@@ -621,9 +621,6 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)struct xdr_stream *xdr = &rqstp->rq_arg_stream;struct nfsd3_writeargs *args = rqstp->rq_argp;u32 max_blocksize =svc_max_payload (rqstp); -struct kvec *head = rqstp->rq_arg.head; -struct kvec *tail = rqstp->rq_arg.tail; -size_t remaining;if (!svcxdr_decode_nfs_fh3 (xdr, &args->fh))return 0 ;
@@ -641,17 +638,12 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)/* request sanity */ if (args->count != args->len)return 0 ; - remaining = head->iov_len + rqstp->rq_arg.page_len + tail->iov_len; - remaining -=xdr_stream_pos (xdr); -if (remaining <xdr_align_size (args->len)) -return 0 ;if (args->count > max_blocksize) { args->count = max_blocksize; args->len = max_blocksize; } - - args->first.iov_base = xdr->p; - args->first.iov_len = head->iov_len -xdr_stream_pos (xdr); +if (!xdr_stream_subsegment (xdr, &args->payload, args->count)) +return 0 ;return 1 ; }
fs/nfsd/nfs4proc.c +1 -2
@@ -1038,8 +1038,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, write->wr_how_written = write->wr_stable_how; - nvecs =svc_fill_write_vector (rqstp, write->wr_payload.pages, - write->wr_payload.head, write->wr_buflen); + nvecs =svc_fill_write_vector (rqstp, &write->wr_payload);WARN_ON_ONCE (nvecs >ARRAY_SIZE (rqstp->rq_vec)); status = nfsd_vfs_write(rqstp, &cstate->current_fh, nf,
fs/nfsd/nfsproc.c +1 -2
@@ -234,8 +234,7 @@ nfsd_proc_write(struct svc_rqst *rqstp)SVCFH_fmt (&argp->fh), argp->len, argp->offset); - nvecs =svc_fill_write_vector (rqstp, rqstp->rq_arg.pages, - &argp->first, cnt); + nvecs =svc_fill_write_vector (rqstp, &argp->payload);if (!nvecs) { resp->status = nfserr_io; goto out;
fs/nfsd/nfsxdr.c +1 -8
@@ -325,10 +325,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p) {struct xdr_stream *xdr = &rqstp->rq_arg_stream;struct nfsd_writeargs *args = rqstp->rq_argp; -struct kvec *head = rqstp->rq_arg.head; -struct kvec *tail = rqstp->rq_arg.tail;u32 beginoffset, totalcount; -size_t remaining;if (!svcxdr_decode_fhandle (xdr, &args->fh))return 0 ;
@@ -346,12 +343,8 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)return 0 ;if (args->len >NFSSVC_MAXBLKSIZE_V2 )return 0 ; - remaining = head->iov_len + rqstp->rq_arg.page_len + tail->iov_len; - remaining -=xdr_stream_pos (xdr); -if (remaining <xdr_align_size (args->len)) +if (!xdr_stream_subsegment (xdr, &args->payload, args->len))return 0 ; - args->first.iov_base = xdr->p; - args->first.iov_len = head->iov_len -xdr_stream_pos (xdr);return 1 ; }
fs/nfsd/xdr.h +1 -1
@@ -33,7 +33,7 @@ struct nfsd_writeargs {svc_fh fh;__u32 offset;int len; -struct kvec first; +struct xdr_buf payload; };struct nfsd_createargs {
fs/nfsd/xdr3.h +1 -1
@@ -40,7 +40,7 @@ struct nfsd3_writeargs {__u32 count;int stable;__u32 len; -struct kvec first; +struct xdr_buf payload; };struct nfsd3_createargs {
include/linux/sunrpc/svc.h +1 -2
@@ -532,8 +532,7 @@ int svc_encode_result_payload(struct svc_rqst *rqstp,unsigned int offset, unsigned int length);unsigned int svc_fill_write_vector (struct svc_rqst *rqstp, -struct page **pages, -struct kvec *first,size_t total); +struct xdr_buf *payload);char *svc_fill_symlink_pathname (struct svc_rqst *rqstp,struct kvec *first,void *p,size_t total);
net/sunrpc/svc.c +6 -5
@@ -1676,16 +1676,17 @@ EXPORT_SYMBOL_GPL(svc_encode_result_payload);/** * svc_fill_write_vector - Construct data argument for VFS write call * @rqstp: svc_rqst to operate on -* @pages: list of pages containing data payload -* @first: buffer containing first section of write payload -* @total: total number of bytes of write payload +* @payload: xdr_buf containing only the write data payload * * Fills in rqstp::rq_vec, and returns the number of elements. */ -unsigned int svc_fill_write_vector (struct svc_rqst *rqstp,struct page **pages, -struct kvec *first,size_t total) +unsigned int svc_fill_write_vector (struct svc_rqst *rqstp, +struct xdr_buf *payload) { +struct page **pages = payload->pages; +struct kvec *first = payload->head;struct kvec *vec = rqstp->rq_vec; +size_t total = payload->len;unsigned int i;/* Some types of transport can present the write payload
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 110/262 net/mlx5e: IPsec: Refactor checksum code in tx data path
In reply to Greg Kroah-HartmanFrom: Raed Salem <[email protected]>
[ Upstream commit 428ffea0711a11efa0c1c4ee1fac27903ed091be ]
Part of code that is related solely to IPsec is always compiled in the driver code regardless if the IPsec functionality is enabled or disabled in the driver code, this will add unnecessary branch in case IPsec is disabled at Tx data path.
Move IPsec related code to IPsec related file such that in case of IPsec is disabled and because of unlikely macro the compiler should be able to optimize and omit the checksum IPsec code all together from Tx data path
--- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 26 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/en_tx.c | 20 ++------------ 2 files changed, 28 insertions(+), 18 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +26 -0
@@ -127,6 +127,25 @@ mlx5e_ipsec_feature_check(struct sk_buff *skb, netdev_features_t features)return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); } +static inline bool +mlx5e_ipsec_txwqe_build_eseg_csum (struct mlx5e_txqsq *sq,struct sk_buff *skb, +struct mlx5_wqe_eth_seg *eseg) +{ +struct xfrm_offload *xo =xfrm_offload (skb); + +if (!mlx5e_ipsec_eseg_meta (eseg)) +return false; + + eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ; +if (xo->inner_ipproto) { + eseg->cs_flags |=MLX5_ETH_WQE_L4_INNER_CSUM |MLX5_ETH_WQE_L3_INNER_CSUM ; + }else if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { + eseg->cs_flags |=MLX5_ETH_WQE_L4_CSUM ; + sq->stats->csum_partial_inner++; + } + +return true; +}#else static inline void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,
@@ -143,6 +162,13 @@ static inline bool mlx5_ipsec_is_rx_flow(struct mlx5_cqe64 *cqe) { return false;static inline netdev_features_t mlx5e_ipsec_feature_check (struct sk_buff *skb,netdev_features_t features) {return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); } + +static inline bool +mlx5e_ipsec_txwqe_build_eseg_csum (struct mlx5e_txqsq *sq,struct sk_buff *skb, +struct mlx5_wqe_eth_seg *eseg) +{ +return false; +}#endif /* CONFIG_MLX5_EN_IPSEC */ #endif /* __MLX5E_IPSEC_RXTX_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +2 -18
@@ -38,6 +38,7 @@#include "en/txrx.h" #include "ipoib/ipoib.h" #include "en_accel/en_accel.h" +#include "en_accel/ipsec_rxtx.h" #include "en/ptp.h" static void mlx5e_dma_unmap_wqe_err (struct mlx5e_txqsq *sq,u8 num_dma)
@@ -213,30 +214,13 @@ static inline void mlx5e_insert_vlan(void *start, struct sk_buff *skb, u16 ihs)memcpy (&vhdr->h_vlan_encapsulated_proto, skb->data + cpy1_sz, cpy2_sz); } -static void -ipsec_txwqe_build_eseg_csum (struct mlx5e_txqsq *sq,struct sk_buff *skb, -struct mlx5_wqe_eth_seg *eseg) -{ -struct xfrm_offload *xo =xfrm_offload (skb); - - eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ; -if (xo->inner_ipproto) { - eseg->cs_flags |=MLX5_ETH_WQE_L4_INNER_CSUM |MLX5_ETH_WQE_L3_INNER_CSUM ; - }else if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { - eseg->cs_flags |=MLX5_ETH_WQE_L4_CSUM ; - sq->stats->csum_partial_inner++; - } -} -static inline void mlx5e_txwqe_build_eseg_csum (struct mlx5e_txqsq *sq,struct sk_buff *skb,struct mlx5e_accel_tx_state *accel,struct mlx5_wqe_eth_seg *eseg) { -if (unlikely (mlx5e_ipsec_eseg_meta (eseg))) { -ipsec_txwqe_build_eseg_csum (sq, skb, eseg); +if (unlikely (mlx5e_ipsec_txwqe_build_eseg_csum (sq, skb, eseg)))return ; - }if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 107/262 octeontx2-af: cn10k: Use appropriate register for LMAC enable
In reply to Greg Kroah-HartmanFrom: Geetha sowjanya <[email protected]>
[ Upstream commit fae80edeafbbba5ef9a0423aa5e5515518626433 ]
CN10K platforms uses RPM(0..2)_MTI_MAC100(0..3)_COMMAND_CONFIG register for lmac TX/RX enable whereas CN9xxx platforms use CGX_CMRX_CONFIG register. This config change was missed when adding support for CN10K RPM.
--- .../net/ethernet/marvell/octeontx2/af/cgx.c | 2 + .../marvell/octeontx2/af/lmac_common.h | 3 ++ .../net/ethernet/marvell/octeontx2/af/rpm.c | 39 +++++++++++++++++++ .../net/ethernet/marvell/octeontx2/af/rpm.h | 4 ++ .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../ethernet/marvell/octeontx2/af/rvu_cgx.c | 14 ++++++- .../ethernet/marvell/octeontx2/af/rvu_nix.c | 10 ++--- 7 files changed, 66 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +2 -0
@@ -1571,6 +1571,8 @@ static struct mac_ops cgx_mac_ops = { .mac_enadis_pause_frm = cgx_lmac_enadis_pause_frm, .mac_pause_frm_config = cgx_lmac_pause_frm_config, .mac_enadis_ptp_config = cgx_lmac_ptp_config, + .mac_rx_tx_enable = cgx_lmac_rx_tx_enable, + .mac_tx_enable = cgx_lmac_tx_enable, };static int cgx_probe (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h +3 -0
@@ -107,6 +107,9 @@ struct mac_ops {void (*mac_enadis_ptp_config)(void *cgxd,int lmac_id,bool enable); + +int (*mac_rx_tx_enable)(void *cgxd,int lmac_id,bool enable); +int (*mac_tx_enable)(void *cgxd,int lmac_id,bool enable); };struct cgx {
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +39 -0
@@ -30,6 +30,8 @@ static struct mac_ops rpm_mac_ops = { .mac_enadis_pause_frm = rpm_lmac_enadis_pause_frm, .mac_pause_frm_config = rpm_lmac_pause_frm_config, .mac_enadis_ptp_config = rpm_lmac_ptp_config, + .mac_rx_tx_enable = rpm_lmac_rx_tx_enable, + .mac_tx_enable = rpm_lmac_tx_enable, };struct mac_ops *rpm_get_mac_ops (void )
@@ -54,6 +56,43 @@ int rpm_get_nr_lmacs(void *rpmd)return hweight8 (rpm_read (rpm,0 ,CGXX_CMRX_RX_LMACS ) &0xFULL ); } +int rpm_lmac_tx_enable (void *rpmd,int lmac_id,bool enable) +{ +rpm_t *rpm = rpmd; +u64 cfg, last; + +if (!is_lmac_valid (rpm, lmac_id)) +return -ENODEV ; + + cfg =rpm_read (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG ); + last = cfg; +if (enable) + cfg |=RPM_TX_EN ; +else + cfg &= ~(RPM_TX_EN ); + +if (cfg != last) +rpm_write (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG , cfg); +return !!(last &RPM_TX_EN ); +} + +int rpm_lmac_rx_tx_enable (void *rpmd,int lmac_id,bool enable) +{ +rpm_t *rpm = rpmd; +u64 cfg; + +if (!is_lmac_valid (rpm, lmac_id)) +return -ENODEV ; + + cfg =rpm_read (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG ); +if (enable) + cfg |=RPM_RX_EN |RPM_TX_EN ; +else + cfg &= ~(RPM_RX_EN |RPM_TX_EN ); +rpm_write (rpm, lmac_id,RPMX_MTI_MAC100X_COMMAND_CONFIG , cfg); +return 0 ; +} +void rpm_lmac_enadis_rx_pause_fwding (void *rpmd,int lmac_id,bool enable) {rpm_t *rpm = rpmd;
drivers/net/ethernet/marvell/octeontx2/af/rpm.h +4 -0
@@ -43,6 +43,8 @@#define RPMX_MTI_STAT_DATA_HI_CDC 0x10038#define RPM_LMAC_FWI 0xa +#define RPM_TX_EN BIT_ULL(0) +#define RPM_RX_EN BIT_ULL(1)/* Function Declarations */ int rpm_get_nr_lmacs (void *rpmd);
@@ -57,4 +59,6 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,int rpm_get_tx_stats (void *rpmd,int lmac_id,int idx,u64 *tx_stat);int rpm_get_rx_stats (void *rpmd,int lmac_id,int idx,u64 *rx_stat);void rpm_lmac_ptp_config (void *rpmd,int lmac_id,bool enable); +int rpm_lmac_rx_tx_enable (void *rpmd,int lmac_id,bool enable); +int rpm_lmac_tx_enable (void *rpmd,int lmac_id,bool enable);#endif /* RPM_H */
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
@@ -801,6 +801,7 @@ bool is_mac_feature_supported(struct rvu *rvu, int pf, int feature);u32 rvu_cgx_get_fifolen (struct rvu *rvu);void *rvu_first_cgx_pdata (struct rvu *rvu);int cgxlmac_to_pf (struct rvu *rvu,int cgx_id,int lmac_id); +int rvu_cgx_config_tx (void *cgxd,int lmac_id,bool enable);int npc_get_nixlf_mcam_index (struct npc_mcam *mcam,u16 pcifunc,int nixlf,int type);
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +12 -2
@@ -442,16 +442,26 @@ void rvu_cgx_enadis_rx_bp(struct rvu *rvu, int pf, bool enable)int rvu_cgx_config_rxtx (struct rvu *rvu,u16 pcifunc,bool start) {int pf =rvu_get_pf (pcifunc); +struct mac_ops *mac_ops;u8 cgx_id, lmac_id; +void *cgxd;if (!is_cgx_config_permitted (rvu, pcifunc))return LMAC_AF_ERR_PERM_DENIED ;rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); + cgxd =rvu_cgx_pdata (cgx_id, rvu); + mac_ops =get_mac_ops (cgxd); + +return mac_ops->mac_rx_tx_enable (cgxd, lmac_id, start); +} -cgx_lmac_rx_tx_enable (rvu_cgx_pdata (cgx_id, rvu), lmac_id, start); +int rvu_cgx_config_tx (void *cgxd,int lmac_id,bool enable) +{ +struct mac_ops *mac_ops; -return 0 ; + mac_ops =get_mac_ops (cgxd); +return mac_ops->mac_tx_enable (cgxd, lmac_id, enable); }void rvu_cgx_disable_dmac_entries (struct rvu *rvu,u16 pcifunc)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +5 -5
@@ -2068,8 +2068,8 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,/* enable cgx tx if disabled */ if (is_pf_cgxmapped (rvu, pf)) {rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); - restore_tx_en = !cgx_lmac_tx_enable (rvu_cgx_pdata (cgx_id, rvu), - lmac_id, true); + restore_tx_en = !rvu_cgx_config_tx (rvu_cgx_pdata (cgx_id, rvu), + lmac_id, true); } cfg =rvu_read64 (rvu, blkaddr,NIX_AF_SMQX_CFG (smq));
@@ -2092,7 +2092,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,rvu_cgx_enadis_rx_bp (rvu, pf, true);/* restore cgx tx state */ if (restore_tx_en) -cgx_lmac_tx_enable (rvu_cgx_pdata (cgx_id, rvu), lmac_id, false); +rvu_cgx_config_tx (rvu_cgx_pdata (cgx_id, rvu), lmac_id, false);return err; }
@@ -3878,7 +3878,7 @@ nix_config_link_credits(struct rvu *rvu, int blkaddr, int link,/* Enable cgx tx if disabled for credits to be back */ if (is_pf_cgxmapped (rvu, pf)) {rvu_get_cgx_lmac_id (rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); - restore_tx_en = !cgx_lmac_tx_enable (rvu_cgx_pdata (cgx_id, rvu), + restore_tx_en = !rvu_cgx_config_tx (rvu_cgx_pdata (cgx_id, rvu), lmac_id, true); }
@@ -3918,7 +3918,7 @@ nix_config_link_credits(struct rvu *rvu, int blkaddr, int link,/* Restore state of cgx tx */ if (restore_tx_en) -cgx_lmac_tx_enable (rvu_cgx_pdata (cgx_id, rvu), lmac_id, false); +rvu_cgx_config_tx (rvu_cgx_pdata (cgx_id, rvu), lmac_id, false);mutex_unlock (&rvu->rsrc_lock);return rc;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 83/262 drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 69e630016ef4e4a1745310c446f204dc6243e907 ]
Actual hardware state of CRTC is controlled by the member 'active' in struct drm_crtc_state instead of the member 'enable', according to the kernel doc of the member 'enable'. In fact, the drm client modeset and atomic helpers are using the member 'active' to do the control.
Referencing the member 'enable' of new_crtc_state, the function crtc_needs_disable() may fail to reflect if CRTC needs disable in self refresh mode, e.g., when the framebuffer emulation will be blanked through the client modeset helper with the next commit, the member 'enable' of new_crtc_state is still true while the member 'active' is false, hence the relevant potential encoder and bridges won't be disabled.
So, let's check new_crtc_state->active to determine if CRTC needs disable in self refresh mode instead of new_crtc_state->enable.
--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -1001,7 +1001,7 @@ crtc_needs_disable(struct drm_crtc_state *old_state,* it's in self refresh mode and needs to be fully disabled. */ return old_state->active || - (old_state->self_refresh_active && !new_state->enable) || + (old_state->self_refresh_active && !new_state->active) || new_state->self_refresh_active; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 36/262 ext4: fast commit may not fallback for ineligible commit
In reply to Greg Kroah-HartmanFrom: Xin Yin <[email protected]>
[ Upstream commit e85c81ba8859a4c839bcd69c5d83b32954133a5b ]
For the follow scenario:
1. jbd start commit transaction n
2. task A get new handle for transaction n+1
3. task A do some ineligible actions and mark FC_INELIGIBLE
4. jbd complete transaction n and clean FC_INELIGIBLE
5. task A call fsync
In this case fast commit will not fallback to full commit and transaction n+1 also not handled by jbd.
Make ext4_fc_mark_ineligible() also record transaction tid for latest ineligible case, when call ext4_fc_cleanup() check current transaction tid, if small than latest ineligible tid do not clear the EXT4_MF_FC_INELIGIBLE.
--- fs/ext4/ext4.h | 3 ++- fs/ext4/extents.c | 4 ++-- fs/ext4/fast_commit.c | 33 +++++++++++++++++++++++++-------- fs/ext4/inode.c | 4 ++-- fs/ext4/ioctl.c | 4 ++-- fs/ext4/namei.c | 4 ++-- fs/ext4/super.c | 1 + fs/ext4/xattr.c | 6 +++--- fs/jbd2/commit.c | 2 +- fs/jbd2/journal.c | 2 +- include/linux/jbd2.h | 2 +- 11 files changed, 42 insertions(+), 23 deletions(-)
fs/ext4/ext4.h +2 -1
@@ -1746,6 +1746,7 @@ struct ext4_sb_info {spinlock_t s_fc_lock;struct buffer_head *s_fc_bh;struct ext4_fc_stats s_fc_stats; +tid_t s_fc_ineligible_tid;#ifdef CONFIG_EXT4_DEBUG int s_fc_debug_max_replay;#endif
@@ -2923,7 +2924,7 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode, struct dentry *dentry);void ext4_fc_track_create (handle_t *handle,struct dentry *dentry);void ext4_fc_track_inode (handle_t *handle,struct inode *inode); -void ext4_fc_mark_ineligible (struct super_block *sb,int reason); +void ext4_fc_mark_ineligible (struct super_block *sb,int reason,handle_t *handle);void ext4_fc_start_update (struct inode *inode);void ext4_fc_stop_update (struct inode *inode);void ext4_fc_del (struct inode *inode);
fs/ext4/extents.c +2 -2
@@ -5340,7 +5340,7 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) ret =PTR_ERR (handle); goto out_mmap; } -ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE , handle);down_write (&EXT4_I (inode)->i_data_sem);ext4_discard_preallocations (inode,0 );
@@ -5480,7 +5480,7 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) ret =PTR_ERR (handle); goto out_mmap; } -ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_FALLOC_RANGE , handle);/* Expand file to avoid data loss if there is error while shifting */ inode->i_size += len;
fs/ext4/fast_commit.c +25 -8
@@ -302,18 +302,32 @@ void ext4_fc_del(struct inode *inode) }/* -* Mark file system as fast commit ineligible. This means that next commit -* operation would result in a full jbd2 commit. +* Mark file system as fast commit ineligible, and record latest +* ineligible transaction tid. This means until the recorded +* transaction, commit operation would result in a full jbd2 commit. */ -void ext4_fc_mark_ineligible (struct super_block *sb,int reason) +void ext4_fc_mark_ineligible (struct super_block *sb,int reason,handle_t *handle) {struct ext4_sb_info *sbi =EXT4_SB (sb); +tid_t tid;if (!test_opt2 (sb,JOURNAL_FAST_COMMIT ) || (EXT4_SB (sb)->s_mount_state &EXT4_FC_REPLAY ))return ;ext4_set_mount_flag (sb,EXT4_MF_FC_INELIGIBLE ); +if (handle && !IS_ERR (handle)) + tid = handle->h_transaction->t_tid; +else { +read_lock (&sbi->s_journal->j_state_lock); + tid = sbi->s_journal->j_running_transaction ? + sbi->s_journal->j_running_transaction->t_tid :0 ; +read_unlock (&sbi->s_journal->j_state_lock); + } +spin_lock (&sbi->s_fc_lock); +if (sbi->s_fc_ineligible_tid < tid) + sbi->s_fc_ineligible_tid = tid; +spin_unlock (&sbi->s_fc_lock);WARN_ON (reason >=EXT4_FC_REASON_MAX ); sbi->s_fc_stats.fc_ineligible_reason_count[reason]++; }
@@ -389,7 +403,7 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)mutex_unlock (&ei->i_fc_lock); node =kmem_cache_alloc (ext4_fc_dentry_cachep,GFP_NOFS );if (!node) { -ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_NOMEM ); +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_NOMEM ,NULL );mutex_lock (&ei->i_fc_lock);return -ENOMEM ; }
@@ -402,7 +416,7 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)if (!node->fcd_name.name) {kmem_cache_free (ext4_fc_dentry_cachep, node);ext4_fc_mark_ineligible (inode->i_sb, -EXT4_FC_REASON_NOMEM ); +EXT4_FC_REASON_NOMEM ,NULL );mutex_lock (&ei->i_fc_lock);return -ENOMEM ; }
@@ -504,7 +518,7 @@ void ext4_fc_track_inode(handle_t *handle, struct inode *inode)if (ext4_should_journal_data (inode)) {ext4_fc_mark_ineligible (inode->i_sb, -EXT4_FC_REASON_INODE_JOURNAL_DATA ); +EXT4_FC_REASON_INODE_JOURNAL_DATA , handle);return ; }
@@ -1180,7 +1194,7 @@ int ext4_fc_commit(journal_t *journal, tid_t commit_tid)* Fast commit cleanup routine. This is called after every fast commit and * full commit. full is true if we are called after a full commit. */ -static void ext4_fc_cleanup (journal_t *journal,int full) +static void ext4_fc_cleanup (journal_t *journal,int full,tid_t tid) {struct super_block *sb = journal->j_private;struct ext4_sb_info *sbi =EXT4_SB (sb);
@@ -1228,7 +1242,10 @@ static void ext4_fc_cleanup(journal_t *journal, int full) &sbi->s_fc_q[FC_Q_MAIN]);ext4_clear_mount_flag (sb,EXT4_MF_FC_COMMITTING ); -ext4_clear_mount_flag (sb,EXT4_MF_FC_INELIGIBLE ); +if (tid >= sbi->s_fc_ineligible_tid) { + sbi->s_fc_ineligible_tid =0 ; +ext4_clear_mount_flag (sb,EXT4_MF_FC_INELIGIBLE ); + }if (full) sbi->s_fc_bytes =0 ;
fs/ext4/inode.c +2 -2
@@ -337,7 +337,7 @@ void ext4_evict_inode(struct inode *inode)return ; no_delete:if (!list_empty (&EXT4_I (inode)->i_fc_list)) -ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_NOMEM ); +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_NOMEM ,NULL );ext4_clear_inode (inode);/* We must guarantee clearing of inode... */ }
@@ -5969,7 +5969,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)return PTR_ERR (handle);ext4_fc_mark_ineligible (inode->i_sb, -EXT4_FC_REASON_JOURNAL_FLAG_CHANGE ); +EXT4_FC_REASON_JOURNAL_FLAG_CHANGE , handle); err =ext4_mark_inode_dirty (handle, inode);ext4_handle_sync (handle);ext4_journal_stop (handle);
fs/ext4/ioctl.c +2 -2
@@ -169,7 +169,7 @@ static long swap_inode_boot_loader(struct super_block *sb, err = -EINVAL ; goto err_out; } -ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_SWAP_BOOT ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_SWAP_BOOT , handle);/* Protect extent tree against block allocations via delalloc */ ext4_double_down_write_data_sem (inode, inode_bl);
@@ -1075,7 +1075,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) err =ext4_resize_fs (sb, n_blocks_count);if (EXT4_SB (sb)->s_journal) { -ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_RESIZE ); +ext4_fc_mark_ineligible (sb,EXT4_FC_REASON_RESIZE ,NULL );jbd2_journal_lock_updates (EXT4_SB (sb)->s_journal); err2 =jbd2_journal_flush (EXT4_SB (sb)->s_journal,0 );jbd2_journal_unlock_updates (EXT4_SB (sb)->s_journal);
fs/ext4/namei.c +2 -2
@@ -3889,7 +3889,7 @@ static int ext4_rename(struct user_namespace *mnt_userns, struct inode *old_dir,* dirents in directories. */ ext4_fc_mark_ineligible (old.inode->i_sb, -EXT4_FC_REASON_RENAME_DIR ); +EXT4_FC_REASON_RENAME_DIR , handle); }else {if (new.inode)ext4_fc_track_unlink (handle, new.dentry);
@@ -4049,7 +4049,7 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,if (unlikely (retval)) goto end_rename;ext4_fc_mark_ineligible (new.inode->i_sb, -EXT4_FC_REASON_CROSS_RENAME ); +EXT4_FC_REASON_CROSS_RENAME , handle);if (old.dir_bh) { retval =ext4_rename_dir_finish (handle, &old, new.dir->i_ino);if (retval)
fs/ext4/super.c +1 -0
@@ -4620,6 +4620,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_fc_bytes =0 ;ext4_clear_mount_flag (sb,EXT4_MF_FC_INELIGIBLE );ext4_clear_mount_flag (sb,EXT4_MF_FC_COMMITTING ); + sbi->s_fc_ineligible_tid =0 ;spin_lock_init (&sbi->s_fc_lock);memset (&sbi->s_fc_stats,0 ,sizeof (sbi->s_fc_stats)); sbi->s_fc_replay_state.fc_regions =NULL ;
fs/ext4/xattr.c +3 -3
@@ -2408,7 +2408,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,if (IS_SYNC (inode))ext4_handle_sync (handle); } -ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR ); +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR , handle); cleanup:brelse (is.iloc.bh);
@@ -2486,7 +2486,7 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,if (error ==0 ) error = error2; } -ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR ); +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR ,NULL );return error; }
@@ -2920,7 +2920,7 @@ int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, error); goto cleanup; } -ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR ); +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR , handle); } error =0 ; cleanup:
fs/jbd2/commit.c +1 -1
@@ -1170,7 +1170,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)if (journal->j_commit_callback) journal->j_commit_callback (journal, commit_transaction);if (journal->j_fc_cleanup_callback) - journal->j_fc_cleanup_callback (journal,1 ); + journal->j_fc_cleanup_callback (journal,1 , commit_transaction->t_tid);trace_jbd2_end_commit (journal, commit_transaction); jbd_debug(1, "JBD2: commit %d complete, head %d\n",
fs/jbd2/journal.c +1 -1
@@ -769,7 +769,7 @@ EXPORT_SYMBOL(jbd2_fc_begin_commit);static int __jbd2_fc_end_commit (journal_t *journal,tid_t tid,bool fallback) {if (journal->j_fc_cleanup_callback) - journal->j_fc_cleanup_callback (journal,0 ); + journal->j_fc_cleanup_callback (journal,0 , tid);write_lock (&journal->j_state_lock); journal->j_flags &= ~JBD2_FAST_COMMIT_ONGOING ;if (fallback)
include/linux/jbd2.h +1 -1
@@ -1295,7 +1295,7 @@ struct journal_s* Clean-up after fast commit or full commit. JBD2 calls this function * after every commit operation. */ -void (*j_fc_cleanup_callback)(struct journal_s *journal,int ); +void (*j_fc_cleanup_callback)(struct journal_s *journal,int full,tid_t tid);/** * @j_fc_replay_callback:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 52/262 PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit d2a14b54989e9ccea8401895fdfbc213bd1f56af ]
Replace __clk_is_enabled() with pm_runtime_suspended(),
as __clk_is_enabled() was checking the wrong bus clock
and caused the following build error too:
arm-linux-gnueabi-ld: drivers/pci/controller/pcie-rcar-host.o: in function `rcar_pcie_aarch32_abort_handler':
pcie-rcar-host.c:(.text+0xdd0): undefined reference to `__clk_is_enabled'
--- drivers/pci/controller/pcie-rcar-host.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/pcie-rcar-host.c +5 -5
@@ -52,10 +52,10 @@ struct rcar_msi {*/ static void __iomem *pcie_base;/* -* Static copy of bus clock pointer, so we can check whether the clock -* is enabled or not. +* Static copy of PCIe device pointer, so we can check whether the +* device is runtime suspended or not. */ -static struct clk *pcie_bus_clk; +static struct device *pcie_dev;#endif /* Structure representing the PCIe interface */
@@ -794,7 +794,7 @@ static int rcar_pcie_get_resources(struct rcar_pcie_host *host)#ifdef CONFIG_ARM /* Cache static copy for L1 link state fixup hook on aarch32 */ pcie_base = pcie->base; - pcie_bus_clk = host->bus_clk; + pcie_dev = pcie->dev;#endif return 0 ;
@@ -1064,7 +1064,7 @@ static int rcar_pcie_aarch32_abort_handler(unsigned long addr,spin_lock_irqsave (&pmsr_lock, flags); -if (!pcie_base || !__clk_is_enabled (pcie_bus_clk)) { +if (!pcie_base ||pm_runtime_suspended (pcie_dev)) { ret =1 ; goto unlock_exit; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 81/262 SUNRPC: Fix sockaddr handling in svcsock_accept_class trace points
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 16720861675393a35974532b3c837d9fd7bfe08c ]
Avoid potentially hazardous memory copying and the needless use of "%pIS" -- in the kernel, an RPC service listener is always bound to ANYADDR. Having the network namespace is helpful when recording errors, though.
--- include/trace/events/sunrpc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/trace/events/sunrpc.h +4 -4
@@ -2112,17 +2112,17 @@ DECLARE_EVENT_CLASS(svcsock_accept_class,TP_STRUCT__entry (__field (long ,status )__string (service, service) - __array(unsigned char, addr, sizeof(struct sockaddr_in6)) + __field(unsigned int, netns_ino) ),TP_fast_assign ( __entry->status = status;__assign_str (service, service); -memcpy (__entry->addr, &xprt->xpt_local,sizeof (__entry->addr)); + __entry->netns_ino = xprt->xpt_net->ns.inum; ), -TP_printk ("listener=%pISpc service=%s status=%ld" , - __entry->addr,__get_str (service), __entry->status +TP_printk ("addr=listener service=%s status=%ld" , +__get_str (service), __entry->status ) );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 101/262 drm/amd/display: move FPU associated DCN301 code to DML folder
In reply to Greg Kroah-HartmanFrom: Qingqing Zhuo <[email protected]>
[ Upstream commit 31484207feb23e6cdb12827560442ab294855923 ]
[Why & How]
As part of the FPU isolation work documented in
https://patchwork.freedesktop.org/series/93042/, isolate code that uses FPU in DCN301 to DML, where all FPU code should locate.
--- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 2 + .../gpu/drm/amd/display/dc/dcn301/Makefile | 26 -- .../amd/display/dc/dcn301/dcn301_resource.c | 349 +--------------- .../amd/display/dc/dcn301/dcn301_resource.h | 3 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 390 ++++++++++++++++++ .../amd/display/dc/dml/dcn301/dcn301_fpu.h | 42 ++ 7 files changed, 450 insertions(+), 365 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +2 -0
@@ -2319,7 +2319,9 @@ bool dcn30_validate_bandwidth(struct dc *dc, goto validate_out; } +DC_FP_START (); dc->res_pool->funcs->calculate_wm_and_dlg (dc, context, pipes, pipe_cnt, vlevel); +DC_FP_END ();BW_VAL_TRACE_END_WATERMARKS ();
drivers/gpu/drm/amd/display/dc/dcn301/Makefile +0 -26
@@ -13,32 +13,6 @@ DCN301 = dcn301_init.o dcn301_resource.o dcn301_dccg.o \ dcn301_dio_link_encoder.o dcn301_hwseq.o dcn301_panel_cntl.o dcn301_hubbub.o -ifdef CONFIG_X86 -CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o := -msse -endif - -ifdef CONFIG_PPC64 -CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o := -mhard-float -maltivec -endif - -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o += -mhard-float -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 -# (8B stack alignment). -CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o += -mpreferred-stack-boundary=4 -else -CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o += -msse2 -endif -endif - AMD_DAL_DCN301 = $(addprefix $(AMDDALPATH)/dc/dcn301/,$(DCN301)) AMD_DISPLAY_FILES += $(AMD_DAL_DCN301)
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +10 -339
397 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h +3 -0
@@ -32,6 +32,9 @@ struct dc;struct resource_pool ;struct _vcs_dpi_display_pipe_params_st ; +extern struct _vcs_dpi_ip_params_st dcn3_01_ip; +extern struct _vcs_dpi_soc_bounding_box_st dcn3_01_soc; +struct dcn301_resource_pool {struct resource_pool base; };
drivers/gpu/drm/amd/display/dc/dml/Makefile +3 -0
@@ -70,6 +70,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) $(fram CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
@@ -84,6 +85,7 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_rcflags) +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags) endif
@@ -101,6 +103,7 @@ DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o DML += dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o +DML += dcn301/dcn301_fpu.o DML += dsc/rc_calc_fpu.o endif
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c new file +390 -0
390 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 113/262 bpf: Fix possible race in inc_misses_counter
In reply to Greg Kroah-HartmanFrom: He Fengqing <[email protected]>
[ Upstream commit 0e3135d3bfa5dfb658145238d2bc723a8e30c3a3 ]
It seems inc_misses_counter() suffers from same issue fixed in the commit d979617aa84d ("bpf: Fixes possible race in update_prog_stats() for 32bit arches"):
As it can run while interrupts are enabled, it could
be re-entered and the u64_stats syncp could be mangled.
--- kernel/bpf/trampoline.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/trampoline.c +3 -2
@@ -541,11 +541,12 @@ static u64 notrace bpf_prog_start_time(void) static void notrace inc_misses_counter(struct bpf_prog *prog) {struct bpf_prog_stats *stats; +unsigned int flags; stats =this_cpu_ptr (prog->stats); -u64_stats_update_begin (&stats->syncp); + flags =u64_stats_update_begin_irqsave (&stats->syncp);u64_stats_inc (&stats->misses); -u64_stats_update_end (&stats->syncp); +u64_stats_update_end_irqrestore (&stats->syncp, flags); }/* The logic is similar to bpf_prog_run(), but with an explicit
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 11/262 tipc: fix a bit overflow in tipc_crypto_key_rcv()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit 143de8d97d79316590475dc2a84513c63c863ddf ]
msg_data_sz return a 32bit value, but size is 16bit. This may lead to a bit overflow.
--- net/tipc/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/crypto.c +1 -1
@@ -2287,7 +2287,7 @@ static bool tipc_crypto_key_rcv(struct tipc_crypto *rx, struct tipc_msg *hdr)struct tipc_crypto *tx =tipc_net (rx->net)->crypto_tx;struct tipc_aead_key *skey =NULL ;u16 key_gen =msg_key_gen (hdr); -u16 size =msg_data_sz (hdr); +u32 size =msg_data_sz (hdr);u8 *data =msg_data (hdr);unsigned int keylen;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 21/262 dmaengine: shdma: Fix runtime PM imbalance on error
In reply to Greg Kroah-HartmanFrom: Yongzhi Liu <[email protected]>
[ Upstream commit 455896c53d5b803733ddd84e1bf8a430644439b6 ]
pm_runtime_get_() increments the runtime PM usage counter even when it returns an error code, thus a matching decrement is needed on the error handling path to keep the counter balanced.
--- drivers/dma/sh/shdma-base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/sh/shdma-base.c +3 -1
@@ -115,8 +115,10 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx) ret =pm_runtime_get (schan->dev);spin_unlock_irq (&schan->chan_lock); -if (ret <0 ) +if (ret <0 ) {dev_err (schan->dev,"%s(): GET = %d\n" , __func__, ret); +pm_runtime_put (schan->dev); + }pm_runtime_barrier (schan->dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 23/262 i2c: imx: allow COMPILE_TEST
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 2ce4462f2724d1b3cedccea441c6d18bb360629a ]
Driver builds fine with COMPILE_TEST. Enable it for wider test coverage and easier maintenance.
--- drivers/i2c/busses/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +1 -1
@@ -677,7 +677,7 @@ config I2C_IMG config I2C_IMX tristate "IMX I2C interface" - depends on ARCH_MXC || ARCH_LAYERSCAPE || COLDFIRE + depends on ARCH_MXC || ARCH_LAYERSCAPE || COLDFIRE || COMPILE_TEST select I2C_SLAVE help Say Y here if you want to use the IIC bus controller on
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 25/262 net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990
In reply to Greg Kroah-HartmanFrom: Daniele Palmas <[email protected]>
[ Upstream commit 21e8a96377e6b6debae42164605bf9dcbe5720c5 ]
Add quirk CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE for Telit FN990 0x1071 composition in order to avoid bind error.
--- drivers/net/usb/cdc_mbim.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/cdc_mbim.c +5 -0
@@ -659,6 +659,11 @@ static const struct usb_device_id mbim_devs[] = { .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle, }, +/* Telit FN990 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1071, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long )&cdc_mbim_info_avoid_altsetting_toggle, + }, + /* default entry */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&cdc_mbim_info_zlp,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 55/262 KVM: VMX: Dont unblock vCPU w/ Posted IRQ if IRQs are disabled in guest
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
[ Upstream commit 1831fa44df743a7cdffdf1c12c799bf6f3c12b8c ]
Don't configure the wakeup handler when a vCPU is blocking with IRQs disabled, in which case any IRQ, posted or otherwise, should not be recognized and thus should not wake the vCPU.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/posted_intr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx/posted_intr.c +2 -1
@@ -147,7 +147,8 @@ int pi_pre_block(struct kvm_vcpu *vcpu)struct pi_desc old, new;struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); -if (!vmx_can_use_vtd_pi (vcpu->kvm)) +if (!vmx_can_use_vtd_pi (vcpu->kvm) || +vmx_interrupt_blocked (vcpu))return 0 ;WARN_ON (irqs_disabled ());
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 99/262 drm/amd/display: Use adjusted DCN301 watermarks
In reply to Greg Kroah-HartmanFrom: Nikola Cornij <[email protected]>
[ Upstream commit 808643ea56a2f96a42873d5e11c399957d6493aa ]
[why]
If DCN30 watermark calc is used for DCN301, the calculated values are wrong due to the data structure mismatch between DCN30 and DCN301. However, using the original DCN301 watermark values causes underflow.
[how]
- Add DCN21-style watermark calculations
- Adjust DCN301 watermark values to remove the underflow
--- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 4 +- .../amd/display/dc/dcn301/dcn301_resource.c | 96 ++++++++++++++++++- 2 files changed, 97 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +2 -2
@@ -582,8 +582,8 @@ static struct wm_table lpddr5_wm_table = { .wm_inst = WM_A, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 5.32, - .sr_enter_plus_exit_time_us = 6.38, + .sr_exit_time_us = 7.95, + .sr_enter_plus_exit_time_us = 9, .valid = true, }, {
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +95 -1
107 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 17/262 cifs: modefromsids must add an ACE for authenticated users
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit 0c6f4ebf8835d01866eb686d47578cde80097981 ]
When we create a file with modefromsids we set an ACL that has one ACE for the magic modefromsid as well as a second ACE that grants full access to all authenticated users.
When later we chante the mode on the file we strip away this, and other, ACE for authenticated users in set_chmod_dacl() and then just add back/update the modefromsid ACE.
Thus leaving the file with a single ACE that is for the mode and no ACE to grant any user any rights to access the file.
Fix this by always adding back also the modefromsid ACE so that we do not drop the rights to access the file.
--- fs/cifs/cifsacl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/cifs/cifsacl.c +4 -1
@@ -949,6 +949,9 @@ static void populate_new_aces(char *nacl_base, pnntace = (struct cifs_ace *) (nacl_base + nsize); nsize +=setup_special_mode_ACE (pnntace, nmode); num_aces++; + pnntace = (struct cifs_ace *) (nacl_base + nsize); + nsize +=setup_authusers_ACE (pnntace); + num_aces++; goto set_size; }
@@ -1613,7 +1616,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, nsecdesclen = secdesclen;if (pnmode && *pnmode !=NO_CHANGE_64 ) {/* chmod */ if (mode_from_sid) - nsecdesclen +=sizeof (struct cifs_ace ); + nsecdesclen +=2 *sizeof (struct cifs_ace );else /* cifsacl */ nsecdesclen +=5 *sizeof (struct cifs_ace ); }else {/* chown */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 54/262 PCI: aardvark: Fix checking for MEM resource type
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 2070b2ddea89f5b604fac3d27ade5cb6d19a5706 ]
IORESOURCE_MEM_64 is not a resource type but a type flag.
Remove incorrect check for type IORESOURCE_MEM_64.
--- drivers/pci/controller/pci-aardvark.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/controller/pci-aardvark.c +2 -4
@@ -1537,8 +1537,7 @@ static int advk_pcie_probe(struct platform_device *pdev)* only PIO for issuing configuration transfers which does * not use PCIe window configuration. */ -if (type !=IORESOURCE_MEM && type !=IORESOURCE_MEM_64 && - type !=IORESOURCE_IO ) +if (type !=IORESOURCE_MEM && type !=IORESOURCE_IO )continue ;/*
@@ -1546,8 +1545,7 @@ static int advk_pcie_probe(struct platform_device *pdev)* configuration is set to transparent memory access so it * does not need window configuration. */ -if ((type ==IORESOURCE_MEM || type ==IORESOURCE_MEM_64 ) && - entry->offset ==0 ) +if (type ==IORESOURCE_MEM && entry->offset ==0 )continue ;/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 72/262 PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit ecae073e393e65ee7be7ebf3fdd5258ab99f1636 ]
Comment in Armada 370 functional specification is misleading. PCI_EXP_DEVCTL_*RE bits are supported and configures receiving of error interrupts.
--- drivers/pci/controller/pci-mvebu.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/pci/controller/pci-mvebu.c +1 -10
@@ -498,9 +498,7 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,break ;case PCI_EXP_DEVCTL : - *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL ) & - ~(PCI_EXP_DEVCTL_URRE |PCI_EXP_DEVCTL_FERE | -PCI_EXP_DEVCTL_NFERE |PCI_EXP_DEVCTL_CERE ); + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL );break ;case PCI_EXP_LNKCAP :
@@ -590,13 +588,6 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,switch (reg) {case PCI_EXP_DEVCTL : -/* -* Armada370 data says these bits must always -* be zero when in root complex mode. -*/ - new &= ~(PCI_EXP_DEVCTL_URRE |PCI_EXP_DEVCTL_FERE | -PCI_EXP_DEVCTL_NFERE |PCI_EXP_DEVCTL_CERE ); -mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL );break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 37/262 ext4: fast commit may miss file actions
In reply to Greg Kroah-HartmanFrom: Xin Yin <[email protected]>
[ Upstream commit bdc8a53a6f2f0b1cb5f991440f2100732299eb93 ]
in the follow scenario:
1. jbd start transaction n
2. task A get new handle for transaction n+1
3. task A do some actions and add inode to FC_Q_MAIN fc_q
4. jbd complete transaction n and clear FC_Q_MAIN fc_q
5. task A call fsync
Fast commit will lost the file actions during a full commit.
we should also add updates to staging queue during a full commit. and in ext4_fc_cleanup(), when reset a inode's fc track range, check it's i_sync_tid, if it bigger than current transaction tid, do not rest it, or we will lost the track range.
And EXT4_MF_FC_COMMITTING is not needed anymore, so drop it.
--- fs/ext4/ext4.h | 5 +---- fs/ext4/fast_commit.c | 11 ++++++----- fs/ext4/super.c | 1 - 3 files changed, 7 insertions(+), 10 deletions(-)
fs/ext4/ext4.h +1 -4
@@ -1792,10 +1792,7 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)enum {EXT4_MF_MNTDIR_SAMPLED ,EXT4_MF_FS_ABORTED ,/* Fatal error detected */ -EXT4_MF_FC_INELIGIBLE ,/* Fast commit ineligible */ -EXT4_MF_FC_COMMITTING /* File system underoing a fast -* commit. -*/ +EXT4_MF_FC_INELIGIBLE /* Fast commit ineligible */ };static inline void ext4_set_mount_flag (struct super_block *sb,int bit)
fs/ext4/fast_commit.c +6 -5
@@ -377,7 +377,8 @@ static int ext4_fc_track_template(spin_lock (&sbi->s_fc_lock);if (list_empty (&EXT4_I (inode)->i_fc_list))list_add_tail (&EXT4_I (inode)->i_fc_list, - (ext4_test_mount_flag (inode->i_sb,EXT4_MF_FC_COMMITTING )) ? + (sbi->s_journal->j_flags &JBD2_FULL_COMMIT_ONGOING || + sbi->s_journal->j_flags &JBD2_FAST_COMMIT_ONGOING ) ? &sbi->s_fc_q[FC_Q_STAGING ] : &sbi->s_fc_q[FC_Q_MAIN ]);spin_unlock (&sbi->s_fc_lock);
@@ -430,7 +431,8 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update) node->fcd_name.len = dentry->d_name.len;spin_lock (&sbi->s_fc_lock); -if (ext4_test_mount_flag (inode->i_sb,EXT4_MF_FC_COMMITTING )) +if (sbi->s_journal->j_flags &JBD2_FULL_COMMIT_ONGOING || + sbi->s_journal->j_flags &JBD2_FAST_COMMIT_ONGOING )list_add_tail (&node->fcd_list, &sbi->s_fc_dentry_q[FC_Q_STAGING ]);else
@@ -894,7 +896,6 @@ static int ext4_fc_submit_inode_data_all(journal_t *journal)int ret =0 ;spin_lock (&sbi->s_fc_lock); -ext4_set_mount_flag (sb,EXT4_MF_FC_COMMITTING );list_for_each_entry (ei, &sbi->s_fc_q[FC_Q_MAIN ], i_fc_list) {ext4_set_inode_state (&ei->vfs_inode,EXT4_STATE_FC_COMMITTING );while (atomic_read (&ei->i_fc_updates)) {
@@ -1212,7 +1213,8 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)list_del_init (&iter->i_fc_list);ext4_clear_inode_state (&iter->vfs_inode,EXT4_STATE_FC_COMMITTING ); -ext4_fc_reset_inode (&iter->vfs_inode); +if (iter->i_sync_tid <= tid) +ext4_fc_reset_inode (&iter->vfs_inode);/* Make sure EXT4_STATE_FC_COMMITTING bit is clear */ smp_mb ();#if (BITS_PER_LONG <64 )
@@ -1241,7 +1243,6 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)list_splice_init (&sbi->s_fc_q[FC_Q_STAGING ], &sbi->s_fc_q[FC_Q_MAIN ]); -ext4_clear_mount_flag (sb,EXT4_MF_FC_COMMITTING );if (tid >= sbi->s_fc_ineligible_tid) { sbi->s_fc_ineligible_tid =0 ;ext4_clear_mount_flag (sb,EXT4_MF_FC_INELIGIBLE );
fs/ext4/super.c +0 -1
@@ -4619,7 +4619,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)INIT_LIST_HEAD (&sbi->s_fc_dentry_q[FC_Q_STAGING ]); sbi->s_fc_bytes =0 ;ext4_clear_mount_flag (sb,EXT4_MF_FC_INELIGIBLE ); -ext4_clear_mount_flag (sb,EXT4_MF_FC_COMMITTING ); sbi->s_fc_ineligible_tid =0 ;spin_lock_init (&sbi->s_fc_lock);memset (&sbi->s_fc_stats,0 ,sizeof (sbi->s_fc_stats));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 75/262 NFSD: Fix verifier returned in stable WRITEs
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit f11ad7aa653130b71e2e89bed207f387718216d5 ]
RFC 8881 explains the purpose of the write verifier this way:
Quoted 5 lines
The final portion of the result is the field writeverf. This field is the write verifier and is a cookie that the client can use to determine whether a server has changed instance state (e.g., server restart) between a call to WRITE and a subsequent call to either WRITE or COMMIT.
But then it says:
Quoted 6 lines
This cookie MUST be unchanged during a single instance of the NFSv4.1 server and MUST be unique between instances of the NFSv4.1 server. If the cookie changes, then the client MUST assume that any data written with an UNSTABLE4 value for committed and an old writeverf in the reply has been lost and will need to be recovered.
RFC 1813 has similar language for NFSv3. NFSv2 does not have a write verifier since it doesn't implement the COMMIT procedure.
Since commit 19e0663ff9bc ("nfsd: Ensure sampling of the write verifier is atomic with the write"), the Linux NFS server has returned a boot-time-based verifier for UNSTABLE WRITEs, but a zero verifier for FILE_SYNC and DATA_SYNC WRITEs. FILE_SYNC and DATA_SYNC WRITEs are not followed up with a COMMIT, so there's no need for clients to compare verifiers for stable writes.
However, by returning a different verifier for stable and unstable writes, the above commit puts the Linux NFS server a step farther out of compliance with the first MUST above. At least one NFS client (FreeBSD) noticed the difference, making this a potential regression.
--- fs/nfsd/vfs.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/nfsd/vfs.c +4 -0
@@ -993,6 +993,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,iov_iter_kvec (&iter,WRITE , vec, vlen, *cnt);if (flags &RWF_SYNC ) {down_write (&nf->nf_rwsem); +if (verf) +nfsd_copy_boot_verifier (verf, +net_generic (SVC_NET (rqstp), + nfsd_net_id)); host_err =vfs_iter_write (file, &iter, &pos, flags);if (host_err <0 ) nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 77/262 nfsd: fix crash on COPY_NOTIFY with special stateid
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
[ Upstream commit 074b07d94e0bb6ddce5690a9b7e2373088e8b33a ]
RTM says "If the special ONE stateid is passed to nfs4_preprocess_stateid_op(), it returns status=0 but does not set *cstid. nfsd4_copy_notify() depends on stid being set if status=0, and thus can crash if the client sends the right COPY_NOTIFY RPC."
RFC 7862 says "The cna_src_stateid MUST refer to either open or locking states provided earlier by the server. If it is invalid, then the operation MUST fail."
The RFC doesn't specify an error, and the choice doesn't matter much as this is clearly illegal client behavior, but bad_stateid seems reasonable.
Simplest is just to guarantee that nfs4_preprocess_stateid_op, called with non-NULL cstid, errors out if it can't return a stateid.
--- fs/nfsd/nfs4state.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/nfsd/nfs4state.c +5 -1
@@ -6042,7 +6042,11 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp, *nfp =NULL ;if (ZERO_STATEID (stateid) ||ONE_STATEID (stateid)) { - status =check_special_stateids (net, fhp, stateid, flags); +if (cstid) + status = nfserr_bad_stateid; +else + status =check_special_stateids (net, fhp, stateid, + flags); goto done; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 13/262 cifs: fix double free race when mount fails in cifs_get_root()
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit 3d6cc9898efdfb062efb74dc18cfc700e082f5d5 ]
When cifs_get_root() fails during cifs_smb3_do_mount() we call deactivate_locked_super() which eventually will call delayed_free() which will free the context.
In this situation we should not proceed to enter the out: section in cifs_smb3_do_mount() and free the same resources a second time.
[Thu Feb 10 12:59:06 2022] BUG: KASAN: use-after-free in rcu_cblist_dequeue+0x32/0x60 [Thu Feb 10 12:59:06 2022] Read of size 8 at addr ffff888364f4d110 by task swapper/1/0
[Thu Feb 10 12:59:06 2022] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G OE 5.17.0-rc3+ #4 [Thu Feb 10 12:59:06 2022] Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.0 12/17/2019 [Thu Feb 10 12:59:06 2022] Call Trace: [Thu Feb 10 12:59:06 2022] <IRQ> [Thu Feb 10 12:59:06 2022] dump_stack_lvl+0x5d/0x78 [Thu Feb 10 12:59:06 2022] print_address_description.constprop.0+0x24/0x150 [Thu Feb 10 12:59:06 2022] ? rcu_cblist_dequeue+0x32/0x60 [Thu Feb 10 12:59:06 2022] kasan_report.cold+0x7d/0x117 [Thu Feb 10 12:59:06 2022] ? rcu_cblist_dequeue+0x32/0x60 [Thu Feb 10 12:59:06 2022] __asan_load8+0x86/0xa0 [Thu Feb 10 12:59:06 2022] rcu_cblist_dequeue+0x32/0x60 [Thu Feb 10 12:59:06 2022] rcu_core+0x547/0xca0 [Thu Feb 10 12:59:06 2022] ? call_rcu+0x3c0/0x3c0 [Thu Feb 10 12:59:06 2022] ? __this_cpu_preempt_check+0x13/0x20 [Thu Feb 10 12:59:06 2022] ? lock_is_held_type+0xea/0x140 [Thu Feb 10 12:59:06 2022] rcu_core_si+0xe/0x10 [Thu Feb 10 12:59:06 2022] __do_softirq+0x1d4/0x67b [Thu Feb 10 12:59:06 2022] __irq_exit_rcu+0x100/0x150 [Thu Feb 10 12:59:06 2022] irq_exit_rcu+0xe/0x30 [Thu Feb 10 12:59:06 2022] sysvec_hyperv_stimer0+0x9d/0xc0 ... [Thu Feb 10 12:59:07 2022] Freed by task 58179: [Thu Feb 10 12:59:07 2022] kasan_save_stack+0x26/0x50 [Thu Feb 10 12:59:07 2022] kasan_set_track+0x25/0x30 [Thu Feb 10 12:59:07 2022] kasan_set_free_info+0x24/0x40 [Thu Feb 10 12:59:07 2022] ____kasan_slab_free+0x137/0x170 [Thu Feb 10 12:59:07 2022] __kasan_slab_free+0x12/0x20 [Thu Feb 10 12:59:07 2022] slab_free_freelist_hook+0xb3/0x1d0 [Thu Feb 10 12:59:07 2022] kfree+0xcd/0x520 [Thu Feb 10 12:59:07 2022] cifs_smb3_do_mount+0x149/0xbe0 [cifs] [Thu Feb 10 12:59:07 2022] smb3_get_tree+0x1a0/0x2e0 [cifs] [Thu Feb 10 12:59:07 2022] vfs_get_tree+0x52/0x140 [Thu Feb 10 12:59:07 2022] path_mount+0x635/0x10c0 [Thu Feb 10 12:59:07 2022] __x64_sys_mount+0x1bf/0x210 [Thu Feb 10 12:59:07 2022] do_syscall_64+0x5c/0xc0 [Thu Feb 10 12:59:07 2022] entry_SYSCALL_64_after_hwframe+0x44/0xae
[Thu Feb 10 12:59:07 2022] Last potentially related work creation: [Thu Feb 10 12:59:07 2022] kasan_save_stack+0x26/0x50 [Thu Feb 10 12:59:07 2022] __kasan_record_aux_stack+0xb6/0xc0 [Thu Feb 10 12:59:07 2022] kasan_record_aux_stack_noalloc+0xb/0x10 [Thu Feb 10 12:59:07 2022] call_rcu+0x76/0x3c0 [Thu Feb 10 12:59:07 2022] cifs_umount+0xce/0xe0 [cifs] [Thu Feb 10 12:59:07 2022] cifs_kill_sb+0xc8/0xe0 [cifs] [Thu Feb 10 12:59:07 2022] deactivate_locked_super+0x5d/0xd0 [Thu Feb 10 12:59:07 2022] cifs_smb3_do_mount+0xab9/0xbe0 [cifs] [Thu Feb 10 12:59:07 2022] smb3_get_tree+0x1a0/0x2e0 [cifs] [Thu Feb 10 12:59:07 2022] vfs_get_tree+0x52/0x140 [Thu Feb 10 12:59:07 2022] path_mount+0x635/0x10c0 [Thu Feb 10 12:59:07 2022] __x64_sys_mount+0x1bf/0x210 [Thu Feb 10 12:59:07 2022] do_syscall_64+0x5c/0xc0 [Thu Feb 10 12:59:07 2022] entry_SYSCALL_64_after_hwframe+0x44/0xae
--- fs/cifs/cifsfs.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/cifsfs.c +1 -0
@@ -909,6 +909,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, out_super:deactivate_locked_super (sb); +return root; out:if (cifs_sb) {kfree (cifs_sb->prepath);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 85/262 ntb_hw_switchtec: Fix bug with more than 32 partitions
In reply to Greg Kroah-HartmanFrom: Wesley Sheng <[email protected]>
[ Upstream commit 7ff351c86b6b258f387502ab2c9b9d04f82c1c3d ]
Switchtec could support as mush as 48 partitions, but ffs & fls are for 32 bit argument, in case of partition index larger than 31, the current code could not parse the peer partition index correctly. Change to the 64 bit version __ffs64 & fls64 accordingly to fix this bug.
--- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/ntb/hw/mscc/ntb_hw_switchtec.c +5 -7
@@ -840,7 +840,6 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev)u64 tpart_vec;int self;u64 part_map; -int bit; sndev->ntb.pdev = sndev->stdev->pdev; sndev->ntb.topo =NTB_TOPO_SWITCH ;
@@ -861,29 +860,28 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev) part_map =ioread64 (&sndev->mmio_ntb->ep_map); part_map &= ~(1 << sndev->self_partition); -if (!ffs (tpart_vec)) { +if (!tpart_vec) {if (sndev->stdev->partition_count !=2 ) {dev_err (&sndev->stdev->dev,"ntb target partition not defined\n" );return -ENODEV ; } - bit =ffs (part_map); -if (!bit) { +if (!part_map) {dev_err (&sndev->stdev->dev,"peer partition is not NT partition\n" );return -ENODEV ; } - sndev->peer_partition = bit -1 ; + sndev->peer_partition =__ffs64 (part_map); }else { -if (ffs (tpart_vec) !=fls (tpart_vec)) { +if (__ffs64 (tpart_vec) != (fls64 (tpart_vec) -1 )) {dev_err (&sndev->stdev->dev,"ntb driver only supports 1 pair of 1-1 ntb mapping\n" );return -ENODEV ; } - sndev->peer_partition =ffs (tpart_vec) -1 ; + sndev->peer_partition =__ffs64 (tpart_vec);if (!(part_map & (1ULL << sndev->peer_partition))) {dev_err (&sndev->stdev->dev,"ntb target partition is not NT partition\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 8/262 btrfs: get rid of warning on transaction commit when using flushoncommit
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit a0f0cf8341e34e5d2265bfd3a7ad68342da1e2aa ]
When using the flushoncommit mount option, during almost every transaction commit we trigger a warning from __writeback_inodes_sb_nr():
$ cat fs/fs-writeback.c:
(...)
static void __writeback_inodes_sb_nr(struct super_block *sb, ...
{
(...)
WARN_ON(!rwsem_is_locked(&sb->s_umount));
(...)
}
(...)The trace produced in dmesg looks like the following:
[947.473890] WARNING: CPU: 5 PID: 930 at fs/fs-writeback.c:2610 __writeback_inodes_sb_nr+0x7e/0xb3 [947.481623] Modules linked in: nfsd nls_cp437 cifs asn1_decoder cifs_arc4 fscache cifs_md4 ipmi_ssif [947.489571] CPU: 5 PID: 930 Comm: btrfs-transacti Not tainted 95.16.3-srb-asrock-00001-g36437ad63879 #186 [947.497969] RIP: 0010:__writeback_inodes_sb_nr+0x7e/0xb3 [947.502097] Code: 24 10 4c 89 44 24 18 c6 (...) [947.519760] RSP: 0018:ffffc90000777e10 EFLAGS: 00010246 [947.523818] RAX: 0000000000000000 RBX: 0000000000963300 RCX: 0000000000000000 [947.529765] RDX: 0000000000000000 RSI: 000000000000fa51 RDI: ffffc90000777e50 [947.535740] RBP: ffff888101628a90 R08: ffff888100955800 R09: ffff888100956000 [947.541701] R10: 0000000000000002 R11: 0000000000000001 R12: ffff888100963488 [947.547645] R13: ffff888100963000 R14: ffff888112fb7200 R15: ffff888100963460 [947.553621] FS: 0000000000000000(0000) GS:ffff88841fd40000(0000) knlGS:0000000000000000 [947.560537] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [947.565122] CR2: 0000000008be50c4 CR3: 000000000220c000 CR4: 00000000001006e0 [947.571072] Call Trace: [947.572354] <TASK> [947.573266] btrfs_commit_transaction+0x1f1/0x998 [947.576785] ? start_transaction+0x3ab/0x44e [947.579867] ? schedule_timeout+0x8a/0xdd [947.582716] transaction_kthread+0xe9/0x156 [947.585721] ? btrfs_cleanup_transaction.isra.0+0x407/0x407 [947.590104] kthread+0x131/0x139 [947.592168] ? set_kthread_struct+0x32/0x32 [947.595174] ret_from_fork+0x22/0x30 [947.597561] </TASK> [947.598553] ---[ end trace 644721052755541c ]---
This is because we started using writeback_inodes_sb() to flush delalloc when committing a transaction (when using -o flushoncommit), in order to avoid deadlocks with filesystem freeze operations. This change was made by commit ce8ea7cc6eb313 ("btrfs: don't call btrfs_start_delalloc_roots in flushoncommit"). After that change we started producing that warning, and every now and then a user reports this since the warning happens too often, it spams dmesg/syslog, and a user is unsure if this reflects any problem that might compromise the filesystem's reliability.
We can not just lock the sb->s_umount semaphore before calling writeback_inodes_sb(), because that would at least deadlock with filesystem freezing, since at fs/super.c:freeze_super() sync_filesystem() is called while we are holding that semaphore in write mode, and that can trigger a transaction commit, resulting in a deadlock. It would also trigger the same type of deadlock in the unmount path. Possibly, it could also introduce some other locking dependencies that lockdep would report.
To fix this call try_to_writeback_inodes_sb() instead of writeback_inodes_sb(), because that will try to read lock sb->s_umount and then will only call writeback_inodes_sb() if it was able to lock it. This is fine because the cases where it can't read lock sb->s_umount are during a filesystem unmount or during a filesystem freeze - in those cases sb->s_umount is write locked and sync_filesystem() is called, which calls writeback_inodes_sb(). In other words, in all cases where we can't take a read lock on sb->s_umount, writeback is already being triggered elsewhere.
An alternative would be to call btrfs_start_delalloc_roots() with a number of pages different from LONG_MAX, for example matching the number of delalloc bytes we currently have, in which case we would end up starting all delalloc with filemap_fdatawrite_wbc() and not with an async flush via filemap_flush() - that is only possible after the rather recent commit e076ab2a2ca70a ("btrfs: shrink delalloc pages instead of full inodes"). However that creates a whole new can of worms due to new lock dependencies, which lockdep complains, like for example:
[ 8948.247280] ======================================================
[ 8948.247823] WARNING: possible circular locking dependency detected
[ 8948.248353] 5.17.0-rc1-btrfs-next-111 #1 Not tainted
[ 8948.248786] ------------------------------------------------------
[ 8948.249320] kworker/u16:18/933570 is trying to acquire lock:
[ 8948.249812] ffff9b3de1591690 (sb_internal#2){.+.+}-{0:0}, at: find_free_extent+0x141e/0x1590 [btrfs]
[ 8948.250638]
but task is already holding lock:
[ 8948.251140] ffff9b3e09c717d8 (&root->delalloc_mutex){+.+.}-{3:3}, at: start_delalloc_inodes+0x78/0x400 [btrfs]
[ 8948.252018]
which lock already depends on the new lock.[ 8948.252710]
the existing dependency chain (in reverse order) is:
[ 8948.253343]
-> #2 (&root->delalloc_mutex){+.+.}-{3:3}:
[ 8948.253950] __mutex_lock+0x90/0x900
[ 8948.254354] start_delalloc_inodes+0x78/0x400 [btrfs]
[ 8948.254859] btrfs_start_delalloc_roots+0x194/0x2a0 [btrfs]
[ 8948.255408] btrfs_commit_transaction+0x32f/0xc00 [btrfs]
[ 8948.255942] btrfs_mksubvol+0x380/0x570 [btrfs]
[ 8948.256406] btrfs_mksnapshot+0x81/0xb0 [btrfs]
[ 8948.256870] __btrfs_ioctl_snap_create+0x17f/0x190 [btrfs]
[ 8948.257413] btrfs_ioctl_snap_create_v2+0xbb/0x140 [btrfs]
[ 8948.257961] btrfs_ioctl+0x1196/0x3630 [btrfs]
[ 8948.258418] __x64_sys_ioctl+0x83/0xb0
[ 8948.258793] do_syscall_64+0x3b/0xc0
[ 8948.259146] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 8948.259709]
-> #1 (&fs_info->delalloc_root_mutex){+.+.}-{3:3}:
[ 8948.260330] __mutex_lock+0x90/0x900
[ 8948.260692] btrfs_start_delalloc_roots+0x97/0x2a0 [btrfs]
[ 8948.261234] btrfs_commit_transaction+0x32f/0xc00 [btrfs]
[ 8948.261766] btrfs_set_free_space_cache_v1_active+0x38/0x60 [btrfs]
[ 8948.262379] btrfs_start_pre_rw_mount+0x119/0x180 [btrfs]
[ 8948.262909] open_ctree+0x1511/0x171e [btrfs]
[ 8948.263359] btrfs_mount_root.cold+0x12/0xde [btrfs]
[ 8948.263863] legacy_get_tree+0x30/0x50
[ 8948.264242] vfs_get_tree+0x28/0xc0
[ 8948.264594] vfs_kern_mount.part.0+0x71/0xb0
[ 8948.265017] btrfs_mount+0x11d/0x3a0 [btrfs]
[ 8948.265462] legacy_get_tree+0x30/0x50
[ 8948.265851] vfs_get_tree+0x28/0xc0
[ 8948.266203] path_mount+0x2d4/0xbe0
[ 8948.266554] __x64_sys_mount+0x103/0x140
[ 8948.266940] do_syscall_64+0x3b/0xc0
[ 8948.267300] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 8948.267790]
-> #0 (sb_internal#2){.+.+}-{0:0}:
[ 8948.268322] __lock_acquire+0x12e8/0x2260
[ 8948.268733] lock_acquire+0xd7/0x310
[ 8948.269092] start_transaction+0x44c/0x6e0 [btrfs]
[ 8948.269591] find_free_extent+0x141e/0x1590 [btrfs]
[ 8948.270087] btrfs_reserve_extent+0x14b/0x280 [btrfs]
[ 8948.270588] cow_file_range+0x17e/0x490 [btrfs]
[ 8948.271051] btrfs_run_delalloc_range+0x345/0x7a0 [btrfs]
[ 8948.271586] writepage_delalloc+0xb5/0x170 [btrfs]
[ 8948.272071] __extent_writepage+0x156/0x3c0 [btrfs]
[ 8948.272579] extent_write_cache_pages+0x263/0x460 [btrfs]
[ 8948.273113] extent_writepages+0x76/0x130 [btrfs]
[ 8948.273573] do_writepages+0xd2/0x1c0
[ 8948.273942] filemap_fdatawrite_wbc+0x68/0x90
[ 8948.274371] start_delalloc_inodes+0x17f/0x400 [btrfs]
[ 8948.274876] btrfs_start_delalloc_roots+0x194/0x2a0 [btrfs]
[ 8948.275417] flush_space+0x1f2/0x630 [btrfs]
[ 8948.275863] btrfs_async_reclaim_data_space+0x108/0x1b0 [btrfs]
[ 8948.276438] process_one_work+0x252/0x5a0
[ 8948.276829] worker_thread+0x55/0x3b0
[ 8948.277189] kthread+0xf2/0x120
[ 8948.277506] ret_from_fork+0x22/0x30
[ 8948.277868]
other info that might help us debug this:[ 8948.278548] Chain exists of:
sb_internal#2 --> &fs_info->delalloc_root_mutex --> &root->delalloc_mutex[ 8948.279601] Possible unsafe locking scenario:
[ 8948.280102] CPU0 CPU1
[ 8948.280508] ---- ----
[ 8948.280915] lock(&root->delalloc_mutex);
[ 8948.281271] lock(&fs_info->delalloc_root_mutex);
[ 8948.281915] lock(&root->delalloc_mutex);
[ 8948.282487] lock(sb_internal#2);
[ 8948.282800]
*** DEADLOCK ***[ 8948.283333] 4 locks held by kworker/u16:18/933570:
[ 8948.283750] #0: ffff9b3dc00a9d48 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x1d2/0x5a0
[ 8948.284609] #1: ffffa90349dafe70 ((work_completion)(&fs_info->async_data_reclaim_work)){+.+.}-{0:0}, at: process_one_work+0x1d2/0x5a0
[ 8948.285637] #2: ffff9b3e14db5040 (&fs_info->delalloc_root_mutex){+.+.}-{3:3}, at: btrfs_start_delalloc_roots+0x97/0x2a0 [btrfs]
[ 8948.286674] #3: ffff9b3e09c717d8 (&root->delalloc_mutex){+.+.}-{3:3}, at: start_delalloc_inodes+0x78/0x400 [btrfs]
[ 8948.287596]
stack backtrace:
[ 8948.287975] CPU: 3 PID: 933570 Comm: kworker/u16:18 Not tainted 5.17.0-rc1-btrfs-next-111 #1
[ 8948.288677] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014
[ 8948.289649] Workqueue: events_unbound btrfs_async_reclaim_data_space [btrfs]
[ 8948.290298] Call Trace:
[ 8948.290517] <TASK>
[ 8948.290700] dump_stack_lvl+0x59/0x73
[ 8948.291026] check_noncircular+0xf3/0x110
[ 8948.291375] ? start_transaction+0x228/0x6e0 [btrfs]
[ 8948.291826] __lock_acquire+0x12e8/0x2260
[ 8948.292241] lock_acquire+0xd7/0x310
[ 8948.292714] ? find_free_extent+0x141e/0x1590 [btrfs]
[ 8948.293241] ? lock_is_held_type+0xea/0x140
[ 8948.293601] start_transaction+0x44c/0x6e0 [btrfs]
[ 8948.294055] ? find_free_extent+0x141e/0x1590 [btrfs]
[ 8948.294518] find_free_extent+0x141e/0x1590 [btrfs]
[ 8948.294957] ? _raw_spin_unlock+0x29/0x40
[ 8948.295312] ? btrfs_get_alloc_profile+0x124/0x290 [btrfs]
[ 8948.295813] btrfs_reserve_extent+0x14b/0x280 [btrfs]
[ 8948.296270] cow_file_range+0x17e/0x490 [btrfs]
[ 8948.296691] btrfs_run_delalloc_range+0x345/0x7a0 [btrfs]
[ 8948.297175] ? find_lock_delalloc_range+0x247/0x270 [btrfs]
[ 8948.297678] writepage_delalloc+0xb5/0x170 [btrfs]
[ 8948.298123] __extent_writepage+0x156/0x3c0 [btrfs]
[ 8948.298570] extent_write_cache_pages+0x263/0x460 [btrfs]
[ 8948.299061] extent_writepages+0x76/0x130 [btrfs]
[ 8948.299495] do_writepages+0xd2/0x1c0
[ 8948.299817] ? sched_clock_cpu+0xd/0x110
[ 8948.300160] ? lock_release+0x155/0x4a0
[ 8948.300494] filemap_fdatawrite_wbc+0x68/0x90
[ 8948.300874] ? do_raw_spin_unlock+0x4b/0xa0
[ 8948.301243] start_delalloc_inodes+0x17f/0x400 [btrfs]
[ 8948.301706] ? lock_release+0x155/0x4a0
[ 8948.302055] btrfs_start_delalloc_roots+0x194/0x2a0 [btrfs]
[ 8948.302564] flush_space+0x1f2/0x630 [btrfs]
[ 8948.302970] btrfs_async_reclaim_data_space+0x108/0x1b0 [btrfs]
[ 8948.303510] process_one_work+0x252/0x5a0
[ 8948.303860] ? process_one_work+0x5a0/0x5a0
[ 8948.304221] worker_thread+0x55/0x3b0
[ 8948.304543] ? process_one_work+0x5a0/0x5a0
[ 8948.304904] kthread+0xf2/0x120
[ 8948.305184] ? kthread_complete_and_exit+0x20/0x20
[ 8948.305598] ret_from_fork+0x22/0x30
[ 8948.305921] </TASK>It all comes from the fact that btrfs_start_delalloc_roots() takes the delalloc_root_mutex, in the transaction commit path we are holding a read lock on one of the superblock's freeze semaphores (via sb_start_intwrite()), the async reclaim task can also do a call to btrfs_start_delalloc_roots(), which ends up triggering writeback with calls to filemap_fdatawrite_wbc(), resulting in extent allocation which in turn can call btrfs_start_transaction(), which will result in taking the freeze semaphore via sb_start_intwrite(), forming a nasty dependency on all those locks which can be taken in different orders by different code paths.
So just adopt the simple approach of calling try_to_writeback_inodes_sb() at btrfs_start_delalloc_flush().
--- fs/btrfs/transaction.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/btrfs/transaction.c +10 -2
@@ -2014,16 +2014,24 @@ static void btrfs_cleanup_pending_block_groups(struct btrfs_trans_handle *trans)static inline int btrfs_start_delalloc_flush (struct btrfs_fs_info *fs_info) {/* -* We use writeback_inodes_sb here because if we used +* We use try_to_writeback_inodes_sb() here because if we used * btrfs_start_delalloc_roots we would deadlock with fs freeze. * Currently are holding the fs freeze lock, if we do an async flush * we'll do btrfs_join_transaction() and deadlock because we need to * wait for the fs freeze lock. Using the direct flushing we benefit * from already being in a transaction and our join_transaction doesn't * have to re-take the fs freeze lock. +* +* Note that try_to_writeback_inodes_sb() will only trigger writeback +* if it can read lock sb->s_umount. It will always be able to lock it, +* except when the filesystem is being unmounted or being frozen, but in +* those cases sync_filesystem() is called, which results in calling +* writeback_inodes_sb() while holding a write lock on sb->s_umount. +* Note that we don't call writeback_inodes_sb() directly, because it +* will emit a warning if sb->s_umount is not locked. */ if (btrfs_test_opt (fs_info,FLUSHONCOMMIT )) -writeback_inodes_sb (fs_info->sb,WB_REASON_SYNC ); +try_to_writeback_inodes_sb (fs_info->sb,WB_REASON_SYNC );return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 33/262 serial: stm32: prevent TDR register overwrite when sending x_char
In reply to Greg Kroah-HartmanFrom: Valentin Caron <[email protected]>
[ Upstream commit d3d079bde07e1b7deaeb57506dc0b86010121d17 ]
When sending x_char in stm32_usart_transmit_chars(), driver can overwrite the value of TDR register by the value of x_char. If this happens, the previous value that was present in TDR register will not be sent through uart.
This code checks if the previous value in TDR register is sent before writing the x_char value into register.
--- drivers/tty/serial/stm32-usart.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/tty/serial/stm32-usart.c +12 -0
@@ -421,10 +421,22 @@ static void stm32_usart_transmit_chars(struct uart_port *port)struct stm32_port *stm32_port =to_stm32_port (port);const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;struct circ_buf *xmit = &port->state->xmit; +u32 isr; +int ret;if (port->x_char) {if (stm32_port->tx_dma_busy)stm32_usart_clr_bits (port, ofs->cr3,USART_CR3_DMAT ); + +/* Check that TDR is empty before filling FIFO */ + ret = +readl_relaxed_poll_timeout_atomic (port->membase + ofs->isr, + isr, + (isr &USART_SR_TXE ), +10 ,1000 ); +if (ret) +dev_warn (port->dev,"1 character may be erased\n" ); +writel_relaxed (port->x_char, port->membase + ofs->tdr); port->x_char =0 ; port->icount.tx++;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 109/262 octeontx2-af: Add KPU changes to parse NGIO as separate layer
In reply to Greg Kroah-HartmanFrom: Kiran Kumar K <[email protected]>
[ Upstream commit 745166fcf01cecc4f5ff3defc6586868349a43f9 ]
With current KPU profile NGIO is being parsed along with CTAG as a single layer. Because of this MCAM/ntuple rules installed with ethertype as 0x8842 are not being hit. Adding KPU profile changes to parse NGIO in separate ltype and CTAG in separate ltype.
--- .../marvell/octeontx2/af/npc_profile.h | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h +35 -35
@@ -186,7 +186,6 @@ enum npc_kpu_parser_state {NPC_S_KPU2_ETAG ,NPC_S_KPU2_PREHEADER ,NPC_S_KPU2_EXDSA , -NPC_S_KPU2_NGIO ,NPC_S_KPU2_CPT_CTAG ,NPC_S_KPU2_CPT_QINQ , NPC_S_KPU3_CTAG,
@@ -213,6 +212,7 @@ enum npc_kpu_parser_state {NPC_S_KPU5_NSH ,NPC_S_KPU5_CPT_IP ,NPC_S_KPU5_CPT_IP6 , +NPC_S_KPU5_NGIO ,NPC_S_KPU6_IP6_EXT ,NPC_S_KPU6_IP6_HOP_DEST , NPC_S_KPU6_IP6_ROUT,
@@ -1117,15 +1117,6 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {0x0000 ,0x0000 , }, - { -NPC_S_KPU1_ETHER ,0xff , -NPC_ETYPE_CTAG , -0xffff , -NPC_ETYPE_NGIO , -0xffff , -0x0000 , -0x0000 , - }, {NPC_S_KPU1_ETHER ,0xff , NPC_ETYPE_CTAG,
@@ -1986,6 +1977,15 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {0x0000 ,0x0000 , }, + { +NPC_S_KPU2_CTAG ,0xff , +NPC_ETYPE_NGIO , +0xffff , +0x0000 , +0x0000 , +0x0000 , +0x0000 , + }, {NPC_S_KPU2_CTAG ,0xff , NPC_ETYPE_PPPOE,
@@ -2877,15 +2877,6 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {0x0000 ,0x0000 , }, - { -NPC_S_KPU2_NGIO ,0xff , -0x0000 , -0x0000 , -0x0000 , -0x0000 , -0x0000 , -0x0000 , - }, {NPC_S_KPU2_CPT_CTAG ,0xff , NPC_ETYPE_IP,
@@ -5205,6 +5196,15 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {0x0000 ,0x0000 , }, + { +NPC_S_KPU5_NGIO ,0xff , +0x0000 , +0x0000 , +0x0000 , +0x0000 , +0x0000 , +0x0000 , + }, {NPC_S_NA ,0X00 , 0x0000,
@@ -8499,14 +8499,6 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = {0 ,0 ,0 ,0 ,0 , }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -8 ,12 ,0 ,0 ,0 , -NPC_S_KPU2_NGIO ,12 ,1 , -NPC_LID_LA ,NPC_LT_LA_ETHER , -0 , -0 ,0 ,0 ,0 , - }, {NPC_ERRLEV_RE ,NPC_EC_NOERR , 8, 12, 0, 0, 0,
@@ -9291,6 +9283,14 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {0 ,0 ,0 ,0 ,0 , }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +0 ,0 ,0 ,2 ,0 , +NPC_S_KPU5_NGIO ,6 ,1 , +NPC_LID_LB ,NPC_LT_LB_CTAG , +0 , +0 ,0 ,0 ,0 , + }, {NPC_ERRLEV_RE ,NPC_EC_NOERR , 8, 0, 6, 2, 0,
@@ -10083,14 +10083,6 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {NPC_F_LB_U_UNK_ETYPE |NPC_F_LB_L_EXDSA ,0 ,0 ,0 ,0 , }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -0 ,0 ,0 ,0 ,1 , -NPC_S_NA ,0 ,1 , -NPC_LID_LC ,NPC_LT_LC_NGIO , -0 , -0 ,0 ,0 ,0 , - }, {NPC_ERRLEV_RE ,NPC_EC_NOERR , 8, 0, 6, 2, 0,
@@ -12154,6 +12146,14 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {0 ,0 ,0 ,0 ,0 , }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +0 ,0 ,0 ,0 ,1 , +NPC_S_NA ,0 ,1 , +NPC_LID_LC ,NPC_LT_LC_NGIO , +0 , +0 ,0 ,0 ,0 , + }, {NPC_ERRLEV_LC ,NPC_EC_UNK , 0, 0, 0, 0, 1,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 42/262 ipv6: fix skb drops in igmp6_event_query() and igmp6_event_report()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 2d3916f3189172d5c69d33065c3c21119fe539fc ]
While investigating on why a synchronize_net() has been added recently in ipv6_mc_down(), I found that igmp6_event_query() and igmp6_event_report() might drop skbs in some cases.
Discussion about removing synchronize_net() from ipv6_mc_down() will happen in a different thread.
--- include/net/ndisc.h | 4 ++-- net/ipv6/mcast.c | 32 ++++++++++++-------------------- 2 files changed, 14 insertions(+), 22 deletions(-)
include/net/ndisc.h +2 -2
@@ -487,9 +487,9 @@ int igmp6_late_init(void);void igmp6_cleanup (void );void igmp6_late_cleanup (void ); -int igmp6_event_query (struct sk_buff *skb); +void igmp6_event_query (struct sk_buff *skb); -int igmp6_event_report (struct sk_buff *skb); +void igmp6_event_report (struct sk_buff *skb);#ifdef CONFIG_SYSCTL
net/ipv6/mcast.c +12 -20
@@ -1371,27 +1371,23 @@ static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld, }/* called with rcu_read_lock() */ -int igmp6_event_query (struct sk_buff *skb) +void igmp6_event_query (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); -if (!idev) -return -EINVAL ; - -if (idev->dead) { -kfree_skb (skb); -return -ENODEV ; - } +if (!idev || idev->dead) + goto out;spin_lock_bh (&idev->mc_query_lock);if (skb_queue_len (&idev->mc_query_queue) <MLD_MAX_SKBS ) {__skb_queue_tail (&idev->mc_query_queue, skb);if (!mod_delayed_work (mld_wq, &idev->mc_query_work,0 ))in6_dev_hold (idev); + skb =NULL ; }spin_unlock_bh (&idev->mc_query_lock); - -return 0 ; +out: +kfree_skb (skb); }static void __mld_query_work (struct sk_buff *skb)
@@ -1542,27 +1538,23 @@ static void mld_query_work(struct work_struct *work) }/* called with rcu_read_lock() */ -int igmp6_event_report (struct sk_buff *skb) +void igmp6_event_report (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); -if (!idev) -return -EINVAL ; - -if (idev->dead) { -kfree_skb (skb); -return -ENODEV ; - } +if (!idev || idev->dead) + goto out;spin_lock_bh (&idev->mc_report_lock);if (skb_queue_len (&idev->mc_report_queue) <MLD_MAX_SKBS ) {__skb_queue_tail (&idev->mc_report_queue, skb);if (!mod_delayed_work (mld_wq, &idev->mc_report_work,0 ))in6_dev_hold (idev); + skb =NULL ; }spin_unlock_bh (&idev->mc_report_lock); - -return 0 ; +out: +kfree_skb (skb); }static void __mld_report_work (struct sk_buff *skb)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 59/262 KVM: x86: Handle 32-bit wrap of EIP for EMULTYPE_SKIP with flat code seg
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 5e854864ee4384736f27a986633bae21731a4e4e ]
Truncate the new EIP to a 32-bit value when handling EMULTYPE_SKIP as the decode phase does not truncate _eip. Wrapping the 32-bit boundary is legal if and only if CS is a flat code segment, but that check is implicitly handled in the form of limit checks in the decode phase.
Opportunstically prepare for a future fix by storing the result of any truncation in "eip" instead of "_eip".
Message-Id: <093eabb1eab2965201c9b018373baf26ff256d85.1635842679.git.houwenlong93@linux.alibaba.com>
--- arch/x86/kvm/x86.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +6 -1
@@ -7999,7 +7999,12 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,* updating interruptibility state and injecting single-step #DBs. */ if (emulation_type &EMULTYPE_SKIP ) { -kvm_rip_write (vcpu, ctxt->_eip); +if (ctxt->mode !=X86EMUL_MODE_PROT64 ) + ctxt->eip = (u32 )ctxt->_eip; +else + ctxt->eip = ctxt->_eip; + +kvm_rip_write (vcpu, ctxt->eip);if (ctxt->eflags &X86_EFLAGS_RF )kvm_set_rflags (vcpu, ctxt->eflags & ~X86_EFLAGS_RF );return 1 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 67/262 PCI: mvebu: Do not modify PCI IO type bits in conf_write
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 2cf150216e5b5619d7c25180ccf2cc8ac7bebc13 ]
PCI IO type bits are already initialized in mvebu_pci_bridge_emul_init() function and only when IO support is enabled. These type bits are read-only and pci-bridge-emul.c code already does not allow to modify them from upper layers.
When IO support is disabled then all IO registers should be read-only and return zeros. Therefore do not modify PCI IO type bits in mvebu_pci_bridge_emul_base_conf_write() callback.
--- drivers/pci/controller/pci-mvebu.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/pci/controller/pci-mvebu.c +0 -7
@@ -497,13 +497,6 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge, }case PCI_IO_BASE : -/* -* We keep bit 1 set, it is a read-only bit that -* indicates we support 32 bits addressing for the -* I/O -*/ - conf->iobase |=PCI_IO_RANGE_TYPE_32 ; - conf->iolimit |=PCI_IO_RANGE_TYPE_32 ;mvebu_pcie_handle_iobase_change (port);break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 6/262 regulator: core: fix false positive in regulator_late_cleanup()
In reply to Greg Kroah-HartmanFrom: Oliver Barta <[email protected]>
[ Upstream commit 4e2a354e3775870ca823f1fb29bbbffbe11059a6 ]
The check done by regulator_late_cleanup() to detect whether a regulator is on was inconsistent with the check done by _regulator_is_enabled(). While _regulator_is_enabled() takes the enable GPIO into account, regulator_late_cleanup() was not doing that.
This resulted in a false positive, e.g. when a GPIO-controlled fixed regulator was used, which was not enabled at boot time, e.g.
reg_disp_1v2: reg_disp_1v2 {
compatible = "regulator-fixed";
regulator-name = "display_1v2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
gpio = <&tlmm 148 0>;
enable-active-high;
};Such regulator doesn't have an is_enabled() operation. Nevertheless it's state can be determined based on the enable GPIO. The check in regulator_late_cleanup() wrongly assumed that the regulator is on and tried to disable it.
--- drivers/regulator/core.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/regulator/core.c +3 -10
@@ -6010,9 +6010,8 @@ core_initcall(regulator_init);static int regulator_late_cleanup (struct device *dev,void *data) {struct regulator_dev *rdev =dev_to_rdev (dev); -const struct regulator_ops *ops = rdev->desc->ops;struct regulation_constraints *c = rdev->constraints; -int enabled, ret; +int ret;if (c && c->always_on)return 0 ;
@@ -6025,14 +6024,8 @@ static int regulator_late_cleanup(struct device *dev, void *data)if (rdev->use_count) goto unlock; -/* If we can't read the status assume it's always on. */ -if (ops->is_enabled) - enabled = ops->is_enabled (rdev); -else - enabled =1 ; - -/* But if reading the status failed, assume that it's off. */ -if (enabled <=0 ) +/* If reading the status failed, assume that it's off. */ +if (_regulator_is_enabled (rdev) <=0 ) goto unlock;if (have_full_constraints ()) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 35/262 ext4: simplify updating of fast commit stats
In reply to Greg Kroah-HartmanFrom: Harshad Shirwadkar <[email protected]>
[ Upstream commit 0915e464cb274648e1ef1663e1356e53ff400983 ]
Move fast commit stats updating logic to a separate function from ext4_fc_commit(). This significantly improves readability of ext4_fc_commit().
--- fs/ext4/ext4.h | 1 - fs/ext4/fast_commit.c | 99 +++++++++++++++++++++++-------------------- fs/ext4/fast_commit.h | 27 ++++++------ 3 files changed, 68 insertions(+), 59 deletions(-)
fs/ext4/ext4.h +0 -1
@@ -1746,7 +1746,6 @@ struct ext4_sb_info {spinlock_t s_fc_lock;struct buffer_head *s_fc_bh;struct ext4_fc_stats s_fc_stats; -u64 s_fc_avg_commit_time;#ifdef CONFIG_EXT4_DEBUG int s_fc_debug_max_replay;#endif
fs/ext4/fast_commit.c +54 -45
143 lines not on this page · raw message
fs/ext4/fast_commit.h +14 -13
@@ -71,21 +71,19 @@ struct ext4_fc_tail { };/* -* Fast commit reason codes +* Fast commit status codes +*/ +enum { +EXT4_FC_STATUS_OK =0 , +EXT4_FC_STATUS_INELIGIBLE , +EXT4_FC_STATUS_SKIPPED , +EXT4_FC_STATUS_FAILED , +}; + +/* +* Fast commit ineligiblity reasons: */ enum { -/* -* Commit status codes: -*/ -EXT4_FC_REASON_OK =0 , -EXT4_FC_REASON_INELIGIBLE , -EXT4_FC_REASON_ALREADY_COMMITTED , -EXT4_FC_REASON_FC_START_FAILED , -EXT4_FC_REASON_FC_FAILED , - -/* -* Fast commit ineligiblity reasons: -*/ EXT4_FC_REASON_XATTR =0 ,EXT4_FC_REASON_CROSS_RENAME ,EXT4_FC_REASON_JOURNAL_FLAG_CHANGE ,
@@ -117,7 +115,10 @@ struct ext4_fc_stats {unsigned int fc_ineligible_reason_count[EXT4_FC_REASON_MAX ];unsigned long fc_num_commits;unsigned long fc_ineligible_commits; +unsigned long fc_failed_commits; +unsigned long fc_skipped_commits;unsigned long fc_numblks; +u64 s_fc_avg_commit_time; };#define EXT4_FC_REPLAY_REALLOC_INCREMENT 4
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 102/262 drm/amd/display: Wrap dcn301_calculate_wm_and_dlg for FPU.
In reply to Greg Kroah-HartmanFrom: Bas Nieuwenhuizen <[email protected]>
[ Upstream commit 25f1488bdbba63415239ff301fe61a8546140d9f ]
Mirrors the logic for dcn30. Cue lots of WARNs and some kernel panics without this fix.
--- .../gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 11 +++++++++++ .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +11 -0
@@ -1387,6 +1387,17 @@ static void set_wm_ranges( pp_smu->nv_funcs.set_wm_ranges (&pp_smu->nv_funcs.pp_smu, &ranges); } +static void dcn301_calculate_wm_and_dlg ( +struct dc *dc,struct dc_state *context, +display_e2e_pipe_params_st *pipes, +int pipe_cnt, +int vlevel) +{ +DC_FP_START (); +dcn301_calculate_wm_and_dlg_fp (dc, context, pipes, pipe_cnt, vlevel); +DC_FP_END (); +} +static struct resource_funcs dcn301_res_pool_funcs = { .destroy = dcn301_destroy_resource_pool, .link_enc_create = dcn301_link_encoder_create,
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c +1 -1
@@ -327,7 +327,7 @@ void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info) dcn3_01_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns *10 ; } -void dcn301_calculate_wm_and_dlg(struct dc *dc, +void dcn301_calculate_wm_and_dlg_fp(struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes, int pipe_cnt,
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h +1 -1
@@ -34,7 +34,7 @@ void dcn301_fpu_set_wm_ranges(int i,void dcn301_fpu_init_soc_bounding_box (struct bp_soc_bb_info bb_info); -void dcn301_calculate_wm_and_dlg(struct dc *dc, +void dcn301_calculate_wm_and_dlg_fp(struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes, int pipe_cnt,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainercover 5.15.27-rc1 review
This is the start of the stable review cycle for the 5.15.27 release. There are 262 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, 09 Mar 2022 09:16:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.27-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.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.27-rc1
Like Xu <[email protected]>
KVM: x86/mmu: Passing up the error state of mmu_alloc_shadow_roots()
Yun Zhou <[email protected]>
proc: fix documentation and description of pagemap
Jiri Bohac <[email protected]>
Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6"
Josef Bacik <[email protected]>
btrfs: do not start relocation until in progress drops are done
Filipe Manana <[email protected]>
btrfs: add missing run of delayed items after unlink during log replay
Sidong Yang <[email protected]>
btrfs: qgroup: fix deadlock between rescan worker and remove qgroup
Josef Bacik <[email protected]>
btrfs: do not WARN_ON() if we have PageError set
Omar Sandoval <[email protected]>
btrfs: fix relocation crash due to premature return from btrfs_commit_transaction()
Filipe Manana <[email protected]>
btrfs: fix lost prealloc extents beyond eof after full fsync
Randy Dunlap <[email protected]>
tracing: Fix return value of __setup handlers
Steven Rostedt (Google) <[email protected]>
tracing/histogram: Fix sorting on old "cpu" value
William Mahon <[email protected]>
HID: add mapping for KEY_ALL_APPLICATIONS
William Mahon <[email protected]>
HID: add mapping for KEY_DICTATE
David Gow <[email protected]>
Input: samsung-keypad - properly state IOMEM dependency
Hans de Goede <[email protected]>
Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
Hans de Goede <[email protected]>
Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
Lukas Bulwahn <[email protected]>
MAINTAINERS: adjust file entry for of_net.c after movement
Dan Carpenter <[email protected]>
iavf: missing unlocks in iavf_watchdog_task()
Stefan Assmann <[email protected]>
iavf: do not override the adapter state in the watchdog task (again)
Ong Boon Leong <[email protected]>
net: stmmac: perserve TX and RX coalesce value during XDP setup
Amit Cohen <[email protected]>
selftests: mlxsw: resource_scale: Fix return value
Vladimir Oltean <[email protected]>
net: dcb: disable softirqs in dcbnl_flush_dev()
Qiang Yu <[email protected]>
drm/amdgpu: fix suspend/resume hang regression
Jiasheng Jiang <[email protected]>
nl80211: Handle nla_memdup failures in handle_nan_filter
Ilya Lipnitskiy <[email protected]>
MIPS: ralink: mt7621: use bitwise NOT instead of logical
Sasha Neftin <[email protected]>
e1000e: Fix possible HW unit hang after an s0ix exit
Douglas Anderson <[email protected]>
drm/bridge: ti-sn65dsi86: Properly undo autosuspend
Vinay Belgaumkar <[email protected]>
drm/i915/guc/slpc: Correct the param count for unset param
Slawomir Laba <[email protected]>
iavf: Fix __IAVF_RESETTING state usage
Slawomir Laba <[email protected]>
iavf: Fix race in init state
Slawomir Laba <[email protected]>
iavf: Fix locking for VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS
Slawomir Laba <[email protected]>
iavf: Fix init state closure on remove
Slawomir Laba <[email protected]>
iavf: Add waiting so the port is initialized in remove
Przemyslaw Patynowski <[email protected]>
iavf: Fix kernel BUG in free_msi_irqs
Karen Sornek <[email protected]>
iavf: Add helper function to go from pci_dev to adapter
Slawomir Laba <[email protected]>
iavf: Rework mutexes for better synchronisation
Jedrzej Jagielski <[email protected]>
iavf: Add trace while removing device
Mateusz Palczewski <[email protected]>
iavf: Combine init and watchdog state machines
Mateusz Palczewski <[email protected]>
iavf: Add __IAVF_INIT_FAILED state
Mateusz Palczewski <[email protected]>
iavf: Refactor iavf state machine tracking
Casper Andersson <[email protected]>
net: sparx5: Fix add vlan when invalid operation
Jia-Ju Bai <[email protected]>
net: chelsio: cxgb3: check the return value of pci_find_capability()
Sukadev Bhattiprolu <[email protected]>
ibmvnic: complete init_done on transport events
Sukadev Bhattiprolu <[email protected]>
ibmvnic: define flush_reset_queue helper
Sukadev Bhattiprolu <[email protected]>
ibmvnic: initialize rc before completing wait
Vincent Whitchurch <[email protected]>
net: stmmac: only enable DMA interrupts when ready
Ong Boon Leong <[email protected]>
net: stmmac: enhance XDP ZC driver level switching performance
Vincent Mailhol <[email protected]>
can: etas_es58x: change opened_channel_cnt's type from atomic_t to u8
Thierry Reding <[email protected]>
ARM: tegra: Move panels to AUX bus
Eric Dumazet <[email protected]>
netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant
Jiasheng Jiang <[email protected]>
soc: fsl: qe: Check of ioremap return value
Christophe JAILLET <[email protected]>
soc: fsl: guts: Add a missing memory allocation failure check
Christophe JAILLET <[email protected]>
soc: fsl: guts: Revert commit 3c0d64e867ed
Anthoine Bourgeois <[email protected]>
ARM: dts: Use 32KiHz oscillator on devkit8000
Anthoine Bourgeois <[email protected]>
ARM: dts: switch timer config to common devkit8000 devicetree
Chuanhong Guo <[email protected]>
MIPS: ralink: mt7621: do memory detection on KSEG1
Suravee Suthikulpanit <[email protected]>
iommu/amd: Fix I/O page table memory leak
Matthew Wilcox (Oracle) <[email protected]>
iommu/amd: Use put_pages_list
Robin Murphy <[email protected]>
iommu/amd: Simplify pagetable freeing
Robin Murphy <[email protected]>
arm64: dts: juno: Remove GICv2m dma-range
Peter Zijlstra <[email protected]>
sched: Fix yet more sched_fork() races
Heiko Carstens <[email protected]>
s390/extable: fix exception table sorting
Hugh Dickins <[email protected]>
memfd: fix F_SEAL_WRITE after shmem huge page allocated
Sukadev Bhattiprolu <[email protected]>
ibmvnic: free reset-work-item when flushing
Sasha Neftin <[email protected]>
igc: igc_write_phy_reg_gpy: drop premature return
Samuel Holland <[email protected]>
pinctrl: sunxi: Use unique lockdep classes for IRQs
Amit Cohen <[email protected]>
selftests: mlxsw: tc_police_scale: Make test more robust
Mat Martineau <[email protected]>
mptcp: Correctly set DATA_FIN timeout when number of retransmits is large
Randy Dunlap <[email protected]>
ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
Randy Dunlap <[email protected]>
mips: setup: fix setnocoherentio() boolean setting
Russell King (Oracle) <[email protected]>
ARM: Fix kgdb breakpoint for Thumb2
Corinna Vinschen <[email protected]>
igc: igc_read_phy_reg_gpy: drop premature return
Brian Norris <[email protected]>
arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
Miaoqian Lin <[email protected]>
iommu/tegra-smmu: Fix missing put_device() call in tegra_smmu_find
Vincent Mailhol <[email protected]>
can: gs_usb: change active_channels's type from atomic_t to u8
Andy Shevchenko <[email protected]>
auxdisplay: lcd2s: Use proper API to free the instance of charlcd object
Andy Shevchenko <[email protected]>
auxdisplay: lcd2s: Fix memory leak in ->remove()
Fabio Estevam <[email protected]>
ASoC: cs4265: Fix the duplicated control name
Alyssa Ross <[email protected]>
firmware: arm_scmi: Remove space in MODULE_ALIAS name
Andy Shevchenko <[email protected]>
auxdisplay: lcd2s: Fix lcd2s_redefine_char() feature
Jann Horn <[email protected]>
efivars: Respect "block" flag in efivar_entry_set_safe()
Slawomir Laba <[email protected]>
iavf: Fix deadlock in iavf_reset_task
Maciej Fijalkowski <[email protected]>
ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc()
Zheyu Ma <[email protected]>
net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()
Sukadev Bhattiprolu <[email protected]>
ibmvnic: register netdev after init of adapter
Randy Dunlap <[email protected]>
net: sxgbe: fix return value of __setup handler
Slawomir Laba <[email protected]>
iavf: Fix missing check for running netdev
Johannes Berg <[email protected]>
mac80211: treat some SAE auth steps as final
Randy Dunlap <[email protected]>
net: stmmac: fix return value of __setup handler
Nicolas Escande <[email protected]>
mac80211: fix forwarded mesh frames AC & queue selection
Filipe Manana <[email protected]>
btrfs: fix ENOSPC failure when attempting direct IO write into NOCOW range
D. Wythe <[email protected]>
net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server
D. Wythe <[email protected]>
net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client
D. Wythe <[email protected]>
net/smc: fix connection leak
Alex Elder <[email protected]>
net: ipa: add an interconnect dependency
Vladimir Oltean <[email protected]>
net: dcb: flush lingering app table entries for unregistered devices
[email protected] <[email protected]>
net: ipv6: ensure we call ipv6_mc_down() at most once
Sven Eckelmann <[email protected]>
batman-adv: Don't expect inter-netns unique iflink indices
Sven Eckelmann <[email protected]>
batman-adv: Request iflink once in batadv_get_real_netdevice
Sven Eckelmann <[email protected]>
batman-adv: Request iflink once in batadv-on-batadv check
Florian Westphal <[email protected]>
netfilter: nf_queue: handle socket prefetch
Florian Westphal <[email protected]>
netfilter: nf_queue: fix possible use-after-free
Florian Westphal <[email protected]>
netfilter: nf_queue: don't assume sk is full socket
lena wang <[email protected]>
net: fix up skbs delta_truesize in UDP GRO frag_list
Sasha Neftin <[email protected]>
e1000e: Correct NVM checksum verification flow
Leon Romanovsky <[email protected]>
xfrm: enforce validity of offload input flags
Antony Antony <[email protected]>
xfrm: fix the if_id check in changelink
Eric Dumazet <[email protected]>
bpf, sockmap: Do not ignore orig_len parameter
Eric Dumazet <[email protected]>
netfilter: fix use-after-free in __nf_register_net_hook()
Jiri Bohac <[email protected]>
xfrm: fix MTU regression
Daniel Borkmann <[email protected]>
mm: Consider __GFP_NOWARN flag for oversized kvmalloc() calls
Dave Jiang <[email protected]>
ntb: intel: fix port config status offset for SPR
Yu Kuai <[email protected]>
blktrace: fix use after free for struct blk_trace
Deren Wu <[email protected]>
mac80211: fix EAPoL rekey fail in 802.3 rx path
Nicolas Cavallari <[email protected]>
thermal: core: Fix TZ_GET_TRIP NULL pointer dereference
Marek Marczykowski-Górecki <[email protected]>
xen/netfront: destroy queues before real_num_tx_queues is zeroed
Leo (Hanghong) Ma <[email protected]>
drm/amd/display: Reduce dmesg error to a debug print
Ville Syrjälä <[email protected]>
drm/i915: s/JSP2/ICP2/ PCH
Lennert Buytenhek <[email protected]>
iommu/amd: Recover from event log overflow
Adrian Huang <[email protected]>
iommu/vt-d: Fix double list_add when enabling VMD in scalable mode
Marek Vasut <[email protected]>
ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
Randy Dunlap <[email protected]>
iwlwifi: mvm: check debugfs_dir ptr before use
Alexandre Ghiti <[email protected]>
riscv: Fix config KASAN && DEBUG_VIRTUAL
Alexandre Ghiti <[email protected]>
riscv: Fix config KASAN && SPARSEMEM && !SPARSE_VMEMMAP
Sunil V L <[email protected]>
riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value
Eric W. Biederman <[email protected]>
ucounts: Fix systemd LimitNPROC with private users regression
Zhen Ni <[email protected]>
ALSA: intel_hdmi: Fix reference to PCM buffer address
Arnd Bergmann <[email protected]>
net: of: fix stub of_net helpers for CONFIG_NET=n
Pali Rohár <[email protected]>
PCI: mvebu: Fix device enumeration regression
Michel Dänzer <[email protected]>
drm/amd/display: For vblank_disable_immediate, check PSR is really used
Michael Chan <[email protected]>
bnxt_en: Fix occasional ethtool -t loopback test failures
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Fix stream->link_enc unassigned during stream removal
Steve French <[email protected]>
cifs: fix confusing unneeded warning message on smb2.1 and earlier
Shyam Prasad N <[email protected]>
cifs: protect session channel fields with chan_lock
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: mtk_dsi: Avoid EPROBE_DEFER loop with external bridge
Enric Balletbo i Serra <[email protected]>
drm/mediatek: mtk_dsi: Reset the dsi0 hardware
Cai Huoqing <[email protected]>
net: ethernet: litex: Add the dependency on HAS_IOMEM
Jakub Kicinski <[email protected]>
of: net: move of_net under net/
Sukadev Bhattiprolu <[email protected]>
ibmvnic: don't release napi in __ibmvnic_open()
Vladimir Oltean <[email protected]>
net: dsa: seville: register the mdiobus under devres
Colin Foster <[email protected]>
net: dsa: ocelot: seville: utilize of_mdiobus_register
Tao Liu <[email protected]>
gve: Recording rx queue before sending to napi
Ville Syrjälä <[email protected]>
drm/i915: Disable DRRS on IVB/HSW port != A
José Roberto de Souza <[email protected]>
drm/i915/display: Move DRRS code its own file
Jani Nikula <[email protected]>
drm/i915/display: split out dpt out of intel_display.c
Palmer Dabbelt <[email protected]>
riscv/mm: Add XIP_FIXUP for phys_ram_base
Alexander Stein <[email protected]>
drm: mxsfb: Fix NULL pointer dereference
Guido Günther <[email protected]>
drm: mxsfb: Set fallback bus format when the bridge doesn't provide one
Agustin Gutierrez <[email protected]>
drm/amd/display: Update watermark values for DCN301
He Fengqing <[email protected]>
bpf: Fix possible race in inc_misses_counter
Eric Dumazet <[email protected]>
bpf: Use u64_stats_t in struct bpf_prog_stats
Raed Salem <[email protected]>
net/mlx5e: IPsec: Fix crypto offload for non TCP/UDP encapsulated traffic
Raed Salem <[email protected]>
net/mlx5e: IPsec: Refactor checksum code in tx data path
Kiran Kumar K <[email protected]>
octeontx2-af: Add KPU changes to parse NGIO as separate layer
Kiran Kumar K <[email protected]>
octeontx2-af: Adjust LA pointer for cpt parse header
Geetha sowjanya <[email protected]>
octeontx2-af: cn10k: Use appropriate register for LMAC enable
Hariprasad Kelam <[email protected]>
octeontx2-af: cn10k: RPM hardware timestamp configuration
Harman Kalra <[email protected]>
octeontx2-af: Reset PTP config in FLR handler
Kiran Kumar K <[email protected]>
octeontx2-af: Optimize KPU1 processing for variable-length headers
Moshe Tal <[email protected]>
ethtool: Fix link extended state for big endian
Bas Nieuwenhuizen <[email protected]>
drm/amd/display: Wrap dcn301_calculate_wm_and_dlg for FPU.
Qingqing Zhuo <[email protected]>
drm/amd/display: move FPU associated DCN301 code to DML folder
Qingqing Zhuo <[email protected]>
drm/amd/display: move FPU associated DSC code to DML folder
Nikola Cornij <[email protected]>
drm/amd/display: Use adjusted DCN301 watermarks
Alex Deucher <[email protected]>
drm/amdgpu: filter out radeon secondary ids as well
Alex Deucher <[email protected]>
drm/amdgpu: filter out radeon PCI device IDs
Nicholas Kazlauskas <[email protected]>
drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled
Sean Christopherson <[email protected]>
hugetlbfs: fix off-by-one error in hugetlb_vmdelete_list()
Waiman Long <[email protected]>
selftests/vm: make charge_reserved_hugetlb.sh work with existing cgroup setting
Andrey Konovalov <[email protected]>
kasan: fix quarantine conflicting with init_on_free
Kefeng Wang <[email protected]>
mm: defer kmemleak object creation of module_alloc()
Xiaoke Wang <[email protected]>
tracing/probes: check the return value of kstrndup() for pbuf
Xiaoke Wang <[email protected]>
tracing/uprobes: Check the return value of kstrdup() for tu->filename
Weizhao Ouyang <[email protected]>
dma-buf: cma_heap: Fix mutex locking section
Tom Rix <[email protected]>
i3c: master: dw: check return of dw_i3c_master_get_free_pos()
Guchun Chen <[email protected]>
drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
Jiasheng Jiang <[email protected]>
drm/amdkfd: Check for null pointer after calling kmemdup
Wesley Sheng <[email protected]>
ntb_hw_switchtec: Fix bug with more than 32 partitions
Jeremy Pallotta <[email protected]>
ntb_hw_switchtec: Fix pff ioread to read into mmio_part_cfg_all
Liu Ying <[email protected]>
drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode
Miaoqian Lin <[email protected]>
drm/sun4i: dw-hdmi: Fix missing put_device() call in sun8i_hdmi_phy_get
Chuck Lever <[email protected]>
SUNRPC: Fix sockaddr handling in svcsock_accept_class trace points
Chuck Lever <[email protected]>
SUNRPC: Fix sockaddr handling in the svc_xprt_create_error trace point
Matthew Auld <[email protected]>
drm/i915: don't call free_mmap_offset when purging
Vitaly Kuznetsov <[email protected]>
x86/hyperv: Properly deal with empty cpumasks in hyperv_flush_tlb_multi()
J. Bruce Fields <[email protected]>
nfsd: fix crash on COPY_NOTIFY with special stateid
Chuck Lever <[email protected]>
Revert "nfsd: skip some unnecessary stats in the v4 case"
Chuck Lever <[email protected]>
NFSD: Fix verifier returned in stable WRITEs
Pali Rohár <[email protected]>
PCI: mvebu: Fix support for DEVCAP2, DEVCTL2 and LNKCTL2 registers on emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Fix support for PCI_EXP_RTSTA on emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Setup PCIe controller to Root Complex mode
Pali Rohár <[email protected]>
PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Fix support for bus mastering and PCI_COMMAND on emulated bridge
Pali Rohár <[email protected]>
PCI: mvebu: Do not modify PCI IO type bits in conf_write
Pali Rohár <[email protected]>
PCI: mvebu: Check for errors from pci_bridge_emul_init() call
Dario Binacchi <[email protected]>
Input: ti_am335x_tsc - fix STEPCONFIG setup for Z2
Dario Binacchi <[email protected]>
Input: ti_am335x_tsc - set ADCREFM for X configuration
Beau Belgrave <[email protected]>
tracing: Do not let synth_events block other dyn_event systems during create
Christophe JAILLET <[email protected]>
i3c/master/mipi-i3c-hci: Fix a potentially infinite loop in 'hci_dat_v1_get_index()'
Jamie Iles <[email protected]>
i3c: fix incorrect address slot lookup on 64-bit
Hou Wenlong <[email protected]>
KVM: x86: Exit to userspace if emulation prepared a completion callback
Sean Christopherson <[email protected]>
KVM: x86: Handle 32-bit wrap of EIP for EMULTYPE_SKIP with flat code seg
Lai Jiangshan <[email protected]>
KVM: X86: Ensure that dirty PDPTRs are loaded
Sean Christopherson <[email protected]>
KVM: VMX: Read Posted Interrupt "control" exactly once per loop iteration
Sean Christopherson <[email protected]>
KVM: s390: Ensure kvm_arch_no_poll() is read once when blocking vCPU
Paolo Bonzini <[email protected]>
KVM: VMX: Don't unblock vCPU w/ Posted IRQ if IRQs are disabled in guest
Pali Rohár <[email protected]>
PCI: aardvark: Fix checking for MEM resource type
Tim Harvey <[email protected]>
PCI: dwc: Do not remap invalid res
Marek Vasut <[email protected]>
PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()
Jianjun Wang <[email protected]>
PCI: mediatek-gen3: Disable DVFSRC voltage request
Eric W. Biederman <[email protected]>
signal: In get_signal test for signal_group_exit every time through the loop
Huang Pei <[email protected]>
MIPS: fix local_{add,sub}_return on MIPS64
Hou Tao <[email protected]>
bpf, arm64: Use emit_addr_mov_i64() for BPF_PSEUDO_FUNC
Tudor Ambarus <[email protected]>
mtd: spi-nor: Fix mtd size for s3an flashes
Andrii Nakryiko <[email protected]>
tools/resolve_btf_ids: Close ELF file on error
Hao Xu <[email protected]>
io_uring: fix no lock protection for ctx->cq_extra
Chuck Lever <[email protected]>
NFSD: Fix zero-length NFSv3 WRITEs
Chuck Lever <[email protected]>
NFSD: Have legacy NFSD WRITE decoders use xdr_stream_subsegment()
Eric Dumazet <[email protected]>
ipv6: fix skb drops in igmp6_event_query() and igmp6_event_report()
Steven Rostedt <[email protected]>
tracing: Add ustring operation to filtering string pointers
Qiang Yu <[email protected]>
drm/amdgpu: check vm ready by amdgpu_vm->evicting flag
Sergey Shtylyov <[email protected]>
ata: pata_hpt37x: fix PCI clock detection
Tadeusz Struk <[email protected]>
sched/fair: Fix fault in reweight_entity
Xin Yin <[email protected]>
ext4: fast commit may miss file actions
Xin Yin <[email protected]>
ext4: fast commit may not fallback for ineligible commit
Harshad Shirwadkar <[email protected]>
ext4: simplify updating of fast commit stats
Harshad Shirwadkar <[email protected]>
ext4: drop ineligible txn start stop APIs
Valentin Caron <[email protected]>
serial: stm32: prevent TDR register overwrite when sending x_char
Masami Hiramatsu <[email protected]>
arm64: Mark start_backtrace() notrace and NOKPROBE_SYMBOL
Steven Rostedt <[email protected]>
tracing: Add test for user space strings when filtering on string pointers
Christophe Vu-Brugier <[email protected]>
exfat: fix i_blocks for files truncated over 4 GiB
Christophe Vu-Brugier <[email protected]>
exfat: reuse exfat_inode_info variable instead of calling EXFAT_I()
Hangyu Hua <[email protected]>
usb: gadget: clear related members when goto fail
Hangyu Hua <[email protected]>
usb: gadget: don't release an existing dev->buf
Haimin Zhang <[email protected]>
block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
Daniele Palmas <[email protected]>
net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990
Wolfram Sang <[email protected]>
i2c: qup: allow COMPILE_TEST
Wolfram Sang <[email protected]>
i2c: imx: allow COMPILE_TEST
Wolfram Sang <[email protected]>
i2c: cadence: allow COMPILE_TEST
Yongzhi Liu <[email protected]>
dmaengine: shdma: Fix runtime PM imbalance on error
Krzysztof Kozlowski <[email protected]>
selftests/ftrace: Do not trace do_softirq because of PREEMPT_RT
Evan Quan <[email protected]>
drm/amd/pm: correct UMD pstate clocks for Dimgrey Cavefish and Beige Goby
Sherry Yang <[email protected]>
selftests/seccomp: Fix seccomp failure by adding missing headers
Ronnie Sahlberg <[email protected]>
cifs: modefromsids must add an ACE for authenticated users
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Add interrupt handler to process interrupts
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Add functionality to clear interrupts
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Handle amd_sfh work buffer in PM ops
Ronnie Sahlberg <[email protected]>
cifs: fix double free race when mount fails in cifs_get_root()
Ronnie Sahlberg <[email protected]>
cifs: do not use uninitialized data in the owner/group sid
Hangyu Hua <[email protected]>
tipc: fix a bit overflow in tipc_crypto_key_rcv()
Ming Lei <[email protected]>
block: loop:use kstatfs.f_bsize of backing file to set discard granularity
Marc Zyngier <[email protected]>
KVM: arm64: vgic: Read HW interrupt pending state from the HW
Filipe Manana <[email protected]>
btrfs: get rid of warning on transaction commit when using flushoncommit
José Expósito <[email protected]>
Input: clear BTN_RIGHT/MIDDLE on buttonpads
Oliver Barta <[email protected]>
regulator: core: fix false positive in regulator_late_cleanup()
Kai Vehmanen <[email protected]>
ASoC: rt5682: do not block workqueue if card is unbound
Kai Vehmanen <[email protected]>
ASoC: rt5668: do not block workqueue if card is unbound
Eric Anholt <[email protected]>
i2c: bcm2835: Avoid clock stretching timeouts
JaeMan Park <[email protected]>
mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
Benjamin Beichler <[email protected]>
mac80211_hwsim: report NOACK frames in tx_status
-------------
Diffstat:
Documentation/admin-guide/mm/pagemap.rst | 2 +-
Documentation/gpu/i915.rst | 14 +-
Documentation/trace/events.rst | 19 +
MAINTAINERS | 2 +-
Makefile | 4 +-
arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 18 +
arch/arm/boot/dts/omap3-devkit8000.dts | 33 -
arch/arm/boot/dts/tegra124-nyan-big.dts | 15 +-
arch/arm/boot/dts/tegra124-nyan-blaze.dts | 15 +-
arch/arm/boot/dts/tegra124-venice2.dts | 14 +-
arch/arm/kernel/kgdb.c | 36 +-
arch/arm/mm/mmu.c | 2 +
arch/arm64/boot/dts/arm/juno-base.dtsi | 3 +-
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 +-
arch/arm64/kernel/module.c | 4 +-
arch/arm64/kernel/stacktrace.c | 3 +-
arch/arm64/kvm/vgic/vgic-mmio.c | 2 +
arch/arm64/net/bpf_jit_comp.c | 5 +-
arch/mips/include/asm/local.h | 9 +-
arch/mips/kernel/setup.c | 2 +-
arch/mips/ralink/mt7621.c | 36 +-
arch/riscv/mm/Makefile | 3 +
arch/riscv/mm/init.c | 1 +
arch/riscv/mm/kasan_init.c | 3 +-
arch/s390/include/asm/extable.h | 9 +-
arch/s390/kernel/module.c | 5 +-
arch/s390/kvm/kvm-s390.c | 2 +-
arch/x86/hyperv/mmu.c | 19 +-
arch/x86/kernel/module.c | 7 +-
arch/x86/kvm/mmu/mmu.c | 2 +-
arch/x86/kvm/vmx/posted_intr.c | 9 +-
arch/x86/kvm/x86.c | 11 +-
block/blk-map.c | 2 +-
drivers/ata/pata_hpt37x.c | 4 +-
drivers/auxdisplay/lcd2s.c | 24 +-
drivers/block/loop.c | 8 +-
drivers/clocksource/timer-ti-dm-systimer.c | 3 +-
drivers/dma-buf/heaps/cma_heap.c | 6 +-
drivers/dma/sh/shdma-base.c | 4 +-
drivers/firmware/arm_scmi/driver.c | 2 +-
drivers/firmware/efi/libstub/riscv-stub.c | 17 +-
drivers/firmware/efi/vars.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 719 ++++++++++++++++++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +-
drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +-
.../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 16 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +-
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 -
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +
drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 26 -
.../drm/amd/display/dc/dcn301/dcn301_resource.c | 262 +-------
.../drm/amd/display/dc/dcn301/dcn301_resource.h | 3 +
drivers/gpu/drm/amd/display/dc/dml/Makefile | 6 +
.../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 390 +++++++++++
.../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h | 42 ++
.../drm/amd/display/dc/{ => dml}/dsc/qp_tables.h | 0
.../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 291 +++++++++
.../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 94 +++
drivers/gpu/drm/amd/display/dc/dsc/Makefile | 29 -
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 259 --------
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 50 +-
drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 1 -
drivers/gpu/drm/amd/display/include/logger_types.h | 3 +
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 26 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.h | 8 +
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 +-
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
drivers/gpu/drm/i915/Makefile | 2 +
drivers/gpu/drm/i915/display/intel_ddi.c | 1 +
drivers/gpu/drm/i915/display/intel_display.c | 220 +------
.../gpu/drm/i915/display/intel_display_debugfs.c | 1 +
drivers/gpu/drm/i915/display/intel_dp.c | 467 +------------
drivers/gpu/drm/i915/display/intel_dp.h | 11 -
drivers/gpu/drm/i915/display/intel_dpt.c | 229 +++++++
drivers/gpu/drm/i915/display/intel_dpt.h | 19 +
drivers/gpu/drm/i915/display/intel_drrs.c | 485 ++++++++++++++
drivers/gpu/drm/i915/display/intel_drrs.h | 32 +
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 1 +
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 -
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +-
drivers/gpu/drm/i915/intel_pch.c | 2 +-
drivers/gpu/drm/i915/intel_pch.h | 2 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 166 ++---
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 12 +-
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 4 +-
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 69 +-
drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 2 +
drivers/hid/hid-debug.c | 5 +-
drivers/hid/hid-input.c | 3 +
drivers/i2c/busses/Kconfig | 6 +-
drivers/i2c/busses/i2c-bcm2835.c | 11 +
drivers/i3c/master.c | 3 +-
drivers/i3c/master/dw-i3c-master.c | 4 +
drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +-
drivers/input/input.c | 6 +
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/mouse/elan_i2c_core.c | 64 +-
drivers/input/touchscreen/ti_am335x_tsc.c | 8 +-
drivers/iommu/amd/amd_iommu.h | 1 +
drivers/iommu/amd/amd_iommu_types.h | 1 +
drivers/iommu/amd/init.c | 10 +
drivers/iommu/amd/io_pgtable.c | 120 ++--
drivers/iommu/amd/iommu.c | 10 +-
drivers/iommu/intel/iommu.c | 2 +-
drivers/iommu/tegra-smmu.c | 4 +-
drivers/mtd/spi-nor/xilinx.c | 3 +-
drivers/net/arcnet/com20020-pci.c | 3 +
drivers/net/can/usb/etas_es58x/es58x_core.c | 9 +-
drivers/net/can/usb/etas_es58x/es58x_core.h | 8 +-
drivers/net/can/usb/gs_usb.c | 10 +-
drivers/net/dsa/ocelot/seville_vsc9953.c | 6 +-
drivers/net/ethernet/amd/Kconfig | 2 +-
drivers/net/ethernet/arc/Kconfig | 4 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +
drivers/net/ethernet/ezchip/Kconfig | 2 +-
drivers/net/ethernet/google/gve/gve_rx.c | 1 +
drivers/net/ethernet/ibm/ibmvnic.c | 54 +-
drivers/net/ethernet/intel/e1000e/hw.h | 1 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 +-
drivers/net/ethernet/intel/e1000e/ich8lan.h | 1 +
drivers/net/ethernet/intel/e1000e/netdev.c | 26 +
drivers/net/ethernet/intel/iavf/iavf.h | 54 +-
drivers/net/ethernet/intel/iavf/iavf_main.c | 357 +++++-----
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 16 +-
drivers/net/ethernet/intel/igc/igc_phy.c | 4 -
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 6 +-
drivers/net/ethernet/litex/Kconfig | 2 +-
drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 12 +-
.../ethernet/marvell/octeontx2/af/lmac_common.h | 8 +
drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 61 +-
drivers/net/ethernet/marvell/octeontx2/af/npc.h | 9 +-
.../ethernet/marvell/octeontx2/af/npc_profile.h | 595 +++++------------
drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 56 ++
drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 7 +
drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 7 +
.../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 23 +-
.../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 30 +-
.../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 96 +++
.../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 29 +
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 20 +-
.../net/ethernet/microchip/sparx5/sparx5_vlan.c | 20 +-
drivers/net/ethernet/mscc/Kconfig | 2 +-
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 6 +-
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 170 ++++-
drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 4 +-
drivers/net/ipa/Kconfig | 1 +
drivers/net/usb/cdc_mbim.c | 5 +
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 11 +-
drivers/net/wireless/mac80211_hwsim.c | 13 +
drivers/net/xen-netfront.c | 39 +-
drivers/ntb/hw/intel/ntb_hw_gen4.c | 17 +-
drivers/ntb/hw/intel/ntb_hw_gen4.h | 16 +
drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 16 +-
drivers/of/Kconfig | 4 -
drivers/of/Makefile | 1 -
drivers/pci/controller/dwc/pcie-designware.c | 7 +-
drivers/pci/controller/pci-aardvark.c | 6 +-
drivers/pci/controller/pci-mvebu.c | 251 +++++--
drivers/pci/controller/pcie-mediatek-gen3.c | 8 +
drivers/pci/controller/pcie-rcar-host.c | 10 +-
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 9 +
drivers/regulator/core.c | 13 +-
drivers/soc/fsl/guts.c | 14 +-
drivers/soc/fsl/qe/qe_io.c | 2 +
drivers/thermal/thermal_netlink.c | 5 +-
drivers/tty/serial/stm32-usart.c | 12 +
drivers/usb/gadget/legacy/inode.c | 10 +-
fs/btrfs/ctree.h | 10 +
fs/btrfs/disk-io.c | 10 +
fs/btrfs/extent-tree.c | 10 +
fs/btrfs/extent_io.c | 16 +-
fs/btrfs/inode.c | 142 ++--
fs/btrfs/qgroup.c | 9 +-
fs/btrfs/relocation.c | 13 +
fs/btrfs/root-tree.c | 15 +
fs/btrfs/transaction.c | 77 ++-
fs/btrfs/transaction.h | 1 +
fs/btrfs/tree-log.c | 61 +-
fs/cifs/cifs_debug.c | 2 +
fs/cifs/cifsacl.c | 9 +-
fs/cifs/cifsfs.c | 1 +
fs/cifs/cifsglob.h | 5 +
fs/cifs/connect.c | 25 +-
fs/cifs/misc.c | 1 +
fs/cifs/sess.c | 41 +-
fs/cifs/transport.c | 3 +
fs/exfat/file.c | 18 +-
fs/exfat/inode.c | 13 +-
fs/exfat/namei.c | 6 +-
fs/exfat/super.c | 10 +-
fs/ext4/ext4.h | 15 +-
fs/ext4/extents.c | 6 +-
fs/ext4/fast_commit.c | 218 +++----
fs/ext4/fast_commit.h | 27 +-
fs/ext4/inode.c | 4 +-
fs/ext4/ioctl.c | 5 +-
fs/ext4/namei.c | 4 +-
fs/ext4/super.c | 3 +-
fs/ext4/xattr.c | 6 +-
fs/hugetlbfs/inode.c | 7 +-
fs/io_uring.c | 3 +
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 2 +-
fs/nfsd/nfs3proc.c | 9 +-
fs/nfsd/nfs3xdr.c | 56 +-
fs/nfsd/nfs4proc.c | 3 +-
fs/nfsd/nfs4state.c | 6 +-
fs/nfsd/nfsproc.c | 8 +-
fs/nfsd/nfsxdr.c | 9 +-
fs/nfsd/vfs.c | 4 +
fs/nfsd/xdr.h | 2 +-
fs/nfsd/xdr3.h | 2 +-
fs/proc/task_mmu.c | 3 +-
include/linux/ethtool.h | 2 +-
include/linux/filter.h | 10 +-
include/linux/jbd2.h | 2 +-
include/linux/kasan.h | 4 +-
include/linux/of_net.h | 2 +-
include/linux/sched/task.h | 4 +-
include/linux/sunrpc/svc.h | 3 +-
include/linux/vmalloc.h | 7 +
include/net/ndisc.h | 4 +-
include/net/netfilter/nf_queue.h | 2 +-
include/net/xfrm.h | 1 -
include/trace/events/sunrpc.h | 13 +-
include/uapi/linux/input-event-codes.h | 4 +-
include/uapi/linux/xfrm.h | 6 +
kernel/bpf/syscall.c | 18 +-
kernel/bpf/trampoline.c | 11 +-
kernel/fork.c | 13 +-
kernel/sched/core.c | 23 +-
kernel/signal.c | 20 +-
kernel/trace/blktrace.c | 26 +-
kernel/trace/trace.c | 4 +-
kernel/trace/trace_events_filter.c | 107 ++-
kernel/trace/trace_events_hist.c | 6 +-
kernel/trace/trace_events_synth.c | 13 +-
kernel/trace/trace_kprobe.c | 2 +-
kernel/trace/trace_probe.c | 2 +
kernel/trace/trace_uprobe.c | 5 +
kernel/user_namespace.c | 14 +-
mm/kasan/quarantine.c | 11 +
mm/kasan/shadow.c | 9 +-
mm/memfd.c | 40 +-
mm/util.c | 4 +-
mm/vmalloc.c | 3 +-
net/batman-adv/hard-interface.c | 29 +-
net/core/Makefile | 1 +
net/core/net-sysfs.c | 2 +-
{drivers/of => net/core}/of_net.c | 0
net/core/skbuff.c | 2 +-
net/core/skmsg.c | 2 +-
net/dcb/dcbnl.c | 44 ++
net/ipv4/esp4.c | 2 +-
net/ipv6/addrconf.c | 8 +-
net/ipv6/esp6.c | 2 +-
net/ipv6/ip6_output.c | 11 +-
net/ipv6/mcast.c | 32 +-
net/mac80211/ieee80211_i.h | 2 +-
net/mac80211/mlme.c | 16 +-
net/mac80211/rx.c | 14 +-
net/mptcp/protocol.c | 7 +-
net/netfilter/core.c | 5 +-
net/netfilter/nf_queue.c | 36 +-
net/netfilter/nf_tables_api.c | 4 +-
net/netfilter/nfnetlink_queue.c | 12 +-
net/smc/af_smc.c | 10 +-
net/smc/smc_core.c | 5 +-
net/sunrpc/svc.c | 11 +-
net/sunrpc/svc_xprt.c | 2 +-
net/tipc/crypto.c | 2 +-
net/wireless/nl80211.c | 12 +
net/xfrm/xfrm_device.c | 6 +-
net/xfrm/xfrm_interface.c | 2 +-
net/xfrm/xfrm_state.c | 14 +-
sound/soc/codecs/cs4265.c | 3 +-
sound/soc/codecs/rt5668.c | 12 +-
sound/soc/codecs/rt5682.c | 12 +-
sound/soc/soc-ops.c | 4 +-
sound/x86/intel_hdmi_audio.c | 2 +-
tools/bpf/resolve_btfids/main.c | 5 +-
.../drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +-
.../selftests/drivers/net/mlxsw/tc_police_scale.sh | 3 +-
.../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +-
tools/testing/selftests/seccomp/Makefile | 2 +-
.../selftests/vm/charge_reserved_hugetlb.sh | 34 +-
.../selftests/vm/hugetlb_reparenting_test.sh | 21 +-
tools/testing/selftests/vm/write_hugetlb_memory.sh | 2 +-
virt/kvm/kvm_main.c | 5 +-
295 files changed, 5465 insertions(+), 3118 deletions(-)Greg Kroah-Hartman
maintainerPATCH 19/262 drm/amd/pm: correct UMD pstate clocks for Dimgrey Cavefish and Beige Goby
From: Evan Quan <[email protected]>
[ Upstream commit 0136f5844b006e2286f873457c3fcba8c45a3735 ]
Correct the UMD pstate profiling clocks for Dimgrey Cavefish and Beige Goby.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 26 +++++++++++++++---- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.h | 8 ++++++ 2 files changed, 29 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +21 -5
@@ -1308,21 +1308,37 @@ static int sienna_cichlid_populate_umd_state_clk(struct smu_context *smu) &dpm_context->dpm_tables.soc_table;struct smu_umd_pstate_table *pstate_table = &smu->pstate_table; +struct amdgpu_device *adev = smu->adev; pstate_table->gfxclk_pstate.min = gfx_table->min; pstate_table->gfxclk_pstate.peak = gfx_table->max; -if (gfx_table->max >=SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK ) - pstate_table->gfxclk_pstate.standard =SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK ; pstate_table->uclk_pstate.min = mem_table->min; pstate_table->uclk_pstate.peak = mem_table->max; -if (mem_table->max >=SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK ) - pstate_table->uclk_pstate.standard =SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK ; pstate_table->socclk_pstate.min = soc_table->min; pstate_table->socclk_pstate.peak = soc_table->max; -if (soc_table->max >=SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK ) + +switch (adev->asic_type) { +case CHIP_SIENNA_CICHLID : +case CHIP_NAVY_FLOUNDER : + pstate_table->gfxclk_pstate.standard =SIENNA_CICHLID_UMD_PSTATE_PROFILING_GFXCLK ; + pstate_table->uclk_pstate.standard =SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK ; pstate_table->socclk_pstate.standard =SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK ; +break ; +case CHIP_DIMGREY_CAVEFISH : + pstate_table->gfxclk_pstate.standard =DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_GFXCLK ; + pstate_table->uclk_pstate.standard =DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_MEMCLK ; + pstate_table->socclk_pstate.standard =DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_SOCCLK ; +break ; +case CHIP_BEIGE_GOBY : + pstate_table->gfxclk_pstate.standard =BEIGE_GOBY_UMD_PSTATE_PROFILING_GFXCLK ; + pstate_table->uclk_pstate.standard =BEIGE_GOBY_UMD_PSTATE_PROFILING_MEMCLK ; + pstate_table->socclk_pstate.standard =BEIGE_GOBY_UMD_PSTATE_PROFILING_SOCCLK ; +break ; +default : +break ; + }return 0 ; }
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.h +8 -0
@@ -33,6 +33,14 @@ typedef enum {#define SIENNA_CICHLID_UMD_PSTATE_PROFILING_SOCCLK 960#define SIENNA_CICHLID_UMD_PSTATE_PROFILING_MEMCLK 1000 +#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_GFXCLK 1950 +#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_SOCCLK 960 +#define DIMGREY_CAVEFISH_UMD_PSTATE_PROFILING_MEMCLK 676 + +#define BEIGE_GOBY_UMD_PSTATE_PROFILING_GFXCLK 2200 +#define BEIGE_GOBY_UMD_PSTATE_PROFILING_SOCCLK 960 +#define BEIGE_GOBY_UMD_PSTATE_PROFILING_MEMCLK 1000 +extern void sienna_cichlid_set_ppt_funcs (struct smu_context *smu);#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 4/262 ASoC: rt5668: do not block workqueue if card is unbound
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit a6d78661dc903d90a327892bbc34268f3a5f4b9c ]
The current rt5668_jack_detect_handler() assumes the component and card will always show up and implements an infinite usleep loop waiting for them to show up.
This does not hold true if a codec interrupt (or other event) occurs when the card is unbound. The codec driver's remove or shutdown functions cannot cancel the workqueue due to the wait loop. As a result, code can either end up blocking the workqueue, or hit a kernel oops when the card is freed.
Fix the issue by rescheduling the jack detect handler in case the card is not ready. In case card never shows up, the shutdown/remove/suspend calls can now cancel the detect task.
--- sound/soc/codecs/rt5668.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
sound/soc/codecs/rt5668.c +7 -5
@@ -1022,11 +1022,13 @@ static void rt5668_jack_detect_handler(struct work_struct *work) container_of(work, struct rt5668_priv, jack_detect_work.work);int val, btn_type; -while (!rt5668->component) -usleep_range (10000 ,15000 ); - -while (!rt5668->component->card->instantiated) -usleep_range (10000 ,15000 ); +if (!rt5668->component || !rt5668->component->card || + !rt5668->component->card->instantiated) { +/* card not yet ready, try later */ +mod_delayed_work (system_power_efficient_wq, + &rt5668->jack_detect_work,msecs_to_jiffies (15 )); +return ; + }mutex_lock (&rt5668->calibrate_mutex);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 63/262 tracing: Do not let synth_events block other dyn_event systems during create
In reply to Greg Kroah-HartmanFrom: Beau Belgrave <[email protected]>
[ Upstream commit 4f67cca70c0f615e9cfe6ac42244f3416ec60877 ]
synth_events is returning -EINVAL if the dyn_event create command does not contain ' \t'. This prevents other systems from getting called back. synth_events needs to return -ECANCELED in these cases when the command is not targeting the synth_event system.
--- kernel/trace/trace_events_synth.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
kernel/trace/trace_events_synth.c +7 -6
@@ -2053,6 +2053,13 @@ static int create_synth_event(const char *raw_command)last_cmd_set (raw_command); + name = raw_command; + +/* Don't try to process if not our system */ +if (name[0 ] !='s' || name[1 ] !=':' ) +return -ECANCELED ; + name +=2 ; + p =strpbrk (raw_command," \t" );if (!p) {synth_err (SYNTH_ERR_INVALID_CMD ,0 );
@@ -2061,12 +2068,6 @@ static int create_synth_event(const char *raw_command) fields =skip_spaces (p); - name = raw_command; - -if (name[0 ] !='s' || name[1 ] !=':' ) -return -ECANCELED ; - name +=2 ; -/* This interface accepts group name prefix */ if (strchr (name,'/' )) { len =str_has_prefix (name,SYNTH_SYSTEM "/" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 44/262 NFSD: Fix zero-length NFSv3 WRITEs
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 6a2f774424bfdcc2df3e17de0cefe74a4269cad5 ]
The Linux NFS server currently responds to a zero-length NFSv3 WRITE request with NFS3ERR_IO. It responds to a zero-length NFSv4 WRITE with NFS4_OK and count of zero.
RFC 1813 says of the WRITE procedure's @count argument:
count
The number of bytes of data to be written. If count is 0, the WRITE will succeed and return a count of 0, barring errors due to permissions checking.
RFC 8881 has similar language for NFSv4, though NFSv4 removed the explicit @count argument because that value is already contained in the opaque payload array.
The synthetic client pynfs's WRT4 and WRT15 tests do emit zero- length WRITEs to exercise this spec requirement. Commit fdec6114ee1f ("nfsd4: zero-length WRITE should succeed") addressed the same problem there with the same fix.
But interestingly the Linux NFS client does not appear to emit zero- length WRITEs, instead squelching them. I'm not aware of a test that can generate such WRITEs for NFSv3, so I wrote a naive C program to generate a zero-length WRITE and test this fix.
--- fs/nfsd/nfs3proc.c | 6 +----- fs/nfsd/nfsproc.c | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-)
fs/nfsd/nfs3proc.c +1 -5
@@ -211,15 +211,11 @@ nfsd3_proc_write(struct svc_rqst *rqstp)fh_copy (&resp->fh, &argp->fh); resp->committed = argp->stable; nvecs =svc_fill_write_vector (rqstp, &argp->payload); -if (!nvecs) { - resp->status = nfserr_io; - goto out; - } + resp->status =nfsd_write (rqstp, &resp->fh, argp->offset, rqstp->rq_vec, nvecs, &cnt, resp->committed, resp->verf); resp->count = cnt; -out:return rpc_success; }
fs/nfsd/nfsproc.c +0 -5
@@ -235,10 +235,6 @@ nfsd_proc_write(struct svc_rqst *rqstp) argp->len, argp->offset); nvecs =svc_fill_write_vector (rqstp, &argp->payload); -if (!nvecs) { - resp->status = nfserr_io; - goto out; - } resp->status = nfsd_write(rqstp, fh_copy(&resp->fh, &argp->fh), argp->offset, rqstp->rq_vec, nvecs,
@@ -247,7 +243,6 @@ nfsd_proc_write(struct svc_rqst *rqstp) resp->status =fh_getattr (&resp->fh, &resp->stat); else if (resp->status == nfserr_jukebox) return rpc_drop_reply; -out:return rpc_success; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 29/262 exfat: reuse exfat_inode_info variable instead of calling EXFAT_I()
In reply to Greg Kroah-HartmanFrom: Christophe Vu-Brugier <[email protected]>
[ Upstream commit 7dee6f57d7f22a89dd214518c778aec448270d4c ]
Also add a local "struct exfat_inode_info *ei" variable to exfat_truncate() to simplify the code.
--- fs/exfat/file.c | 14 +++++++------- fs/exfat/inode.c | 9 ++++----- fs/exfat/namei.c | 6 +++--- fs/exfat/super.c | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-)
fs/exfat/file.c +7 -7
@@ -110,8 +110,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)exfat_set_volume_dirty (sb); num_clusters_new =EXFAT_B_TO_CLU_ROUND_UP (i_size_read (inode), sbi); - num_clusters_phys = -EXFAT_B_TO_CLU_ROUND_UP (EXFAT_I (inode)->i_size_ondisk, sbi); + num_clusters_phys =EXFAT_B_TO_CLU_ROUND_UP (ei->i_size_ondisk, sbi);exfat_chain_set (&clu, ei->start_clu, num_clusters_phys, ei->flags);
@@ -228,12 +227,13 @@ void exfat_truncate(struct inode *inode, loff_t size) {struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb); +struct exfat_inode_info *ei =EXFAT_I (inode);unsigned int blocksize =i_blocksize (inode);loff_t aligned_size;int err;mutex_lock (&sbi->s_lock); -if (EXFAT_I (inode)->start_clu ==0 ) { +if (ei->start_clu ==0 ) {/* * Empty start_clu != ~0 (not allocated) */
@@ -260,11 +260,11 @@ void exfat_truncate(struct inode *inode, loff_t size) aligned_size++; } -if (EXFAT_I (inode)->i_size_ondisk >i_size_read (inode)) -EXFAT_I (inode)->i_size_ondisk = aligned_size; +if (ei->i_size_ondisk >i_size_read (inode)) + ei->i_size_ondisk = aligned_size; -if (EXFAT_I (inode)->i_size_aligned >i_size_read (inode)) -EXFAT_I (inode)->i_size_aligned = aligned_size; +if (ei->i_size_aligned >i_size_read (inode)) + ei->i_size_aligned = aligned_size;mutex_unlock (&sbi->s_lock); }
fs/exfat/inode.c +4 -5
@@ -114,10 +114,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,unsigned int local_clu_offset = clu_offset;unsigned int num_to_be_allocated =0 , num_clusters =0 ; -if (EXFAT_I (inode)->i_size_ondisk >0 ) +if (ei->i_size_ondisk >0 ) num_clusters = -EXFAT_B_TO_CLU_ROUND_UP (EXFAT_I (inode)->i_size_ondisk, - sbi); +EXFAT_B_TO_CLU_ROUND_UP (ei->i_size_ondisk, sbi);if (clu_offset >= num_clusters) num_to_be_allocated = clu_offset - num_clusters +1 ;
@@ -416,10 +415,10 @@ static int exfat_write_end(struct file *file, struct address_space *mapping, err =generic_write_end (file, mapping, pos, len, copied, pagep, fsdata); -if (EXFAT_I (inode)->i_size_aligned <i_size_read (inode)) { +if (ei->i_size_aligned <i_size_read (inode)) {exfat_fs_error (inode->i_sb,"invalid size(size(%llu) > aligned(%llu)\n" , -i_size_read (inode),EXFAT_I (inode)->i_size_aligned); +i_size_read (inode), ei->i_size_aligned);return -EIO ; }
fs/exfat/namei.c +3 -3
@@ -395,9 +395,9 @@ static int exfat_find_empty_entry(struct inode *inode,/* directory inode should be updated in here */ i_size_write (inode, size); -EXFAT_I (inode)->i_size_ondisk += sbi->cluster_size; -EXFAT_I (inode)->i_size_aligned += sbi->cluster_size; -EXFAT_I (inode)->flags = p_dir->flags; + ei->i_size_ondisk += sbi->cluster_size; + ei->i_size_aligned += sbi->cluster_size; + ei->flags = p_dir->flags; inode->i_blocks +=1 << sbi->sect_per_clus_bits; }
fs/exfat/super.c +3 -3
@@ -366,9 +366,9 @@ static int exfat_read_root(struct inode *inode) inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & ~(sbi->cluster_size -1 )) >> inode->i_blkbits; -EXFAT_I (inode)->i_pos = ((loff_t )sbi->root_dir <<32 ) |0xffffffff ; -EXFAT_I (inode)->i_size_aligned =i_size_read (inode); -EXFAT_I (inode)->i_size_ondisk =i_size_read (inode); + ei->i_pos = ((loff_t )sbi->root_dir <<32 ) |0xffffffff ; + ei->i_size_aligned =i_size_read (inode); + ei->i_size_ondisk =i_size_read (inode);exfat_save_attr (inode,ATTR_SUBDIR ); inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 53/262 PCI: dwc: Do not remap invalid res
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit 6e5ebc96ec651b67131f816d7e3bf286c635e749 ]
On imx6 and perhaps others when pcie probes you get a:
imx6q-pcie 33800000.pcie: invalid resource
This occurs because the atu is not specified in the DT and as such it should not be remapped.
--- drivers/pci/controller/dwc/pcie-designware.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pcie-designware.c +4 -3
@@ -671,10 +671,11 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci)if (!pci->atu_base) {struct resource *res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"atu" ); -if (res) +if (res) { pci->atu_size =resource_size (res); - pci->atu_base =devm_ioremap_resource (dev, res); -if (IS_ERR (pci->atu_base)) + pci->atu_base =devm_ioremap_resource (dev, res); + } +if (!pci->atu_base ||IS_ERR (pci->atu_base)) pci->atu_base = pci->dbi_base +DEFAULT_DBI_ATU_OFFSET ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 51/262 PCI: mediatek-gen3: Disable DVFSRC voltage request
In reply to Greg Kroah-HartmanFrom: Jianjun Wang <[email protected]>
[ Upstream commit ab344fd43f2958726d17d651c0cb692c67dca382 ]
When the DVFSRC (dynamic voltage and frequency scaling resource collector) feature is not implemented, the PCIe hardware will assert a voltage request signal when exit from the L1 PM Substates to request a specific Vcore voltage, but cannot receive the voltage ready signal, which will cause the link to fail to exit the L1 PM Substates.
Disable DVFSRC voltage request by default, we need to find a common way to enable it in the future.
--- drivers/pci/controller/pcie-mediatek-gen3.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/controller/pcie-mediatek-gen3.c +8 -0
@@ -79,6 +79,9 @@#define PCIE_ICMD_PM_REG 0x198#define PCIE_TURN_OFF_LINK BIT(4) +#define PCIE_MISC_CTRL_REG 0x348 +#define PCIE_DISABLE_DVFSRC_VLT_REQ BIT(1) +#define PCIE_TRANS_TABLE_BASE_REG 0x800#define PCIE_ATR_SRC_ADDR_MSB_OFFSET 0x4#define PCIE_ATR_TRSL_ADDR_LSB_OFFSET 0x8
@@ -297,6 +300,11 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port) val &= ~PCIE_INTX_ENABLE ;writel_relaxed (val, port->base +PCIE_INT_ENABLE_REG ); +/* Disable DVFSRC voltage request */ + val =readl_relaxed (port->base +PCIE_MISC_CTRL_REG ); + val |=PCIE_DISABLE_DVFSRC_VLT_REQ ; +writel_relaxed (val, port->base +PCIE_MISC_CTRL_REG ); +/* Assert all reset signals */ val =readl_relaxed (port->base +PCIE_RST_CTRL_REG ); val |=PCIE_MAC_RSTB |PCIE_PHY_RSTB |PCIE_BRG_RSTB |PCIE_PE_RSTB ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 104/262 octeontx2-af: Optimize KPU1 processing for variable-length headers
In reply to Greg Kroah-HartmanFrom: Kiran Kumar K <[email protected]>
[ Upstream commit edadeb38dc2fa2550801995b748110c3e5e59557 ]
Optimized KPU1 entry processing for variable-length custom L2 headers of size 24B, 90B by
- Moving LA LTYPE parsing for 24B and 90B headers to PKIND.
- Removing LA flags assignment for 24B and 90B headers.
- Reserving a PKIND 55 to parse variable length headers.
Also, new mailbox(NPC_SET_PKIND) added to configure PKIND with corresponding variable-length offset, mask, and shift count (NPC_AF_KPUX_ENTRYX_ACTION0).
--- .../net/ethernet/marvell/octeontx2/af/mbox.h | 20 +- .../net/ethernet/marvell/octeontx2/af/npc.h | 9 +- .../marvell/octeontx2/af/npc_profile.h | 382 +++--------------- .../net/ethernet/marvell/octeontx2/af/rvu.h | 5 + .../ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- .../ethernet/marvell/octeontx2/af/rvu_nix.c | 4 + .../ethernet/marvell/octeontx2/af/rvu_npc.c | 96 +++++ 7 files changed, 195 insertions(+), 323 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +19 -1
@@ -84,7 +84,7 @@ struct mbox_msghdr {#define OTX2_MBOX_REQ_SIG (0xdead)#define OTX2_MBOX_RSP_SIG (0xbeef)u16 sig;/* Signature, for validating corrupted msgs */ -#define OTX2_MBOX_VERSION (0x0009) +#define OTX2_MBOX_VERSION (0x000a)u16 ver;/* Version of msg's structure for this ID */ u16 next_msgoff;/* Offset of next msg within mailbox region */ int rc;/* Msg process'ed response code */
@@ -229,6 +229,8 @@ M(NPC_DELETE_FLOW, 0x600e, npc_delete_flow, \M (NPC_MCAM_READ_ENTRY ,0x600f , npc_mcam_read_entry, \ npc_mcam_read_entry_req, \ npc_mcam_read_entry_rsp) \ +M (NPC_SET_PKIND ,0x6010 , npc_set_pkind, \ + npc_set_pkind, msg_rsp) \M (NPC_MCAM_READ_BASE_RULE ,0x6011 , npc_read_base_steer_rule, \ msg_req, npc_mcam_read_base_rule_rsp) \ M(NPC_MCAM_GET_STATS, 0x6012, npc_mcam_entry_stats, \
@@ -593,6 +595,22 @@ struct rpm_stats_rsp {u64 tx_stats[RPM_TX_STATS_COUNT ]; }; +struct npc_set_pkind { +struct mbox_msghdr hdr; +#define OTX2_PRIV_FLAGS_DEFAULT BIT_ULL(0) +#define OTX2_PRIV_FLAGS_CUSTOM BIT_ULL(63) +u64 mode; +#define PKIND_TX BIT_ULL(0) +#define PKIND_RX BIT_ULL(1) +u8 dir; +u8 pkind;/* valid only in case custom flag */ +u8 var_len_off;/* Offset of custom header length field. +* Valid only for pkind NPC_RX_CUSTOM_PRE_L2_PKIND +*/ +u8 var_len_off_mask;/* Mask for length with in offset */ +u8 shift_dir;/* shift direction to get length of the header at var_len_off */ +}; +/* NPA mbox message formats */ /* NPA mailbox error codes
drivers/net/ethernet/marvell/octeontx2/af/npc.h +7 -2
@@ -31,9 +31,9 @@ enum npc_kpu_la_ltype {NPC_LT_LA_HIGIG2_ETHER ,NPC_LT_LA_IH_NIX_HIGIG2_ETHER ,NPC_LT_LA_CUSTOM_L2_90B_ETHER , -NPC_LT_LA_CH_LEN_90B_ETHER ,NPC_LT_LA_CPT_HDR ,NPC_LT_LA_CUSTOM_L2_24B_ETHER , +NPC_LT_LA_CUSTOM_PRE_L2_ETHER ,NPC_LT_LA_CUSTOM0 =0xE , NPC_LT_LA_CUSTOM1 = 0xF, };
@@ -148,10 +148,11 @@ enum npc_kpu_lh_ltype {* Software assigns pkind for each incoming port such as CGX * Ethernet interfaces, LBK interfaces, etc. */ -#define NPC_UNRESERVED_PKIND_COUNT NPC_RX_VLAN_EXDSA_PKIND +#define NPC_UNRESERVED_PKIND_COUNT NPC_RX_CUSTOM_PRE_L2_PKINDenum npc_pkind_type {NPC_RX_LBK_PKIND =0ULL , +NPC_RX_CUSTOM_PRE_L2_PKIND =55ULL ,NPC_RX_VLAN_EXDSA_PKIND =56ULL ,NPC_RX_CHLEN24B_PKIND =57ULL ,NPC_RX_CPT_HDR_PKIND ,
@@ -162,6 +163,10 @@ enum npc_pkind_type { NPC_TX_DEF_PKIND, /* NIX-TX PKIND */ }; +enum npc_interface_type { +NPC_INTF_MODE_DEF , +}; +/* list of known and supported fields in packet header and * fields present in key structure. */
drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h +63 -319
591 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +5 -0
@@ -237,6 +237,7 @@ struct rvu_pfvf {bool cgx_in_use;/* this PF/VF using CGX? */ int cgx_users;/* number of cgx users - used only by PFs */ +int intf_mode;u8 nix_blkaddr;/* BLKADDR_NIX0/1 assigned to this PF */ u8 nix_rx_intf;/* NIX0_RX/NIX1_RX interface to NPC */ u8 nix_tx_intf;/* NIX0_TX/NIX1_TX interface to NPC */
@@ -794,6 +795,7 @@ void npc_enable_mcam_entry(struct rvu *rvu, struct npc_mcam *mcam,void npc_read_mcam_entry (struct rvu *rvu,struct npc_mcam *mcam,int blkaddr,u16 src,struct mcam_entry *entry,u8 *intf,u8 *ena); +bool is_cgx_config_permitted (struct rvu *rvu,u16 pcifunc);bool is_mac_feature_supported (struct rvu *rvu,int pf,int feature);u32 rvu_cgx_get_fifolen (struct rvu *rvu);void *rvu_first_cgx_pdata (struct rvu *rvu);
@@ -827,4 +829,7 @@ void rvu_switch_enable(struct rvu *rvu);void rvu_switch_disable (struct rvu *rvu);void rvu_switch_update_rules (struct rvu *rvu,u16 pcifunc); +int rvu_npc_set_parse_mode (struct rvu *rvu,u16 pcifunc,u64 mode,u8 dir, +u64 pkind,u8 var_len_off,u8 var_len_off_mask, +u8 shift_dir);#endif /* RVU_H */
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +1 -1
@@ -411,7 +411,7 @@ int rvu_cgx_exit(struct rvu *rvu)* VF's of mapped PF and other PFs are not allowed. This fn() checks * whether a PFFUNC is permitted to do the config or not. */ -static bool is_cgx_config_permitted (struct rvu *rvu,u16 pcifunc) +inline bool is_cgx_config_permitted (struct rvu *rvu,u16 pcifunc) {if ((pcifunc &RVU_PFVF_FUNC_MASK ) || !is_pf_cgxmapped (rvu,rvu_get_pf (pcifunc)))
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +4 -0
@@ -4555,6 +4555,10 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int nixlf)dev_err (rvu->dev,"CQ ctx disable failed\n" ); } +/* reset HW config done for Switch headers */ +rvu_npc_set_parse_mode (rvu, pcifunc,OTX2_PRIV_FLAGS_DEFAULT , + (PKIND_TX |PKIND_RX ),0 ,0 ,0 ,0 ); +nix_ctx_free (rvu, pfvf);nix_free_all_bandprof (rvu, pcifunc);
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +96 -0
102 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 118/262 drm/i915/display: split out dpt out of intel_display.c
In reply to Greg Kroah-HartmanFrom: Jani Nikula <[email protected]>
[ Upstream commit dc6d6158a6e8b11a11544a541583296d9323050f ]
Let's try to reduce the size of intel_display.c, not increase it.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 220 +----------------- drivers/gpu/drm/i915/display/intel_dpt.c | 229 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dpt.h | 19 ++ 4 files changed, 250 insertions(+), 219 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.c create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -211,6 +211,7 @@ i915-y += \ display/intel_dpio_phy.o \ display/intel_dpll.o \ display/intel_dpll_mgr.o \ + display/intel_dpt.o \ display/intel_dsb.o \ display/intel_fb.o \ display/intel_fbc.o \
drivers/gpu/drm/i915/display/intel_display.c +1 -219
238 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpt.c new file +229 -0
229 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpt.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __INTEL_DPT_H__ +#define __INTEL_DPT_H__ + +struct i915_address_space ; +struct i915_vma ; +struct intel_framebuffer ; + +void intel_dpt_destroy (struct i915_address_space *vm); +struct i915_vma *intel_dpt_pin (struct i915_address_space *vm); +void intel_dpt_unpin (struct i915_address_space *vm); +struct i915_address_space * +intel_dpt_create (struct intel_framebuffer *fb); + +#endif /* __INTEL_DPT_H__ */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 114/262 drm/amd/display: Update watermark values for DCN301
In reply to Greg Kroah-HartmanFrom: Agustin Gutierrez <[email protected]>
[ Upstream commit 2d8ae25d233767171942a9fba5fd8f4a620996be ]
[Why]
There is underflow / visual corruption DCN301, for high bandwidth MST DSC configurations such as 2x1440p144 or 2x4k60.
[How]
Use up-to-date watermark values for DCN301.
--- .../amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +8 -8
@@ -582,32 +582,32 @@ static struct wm_table lpddr5_wm_table = { .wm_inst = WM_A, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 7.95, - .sr_enter_plus_exit_time_us = 9, + .sr_exit_time_us = 13.5, + .sr_enter_plus_exit_time_us = 16.5, .valid = true, }, { .wm_inst = WM_B, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 9.82, - .sr_enter_plus_exit_time_us = 11.196, + .sr_exit_time_us = 13.5, + .sr_enter_plus_exit_time_us = 16.5, .valid = true, }, { .wm_inst = WM_C, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 9.89, - .sr_enter_plus_exit_time_us = 11.24, + .sr_exit_time_us = 13.5, + .sr_enter_plus_exit_time_us = 16.5, .valid = true, }, { .wm_inst = WM_D, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 9.748, - .sr_enter_plus_exit_time_us = 11.102, + .sr_exit_time_us = 13.5, + .sr_enter_plus_exit_time_us = 16.5, .valid = true, }, }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 57/262 KVM: VMX: Read Posted Interrupt "control" exactly once per loop iteration
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit cfb0e1306a3790eb055ebf7cdb7b0ee8a23e9b6e ]
Use READ_ONCE() when loading the posted interrupt descriptor control field to ensure "old" and "new" have the same base value. If the compiler emits separate loads, and loads into "new" before "old", KVM could theoretically drop the ON bit if it were set between the loads.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/posted_intr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/posted_intr.c +3 -3
@@ -51,7 +51,7 @@ void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)/* The full case. */ do { - old.control = new.control = pi_desc->control; + old.control = new.control = READ_ONCE(pi_desc->control); dest = cpu_physical_id(cpu);
@@ -104,7 +104,7 @@ static void __pi_post_block(struct kvm_vcpu *vcpu)unsigned int dest; do { - old.control = new.control = pi_desc->control; + old.control = new.control = READ_ONCE(pi_desc->control); WARN(old.nv != POSTED_INTR_WAKEUP_VECTOR, "Wakeup handler not enabled while the VCPU is blocked\n");
@@ -163,7 +163,7 @@ int pi_pre_block(struct kvm_vcpu *vcpu) } do { - old.control = new.control = pi_desc->control; + old.control = new.control = READ_ONCE(pi_desc->control); WARN((pi_desc->sn == 1), "Warning: SN field of posted-interrupts "
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 65/262 Input: ti_am335x_tsc - fix STEPCONFIG setup for Z2
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 6bfeb6c21e1bdc11c328b7d996d20f0f73c6b9b0 ]
The Z2 step configuration doesn't erase the SEL_INP_SWC_3_0 bit-field before setting the ADC channel. This way its value could be corrupted by the ADC channel selected for the Z1 coordinate.
--- drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +4 -1
@@ -196,7 +196,10 @@ static void titsc_step_config(struct titsc *ts_dev) STEPCONFIG_OPENDLY); end_step++; - config |=STEPCONFIG_INP (ts_dev->inp_yn); + config =STEPCONFIG_MODE_HWSYNC | +STEPCONFIG_AVG_16 | ts_dev->bit_yp | + ts_dev->bit_xn |STEPCONFIG_INM_ADCREFM | +STEPCONFIG_INP (ts_dev->inp_yn);titsc_writel (ts_dev,REG_STEPCONFIG (end_step), config);titsc_writel (ts_dev,REG_STEPDELAY (end_step),STEPCONFIG_OPENDLY );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 94/262 selftests/vm: make charge_reserved_hugetlb.sh work with existing cgroup setting
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 209376ed2a8431ccb4c40fdcef11194fc1e749b0 ]
The hugetlb cgroup reservation test charge_reserved_hugetlb.sh assume that no cgroup filesystems are mounted before running the test. That is not true in many cases. As a result, the test fails to run. Fix that by querying the current cgroup mount setting and using the existing cgroup setup instead before attempting to freshly mount a cgroup filesystem.
Similar change is also made for hugetlb_reparenting_test.sh as well, though it still has problem if cgroup v2 isn't used.
The patched test scripts were run on a centos 8 based system to verify that they ran properly.
--- .../selftests/vm/charge_reserved_hugetlb.sh | 34 +++++++++++-------- .../selftests/vm/hugetlb_reparenting_test.sh | 21 +++++++----- .../selftests/vm/write_hugetlb_memory.sh | 2 +- 3 files changed, 34 insertions(+), 23 deletions(-)
tools/testing/selftests/vm/charge_reserved_hugetlb.sh +20 -14
@@ -24,19 +24,23 @@ if [[ "$1" == "-cgroup-v2" ]]; then reservation_usage_file=rsvd.current fi -cgroup_path=/dev/cgroup/memory -if [[ ! -e $cgroup_path ]]; then - mkdir -p $cgroup_path - if [[ $cgroup2 ]]; then +if [[ $cgroup2 ]]; then + cgroup_path=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') + if [[ -z "$cgroup_path" ]]; then + cgroup_path=/dev/cgroup/memory mount -t cgroup2 none $cgroup_path - else + do_umount=1 + fi + echo "+hugetlb" >$cgroup_path/cgroup.subtree_control +else + cgroup_path=$(mount -t cgroup | grep ",hugetlb" | awk -e '{print $3}') + if [[ -z "$cgroup_path" ]]; then + cgroup_path=/dev/cgroup/memory mount -t cgroup memory,hugetlb $cgroup_path + do_umount=1 fi fi - -if [[ $cgroup2 ]]; then - echo "+hugetlb" >/dev/cgroup/memory/cgroup.subtree_control -fi +export cgroup_path function cleanup() { if [[ $cgroup2 ]]; then
@@ -108,7 +112,7 @@ function setup_cgroup() { function wait_for_hugetlb_memory_to_get_depleted() { local cgroup="$1" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" # Wait for hugetlbfs memory to get depleted. while [ $(cat $path) != 0 ]; do echo Waiting for hugetlb memory to get depleted.
@@ -121,7 +125,7 @@ function wait_for_hugetlb_memory_to_get_reserved() { local cgroup="$1" local size="$2" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" # Wait for hugetlbfs memory to get written. while [ $(cat $path) != $size ]; do echo Waiting for hugetlb memory reservation to reach size $size.
@@ -134,7 +138,7 @@ function wait_for_hugetlb_memory_to_get_written() { local cgroup="$1" local size="$2" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$fault_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$fault_usage_file" # Wait for hugetlbfs memory to get written. while [ $(cat $path) != $size ]; do echo Waiting for hugetlb memory to reach size $size.
@@ -574,5 +578,7 @@ for populate in "" "-o"; do done # populate done # method -umount $cgroup_path -rmdir $cgroup_path +if [[ $do_umount ]]; then + umount $cgroup_path + rmdir $cgroup_path +fi
tools/testing/selftests/vm/hugetlb_reparenting_test.sh +13 -8
@@ -18,19 +18,24 @@ if [[ "$1" == "-cgroup-v2" ]]; then usage_file=current fi -CGROUP_ROOT='/dev/cgroup/memory' -MNT='/mnt/huge/' -if [[ ! -e $CGROUP_ROOT ]]; then - mkdir -p $CGROUP_ROOT - if [[ $cgroup2 ]]; then +if [[ $cgroup2 ]]; then + CGROUP_ROOT=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') + if [[ -z "$CGROUP_ROOT" ]]; then + CGROUP_ROOT=/dev/cgroup/memory mount -t cgroup2 none $CGROUP_ROOT - sleep 1 - echo "+hugetlb +memory" >$CGROUP_ROOT/cgroup.subtree_control - else + do_umount=1 + fi + echo "+hugetlb +memory" >$CGROUP_ROOT/cgroup.subtree_control +else + CGROUP_ROOT=$(mount -t cgroup | grep ",hugetlb" | awk -e '{print $3}') + if [[ -z "$CGROUP_ROOT" ]]; then + CGROUP_ROOT=/dev/cgroup/memory mount -t cgroup memory,hugetlb $CGROUP_ROOT + do_umount=1 fi fi +MNT='/mnt/huge/' function get_machine_hugepage_size() { hpz=$(grep -i hugepagesize /proc/meminfo)
tools/testing/selftests/vm/write_hugetlb_memory.sh +1 -1
@@ -14,7 +14,7 @@ want_sleep=$8 reserve=$9 echo "Putting task in cgroup '$cgroup'" -echo $$ > /dev/cgroup/memory/"$cgroup"/cgroup.procs +echo $$ > ${cgroup_path:-/dev/cgroup/memory}/"$cgroup"/cgroup.procs echo "Method is $method"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 95/262 hugetlbfs: fix off-by-one error in hugetlb_vmdelete_list()
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit d6aba4c8e20d4d2bf65d589953f6d891c178f3a3 ]
Pass "end - 1" instead of "end" when walking the interval tree in hugetlb_vmdelete_list() to fix an inclusive vs. exclusive bug. The two callers that pass a non-zero "end" treat it as exclusive, whereas the interval tree iterator expects an inclusive "last". E.g. punching a hole in a file that precisely matches the size of a single hugepage, with a vma starting right on the boundary, will result in unmap_hugepage_range() being called twice, with the second call having start==end.
The off-by-one error doesn't cause functional problems as __unmap_hugepage_range() turns into a massive nop due to short-circuiting its for-loop on "address < end". But, the mmu_notifier invocations to invalid_range_{start,end}() are passed a bogus zero-sized range, which may be unexpected behavior for secondary MMUs.
The bug was exposed by commit ed922739c919 ("KVM: Use interval tree to do fast hva lookup in memslots"), currently queued in the KVM tree for 5.17, which added a WARN to detect ranges with start==end.
--- fs/hugetlbfs/inode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/hugetlbfs/inode.c +4 -3
@@ -409,10 +409,11 @@ hugetlb_vmdelete_list(struct rb_root_cached *root, pgoff_t start, pgoff_t end)struct vm_area_struct *vma;/* -* end == 0 indicates that the entire range after -* start should be unmapped. +* end == 0 indicates that the entire range after start should be +* unmapped. Note, end is exclusive, whereas the interval tree takes +* an inclusive "last". */ - vma_interval_tree_foreach(vma, root, start, end ? end : ULONG_MAX) { + vma_interval_tree_foreach(vma, root, start, end ? end - 1 : ULONG_MAX) {unsigned long v_offset;unsigned long v_end;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 100/262 drm/amd/display: move FPU associated DSC code to DML folder
In reply to Greg Kroah-HartmanFrom: Qingqing Zhuo <[email protected]>
[ Upstream commit d738db6883df3e3c513f9e777c842262693f951b ]
[Why & How]
As part of the FPU isolation work documented in
https://patchwork.freedesktop.org/series/93042/, isolate code that uses FPU in DSC to DML, where all FPU code should locate.
This change does not refactor any functions but move code around.
---
drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +
.../amd/display/dc/{ => dml}/dsc/qp_tables.h | 0
.../drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 291 ++++++++++++++++++
.../drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 94 ++++++
drivers/gpu/drm/amd/display/dc/dsc/Makefile | 29 --
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 259 ----------------
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 50 +--
.../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 1 -
8 files changed, 389 insertions(+), 338 deletions(-)
rename drivers/gpu/drm/amd/display/dc/{ => dml}/dsc/qp_tables.h (100%)
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.hdrivers/gpu/drm/amd/display/dc/dml/Makefile +3 -0
@@ -70,6 +70,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) $(fram CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
@@ -84,6 +85,7 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_rcfla CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags) endif CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
@@ -99,6 +101,7 @@ DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o DML += dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o +DML += dsc/rc_calc_fpu.o endif AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML))
drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h renamed from drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h +0 -0
drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c new file +291 -0
291 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h new file +94 -0
94 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dsc/Makefile +0 -29
@@ -1,35 +1,6 @@ # SPDX-License-Identifier: MIT # # Makefile for the 'dsc' sub-component of DAL. - -ifdef CONFIG_X86 -dsc_ccflags := -mhard-float -msse -endif - -ifdef CONFIG_PPC64 -dsc_ccflags := -mhard-float -maltivec -endif - -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC = 1 -endif -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 -# (8B stack alignment). -dsc_ccflags += -mpreferred-stack-boundary=4 -else -dsc_ccflags += -msse2 -endif -endif - -CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_ccflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_rcflags) - DSC = dc_dsc.o rc_calc.o rc_calc_dpi.o AMD_DAL_DSC = $(addprefix $(AMDDALPATH)/dc/dsc/,$(DSC))
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c +0 -259
266 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h +1 -49
56 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c +0 -1
@@ -22,7 +22,6 @@* Authors: AMD * */ -#include "os_types.h" #include <drm/drm_dsc.h> #include "dscc_types.h" #include "rc_calc.h"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 7/262 Input: clear BTN_RIGHT/MIDDLE on buttonpads
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit 37ef4c19b4c659926ce65a7ac709ceaefb211c40 ]
Buttonpads are expected to map the INPUT_PROP_BUTTONPAD property bit and the BTN_LEFT key bit.
As explained in the specification, where a device has a button type value of 0 (click-pad) or 1 (pressure-pad) there should not be discrete buttons:
https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/touchpad-windows-precision-touchpad-collection#device-capabilities-feature-report
However, some drivers map the BTN_RIGHT and/or BTN_MIDDLE key bits even though the device is a buttonpad and therefore does not have those buttons.
This behavior has forced userspace applications like libinput to implement different workarounds and quirks to detect buttonpads and offer to the user the right set of features and configuration options. For more information:
https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/726
In order to avoid this issue clear the BTN_RIGHT and BTN_MIDDLE key bits when the input device is register if the INPUT_PROP_BUTTONPAD property bit is set.
Notice that this change will not affect udev because it does not check for buttons. See systemd/src/udev/udev-builtin-input_id.c.
List of known affected hardware:
- Chuwi AeroBook Plus
- Chuwi Gemibook
- Framework Laptop
- GPD Win Max
- Huawei MateBook 2020
- Prestigio Smartbook 141 C2
- Purism Librem 14v1
- StarLite Mk II - AMI firmware - StarLite Mk II - Coreboot firmware - StarLite Mk III - AMI firmware - StarLite Mk III - Coreboot firmware
- StarLabTop Mk IV - AMI firmware
- StarLabTop Mk IV - Coreboot firmware
- StarBook Mk V
--- drivers/input/input.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/input/input.c +6 -0
@@ -2285,6 +2285,12 @@ int input_register_device(struct input_dev *dev)/* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit (KEY_RESERVED , dev->keybit); +/* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ +if (test_bit (INPUT_PROP_BUTTONPAD , dev->propbit)) { +__clear_bit (BTN_RIGHT , dev->keybit); +__clear_bit (BTN_MIDDLE , dev->keybit); + } +/* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks (dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 108/262 octeontx2-af: Adjust LA pointer for cpt parse header
In reply to Greg Kroah-HartmanFrom: Kiran Kumar K <[email protected]>
[ Upstream commit 85212a127e469c5560daf63a9782755ee4b03619 ]
In case of ltype NPC_LT_LA_CPT_HDR, LA pointer is pointing to the start of cpt parse header. Since cpt parse header has veriable length padding, this will be a problem for DMAC extraction. Adding KPU profile changes to adjust the LA pointer to start at ether header in case of cpt parse header by
- Adding ptr advance in pkind 58 to a fixed value 40
- Adding variable length offset 7 and mask 7 (pad len in
CPT_PARSE_HDR).
Also added the missing static declaration for npc_set_var_len_offset_pkind function.
--- .../marvell/octeontx2/af/npc_profile.h | 173 ++++++++---------- .../ethernet/marvell/octeontx2/af/rvu_npc.c | 2 +- 2 files changed, 80 insertions(+), 95 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h +79 -94
@@ -187,6 +187,8 @@ enum npc_kpu_parser_state {NPC_S_KPU2_PREHEADER ,NPC_S_KPU2_EXDSA ,NPC_S_KPU2_NGIO , +NPC_S_KPU2_CPT_CTAG , +NPC_S_KPU2_CPT_QINQ ,NPC_S_KPU3_CTAG ,NPC_S_KPU3_STAG , NPC_S_KPU3_QINQ,
@@ -1004,11 +1006,11 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = { }, {NPC_ERRLEV_RE ,NPC_EC_NOERR , -40 ,54 ,58 ,0 ,0 , -NPC_S_KPU1_CPT_HDR ,0 ,0 , +12 ,16 ,20 ,0 ,0 , +NPC_S_KPU1_CPT_HDR ,40 ,0 ,NPC_LID_LA ,NPC_LT_NA ,0 , - 0, 0, 0, 0, + 7, 7, 0, 0, }, {
@@ -1846,80 +1848,35 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = { }, {NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff ,NPC_ETYPE_IP ,0xffff ,0x0000 ,0x0000 , - }, - { -NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff , -NPC_ETYPE_IP6 , -0xffff ,0x0000 ,0x0000 , }, {NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff , -NPC_ETYPE_CTAG , -0xffff , -0x0000 , -0x0000 , - }, - { -NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff , -NPC_ETYPE_QINQ , +NPC_ETYPE_IP6 ,0xffff ,0x0000 ,0x0000 , - }, - { -NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff ,0x0000 ,0x0000 , -NPC_ETYPE_IP , -0xffff , }, {NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , +NPC_ETYPE_CTAG ,0xffff ,0x0000 ,0x0000 , -NPC_ETYPE_IP6 , -0xffff , - }, - { -NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff ,0x0000 ,0x0000 , -NPC_ETYPE_CTAG , -0xffff , }, {NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0xffff , -0x0000 , -0x0000 ,NPC_ETYPE_QINQ ,0xffff , - }, - { -NPC_S_KPU1_CPT_HDR ,0xff , -0x0000 , -0x0000 ,0x0000 ,0x0000 , 0x0000,
@@ -2929,6 +2886,42 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {0x0000 ,0x0000 , }, + { +NPC_S_KPU2_CPT_CTAG ,0xff , +NPC_ETYPE_IP , +0xffff , +0x0000 , +0x0000 , +0x0000 , +0x0000 , + }, + { +NPC_S_KPU2_CPT_CTAG ,0xff , +NPC_ETYPE_IP6 , +0xffff , +0x0000 , +0x0000 , +0x0000 , +0x0000 , + }, + { +NPC_S_KPU2_CPT_QINQ ,0xff , +NPC_ETYPE_CTAG , +0xffff , +NPC_ETYPE_IP , +0xffff , +0x0000 , +0x0000 , + }, + { +NPC_S_KPU2_CPT_QINQ ,0xff , +NPC_ETYPE_CTAG , +0xffff , +NPC_ETYPE_IP6 , +0xffff , +0x0000 , +0x0000 , + }, {NPC_S_NA ,0X00 , 0x0000,
@@ -9176,39 +9169,7 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = { {NPC_ERRLEV_RE ,NPC_EC_NOERR ,8 ,0 ,6 ,3 ,0 , -NPC_S_KPU5_CPT_IP ,56 ,1 , -NPC_LID_LA ,NPC_LT_LA_CPT_HDR , -0 , -0 ,0 ,0 ,0 , - }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -6 ,0 ,0 ,3 ,0 , -NPC_S_KPU5_CPT_IP6 ,56 ,1 , -NPC_LID_LA ,NPC_LT_LA_CPT_HDR , -0 , -0 ,0 ,0 ,0 , - }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -4 ,8 ,0 ,0 ,0 , -NPC_S_KPU2_CTAG ,54 ,1 , -NPC_LID_LA ,NPC_LT_LA_CPT_HDR , -NPC_F_LA_U_HAS_TAG |NPC_F_LA_L_WITH_VLAN , -0 ,0 ,0 ,0 , - }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -4 ,8 ,0 ,0 ,0 , -NPC_S_KPU2_QINQ ,54 ,1 , -NPC_LID_LA ,NPC_LT_LA_CPT_HDR , -NPC_F_LA_U_HAS_TAG |NPC_F_LA_L_WITH_VLAN , -0 ,0 ,0 ,0 , - }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -8 ,0 ,6 ,3 ,0 , -NPC_S_KPU5_CPT_IP ,60 ,1 , +NPC_S_KPU5_CPT_IP ,14 ,1 ,NPC_LID_LA ,NPC_LT_LA_CPT_HDR ,0 , 0, 0, 0, 0,
@@ -9216,7 +9177,7 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = { {NPC_ERRLEV_RE ,NPC_EC_NOERR ,6 ,0 ,0 ,3 ,0 , -NPC_S_KPU5_CPT_IP6 ,60 ,1 , +NPC_S_KPU5_CPT_IP6 ,14 ,1 ,NPC_LID_LA ,NPC_LT_LA_CPT_HDR ,0 , 0, 0, 0, 0,
@@ -9224,7 +9185,7 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = { {NPC_ERRLEV_RE ,NPC_EC_NOERR ,4 ,8 ,0 ,0 ,0 , -NPC_S_KPU2_CTAG ,58 ,1 , +NPC_S_KPU2_CPT_CTAG ,12 ,1 ,NPC_LID_LA ,NPC_LT_LA_CPT_HDR ,NPC_F_LA_U_HAS_TAG |NPC_F_LA_L_WITH_VLAN , 0, 0, 0, 0,
@@ -9232,19 +9193,11 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = { {NPC_ERRLEV_RE ,NPC_EC_NOERR ,4 ,8 ,0 ,0 ,0 , -NPC_S_KPU2_QINQ ,58 ,1 , +NPC_S_KPU2_CPT_QINQ ,12 ,1 ,NPC_LID_LA ,NPC_LT_LA_CPT_HDR ,NPC_F_LA_U_HAS_TAG |NPC_F_LA_L_WITH_VLAN ,0 ,0 ,0 ,0 , }, - { -NPC_ERRLEV_RE ,NPC_EC_NOERR , -0 ,0 ,0 ,0 ,1 , -NPC_S_NA ,0 ,1 , -NPC_LID_LA ,NPC_LT_LA_CPT_HDR , -NPC_F_LA_L_UNK_ETYPE , -0 ,0 ,0 ,0 , - }, {NPC_ERRLEV_RE ,NPC_EC_NOERR , 12, 0, 0, 1, 0,
@@ -10138,6 +10091,38 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {0 ,0 ,0 ,0 ,0 , }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +8 ,0 ,6 ,2 ,0 , +NPC_S_KPU5_CPT_IP ,6 ,1 , +NPC_LID_LB ,NPC_LT_LB_CTAG , +0 , +0 ,0 ,0 ,0 , + }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +6 ,0 ,0 ,2 ,0 , +NPC_S_KPU5_CPT_IP6 ,6 ,1 , +NPC_LID_LB ,NPC_LT_LB_CTAG , +0 , +0 ,0 ,0 ,0 , + }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +8 ,0 ,6 ,2 ,0 , +NPC_S_KPU5_CPT_IP ,10 ,1 , +NPC_LID_LB ,NPC_LT_LB_STAG_QINQ , +NPC_F_LB_U_MORE_TAG |NPC_F_LB_L_WITH_CTAG , +0 ,0 ,0 ,0 , + }, + { +NPC_ERRLEV_RE ,NPC_EC_NOERR , +6 ,0 ,0 ,2 ,0 , +NPC_S_KPU5_CPT_IP6 ,10 ,1 , +NPC_LID_LB ,NPC_LT_LB_STAG_QINQ , +NPC_F_LB_U_MORE_TAG |NPC_F_LB_L_WITH_CTAG , +0 ,0 ,0 ,0 , + }, {NPC_ERRLEV_LB ,NPC_EC_L2_K3 , 0, 0, 0, 0, 1,
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +1 -1
@@ -3183,7 +3183,7 @@ int rvu_mbox_handler_npc_get_kex_cfg(struct rvu *rvu, struct msg_req *req,return 0 ; } -int +static int npc_set_var_len_offset_pkind (struct rvu *rvu,u16 pcifunc,u64 pkind,u8 var_len_off,u8 var_len_off_mask,u8 shift_dir) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 82/262 drm/sun4i: dw-hdmi: Fix missing put_device() call in sun8i_hdmi_phy_get
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c71af3dae3e34d2fde0c19623cf7f8483321f0e3 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +3 -1
@@ -658,8 +658,10 @@ int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node)return -EPROBE_DEFER ; phy =platform_get_drvdata (pdev); -if (!phy) +if (!phy) { +put_device (&pdev->dev);return -EPROBE_DEFER ; + } hdmi->phy = phy;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 116/262 drm: mxsfb: Fix NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 622c9a3a7868e1eeca39c55305ca3ebec4742b64 ]
mxsfb should not ever dereference the NULL pointer which drm_atomic_get_new_bridge_state is allowed to return. Assume a fixed format instead.
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +5 -1
@@ -361,7 +361,11 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, bridge_state =drm_atomic_get_new_bridge_state (state, mxsfb->bridge); - bus_format = bridge_state->input_bus_cfg.format; +if (!bridge_state) + bus_format =MEDIA_BUS_FMT_FIXED ; +else + bus_format = bridge_state->input_bus_cfg.format; +if (bus_format ==MEDIA_BUS_FMT_FIXED ) {dev_warn_once (drm->dev, "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 69/262 PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 91a8d79fc797d3486ae978beebdfc55261c7d65b ]
It looks like that mvebu PCIe controller has for each PCIe link fully independent PCIe host bridge and so every PCIe Root Port is isolated not only on its own bus but also isolated from each others. But in past device tree structure was defined to put all PCIe Root Ports (as PCI Bridge devices) into one root bus 0 and this bus is emulated by pci-mvebu.c driver.
Probably reason for this decision was incorrect understanding of PCIe topology of these Armada SoCs and also reason of misunderstanding how is PCIe controller generating Type 0 and Type 1 config requests (it is fully different compared to other drivers). Probably incorrect setup leaded to very surprised things like having PCIe Root Port (PCI Bridge device, with even incorrect Device Class set to Memory Controller) and the PCIe device behind the Root Port on the same PCI bus, which obviously was needed to somehow hack (as these two devices cannot be in reality on the same bus).
Properly set mvebu local bus number and mvebu local device number based on PCI Bridge secondary bus number configuration. Also correctly report configured secondary bus number in config space. And explain in driver comment why this setup is correct.
--- drivers/pci/controller/pci-mvebu.c | 99 +++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-mvebu.c +97 -2
@@ -125,6 +125,11 @@ static bool mvebu_pcie_link_up(struct mvebu_pcie_port *port)return !(mvebu_readl (port,PCIE_STAT_OFF ) &PCIE_STAT_LINK_DOWN ); } +static u8 mvebu_pcie_get_local_bus_nr (struct mvebu_pcie_port *port) +{ +return (mvebu_readl (port,PCIE_STAT_OFF ) &PCIE_STAT_BUS ) >>8 ; +} +static void mvebu_pcie_set_local_bus_nr (struct mvebu_pcie_port *port,int nr) {u32 stat;
@@ -437,6 +442,20 @@ mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge, *value =mvebu_readl (port,PCIE_CMD_OFF );break ; +case PCI_PRIMARY_BUS : { +/* +* From the whole 32bit register we support reading from HW only +* secondary bus number which is mvebu local bus number. +* Other bits are retrieved only from emulated config buffer. +*/ +__le32 *cfgspace = (__le32 *)&bridge->conf; +u32 val =le32_to_cpu (cfgspace[PCI_PRIMARY_BUS /4 ]); + val &= ~0xff00 ; + val |=mvebu_pcie_get_local_bus_nr (port) <<8 ; + *value = val; +break ; + } +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -520,7 +539,8 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,break ;case PCI_PRIMARY_BUS : -mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus); +if (mask &0xff00 ) +mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus);break ;default :
@@ -1135,8 +1155,83 @@ static int mvebu_pcie_probe(struct platform_device *pdev)continue ; } +/* +* PCIe topology exported by mvebu hw is quite complicated. In +* reality has something like N fully independent host bridges +* where each host bridge has one PCIe Root Port (which acts as +* PCI Bridge device). Each host bridge has its own independent +* internal registers, independent access to PCI config space, +* independent interrupt lines, independent window and memory +* access configuration. But additionally there is some kind of +* peer-to-peer support between PCIe devices behind different +* host bridges limited just to forwarding of memory and I/O +* transactions (forwarding of error messages and config cycles +* is not supported). So we could say there are N independent +* PCIe Root Complexes. +* +* For this kind of setup DT should have been structured into +* N independent PCIe controllers / host bridges. But instead +* structure in past was defined to put PCIe Root Ports of all +* host bridges into one bus zero, like in classic multi-port +* Root Complex setup with just one host bridge. +* +* This means that pci-mvebu.c driver provides "virtual" bus 0 +* on which registers all PCIe Root Ports (PCI Bridge devices) +* specified in DT by their BDF addresses and virtually routes +* PCI config access of each PCI bridge device to specific PCIe +* host bridge. +* +* Normally PCI Bridge should choose between Type 0 and Type 1 +* config requests based on primary and secondary bus numbers +* configured on the bridge itself. But because mvebu PCI Bridge +* does not have registers for primary and secondary bus numbers +* in its config space, it determinates type of config requests +* via its own custom way. +* +* There are two options how mvebu determinate type of config +* request. +* +* 1. If Secondary Bus Number Enable bit is not set or is not +* available (applies for pre-XP PCIe controllers) then Type 0 +* is used if target bus number equals Local Bus Number (bits +* [15:8] in register 0x1a04) and target device number differs +* from Local Device Number (bits [20:16] in register 0x1a04). +* Type 1 is used if target bus number differs from Local Bus +* Number. And when target bus number equals Local Bus Number +* and target device equals Local Device Number then request is +* routed to Local PCI Bridge (PCIe Root Port). +* +* 2. If Secondary Bus Number Enable bit is set (bit 7 in +* register 0x1a2c) then mvebu hw determinate type of config +* request like compliant PCI Bridge based on primary bus number +* which is configured via Local Bus Number (bits [15:8] in +* register 0x1a04) and secondary bus number which is configured +* via Secondary Bus Number (bits [7:0] in register 0x1a2c). +* Local PCI Bridge (PCIe Root Port) is available on primary bus +* as device with Local Device Number (bits [20:16] in register +* 0x1a04). +* +* Secondary Bus Number Enable bit is disabled by default and +* option 2. is not available on pre-XP PCIe controllers. Hence +* this driver always use option 1. +* +* Basically it means that primary and secondary buses shares +* one virtual number configured via Local Bus Number bits and +* Local Device Number bits determinates if accessing primary +* or secondary bus. Set Local Device Number to 1 and redirect +* all writes of PCI Bridge Secondary Bus Number register to +* Local Bus Number (bits [15:8] in register 0x1a04). +* +* So when accessing devices on buses behind secondary bus +* number it would work correctly. And also when accessing +* device 0 at secondary bus number via config space would be +* correctly routed to secondary bus. Due to issues described +* in mvebu_pcie_setup_hw(), PCI Bridges at primary bus (zero) +* are not accessed directly via PCI config space but rarher +* indirectly via kernel emulated PCI bridge driver. +*/ mvebu_pcie_setup_hw (port); -mvebu_pcie_set_local_dev_nr (port,1 ); +mvebu_pcie_set_local_dev_nr (port,0 ); } pcie->nports = i;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 50/262 signal: In get_signal test for signal_group_exit every time through the loop
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit e7f7c99ba911f56bc338845c1cd72954ba591707 ]
Recently while investigating a problem with rr and signals I noticed that siglock is dropped in ptrace_signal and get_signal does not jump to relock.
Looking farther to see if the problem is anywhere else I see that do_signal_stop also returns if signal_group_exit is true. I believe that test can now never be true, but it is a bit hard to trace through and be certain.
Testing signal_group_exit is not expensive, so move the test for signal_group_exit into the for loop inside of get_signal to ensure the test is never skipped improperly.
This has been a potential problem since I added the test for signal_group_exit was added.
--- kernel/signal.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
kernel/signal.c +10 -10
@@ -2710,19 +2710,19 @@ bool get_signal(struct ksignal *ksig) goto relock; } -/* Has this task already been marked for death? */ -if (signal_group_exit (signal)) { - ksig->info.si_signo = signr =SIGKILL ; -sigdelset (¤t->pending.signal,SIGKILL ); -trace_signal_deliver (SIGKILL ,SEND_SIG_NOINFO , - &sighand->action[SIGKILL -1 ]); -recalc_sigpending (); - goto fatal; - } -for (;;) {struct k_sigaction *ka; +/* Has this task already been marked for death? */ +if (signal_group_exit (signal)) { + ksig->info.si_signo = signr =SIGKILL ; +sigdelset (¤t->pending.signal,SIGKILL ); +trace_signal_deliver (SIGKILL ,SEND_SIG_NOINFO , + &sighand->action[SIGKILL -1 ]); +recalc_sigpending (); + goto fatal; + } +if (unlikely (current->jobctl &JOBCTL_STOP_PENDING ) &&do_signal_stop (0 )) goto relock;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 14/262 HID: amd_sfh: Handle amd_sfh work buffer in PM ops
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 0cf74235f4403b760a37f77271d2ca3424001ff9 ]
Since in the current amd_sfh design the sensor data is periodically obtained in the form of poll data, during the suspend/resume cycle, scheduling a delayed work adds no value.
So, cancel the work and restart back during the suspend/resume cycle respectively.
--- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +4 -0
@@ -287,6 +287,8 @@ static int __maybe_unused amd_mp2_pci_resume(struct device *dev) } } +schedule_delayed_work (&cl_data->work_buffer,msecs_to_jiffies (AMD_SFH_IDLE_LOOP )); +return 0 ; }
@@ -310,6 +312,8 @@ static int __maybe_unused amd_mp2_pci_suspend(struct device *dev) } } +cancel_delayed_work_sync (&cl_data->work_buffer); +return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 1/262 mac80211_hwsim: report NOACK frames in tx_status
In reply to Greg Kroah-HartmanFrom: Benjamin Beichler <[email protected]>
[ Upstream commit 42a79960ffa50bfe9e0bf5d6280be89bf563a5dd ]
Add IEEE80211_TX_STAT_NOACK_TRANSMITTED to tx_status flags to have proper statistics for non-acked frames.
--- drivers/net/wireless/mac80211_hwsim.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/mac80211_hwsim.c +4 -0
@@ -3641,6 +3641,10 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, } txi->flags |=IEEE80211_TX_STAT_ACK ; } + +if (hwsim_flags &HWSIM_TX_CTL_NO_ACK ) + txi->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; +ieee80211_tx_status_irqsafe (data2->hw, skb);return 0 ; out:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 78/262 x86/hyperv: Properly deal with empty cpumasks in hyperv_flush_tlb_multi()
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 51500b71d500f251037ed339047a4d9e7d7e295b ]
KASAN detected the following issue:
BUG: KASAN: slab-out-of-bounds in hyperv_flush_tlb_multi+0xf88/0x1060
Read of size 4 at addr ffff8880011ccbc0 by task kcompactd0/33
CPU: 1 PID: 33 Comm: kcompactd0 Not tainted 5.14.0-39.el9.x86_64+debug #1
Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine,
BIOS Hyper-V UEFI Release v4.0 12/17/2019
Call Trace:
dump_stack_lvl+0x57/0x7d
print_address_description.constprop.0+0x1f/0x140
? hyperv_flush_tlb_multi+0xf88/0x1060
__kasan_report.cold+0x7f/0x11e
? hyperv_flush_tlb_multi+0xf88/0x1060
kasan_report+0x38/0x50
hyperv_flush_tlb_multi+0xf88/0x1060
flush_tlb_mm_range+0x1b1/0x200
ptep_clear_flush+0x10e/0x150
...
Allocated by task 0:
kasan_save_stack+0x1b/0x40
__kasan_kmalloc+0x7c/0x90
hv_common_init+0xae/0x115
hyperv_init+0x97/0x501
apic_intr_mode_init+0xb3/0x1e0
x86_late_time_init+0x92/0xa2
start_kernel+0x338/0x3eb
secondary_startup_64_no_verify+0xc2/0xcb
The buggy address belongs to the object at ffff8880011cc800
which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 960 bytes inside of
1024-byte region [ffff8880011cc800, ffff8880011ccc00)'hyperv_flush_tlb_multi+0xf88/0x1060' points to hv_cpu_number_to_vp_number() and '960 bytes' means we're trying to get VP_INDEX for CPU#240. 'nr_cpus' here is exactly 240 so we're trying to access past hv_vp_index's last element. This can (and will) happen when 'cpus' mask is empty and cpumask_last() will return '>=nr_cpus'.
Commit ad0a6bad4475 ("x86/hyperv: check cpu mask after interrupt has been disabled") tried to deal with empty cpumask situation but apparently didn't fully fix the issue.
'cpus' cpumask which is passed to hyperv_flush_tlb_multi() is 'mm_cpumask(mm)' (which is '&mm->cpu_bitmap'). This mask changes every time the particular mm is scheduled/unscheduled on some CPU (see switch_mm_irqs_off()), disabling IRQs on the CPU which is performing remote TLB flush has zero influence on whether the particular process can get scheduled/unscheduled on _other_ CPUs so e.g. in the case where the mm was scheduled on one other CPU and got unscheduled during hyperv_flush_tlb_multi()'s execution will lead to cpumask becoming empty.
It doesn't seem that there's a good way to protect 'mm_cpumask(mm)' from changing during hyperv_flush_tlb_multi()'s execution. It would be possible to copy it in the very beginning of the function but this is a waste. It seems we can deal with changing cpumask just fine.
When 'cpus' cpumask changes during hyperv_flush_tlb_multi()'s execution, there are two possible issues:
- 'Under-flushing': we will not flush TLB on a CPU which got added to the mask while hyperv_flush_tlb_multi() was already running. This is not a problem as this is equal to mm getting scheduled on that CPU right after TLB flush.
- 'Over-flushing': we may flush TLB on a CPU which is already cleared from the mask. First, extra TLB flush preserves correctness. Second, Hyper-V's TLB flush hypercall takes 'mm->pgd' argument so Hyper-V may avoid the flush if CR3 doesn't match.
Fix the immediate issue with cpumask_last()/hv_cpu_number_to_vp_number() and remove the pointless cpumask_empty() check from the beginning of the function as it really doesn't protect anything. Also, avoid the hypercall altogether when 'flush->processor_mask' ends up being empty.
--- arch/x86/hyperv/mmu.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/x86/hyperv/mmu.c +9 -10
@@ -68,15 +68,6 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,local_irq_save (flags); -/* -* Only check the mask _after_ interrupt has been disabled to avoid the -* mask changing under our feet. -*/ -if (cpumask_empty (cpus)) { -local_irq_restore (flags); -return ; - } - flush_pcpu = (struct hv_tlb_flush **)this_cpu_ptr (hyperv_pcpu_input_arg);
@@ -115,7 +106,9 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,* must. We will also check all VP numbers when walking the * supplied CPU set to remain correct in all cases. */ -if (hv_cpu_number_to_vp_number (cpumask_last (cpus)) >=64 ) + cpu =cpumask_last (cpus); + +if (cpu < nr_cpumask_bits &&hv_cpu_number_to_vp_number (cpu) >=64 ) goto do_ex_hypercall;for_each_cpu (cpu, cpus) {
@@ -131,6 +124,12 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,__set_bit (vcpu, (unsigned long *) &flush->processor_mask); } + +/* nothing to flush if 'processor_mask' ends up being empty */ +if (!flush->processor_mask) { +local_irq_restore (flags); +return ; + } }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 76/262 Revert "nfsd: skip some unnecessary stats in the v4 case"
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 58f258f65267542959487dbe8b5641754411843d ]
On the wire, I observed NFSv4 OPEN(CREATE) operations sometimes returning a reasonable-looking value in the cinfo.before field and zero in the cinfo.after field.
RFC 8881 Section 10.8.1 says:
Quoted 5 lines
When a client is making changes to a given directory, it needs to determine whether there have been changes made to the directory by other clients. It does this by using the change attribute as reported before and after the directory operation in the associated
change_info4value returned for the operation.
and
Quoted 3 lines
... The post-operation change
value needs to be saved as the basis for futurechange_info4comparisons.
A good quality client implementation therefore saves the zero cinfo.after value. During a subsequent OPEN operation, it will receive a different non-zero value in the cinfo.before field for that directory, and it will incorrectly believe the directory has changed, triggering an undesirable directory cache invalidation.
There are filesystem types where fs_supports_change_attribute() returns false, tmpfs being one. On NFSv4 mounts, this means the fh_getattr() call site in fill_pre_wcc() and fill_post_wcc() is never invoked. Subsequently, nfsd4_change_attribute() is invoked with an uninitialized @stat argument.
In fill_pre_wcc(), @stat contains stale stack garbage, which is then placed on the wire. In fill_post_wcc(), ->fh_post_wc is all zeroes, so zero is placed on the wire. Both of these values are meaningless.
This fix can be applied immediately to stable kernels. Once there are more regression tests in this area, this optimization can be attempted again.
--- fs/nfsd/nfs3xdr.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
fs/nfsd/nfs3xdr.c +17 -27
@@ -487,11 +487,6 @@ svcxdr_encode_wcc_data(struct svc_rqst *rqstp, struct xdr_stream *xdr,return true; } -static bool fs_supports_change_attribute (struct super_block *sb) -{ -return sb->s_flags &SB_I_VERSION || sb->s_export_op->fetch_iversion; -} -/* * Fill in the pre_op attr for the wcc data */
@@ -500,26 +495,24 @@ void fill_pre_wcc(struct svc_fh *fhp)struct inode *inode;struct kstat stat;bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE ); +__be32 err;if (fhp->fh_no_wcc || fhp->fh_pre_saved)return ; inode =d_inode (fhp->fh_dentry); -if (fs_supports_change_attribute (inode->i_sb) || !v4) { -__be32 err =fh_getattr (fhp, &stat); - -if (err) { -/* Grab the times from inode anyway */ - stat.mtime = inode->i_mtime; - stat.ctime = inode->i_ctime; - stat.size = inode->i_size; - } - fhp->fh_pre_mtime = stat.mtime; - fhp->fh_pre_ctime = stat.ctime; - fhp->fh_pre_size = stat.size; + err =fh_getattr (fhp, &stat); +if (err) { +/* Grab the times from inode anyway */ + stat.mtime = inode->i_mtime; + stat.ctime = inode->i_ctime; + stat.size = inode->i_size; }if (v4) fhp->fh_pre_change =nfsd4_change_attribute (&stat, inode); + fhp->fh_pre_mtime = stat.mtime; + fhp->fh_pre_ctime = stat.ctime; + fhp->fh_pre_size = stat.size; fhp->fh_pre_saved = true; }
@@ -530,6 +523,7 @@ void fill_post_wcc(struct svc_fh *fhp) {bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE );struct inode *inode =d_inode (fhp->fh_dentry); +__be32 err;if (fhp->fh_no_wcc)return ;
@@ -537,16 +531,12 @@ void fill_post_wcc(struct svc_fh *fhp)if (fhp->fh_post_saved)printk ("nfsd: inode locked twice during operation.\n" ); - fhp->fh_post_saved = true; - -if (fs_supports_change_attribute (inode->i_sb) || !v4) { -__be32 err =fh_getattr (fhp, &fhp->fh_post_attr); - -if (err) { - fhp->fh_post_saved = false; - fhp->fh_post_attr.ctime = inode->i_ctime; - } - } + err =fh_getattr (fhp, &fhp->fh_post_attr); +if (err) { + fhp->fh_post_saved = false; + fhp->fh_post_attr.ctime = inode->i_ctime; + }else + fhp->fh_post_saved = true;if (v4) fhp->fh_post_change =nfsd4_change_attribute (&fhp->fh_post_attr, inode);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 60/262 KVM: x86: Exit to userspace if emulation prepared a completion callback
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit adbfb12d4c4517a8adde23a7fc46538953d56eea ]
em_rdmsr() and em_wrmsr() return X86EMUL_IO_NEEDED if MSR accesses required an exit to userspace. However, x86_emulate_insn() doesn't return X86EMUL_*, so x86_emulate_instruction() doesn't directly act on X86EMUL_IO_NEEDED; instead, it looks for other signals to differentiate between PIO, MMIO, etc. causing RDMSR/WRMSR emulation not to exit to userspace now.
Nevertheless, if the userspace_msr_exit_test testcase in selftests is changed to test RDMSR/WRMSR with a forced emulation prefix, the test passes. What happens is that first userspace exit information is filled but the userspace exit does not happen. Because x86_emulate_instruction() returns 1, the guest retries the instruction---but this time RIP has already been adjusted past the forced emulation prefix, so the guest executes RDMSR/WRMSR and the userspace exit finally happens.
Since the X86EMUL_IO_NEEDED path has provided a complete_userspace_io callback, x86_emulate_instruction() can just return 0 if the callback is not NULL. Then RDMSR/WRMSR instruction emulation will exit to userspace directly, without the RDMSR/WRMSR vmexit.
Message-Id: <56f9df2ee5c05a81155e2be366c9dc1f7adc8817.1635842679.git.houwenlong93@linux.alibaba.com>
--- arch/x86/kvm/x86.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -0
@@ -8068,6 +8068,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, writeback = false; r =0 ; vcpu->arch.complete_userspace_io = complete_emulated_mmio; + }else if (vcpu->arch.complete_userspace_io) { + writeback = false; + r =0 ; }else if (r ==EMULATION_RESTART ) goto restart;else
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 48/262 bpf, arm64: Use emit_addr_mov_i64() for BPF_PSEUDO_FUNC
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
[ Upstream commit e4a41c2c1fa916547e63440c73a51a5eb06247af ]
The following error is reported when running "./test_progs -t for_each" under arm64:
bpf_jit: multi-func JIT bug 58 != 56
[...]
JIT doesn't support bpf-to-bpf calls
The root cause is the size of BPF_PSEUDO_FUNC instruction increases from 2 to 3 after the address of called bpf-function is settled and there are two bpf-to-bpf calls in test_pkt_access. The generated instructions are shown below:
0x48: 21 00 C0 D2 movz x1, #0x1, lsl #32 0x4c: 21 00 80 F2 movk x1, #0x1
0x48: E1 3F C0 92 movn x1, #0x1ff, lsl #32 0x4c: 41 FE A2 F2 movk x1, #0x17f2, lsl #16 0x50: 81 70 9F F2 movk x1, #0xfb84
Fixing it by using emit_addr_mov_i64() for BPF_PSEUDO_FUNC, so the size of jited image will not change.
--- arch/arm64/net/bpf_jit_comp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/net/bpf_jit_comp.c +4 -1
@@ -788,7 +788,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,u64 imm64; imm64 = (u64 )insn1.imm <<32 | (u32 )imm; -emit_a64_mov_i64 (dst, imm64, ctx); +if (bpf_pseudo_func (insn)) +emit_addr_mov_i64 (dst, imm64, ctx); +else +emit_a64_mov_i64 (dst, imm64, ctx);return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 15/262 HID: amd_sfh: Add functionality to clear interrupts
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit fb75a3791a8032848c987db29b622878d8fe2b1c ]
Newer AMD platforms with SFH may generate interrupts on some events which are unwarranted. Until this is cleared the actual MP2 data processing maybe stalled in some cases.
Add a mechanism to clear the pending interrupts (if any) during the driver initialization and sensor command operations.
--- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 25 ++++++++++++++++++++++++- drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 + 2 files changed, 25 insertions(+), 1 deletion(-)
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +24 -1
@@ -88,6 +88,20 @@ static void amd_stop_all_sensor_v2(struct amd_mp2_dev *privdata)writel (cmd_base.ul, privdata->mmio +AMD_C2P_MSG0 ); } +static void amd_sfh_clear_intr_v2 (struct amd_mp2_dev *privdata) +{ +if (readl (privdata->mmio +AMD_P2C_MSG (4 ))) { +writel (0 , privdata->mmio +AMD_P2C_MSG (4 )); +writel (0xf , privdata->mmio +AMD_P2C_MSG (5 )); + } +} + +static void amd_sfh_clear_intr (struct amd_mp2_dev *privdata) +{ +if (privdata->mp2_ops->clear_intr) + privdata->mp2_ops->clear_intr (privdata); +} +void amd_start_sensor (struct amd_mp2_dev *privdata,struct amd_mp2_sensor_info info) {union sfh_cmd_param cmd_param;
@@ -192,6 +206,7 @@ static void amd_mp2_pci_remove(void *privdata)struct amd_mp2_dev *mp2 = privdata;amd_sfh_hid_client_deinit (privdata); mp2->mp2_ops->stop_all (mp2); +amd_sfh_clear_intr (mp2); }static const struct amd_mp2_ops amd_sfh_ops_v2 = {
@@ -199,6 +214,7 @@ static const struct amd_mp2_ops amd_sfh_ops_v2 = { .stop = amd_stop_sensor_v2, .stop_all = amd_stop_all_sensor_v2, .response = amd_sfh_wait_response_v2, + .clear_intr = amd_sfh_clear_intr_v2, };static const struct amd_mp2_ops amd_sfh_ops = {
@@ -258,8 +274,13 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *imp2_select_ops (privdata); rc =amd_sfh_hid_client_init (privdata); -if (rc) +if (rc) { +amd_sfh_clear_intr (privdata); +dev_err (&pdev->dev,"amd_sfh_hid_client_init failed\n" );return rc; + } + +amd_sfh_clear_intr (privdata);return devm_add_action_or_reset (&pdev->dev, amd_mp2_pci_remove, privdata); }
@@ -288,6 +309,7 @@ static int __maybe_unused amd_mp2_pci_resume(struct device *dev) }schedule_delayed_work (&cl_data->work_buffer,msecs_to_jiffies (AMD_SFH_IDLE_LOOP )); +amd_sfh_clear_intr (mp2);return 0 ; }
@@ -313,6 +335,7 @@ static int __maybe_unused amd_mp2_pci_suspend(struct device *dev) }cancel_delayed_work_sync (&cl_data->work_buffer); +amd_sfh_clear_intr (mp2);return 0 ; }
drivers/hid/amd-sfh-hid/amd_sfh_pcie.h +1 -0
@@ -140,5 +140,6 @@ struct amd_mp2_ops {void (*stop)(struct amd_mp2_dev *privdata,u16 sensor_idx);void (*stop_all)(struct amd_mp2_dev *privdata);int (*response)(struct amd_mp2_dev *mp2,u8 sid,u32 sensor_sts); + void (*clear_intr)(struct amd_mp2_dev *privdata); };#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 62/262 i3c/master/mipi-i3c-hci: Fix a potentially infinite loop in hci_dat_v1_get_index()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3f43926f271287fb1744c9ac9ae1122497f2b0c2 ]
The code in 'hci_dat_v1_get_index()' really looks like a hand coded version of 'for_each_set_bit()', except that a +1 is missing when searching for the next set bit.
This really looks odd and it seems that it will loop until 'dat_w0_read()' returns the expected result.
So use 'for_each_set_bit()' instead. It is less verbose and should be more correct.
--- drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i3c/master/mipi-i3c-hci/dat_v1.c +1 -3
@@ -160,9 +160,7 @@ static int hci_dat_v1_get_index(struct i3c_hci *hci, u8 dev_addr)unsigned int dat_idx;u32 dat_w0; -for (dat_idx =find_first_bit (hci->DAT_data, hci->DAT_entries); - dat_idx < hci->DAT_entries; - dat_idx =find_next_bit (hci->DAT_data, hci->DAT_entries, dat_idx)) { +for_each_set_bit (dat_idx, hci->DAT_data, hci->DAT_entries) { dat_w0 =dat_w0_read (dat_idx);if (FIELD_GET (DAT_0_DYNAMIC_ADDRESS , dat_w0) == dev_addr)return dat_idx;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 98/262 drm/amdgpu: filter out radeon secondary ids as well
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 9e5a14bce2402e84251a10269df0235cd7ce9234 ]
Older radeon boards (r2xx-r5xx) had secondary PCI functions which we solely there for supporting multi-head on OSs with special requirements. Add them to the unsupported list as well so we don't attempt to bind to them. The driver would fail to bind to them anyway, but this does so in a cleaner way that should not confuse the user.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 81 +++++++++++++++++++++++++ 1 file changed, 81 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +81 -0
@@ -1519,6 +1519,87 @@ static const u16 amdgpu_unsupported_pciidlist[] = {0x99A0 ,0x99A2 ,0x99A4 , +/* radeon secondary ids */ +0x3171 , +0x3e70 , +0x4164 , +0x4165 , +0x4166 , +0x4168 , +0x4170 , +0x4171 , +0x4172 , +0x4173 , +0x496e , +0x4a69 , +0x4a6a , +0x4a6b , +0x4a70 , +0x4a74 , +0x4b69 , +0x4b6b , +0x4b6c , +0x4c6e , +0x4e64 , +0x4e65 , +0x4e66 , +0x4e67 , +0x4e68 , +0x4e69 , +0x4e6a , +0x4e71 , +0x4f73 , +0x5569 , +0x556b , +0x556d , +0x556f , +0x5571 , +0x5854 , +0x5874 , +0x5940 , +0x5941 , +0x5b72 , +0x5b73 , +0x5b74 , +0x5b75 , +0x5d44 , +0x5d45 , +0x5d6d , +0x5d6f , +0x5d72 , +0x5d77 , +0x5e6b , +0x5e6d , +0x7120 , +0x7124 , +0x7129 , +0x712e , +0x712f , +0x7162 , +0x7163 , +0x7166 , +0x7167 , +0x7172 , +0x7173 , +0x71a0 , +0x71a1 , +0x71a3 , +0x71a7 , +0x71bb , +0x71e0 , +0x71e1 , +0x71e2 , +0x71e6 , +0x71e7 , +0x71f2 , +0x7269 , +0x726b , +0x726e , +0x72a0 , +0x72a8 , +0x72b1 , +0x72b3 , + 0x793f, }; static const struct pci_device_id pciidlist[] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 115/262 drm: mxsfb: Set fallback bus format when the bridge doesnt provide one
In reply to Greg Kroah-HartmanFrom: Guido Günther <[email protected]>
[ Upstream commit 1db060509903b29d63fe2e39c14fd0f99c4a447e ]
If a bridge doesn't do any bus format handling MEDIA_BUS_FMT_FIXED is returned. Fallback to a reasonable default (MEDIA_BUS_FMT_RGB888_1X24) in that case.
This unbreaks e.g. using mxsfb with the nwl bridge and mipi dsi panels.
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +6 -0
@@ -362,6 +362,12 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,drm_atomic_get_new_bridge_state (state, mxsfb->bridge); bus_format = bridge_state->input_bus_cfg.format; +if (bus_format ==MEDIA_BUS_FMT_FIXED ) { +dev_warn_once (drm->dev, +"Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n" +"Please fix bridge driver by handling atomic_get_input_bus_fmts.\n" ); + bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; + } }/* If there is no bridge, use bus format from connector */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 16/262 HID: amd_sfh: Add interrupt handler to process interrupts
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 7f016b35ca7623c71b31facdde080e8ce171a697 ]
On newer AMD platforms with SFH, it is observed that random interrupts get generated on the SFH hardware and until this is cleared the firmware sensor processing is stalled, resulting in no data been received to driver side.
Add routines to handle these interrupts, so that firmware operations are not stalled.
--- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 40 ++++++++++++++++++++++++++ drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 + 2 files changed, 41 insertions(+)
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +40 -0
@@ -102,6 +102,30 @@ static void amd_sfh_clear_intr(struct amd_mp2_dev *privdata) privdata->mp2_ops->clear_intr (privdata); } +static irqreturn_t amd_sfh_irq_handler (int irq,void *data) +{ +amd_sfh_clear_intr (data); + +return IRQ_HANDLED ; +} + +static int amd_sfh_irq_init_v2 (struct amd_mp2_dev *privdata) +{ +int rc; + +pci_intx (privdata->pdev, true); + + rc =devm_request_irq (&privdata->pdev->dev, privdata->pdev->irq, + amd_sfh_irq_handler,0 ,DRIVER_NAME , privdata); +if (rc) { +dev_err (&privdata->pdev->dev,"failed to request irq %d err=%d\n" , + privdata->pdev->irq, rc); +return rc; + } + +return 0 ; +} +void amd_start_sensor (struct amd_mp2_dev *privdata,struct amd_mp2_sensor_info info) {union sfh_cmd_param cmd_param;
@@ -206,6 +230,7 @@ static void amd_mp2_pci_remove(void *privdata)struct amd_mp2_dev *mp2 = privdata;amd_sfh_hid_client_deinit (privdata); mp2->mp2_ops->stop_all (mp2); +pci_intx (mp2->pdev, false);amd_sfh_clear_intr (mp2); }
@@ -215,6 +240,7 @@ static const struct amd_mp2_ops amd_sfh_ops_v2 = { .stop_all = amd_stop_all_sensor_v2, .response = amd_sfh_wait_response_v2, .clear_intr = amd_sfh_clear_intr_v2, + .init_intr = amd_sfh_irq_init_v2, };static const struct amd_mp2_ops amd_sfh_ops = {
@@ -240,6 +266,14 @@ static void mp2_select_ops(struct amd_mp2_dev *privdata) } } +static int amd_sfh_irq_init (struct amd_mp2_dev *privdata) +{ +if (privdata->mp2_ops->init_intr) +return privdata->mp2_ops->init_intr (privdata); + +return 0 ; +} +static int amd_mp2_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct amd_mp2_dev *privdata;
@@ -273,6 +307,12 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *imp2_select_ops (privdata); + rc =amd_sfh_irq_init (privdata); +if (rc) { +dev_err (&pdev->dev,"amd_sfh_irq_init failed\n" ); +return rc; + } + rc =amd_sfh_hid_client_init (privdata);if (rc) {amd_sfh_clear_intr (privdata);
drivers/hid/amd-sfh-hid/amd_sfh_pcie.h +1 -0
@@ -141,5 +141,6 @@ struct amd_mp2_ops {void (*stop_all)(struct amd_mp2_dev *privdata);int (*response)(struct amd_mp2_dev *mp2,u8 sid,u32 sensor_sts);void (*clear_intr)(struct amd_mp2_dev *privdata); + int (*init_intr)(struct amd_mp2_dev *privdata); };#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 58/262 KVM: X86: Ensure that dirty PDPTRs are loaded
In reply to Greg Kroah-HartmanFrom: Lai Jiangshan <[email protected]>
[ Upstream commit 2c5653caecc4807b8abfe9c41880ac38417be7bf ]
For VMX with EPT, dirty PDPTRs need to be loaded before the next vmentry via vmx_load_mmu_pgd()
But not all paths that call load_pdptrs() will cause vmx_load_mmu_pgd() to be invoked. Normally, kvm_mmu_reset_context() is used to cause KVM_REQ_LOAD_MMU_PGD, but sometimes it is skipped:
* commit d81135a57aa6("KVM: x86: do not reset mmu if CR0.CD and CR0.NW are changed") skips kvm_mmu_reset_context() after load_pdptrs() when changing CR0.CD and CR0.NW.
* commit 21823fbda552("KVM: x86: Invalidate all PGDs for the current PCID on MOV CR3 w/ flush") skips KVM_REQ_LOAD_MMU_PGD after load_pdptrs() when rewriting the CR3 with the same value.
* commit a91a7c709600("KVM: X86: Don't reset mmu context when toggling X86_CR4_PGE") skips kvm_mmu_reset_context() after load_pdptrs() when changing CR4.PGE.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/x86.c +1 -0
@@ -848,6 +848,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3)memcpy (mmu->pdptrs, pdpte,sizeof (mmu->pdptrs));kvm_register_mark_dirty (vcpu,VCPU_EXREG_PDPTR ); +kvm_make_request (KVM_REQ_LOAD_MMU_PGD , vcpu); vcpu->arch.pdptrs_from_userspace = false; out:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 80/262 SUNRPC: Fix sockaddr handling in the svc_xprt_create_error trace point
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit dc6c6fb3d639756a532bcc47d4a9bf9f3965881b ]
While testing, I got an unexpected KASAN splat:
Jan 08 13:50:27 oracle-102.nfsv4.dev kernel: BUG: KASAN: stack-out-of-bounds in trace_event_raw_event_svc_xprt_create_err+0x190/0x210 [sunrpc] Jan 08 13:50:27 oracle-102.nfsv4.dev kernel: Read of size 28 at addr ffffc9000008f728 by task mount.nfs/4628
The memcpy() in the TP_fast_assign section of this trace point copies the size of the destination buffer in order that the buffer won't be overrun.
In other similar trace points, the source buffer for this memcpy is a "struct sockaddr_storage" so the actual length of the source buffer is always long enough to prevent the memcpy from reading uninitialized or unallocated memory.
However, for this trace point, the source buffer can be as small as a "struct sockaddr_in". For AF_INET sockaddrs, the memcpy() reads memory that follows the source buffer, which is not always valid memory.
To avoid copying past the end of the passed-in sockaddr, make the source address's length available to the memcpy(). It would be a little nicer if the tracing infrastructure was more friendly about storing socket addresses that are not AF_INET, but I could not find a way to make printk("%pIS") work with a dynamic array.
--- include/trace/events/sunrpc.h | 5 +++-- net/sunrpc/svc_xprt.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
include/trace/events/sunrpc.h +3 -2
@@ -1727,10 +1727,11 @@ TRACE_EVENT(svc_xprt_create_err,const char *program, const char *protocol, struct sockaddr *sap, + size_t salen, const struct svc_xprt *xprt ), -TP_ARGS (program ,protocol ,sap ,xprt ), +TP_ARGS (program ,protocol ,sap ,salen ,xprt ),TP_STRUCT__entry ( __field(long, error)
@@ -1743,7 +1744,7 @@ TRACE_EVENT(svc_xprt_create_err, __entry->error =PTR_ERR (xprt);__assign_str (program, program);__assign_str (protocol, protocol); -memcpy (__entry->addr, sap,sizeof (__entry->addr)); +memcpy (__entry->addr, sap,min (salen,sizeof (__entry->addr))); ), TP_printk("addr=%pISpc program=%s protocol=%s error=%ld",
net/sunrpc/svc_xprt.c +1 -1
@@ -243,7 +243,7 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, xprt = xcl->xcl_ops->xpo_create (serv, net, sap, len, flags);if (IS_ERR (xprt))trace_svc_xprt_create_err (serv->sv_program->pg_name, - xcl->xcl_name, sap, xprt); + xcl->xcl_name, sap, len, xprt);return xprt; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 40/262 drm/amdgpu: check vm ready by amdgpu_vm->evicting flag
In reply to Greg Kroah-HartmanFrom: Qiang Yu <[email protected]>
[ Upstream commit c1a66c3bc425ff93774fb2f6eefa67b83170dd7e ]
Workstation application ANSA/META v21.1.4 get this error dmesg when running CI test suite provided by ANSA/META:
[drm:amdgpu_gem_va_ioctl [amdgpu]] *ERROR* Couldn't update BO_VA (-16)
This is caused by:
1. create a 256MB buffer in invisible VRAM
2. CPU map the buffer and access it causes vm_fault and try to move it to visible VRAM
3. force visible VRAM space and traverse all VRAM bos to check if evicting this bo is valuable
4. when checking a VM bo (in invisible VRAM), amdgpu_vm_evictable() will set amdgpu_vm->evicting, but latter due to not in visible VRAM, won't really evict it so not add it to amdgpu_vm->evicted
5. before next CS to clear the amdgpu_vm->evicting, user VM ops ioctl will pass amdgpu_vm_ready() (check amdgpu_vm->evicted) but fail in amdgpu_vm_bo_update_mapping() (check amdgpu_vm->evicting) and get this error log
This error won't affect functionality as next CS will finish the waiting VM ops. But we'd better clear the error log by checking the amdgpu_vm->evicting flag in amdgpu_vm_ready() to stop calling amdgpu_vm_bo_update_mapping() later.
Another reason is amdgpu_vm->evicted list holds all BOs (both user buffer and page table), but only page table BOs' eviction prevent VM ops. amdgpu_vm->evicting flag is set only for page table BOs, so we should use evicting flag instead of evicted list in amdgpu_vm_ready().
The side effect of this change is: previously blocked VM op (user buffer in "evicted" list but no page table in it) gets done immediately.
v2: update commit comments.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +7 -2
@@ -768,11 +768,16 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,* Check if all VM PDs/PTs are ready for updates * * Returns: -* True if eviction list is empty. +* True if VM is not evicting. */ bool amdgpu_vm_ready (struct amdgpu_vm *vm) { -return list_empty (&vm->evicted); +bool ret; + +amdgpu_vm_eviction_lock (vm); + ret = !vm->evicting; +amdgpu_vm_eviction_unlock (vm); +return ret; }/**
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 18/262 selftests/seccomp: Fix seccomp failure by adding missing headers
In reply to Greg Kroah-HartmanFrom: Sherry Yang <[email protected]>
[ Upstream commit 21bffcb76ee2fbafc7d5946cef10abc9df5cfff7 ]
seccomp_bpf failed on tests 47 global.user_notification_filter_empty and 48 global.user_notification_filter_empty_threaded when it's tested on updated kernel but with old kernel headers. Because old kernel headers don't have definition of macro __NR_clone3 which is required for these two tests. Since under selftests/, we can install headers once for all tests (the default INSTALL_HDR_PATH is usr/include), fix it by adding usr/include to the list of directories to be searched. Use "-isystem" to indicate it's a system directory as the real kernel headers directories are.
--- tools/testing/selftests/seccomp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/seccomp/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -Wl,-no-as-needed -Wall +CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/ LDFLAGS += -lpthread TEST_GEN_PROGS := seccomp_bpf seccomp_benchmark
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 10/262 block: loop:use kstatfs.f_bsize of backing file to set discard granularity
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 06582bc86d7f48d35cd044098ca1e246e8c7c52e ]
If backing file's filesystem has implemented ->fallocate(), we think the loop device can support discard, then pass sb->s_blocksize as discard_granularity. However, some underlying FS, such as overlayfs, doesn't set sb->s_blocksize, and causes discard_granularity to be set as zero, then the warning in __blkdev_issue_discard() is triggered.
Christoph suggested to pass kstatfs.f_bsize as discard granularity, and this way is fine because kstatfs.f_bsize means 'Optimal transfer block size', which still matches with definition of discard granularity.
So fix the issue by setting discard_granularity as kstatfs.f_bsize if it is available, otherwise claims discard isn't supported.
--- drivers/block/loop.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/block/loop.c +7 -1
@@ -79,6 +79,7 @@#include <linux/ioprio.h> #include <linux/blk-cgroup.h> #include <linux/sched/mm.h> +#include <linux/statfs.h> #include "loop.h"
@@ -939,8 +940,13 @@ static void loop_config_discard(struct loop_device *lo) granularity =0 ; }else { +struct kstatfs sbuf; + max_discard_sectors =UINT_MAX >>9 ; - granularity = inode->i_sb->s_blocksize; +if (!vfs_statfs (&file->f_path, &sbuf)) + granularity = sbuf.f_bsize; +else + max_discard_sectors =0 ; }if (max_discard_sectors) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 70/262 PCI: mvebu: Setup PCIe controller to Root Complex mode
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit df08ac016124bd88b8598ac0599d7b89c0642774 ]
This driver operates only in Root Complex mode, so ensure that hardware is properly configured in Root Complex mode.
--- drivers/pci/controller/pci-mvebu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +7 -1
@@ -55,6 +55,7 @@#define PCIE_MASK_ENABLE_INTS 0x0f000000#define PCIE_CTRL_OFF 0x1a00#define PCIE_CTRL_X1_MODE 0x0001 +#define PCIE_CTRL_RC_MODE BIT(1)#define PCIE_STAT_OFF 0x1a04#define PCIE_STAT_BUS 0xff00#define PCIE_STAT_DEV 0x1f0000
@@ -218,7 +219,12 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)static void mvebu_pcie_setup_hw (struct mvebu_pcie_port *port) { -u32 cmd, mask; +u32 ctrl, cmd, mask; + +/* Setup PCIe controller to Root Complex mode. */ + ctrl =mvebu_readl (port,PCIE_CTRL_OFF ); + ctrl |=PCIE_CTRL_RC_MODE ; +mvebu_writel (port, ctrl,PCIE_CTRL_OFF );/* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd =mvebu_readl (port,PCIE_CMD_OFF );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 103/262 ethtool: Fix link extended state for big endian
In reply to Greg Kroah-HartmanFrom: Moshe Tal <[email protected]>
[ Upstream commit e2f08207c558bc0bc8abaa557cdb29bad776ac7b ]
The link extended sub-states are assigned as enum that is an integer size but read from a union as u8, this is working for small values on little endian systems but for big endian this always give 0. Fix the variable in the union to match the enum size.
--- include/linux/ethtool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ethtool.h +1 -1
@@ -94,7 +94,7 @@ struct ethtool_link_ext_state_info {enum ethtool_link_ext_substate_link_logical_mismatch link_logical_mismatch;enum ethtool_link_ext_substate_bad_signal_integrity bad_signal_integrity;enum ethtool_link_ext_substate_cable_issue cable_issue; -u8 __link_ext_substate; +u32 __link_ext_substate; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 86/262 drm/amdkfd: Check for null pointer after calling kmemdup
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit abfaf0eee97925905e742aa3b0b72e04a918fa9e ]
As the possible failure of the allocation, kmemdup() may return NULL pointer.
Therefore, it should be better to check the 'props2' in order to prevent the dereference of NULL pointer.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +3 -0
@@ -1060,6 +1060,9 @@ static int kfd_parse_subtype_iolink(struct crat_subtype_iolink *iolink,return -ENODEV ;/* same everything but the other direction */ props2 =kmemdup (props,sizeof (*props2),GFP_KERNEL ); +if (!props2) +return -ENOMEM ; + props2->node_from = id_to; props2->node_to = id_from; props2->kobj =NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 97/262 drm/amdgpu: filter out radeon PCI device IDs
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit bdbeb0dde4258586bb2f481b12da1e83aa4766f3 ]
Once we claim all 0x1002 PCI display class devices, we will need to filter out devices owned by radeon.
v2: rename radeon id array to make it more clear that the devices are not supported by amdgpu.
add r128, mach64 pci ids as well
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 638 +++++++++++++++++++++++- 1 file changed, 637 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +637 -1
@@ -891,6 +891,636 @@ MODULE_PARM_DESC(smu_pptable_id, "specify pptable id to be used (-1 = auto(default) value, 0 = use pptable from vbios, > 0 = soft pptable id)");module_param_named (smu_pptable_id, amdgpu_smu_pptable_id, int,0444 ); +/* These devices are not supported by amdgpu. +* They are supported by the mach64, r128, radeon drivers +*/ +static const u16 amdgpu_unsupported_pciidlist[] = { +/* mach64 */ +0x4354 , +0x4358 , +0x4554 , +0x4742 , +0x4744 , +0x4749 , +0x474C , +0x474D , +0x474E , +0x474F , +0x4750 , +0x4751 , +0x4752 , +0x4753 , +0x4754 , +0x4755 , +0x4756 , +0x4757 , +0x4758 , +0x4759 , +0x475A , +0x4C42 , +0x4C44 , +0x4C47 , +0x4C49 , +0x4C4D , +0x4C4E , +0x4C50 , +0x4C51 , +0x4C52 , +0x4C53 , +0x5654 , +0x5655 , +0x5656 , +/* r128 */ +0x4c45 , +0x4c46 , +0x4d46 , +0x4d4c , +0x5041 , +0x5042 , +0x5043 , +0x5044 , +0x5045 , +0x5046 , +0x5047 , +0x5048 , +0x5049 , +0x504A , +0x504B , +0x504C , +0x504D , +0x504E , +0x504F , +0x5050 , +0x5051 , +0x5052 , +0x5053 , +0x5054 , +0x5055 , +0x5056 , +0x5057 , +0x5058 , +0x5245 , +0x5246 , +0x5247 , +0x524b , +0x524c , +0x534d , +0x5446 , +0x544C , +0x5452 , +/* radeon */ +0x3150 , +0x3151 , +0x3152 , +0x3154 , +0x3155 , +0x3E50 , +0x3E54 , +0x4136 , +0x4137 , +0x4144 , +0x4145 , +0x4146 , +0x4147 , +0x4148 , +0x4149 , +0x414A , +0x414B , +0x4150 , +0x4151 , +0x4152 , +0x4153 , +0x4154 , +0x4155 , +0x4156 , +0x4237 , +0x4242 , +0x4336 , +0x4337 , +0x4437 , +0x4966 , +0x4967 , +0x4A48 , +0x4A49 , +0x4A4A , +0x4A4B , +0x4A4C , +0x4A4D , +0x4A4E , +0x4A4F , +0x4A50 , +0x4A54 , +0x4B48 , +0x4B49 , +0x4B4A , +0x4B4B , +0x4B4C , +0x4C57 , +0x4C58 , +0x4C59 , +0x4C5A , +0x4C64 , +0x4C66 , +0x4C67 , +0x4E44 , +0x4E45 , +0x4E46 , +0x4E47 , +0x4E48 , +0x4E49 , +0x4E4A , +0x4E4B , +0x4E50 , +0x4E51 , +0x4E52 , +0x4E53 , +0x4E54 , +0x4E56 , +0x5144 , +0x5145 , +0x5146 , +0x5147 , +0x5148 , +0x514C , +0x514D , +0x5157 , +0x5158 , +0x5159 , +0x515A , +0x515E , +0x5460 , +0x5462 , +0x5464 , +0x5548 , +0x5549 , +0x554A , +0x554B , +0x554C , +0x554D , +0x554E , +0x554F , +0x5550 , +0x5551 , +0x5552 , +0x5554 , +0x564A , +0x564B , +0x564F , +0x5652 , +0x5653 , +0x5657 , +0x5834 , +0x5835 , +0x5954 , +0x5955 , +0x5974 , +0x5975 , +0x5960 , +0x5961 , +0x5962 , +0x5964 , +0x5965 , +0x5969 , +0x5a41 , +0x5a42 , +0x5a61 , +0x5a62 , +0x5b60 , +0x5b62 , +0x5b63 , +0x5b64 , +0x5b65 , +0x5c61 , +0x5c63 , +0x5d48 , +0x5d49 , +0x5d4a , +0x5d4c , +0x5d4d , +0x5d4e , +0x5d4f , +0x5d50 , +0x5d52 , +0x5d57 , +0x5e48 , +0x5e4a , +0x5e4b , +0x5e4c , +0x5e4d , +0x5e4f , +0x6700 , +0x6701 , +0x6702 , +0x6703 , +0x6704 , +0x6705 , +0x6706 , +0x6707 , +0x6708 , +0x6709 , +0x6718 , +0x6719 , +0x671c , +0x671d , +0x671f , +0x6720 , +0x6721 , +0x6722 , +0x6723 , +0x6724 , +0x6725 , +0x6726 , +0x6727 , +0x6728 , +0x6729 , +0x6738 , +0x6739 , +0x673e , +0x6740 , +0x6741 , +0x6742 , +0x6743 , +0x6744 , +0x6745 , +0x6746 , +0x6747 , +0x6748 , +0x6749 , +0x674A , +0x6750 , +0x6751 , +0x6758 , +0x6759 , +0x675B , +0x675D , +0x675F , +0x6760 , +0x6761 , +0x6762 , +0x6763 , +0x6764 , +0x6765 , +0x6766 , +0x6767 , +0x6768 , +0x6770 , +0x6771 , +0x6772 , +0x6778 , +0x6779 , +0x677B , +0x6840 , +0x6841 , +0x6842 , +0x6843 , +0x6849 , +0x684C , +0x6850 , +0x6858 , +0x6859 , +0x6880 , +0x6888 , +0x6889 , +0x688A , +0x688C , +0x688D , +0x6898 , +0x6899 , +0x689b , +0x689c , +0x689d , +0x689e , +0x68a0 , +0x68a1 , +0x68a8 , +0x68a9 , +0x68b0 , +0x68b8 , +0x68b9 , +0x68ba , +0x68be , +0x68bf , +0x68c0 , +0x68c1 , +0x68c7 , +0x68c8 , +0x68c9 , +0x68d8 , +0x68d9 , +0x68da , +0x68de , +0x68e0 , +0x68e1 , +0x68e4 , +0x68e5 , +0x68e8 , +0x68e9 , +0x68f1 , +0x68f2 , +0x68f8 , +0x68f9 , +0x68fa , +0x68fe , +0x7100 , +0x7101 , +0x7102 , +0x7103 , +0x7104 , +0x7105 , +0x7106 , +0x7108 , +0x7109 , +0x710A , +0x710B , +0x710C , +0x710E , +0x710F , +0x7140 , +0x7141 , +0x7142 , +0x7143 , +0x7144 , +0x7145 , +0x7146 , +0x7147 , +0x7149 , +0x714A , +0x714B , +0x714C , +0x714D , +0x714E , +0x714F , +0x7151 , +0x7152 , +0x7153 , +0x715E , +0x715F , +0x7180 , +0x7181 , +0x7183 , +0x7186 , +0x7187 , +0x7188 , +0x718A , +0x718B , +0x718C , +0x718D , +0x718F , +0x7193 , +0x7196 , +0x719B , +0x719F , +0x71C0 , +0x71C1 , +0x71C2 , +0x71C3 , +0x71C4 , +0x71C5 , +0x71C6 , +0x71C7 , +0x71CD , +0x71CE , +0x71D2 , +0x71D4 , +0x71D5 , +0x71D6 , +0x71DA , +0x71DE , +0x7200 , +0x7210 , +0x7211 , +0x7240 , +0x7243 , +0x7244 , +0x7245 , +0x7246 , +0x7247 , +0x7248 , +0x7249 , +0x724A , +0x724B , +0x724C , +0x724D , +0x724E , +0x724F , +0x7280 , +0x7281 , +0x7283 , +0x7284 , +0x7287 , +0x7288 , +0x7289 , +0x728B , +0x728C , +0x7290 , +0x7291 , +0x7293 , +0x7297 , +0x7834 , +0x7835 , +0x791e , +0x791f , +0x793f , +0x7941 , +0x7942 , +0x796c , +0x796d , +0x796e , +0x796f , +0x9400 , +0x9401 , +0x9402 , +0x9403 , +0x9405 , +0x940A , +0x940B , +0x940F , +0x94A0 , +0x94A1 , +0x94A3 , +0x94B1 , +0x94B3 , +0x94B4 , +0x94B5 , +0x94B9 , +0x9440 , +0x9441 , +0x9442 , +0x9443 , +0x9444 , +0x9446 , +0x944A , +0x944B , +0x944C , +0x944E , +0x9450 , +0x9452 , +0x9456 , +0x945A , +0x945B , +0x945E , +0x9460 , +0x9462 , +0x946A , +0x946B , +0x947A , +0x947B , +0x9480 , +0x9487 , +0x9488 , +0x9489 , +0x948A , +0x948F , +0x9490 , +0x9491 , +0x9495 , +0x9498 , +0x949C , +0x949E , +0x949F , +0x94C0 , +0x94C1 , +0x94C3 , +0x94C4 , +0x94C5 , +0x94C6 , +0x94C7 , +0x94C8 , +0x94C9 , +0x94CB , +0x94CC , +0x94CD , +0x9500 , +0x9501 , +0x9504 , +0x9505 , +0x9506 , +0x9507 , +0x9508 , +0x9509 , +0x950F , +0x9511 , +0x9515 , +0x9517 , +0x9519 , +0x9540 , +0x9541 , +0x9542 , +0x954E , +0x954F , +0x9552 , +0x9553 , +0x9555 , +0x9557 , +0x955f , +0x9580 , +0x9581 , +0x9583 , +0x9586 , +0x9587 , +0x9588 , +0x9589 , +0x958A , +0x958B , +0x958C , +0x958D , +0x958E , +0x958F , +0x9590 , +0x9591 , +0x9593 , +0x9595 , +0x9596 , +0x9597 , +0x9598 , +0x9599 , +0x959B , +0x95C0 , +0x95C2 , +0x95C4 , +0x95C5 , +0x95C6 , +0x95C7 , +0x95C9 , +0x95CC , +0x95CD , +0x95CE , +0x95CF , +0x9610 , +0x9611 , +0x9612 , +0x9613 , +0x9614 , +0x9615 , +0x9616 , +0x9640 , +0x9641 , +0x9642 , +0x9643 , +0x9644 , +0x9645 , +0x9647 , +0x9648 , +0x9649 , +0x964a , +0x964b , +0x964c , +0x964e , +0x964f , +0x9710 , +0x9711 , +0x9712 , +0x9713 , +0x9714 , +0x9715 , +0x9802 , +0x9803 , +0x9804 , +0x9805 , +0x9806 , +0x9807 , +0x9808 , +0x9809 , +0x980A , +0x9900 , +0x9901 , +0x9903 , +0x9904 , +0x9905 , +0x9906 , +0x9907 , +0x9908 , +0x9909 , +0x990A , +0x990B , +0x990C , +0x990D , +0x990E , +0x990F , +0x9910 , +0x9913 , +0x9917 , +0x9918 , +0x9919 , +0x9990 , +0x9991 , +0x9992 , +0x9993 , +0x9994 , +0x9995 , +0x9996 , +0x9997 , +0x9998 , +0x9999 , +0x999A , +0x999B , +0x999C , +0x999D , +0x99A0 , +0x99A2 , +0x99A4 , +}; +static const struct pci_device_id pciidlist[] = { #ifdef CONFIG_DRM_AMDGPU_SI {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
@@ -1273,7 +1903,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,struct drm_device *ddev;struct amdgpu_device *adev;unsigned long flags = ent->driver_data; -int ret, retry =0 ; +int ret, retry =0 , i;bool supports_atomic = false;bool is_fw_fb;resource_size_t base, size;
@@ -1281,6 +1911,12 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,if (amdgpu_aspm ==-1 && !pcie_aspm_enabled (pdev)) amdgpu_aspm =0 ; +/* skip devices which are owned by radeon */ +for (i =0 ; i <ARRAY_SIZE (amdgpu_unsupported_pciidlist); i++) { +if (amdgpu_unsupported_pciidlist[i] == pdev->device) +return -ENODEV ; + } +if (amdgpu_virtual_display ||amdgpu_device_asic_has_dc_support (flags &AMD_ASIC_MASK )) supports_atomic = true;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 49/262 MIPS: fix local_{add,sub}_return on MIPS64
In reply to Greg Kroah-HartmanFrom: Huang Pei <[email protected]>
[ Upstream commit 277c8cb3e8ac199f075bf9576ad286687ed17173 ]
Use "daddu/dsubu" for long int on MIPS64 instead of "addu/subu"
--- arch/mips/include/asm/local.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/mips/include/asm/local.h +5 -4
@@ -5,6 +5,7 @@#include <linux/percpu.h> #include <linux/bitops.h> #include <linux/atomic.h> +#include <asm/asm.h> #include <asm/cmpxchg.h> #include <asm/compiler.h> #include <asm/war.h>
@@ -39,7 +40,7 @@ static __inline__ long local_add_return(long i, local_t * l)" .set arch=r4000 \n" __SYNC(full, loongson3_war) " \n""1:" __LL"%1, %2 # local_add_return \n" -" addu %0, %1, %3 \n" + __stringify(LONG_ADDU) " %0, %1, %3 \n" __SC"%0, %2 \n" " beqzl %0, 1b \n" " addu %0, %1, %3 \n"
@@ -55,7 +56,7 @@ static __inline__ long local_add_return(long i, local_t * l)" .set " MIPS_ISA_ARCH_LEVEL " \n" __SYNC(full, loongson3_war) " \n""1:" __LL"%1, %2 # local_add_return \n" -" addu %0, %1, %3 \n" + __stringify(LONG_ADDU) " %0, %1, %3 \n" __SC"%0, %2 \n" " beqz %0, 1b \n" " addu %0, %1, %3 \n"
@@ -88,7 +89,7 @@ static __inline__ long local_sub_return(long i, local_t * l)" .set arch=r4000 \n" __SYNC(full, loongson3_war) " \n""1:" __LL"%1, %2 # local_sub_return \n" -" subu %0, %1, %3 \n" + __stringify(LONG_SUBU) " %0, %1, %3 \n" __SC"%0, %2 \n" " beqzl %0, 1b \n" " subu %0, %1, %3 \n"
@@ -104,7 +105,7 @@ static __inline__ long local_sub_return(long i, local_t * l)" .set " MIPS_ISA_ARCH_LEVEL " \n" __SYNC(full, loongson3_war) " \n""1:" __LL"%1, %2 # local_sub_return \n" -" subu %0, %1, %3 \n" + __stringify(LONG_SUBU) " %0, %1, %3 \n" __SC"%0, %2 \n" " beqz %0, 1b \n" " subu %0, %1, %3 \n"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 87/262 drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 2096b74b1da5ca418827b54ac4904493bd9de89c ]
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40 drm_handle_vblank+0x69/0x350 [drm] ? try_to_wake_up+0x432/0x5c0 ? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu] drm_crtc_handle_vblank+0x17/0x20 [drm] amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu] __hrtimer_run_queues+0xfb/0x230 hrtimer_interrupt+0x109/0x220 __sysvec_apic_timer_interrupt+0x64/0xe0 asm_call_irq_on_stack+0x12/0x20
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +3 -2
@@ -142,15 +142,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,static void amdgpu_vkms_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +unsigned long flags;if (crtc->state->event) { -spin_lock (&crtc->dev->event_lock); +spin_lock_irqsave (&crtc->dev->event_lock, flags);if (drm_crtc_vblank_get (crtc) !=0 )drm_crtc_send_vblank_event (crtc, crtc->state->event);else drm_crtc_arm_vblank_event (crtc, crtc->state->event); -spin_unlock (&crtc->dev->event_lock); +spin_unlock_irqrestore (&crtc->dev->event_lock, flags); crtc->state->event =NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 2/262 mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
In reply to Greg Kroah-HartmanFrom: JaeMan Park <[email protected]>
[ Upstream commit cacfddf82baf1470e5741edeecb187260868f195 ]
In mac80211_hwsim, the probe_req frame is created and sent while scanning. It is sent with ieee80211_tx_info which is not initialized. Uninitialized ieee80211_tx_info can cause problems when using mac80211_hwsim with wmediumd. wmediumd checks the tx_rates field of ieee80211_tx_info and doesn't relay probe_req frame to other clients even if it is a broadcasting message.
Call ieee80211_tx_prepare_skb() to initialize ieee80211_tx_info for the probe_req that is created by hw_scan_work in mac80211_hwsim.
--- drivers/net/wireless/mac80211_hwsim.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/mac80211_hwsim.c +9 -0
@@ -2336,6 +2336,15 @@ static void hw_scan_work(struct work_struct *work)if (req->ie_len)skb_put_data (probe, req->ie, req->ie_len); +if (!ieee80211_tx_prepare_skb (hwsim->hw, + hwsim->hw_scan_vif, + probe, + hwsim->tmp_chan->band, +NULL )) { +kfree_skb (probe); +continue ; + } +local_bh_disable ();mac80211_hwsim_tx_frame (hwsim->hw, probe, hwsim->tmp_chan);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 79/262 drm/i915: dont call free_mmap_offset when purging
In reply to Greg Kroah-HartmanFrom: Matthew Auld <[email protected]>
[ Upstream commit 4c2602ba8d74c35d550ed3d518809c697de08d88 ]
The TTM backend is in theory the only user here(also purge should only be called once we have dropped the pages), where it is setup at object creation and is only removed once the object is destroyed. Also resetting the node here might be iffy since the ttm fault handler uses the stored fake offset to determine the page offset within the pages array.
This also blows up in the dontneed-before-mmap test, since the expectation is that the vma_node will live on, until the object is destroyed:
<2> [749.062902] kernel BUG at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:943!
<4> [749.062923] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
<4> [749.062928] CPU: 0 PID: 1643 Comm: gem_madvise Tainted: G U W 5.16.0-rc8-CI-CI_DRM_11046+ #1
<4> [749.062933] Hardware name: Gigabyte Technology Co., Ltd. GB-Z390 Garuda/GB-Z390 Garuda-CF, BIOS IG1c 11/19/2019
<4> [749.062937] RIP: 0010:i915_ttm_mmap_offset.cold.35+0x5b/0x5d [i915]
<4> [749.063044] Code: 00 48 c7 c2 a0 23 4e a0 48 c7 c7 26 df 4a a0 e8 95 1d d0 e0 bf 01 00 00 00 e8 8b ec cf e0 31 f6 bf 09 00 00 00 e8 5f 30 c0 e0 <0f> 0b 48 c7 c1 24 4b 56 a0 ba 5b 03 00 00 48 c7 c6 c0 23 4e a0 48 <4> [749.063052] RSP: 0018:ffffc90002ab7d38 EFLAGS: 00010246
<4> [749.063056] RAX: 0000000000000240 RBX: ffff88811f2e61c0 RCX: 0000000000000006
<4> [749.063060] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000009
<4> [749.063063] RBP: ffffc90002ab7e58 R08: 0000000000000001 R09: 0000000000000001
<4> [749.063067] R10: 000000000123d0f8 R11: ffffc90002ab7b20 R12: ffff888112a1a000
<4> [749.063071] R13: 0000000000000004 R14: ffff88811f2e61c0 R15: ffff888112a1a000
<4> [749.063074] FS: 00007f6e5fcad500(0000) GS:ffff8884ad600000(0000) knlGS:0000000000000000
<4> [749.063078] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [749.063081] CR2: 00007efd264e39f0 CR3: 0000000115fd6005 CR4: 00000000003706f0
<4> [749.063085] Call Trace:
<4> [749.063087] <TASK> <4> [749.063089] __assign_mmap_offset+0x41/0x300 [i915] <4> [749.063171] __assign_mmap_offset_handle+0x159/0x270 [i915] <4> [749.063248] ? i915_gem_dumb_mmap_offset+0x70/0x70 [i915] <4> [749.063325] drm_ioctl_kernel+0xae/0x140 <4> [749.063330] drm_ioctl+0x201/0x3d0 <4> [749.063333] ? i915_gem_dumb_mmap_offset+0x70/0x70 [i915] <4> [749.063409] ? do_user_addr_fault+0x200/0x670 <4> [749.063415] __x64_sys_ioctl+0x6d/0xa0 <4> [749.063419] do_syscall_64+0x3a/0xb0 <4> [749.063423] entry_SYSCALL_64_after_hwframe+0x44/0xae
<4> [749.063428] RIP: 0033:0x7f6e5f100317
Testcase: igt/gem_madvise/dontneed-before-mmap
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +0 -1
@@ -162,7 +162,6 @@ int i915_gem_object_pin_pages_unlocked(struct drm_i915_gem_object *obj)/* Immediately discard the backing storage */ void i915_gem_object_truncate (struct drm_i915_gem_object *obj) { -drm_gem_free_mmap_offset (&obj->base);if (obj->ops->truncate) obj->ops->truncate (obj); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 45/262 io_uring: fix no lock protection for ctx->cq_extra
In reply to Greg Kroah-HartmanFrom: Hao Xu <[email protected]>
[ Upstream commit e302f1046f4c209291b07ff7bc4d15ca26891f16 ]
ctx->cq_extra should be protected by completion lock so that the req_need_defer() does the right check.
--- fs/io_uring.c | 3 +++ 1 file changed, 3 insertions(+)
fs/io_uring.c +3 -0
@@ -6573,11 +6573,14 @@ static bool io_drain_req(struct io_kiocb *req) }/* Still need defer if there is pending req in defer list. */ +spin_lock (&ctx->completion_lock);if (likely (list_empty_careful (&ctx->defer_list) && !(req->flags &REQ_F_IO_DRAIN ))) { +spin_unlock (&ctx->completion_lock); ctx->drain_active = false;return false; } +spin_unlock (&ctx->completion_lock); seq =io_get_sequence (req);/* Still a chance to pass the sequence check */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 31/262 tracing: Add test for user space strings when filtering on string pointers
In reply to Greg Kroah-HartmanFrom: Steven Rostedt <[email protected]>
[ Upstream commit 77360f9bbc7e5e2ab7a2c8b4c0244fbbfcfc6f62 ]
Pingfan reported that the following causes a fault:
echo "filename ~ \"cpu\"" > events/syscalls/sys_enter_openat/filter echo 1 > events/syscalls/sys_enter_at/enable
The reason is that trace event filter treats the user space pointer defined by "filename" as a normal pointer to compare against the "cpu" string. The following bug happened:
kvm-03-guest16 login: [72198.026181] BUG: unable to handle page fault for address: 00007fffaae8ef60 #PF: supervisor read access in kernel mode
#PF: error_code(0x0001) - permissions violation
PGD 80000001008b7067 P4D 80000001008b7067 PUD 2393f1067 PMD 2393ec067 PTE 8000000108f47867
Oops: 0001 [#1] PREEMPT SMP PTI
CPU: 1 PID: 1 Comm: systemd Kdump: loaded Not tainted 5.14.0-32.el9.x86_64 #1
Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
RIP: 0010:strlen+0x0/0x20
Code: 48 89 f9 74 09 48 83 c1 01 80 39 00 75 f7 31 d2 44 0f b6 04 16 44 88 04 11
48 83 c2 01 45 84 c0 75 ee c3 0f 1f 80 00 00 00 00 <80> 3f 00 74 10 48 89 f8
48 83 c0 01 80 38 00 75 f7 48 29 f8 c3 31
RSP: 0018:ffffb5b900013e48 EFLAGS: 00010246
RAX: 0000000000000018 RBX: ffff8fc1c49ede00 RCX: 0000000000000000
RDX: 0000000000000020 RSI: ffff8fc1c02d601c RDI: 00007fffaae8ef60
RBP: 00007fffaae8ef60 R08: 0005034f4ddb8ea4 R09: 0000000000000000
R10: ffff8fc1c02d601c R11: 0000000000000000 R12: ffff8fc1c8a6e380
R13: 0000000000000000 R14: ffff8fc1c02d6010 R15: ffff8fc1c00453c0
FS: 00007fa86123db40(0000) GS:ffff8fc2ffd00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fffaae8ef60 CR3: 0000000102880001 CR4: 00000000007706e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
filter_pred_pchar+0x18/0x40
filter_match_preds+0x31/0x70
ftrace_syscall_enter+0x27a/0x2c0
syscall_trace_enter.constprop.0+0x1aa/0x1d0
do_syscall_64+0x16/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7fa861d88664The above happened because the kernel tried to access user space directly and triggered a "supervisor read access in kernel mode" fault. Worse yet, the memory could not even be loaded yet, and a SEGFAULT could happen as well. This could be true for kernel space accessing as well.
To be even more robust, test both kernel and user space strings. If the string fails to read, then simply have the filter fail.
Note, TASK_SIZE is used to determine if the pointer is user or kernel space and the appropriate strncpy_from_kernel/user_nofault() function is used to copy the memory. For some architectures, the compare to TASK_SIZE may always pick user space or kernel space. If it gets it wrong, the only thing is that the filter will fail to match. In the future, this needs to be fixed to have the event denote which should be used. But failing a filter is much better than panicing the machine, and that can be solved later.
--- Documentation/trace/events.rst | 10 +++++ kernel/trace/trace_events_filter.c | 66 ++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 3 deletions(-)
Documentation/trace/events.rst +10 -0
@@ -230,6 +230,16 @@ Currently the caret ('^') for an error always appears at the beginning of the filter string; the error message should still be useful though even without more accurate position info. +5.2.1 Filter limitations +------------------------ + +If a filter is placed on a string pointer ``(char *)`` that does not point +to a string on the ring buffer, but instead points to kernel or user space +memory, then, for safety reasons, at most 1024 bytes of the content is +copied onto a temporary buffer to do the compare. If the copy of the memory +faults (the pointer points to memory that should not be accessed), then the +string compare will be treated as not matching. + 5.3 Clearing filters --------------------
kernel/trace/trace_events_filter.c +63 -3
99 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 56/262 KVM: s390: Ensure kvm_arch_no_poll() is read once when blocking vCPU
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 6f390916c4fb359507d9ac4bf1b28a4f8abee5c0 ]
Wrap s390's halt_poll_max_steal with READ_ONCE and snapshot the result of kvm_arch_no_poll() in kvm_vcpu_block() to avoid a mostly-theoretical, largely benign bug on s390 where the result of kvm_arch_no_poll() could change due to userspace modifying halt_poll_max_steal while the vCPU is blocking. The bug is largely benign as it will either cause KVM to skip updating halt-polling times (no_poll toggles false=>true) or to update halt-polling times with a slightly flawed block_ns.
Note, READ_ONCE is unnecessary in the current code, add it in case the arch hook is ever inlined, and to provide a hint that userspace can change the param at will.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 2 +- virt/kvm/kvm_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +1 -1
@@ -3447,7 +3447,7 @@ bool kvm_arch_no_poll(struct kvm_vcpu *vcpu) {/* do not poll with more than halt_poll_max_steal percent of steal time */ if (S390_lowcore.avg_steal_timer *100 / (TICK_USEC <<12 ) >= - halt_poll_max_steal) { +READ_ONCE (halt_poll_max_steal)) { vcpu->stat.halt_no_poll_steal++;return true; }
virt/kvm/kvm_main.c +3 -2
@@ -3222,6 +3222,7 @@ update_halt_poll_stats(struct kvm_vcpu *vcpu, u64 poll_ns, bool waited)*/ void kvm_vcpu_block (struct kvm_vcpu *vcpu) { +bool halt_poll_allowed = !kvm_arch_no_poll (vcpu);ktime_t start, cur, poll_end;bool waited = false;u64 block_ns;
@@ -3229,7 +3230,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)kvm_arch_vcpu_blocking (vcpu); start = cur = poll_end =ktime_get (); -if (vcpu->halt_poll_ns && !kvm_arch_no_poll (vcpu)) { +if (vcpu->halt_poll_ns && halt_poll_allowed) {ktime_t stop =ktime_add_ns (ktime_get (), vcpu->halt_poll_ns); ++vcpu->stat.generic.halt_attempted_poll;
@@ -3284,7 +3285,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)update_halt_poll_stats ( vcpu,ktime_to_ns (ktime_sub (poll_end, start)), waited); -if (!kvm_arch_no_poll (vcpu)) { +if (halt_poll_allowed) {if (!vcpu_valid_wakeup (vcpu)) {shrink_halt_poll_ns (vcpu); }else if (vcpu->kvm->max_halt_poll_ns) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 61/262 i3c: fix incorrect address slot lookup on 64-bit
In reply to Greg Kroah-HartmanFrom: Jamie Iles <[email protected]>
[ Upstream commit f18f98110f2b179792cb70d85cba697320a3790f ]
The address slot bitmap is an array of unsigned long's which are the same size as an int on 32-bit platforms but not 64-bit. Loading the bitmap into an int could result in the incorrect status being returned for a slot and slots being reported as the wrong status.
--- drivers/i3c/master.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i3c/master.c +2 -1
@@ -343,7 +343,8 @@ struct bus_type i3c_bus_type = {static enum i3c_addr_slot_status i3c_bus_get_addr_slot_status (struct i3c_bus *bus,u16 addr) { -int status, bitpos = addr *2 ; +unsigned long status; +int bitpos = addr *2 ;if (addr >I2C_MAX_ADDR )return I3C_ADDR_SLOT_RSVD ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 39/262 ata: pata_hpt37x: fix PCI clock detection
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 5f6b0f2d037c8864f20ff15311c695f65eb09db5 ]
The f_CNT register (at the PCI config. address 0x78) is 16-bit, not 8-bit! The bug was there from the very start... :-(
--- drivers/ata/pata_hpt37x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ata/pata_hpt37x.c +2 -2
@@ -964,14 +964,14 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)if ((freq >>12 ) !=0xABCDE ) {int i; -u8 sr; +u16 sr;u32 total =0 ;pr_warn ("BIOS has not set timing clocks\n" );/* This is the process the HPT371 BIOS is reported to use */ for (i =0 ; i <128 ; i++) { -pci_read_config_byte (dev,0x78 , &sr); +pci_read_config_word (dev,0x78 , &sr); total += sr &0x1FF ;udelay (15 ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 66/262 PCI: mvebu: Check for errors from pci_bridge_emul_init() call
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 5d18d702e5c9309f4195653475c7a7fdde4ca71f ]
Function pci_bridge_emul_init() may fail so correctly check for errors.
--- drivers/pci/controller/pci-mvebu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/pci/controller/pci-mvebu.c +12 -3
@@ -570,7 +570,7 @@ static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = {* Initialize the configuration space of the PCI-to-PCI bridge * associated with the given PCIe interface. */ -static void mvebu_pci_bridge_emul_init (struct mvebu_pcie_port *port) +static int mvebu_pci_bridge_emul_init (struct mvebu_pcie_port *port) {struct pci_bridge_emul *bridge = &port->bridge;u32 pcie_cap =mvebu_readl (port,PCIE_CAP_PCIEXP );
@@ -597,7 +597,7 @@ static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port) bridge->data = port; bridge->ops = &mvebu_pci_bridge_emul_ops; -pci_bridge_emul_init (bridge,PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR ); +return pci_bridge_emul_init (bridge,PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR ); }static inline struct mvebu_pcie *sys_to_pcie (struct pci_sys_data *sys)
@@ -1120,9 +1120,18 @@ static int mvebu_pcie_probe(struct platform_device *pdev)continue ; } + ret =mvebu_pci_bridge_emul_init (port); +if (ret <0 ) { +dev_err (dev,"%s: cannot init emulated bridge\n" , + port->name); +devm_iounmap (dev, port->base); + port->base =NULL ; +mvebu_pcie_powerdown (port); +continue ; + } +mvebu_pcie_setup_hw (port);mvebu_pcie_set_local_dev_nr (port,1 ); -mvebu_pci_bridge_emul_init (port); } pcie->nports = i;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 111/262 net/mlx5e: IPsec: Fix crypto offload for non TCP/UDP encapsulated traffic
In reply to Greg Kroah-HartmanFrom: Raed Salem <[email protected]>
[ Upstream commit 5352859b3bfa0ca188b2f1d2c1436fddc781e3b6 ]
IPsec crypto offload always set the ethernet segment checksum flags with the inner L4 header checksum flag enabled for encapsulated IPsec offloaded packet regardless of the encapsulated L4 header type, and even if it doesn't exists in the first place, this breaks non TCP/UDP traffic as such.
Set the inner L4 checksum flag only when the encapsulated L4 header protocol is TCP/UDP using software parser swp_inner_l4_offset field as indication.
--- .../ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +6 -3
@@ -131,14 +131,17 @@ static inline bool mlx5e_ipsec_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg) { - struct xfrm_offload *xo = xfrm_offload(skb); + u8 inner_ipproto;if (!mlx5e_ipsec_eseg_meta (eseg))return false; eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ; -if (xo->inner_ipproto) { - eseg->cs_flags |=MLX5_ETH_WQE_L4_INNER_CSUM |MLX5_ETH_WQE_L3_INNER_CSUM ; + inner_ipproto =xfrm_offload (skb)->inner_ipproto; +if (inner_ipproto) { + eseg->cs_flags |=MLX5_ETH_WQE_L3_INNER_CSUM ; +if (inner_ipproto ==IPPROTO_TCP || inner_ipproto ==IPPROTO_UDP ) + eseg->cs_flags |=MLX5_ETH_WQE_L4_INNER_CSUM ; }else if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { eseg->cs_flags |=MLX5_ETH_WQE_L4_CSUM ; sq->stats->csum_partial_inner++;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 117/262 riscv/mm: Add XIP_FIXUP for phys_ram_base
In reply to Greg Kroah-HartmanFrom: Palmer Dabbelt <[email protected]>
[ Upstream commit 4b1c70aa8ed8249608bb991380cb8ff423edf49e ]
This manifests as a crash early in boot on VexRiscv.
--- arch/riscv/mm/init.c | 1 + 1 file changed, 1 insertion(+)
arch/riscv/mm/init.c +1 -0
@@ -451,6 +451,7 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size) }#ifdef CONFIG_XIP_KERNEL +#define phys_ram_base (*(phys_addr_t *)XIP_FIXUP(&phys_ram_base))/* called from head.S with MMU off */ asmlinkage void __init __copy_data(void) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 73/262 PCI: mvebu: Fix support for PCI_EXP_RTSTA on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 838ff44a398ff47fe9b924961d91aee325821220 ]
PME Status bit in Root Status Register (PCIE_RC_RTSTA_OFF) is read-only and can be cleared only by writing 0b to the Interrupt Cause RW0C register (PCIE_INT_CAUSE_OFF).
--- drivers/pci/controller/pci-mvebu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +10 -1
@@ -51,6 +51,8 @@ PCIE_CONF_FUNC(PCI_FUNC(devfn)) | PCIE_CONF_REG(where) | \ PCIE_CONF_ADDR_EN)#define PCIE_CONF_DATA_OFF 0x18fc +#define PCIE_INT_CAUSE_OFF 0x1900 +#define PCIE_INT_PM_PME BIT(28)#define PCIE_MASK_OFF 0x1910#define PCIE_MASK_ENABLE_INTS 0x0f000000#define PCIE_CTRL_OFF 0x1a00
@@ -604,7 +606,14 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,break ;case PCI_EXP_RTSTA : -mvebu_writel (port, new,PCIE_RC_RTSTA ); +/* +* PME Status bit in Root Status Register (PCIE_RC_RTSTA) +* is read-only and can be cleared only by writing 0b to the +* Interrupt Cause RW0C register (PCIE_INT_CAUSE_OFF). So +* clear PME via Interrupt Cause. +*/ +if (new &PCI_EXP_RTSTA_PME ) +mvebu_writel (port, ~PCIE_INT_PM_PME ,PCIE_INT_CAUSE_OFF );break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 5/262 ASoC: rt5682: do not block workqueue if card is unbound
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 4c33de0673ced9c7c37b3bbd9bfe0fda72340b2a ]
The current rt5682_jack_detect_handler() assumes the component and card will always show up and implements an infinite usleep loop waiting for them to show up.
This does not hold true if a codec interrupt (or other event) occurs when the card is unbound. The codec driver's remove or shutdown functions cannot cancel the workqueue due to the wait loop. As a result, code can either end up blocking the workqueue, or hit a kernel oops when the card is freed.
Fix the issue by rescheduling the jack detect handler in case the card is not ready. In case card never shows up, the shutdown/remove/suspend calls can now cancel the detect task.
--- sound/soc/codecs/rt5682.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
sound/soc/codecs/rt5682.c +7 -5
@@ -1090,11 +1090,13 @@ void rt5682_jack_detect_handler(struct work_struct *work) container_of(work, struct rt5682_priv, jack_detect_work.work);int val, btn_type; -while (!rt5682->component) -usleep_range (10000 ,15000 ); - -while (!rt5682->component->card->instantiated) -usleep_range (10000 ,15000 ); +if (!rt5682->component || !rt5682->component->card || + !rt5682->component->card->instantiated) { +/* card not yet ready, try later */ +mod_delayed_work (system_power_efficient_wq, + &rt5682->jack_detect_work,msecs_to_jiffies (15 )); +return ; + }mutex_lock (&rt5682->calibrate_mutex);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 27/262 usb: gadget: dont release an existing dev->buf
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit 89f3594d0de58e8a57d92d497dea9fee3d4b9cda upstream.
dev->buf does not need to be released if it already exists before executing dev_config.
--- drivers/usb/gadget/legacy/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/legacy/inode.c +2 -1
@@ -1829,8 +1829,9 @@ dev_config (struct file *fd, const charspin_lock_irq (&dev->lock); value = -EINVAL ;if (dev->buf) { +spin_unlock_irq (&dev->lock);kfree (kbuf); - goto fail; +return value; } dev->buf = kbuf;
Greg Kroah-Hartman
maintainerPATCH 68/262 PCI: mvebu: Fix support for bus mastering and PCI_COMMAND on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit e42b85583719adb87ab88dc7bcd41b38011f7d11 ]
According to PCI specifications bits [0:2] of Command Register, this should be by default disabled on reset. So explicitly disable these bits at early beginning of driver initialization.
Also remove code which unconditionally enables all 3 bits and let kernel code (via pci_set_master() function) to handle bus mastering of PCI Bridge via emulated PCI_COMMAND on emulated bridge.
Adjust existing functions mvebu_pcie_handle_iobase_change() and mvebu_pcie_handle_membase_change() to handle PCI_IO_BASE and PCI_MEM_BASE registers correctly even when bus mastering on emulated bridge is disabled.
--- drivers/pci/controller/pci-mvebu.c | 52 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-)
drivers/pci/controller/pci-mvebu.c +32 -20
@@ -215,16 +215,14 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) {u32 cmd, mask; -/* Point PCIe unit MBUS decode windows to DRAM space. */ -mvebu_pcie_setup_wins (port); - -/* Master + slave enable. */ +/* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd =mvebu_readl (port,PCIE_CMD_OFF ); - cmd |=PCI_COMMAND_IO ; - cmd |=PCI_COMMAND_MEMORY ; - cmd |=PCI_COMMAND_MASTER ; + cmd &= ~(PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER );mvebu_writel (port, cmd,PCIE_CMD_OFF ); +/* Point PCIe unit MBUS decode windows to DRAM space. */ +mvebu_pcie_setup_wins (port); +/* Enable interrupt lines A-D. */ mask =mvebu_readl (port,PCIE_MASK_OFF ); mask |=PCIE_MASK_ENABLE_INTS ;
@@ -371,8 +369,7 @@ static void mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port)/* Are the new iobase/iolimit values invalid? */ if (conf->iolimit < conf->iobase || - conf->iolimitupper < conf->iobaseupper || - !(conf->command &PCI_COMMAND_IO )) { + conf->iolimitupper < conf->iobaseupper) {mvebu_pcie_set_window (port, port->io_target, port->io_attr, &desired, &port->iowin);return ;
@@ -409,8 +406,7 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port)struct pci_bridge_emul_conf *conf = &port->bridge.conf;/* Are the new membase/memlimit values invalid? */ -if (conf->memlimit < conf->membase || - !(conf->command &PCI_COMMAND_MEMORY )) { +if (conf->memlimit < conf->membase) {mvebu_pcie_set_window (port, port->mem_target, port->mem_attr, &desired, &port->memwin);return ;
@@ -430,6 +426,24 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port) &port->memwin); } +static pci_bridge_emul_read_status_t +mvebu_pci_bridge_emul_base_conf_read (struct pci_bridge_emul *bridge, +int reg,u32 *value) +{ +struct mvebu_pcie_port *port = bridge->data; + +switch (reg) { +case PCI_COMMAND : + *value =mvebu_readl (port,PCIE_CMD_OFF ); +break ; + +default : +return PCI_BRIDGE_EMUL_NOT_HANDLED ; + } + +return PCI_BRIDGE_EMUL_HANDLED ; +} +static pci_bridge_emul_read_status_t mvebu_pci_bridge_emul_pcie_conf_read (struct pci_bridge_emul *bridge,int reg,u32 *value)
@@ -484,17 +498,14 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,switch (reg) {case PCI_COMMAND : - { -if (!mvebu_has_ioport (port)) - conf->command &= ~PCI_COMMAND_IO ; - -if ((old ^ new) &PCI_COMMAND_IO ) -mvebu_pcie_handle_iobase_change (port); -if ((old ^ new) &PCI_COMMAND_MEMORY ) -mvebu_pcie_handle_membase_change (port); +if (!mvebu_has_ioport (port)) { + conf->command =cpu_to_le16 ( +le16_to_cpu (conf->command) & ~PCI_COMMAND_IO ); + new &= ~PCI_COMMAND_IO ; + } +mvebu_writel (port, new,PCIE_CMD_OFF );break ; - }case PCI_IO_BASE :mvebu_pcie_handle_iobase_change (port);
@@ -554,6 +565,7 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, }static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { + .read_base = mvebu_pci_bridge_emul_base_conf_read, .write_base = mvebu_pci_bridge_emul_base_conf_write, .read_pcie = mvebu_pci_bridge_emul_pcie_conf_read, .write_pcie = mvebu_pci_bridge_emul_pcie_conf_write,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 24/262 i2c: qup: allow COMPILE_TEST
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 5de717974005fcad2502281e9f82e139ca91f4bb ]
Driver builds fine with COMPILE_TEST. Enable it for wider test coverage and easier maintenance.
--- drivers/i2c/busses/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +1 -1
@@ -921,7 +921,7 @@ config I2C_QCOM_GENI config I2C_QUP tristate "Qualcomm QUP based I2C controller" - depends on ARCH_QCOM + depends on ARCH_QCOM || COMPILE_TEST help If you say yes to this option, support will be included for the built-in I2C interface on the Qualcomm SoCs.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 112/262 bpf: Use u64_stats_t in struct bpf_prog_stats
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 61a0abaee2092eee69e44fe60336aa2f5b578938 ]
Commit 316580b69d0a ("u64_stats: provide u64_stats_t type") fixed possible load/store tearing on 64bit arches.
For instance the following C code
stats->nsecs += sched_clock() - start;
Could be rightfully implemented like this by a compiler, confusing concurrent readers a lot:
stats->nsecs += sched_clock();
// arbitrary delaystats->nsecs -= start;
--- include/linux/filter.h | 10 +++++----- kernel/bpf/syscall.c | 18 ++++++++++++------ kernel/bpf/trampoline.c | 6 +++--- 3 files changed, 20 insertions(+), 14 deletions(-)
include/linux/filter.h +5 -5
@@ -554,9 +554,9 @@ struct bpf_binary_header { };struct bpf_prog_stats { -u64 cnt; -u64 nsecs; -u64 misses; +u64_stats_t cnt; +u64_stats_t nsecs; +u64_stats_t misses;struct u64_stats_sync syncp; }__aligned(2 * sizeof(u64)) ;
@@ -618,8 +618,8 @@ static __always_inline u32 __bpf_prog_run(const struct bpf_prog *prog, ret =dfunc (ctx, prog->insnsi, prog->bpf_func); stats =this_cpu_ptr (prog->stats); flags =u64_stats_update_begin_irqsave (&stats->syncp); - stats->cnt++; - stats->nsecs +=sched_clock () - start; +u64_stats_inc (&stats->cnt); +u64_stats_add (&stats->nsecs,sched_clock () - start);u64_stats_update_end_irqrestore (&stats->syncp, flags); }else { ret =dfunc (ctx, prog->insnsi, prog->bpf_func);
kernel/bpf/syscall.c +12 -6
@@ -1824,8 +1824,14 @@ static int bpf_prog_release(struct inode *inode, struct file *filp)return 0 ; } +struct bpf_prog_kstats { +u64 nsecs; +u64 cnt; +u64 misses; +}; +static void bpf_prog_get_stats (const struct bpf_prog *prog, -struct bpf_prog_stats *stats) +struct bpf_prog_kstats *stats) {u64 nsecs =0 , cnt =0 , misses =0 ;int cpu;
@@ -1838,9 +1844,9 @@ static void bpf_prog_get_stats(const struct bpf_prog *prog, st =per_cpu_ptr (prog->stats, cpu);do { start =u64_stats_fetch_begin_irq (&st->syncp); - tnsecs = st->nsecs; - tcnt = st->cnt; - tmisses = st->misses; + tnsecs =u64_stats_read (&st->nsecs); + tcnt =u64_stats_read (&st->cnt); + tmisses =u64_stats_read (&st->misses); }while (u64_stats_fetch_retry_irq (&st->syncp, start)); nsecs += tnsecs; cnt += tcnt;
@@ -1856,7 +1862,7 @@ static void bpf_prog_show_fdinfo(struct seq_file *m, struct file *filp) {const struct bpf_prog *prog = filp->private_data;char prog_tag[sizeof (prog->tag) *2 +1 ] = { }; -struct bpf_prog_stats stats; +struct bpf_prog_kstats stats;bpf_prog_get_stats (prog, &stats);bin2hex (prog_tag, prog->tag,sizeof (prog->tag));
@@ -3595,7 +3601,7 @@ static int bpf_prog_get_info_by_fd(struct file *file,struct bpf_prog_info __user *uinfo =u64_to_user_ptr (attr->info.info);struct bpf_prog_info info;u32 info_len = attr->info.info_len; -struct bpf_prog_stats stats; +struct bpf_prog_kstats stats;char __user *uinsns;u32 ulen;int err;
kernel/bpf/trampoline.c +3 -3
@@ -544,7 +544,7 @@ static void notrace inc_misses_counter(struct bpf_prog *prog) stats =this_cpu_ptr (prog->stats);u64_stats_update_begin (&stats->syncp); - stats->misses++; +u64_stats_inc (&stats->misses);u64_stats_update_end (&stats->syncp); }
@@ -589,8 +589,8 @@ static void notrace update_prog_stats(struct bpf_prog *prog, stats =this_cpu_ptr (prog->stats); flags =u64_stats_update_begin_irqsave (&stats->syncp); - stats->cnt++; - stats->nsecs +=sched_clock () - start; +u64_stats_inc (&stats->cnt); +u64_stats_add (&stats->nsecs,sched_clock () - start);u64_stats_update_end_irqrestore (&stats->syncp, flags); } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 71/262 PCI: mvebu: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit d75404cc08832206f173668bd35391c581fea121 ]
Hardware supports PCIe Hot Reset via PCIE_CTRL_OFF register. Use it for implementing PCI_BRIDGE_CTL_BUS_RESET bit of PCI_BRIDGE_CONTROL register on emulated bridge.
With this change the function pci_reset_secondary_bus() starts working and can reset connected PCIe card.
--- drivers/pci/controller/pci-mvebu.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/pci/controller/pci-mvebu.c +28 -0
@@ -56,6 +56,7 @@#define PCIE_CTRL_OFF 0x1a00#define PCIE_CTRL_X1_MODE 0x0001#define PCIE_CTRL_RC_MODE BIT(1) +#define PCIE_CTRL_MASTER_HOT_RESET BIT(24)#define PCIE_STAT_OFF 0x1a04#define PCIE_STAT_BUS 0xff00#define PCIE_STAT_DEV 0x1f0000
@@ -462,6 +463,22 @@ mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge,break ; } +case PCI_INTERRUPT_LINE : { +/* +* From the whole 32bit register we support reading from HW only +* one bit: PCI_BRIDGE_CTL_BUS_RESET. +* Other bits are retrieved only from emulated config buffer. +*/ +__le32 *cfgspace = (__le32 *)&bridge->conf; +u32 val =le32_to_cpu (cfgspace[PCI_INTERRUPT_LINE /4 ]); +if (mvebu_readl (port,PCIE_CTRL_OFF ) &PCIE_CTRL_MASTER_HOT_RESET ) + val |=PCI_BRIDGE_CTL_BUS_RESET <<16 ; +else + val &= ~(PCI_BRIDGE_CTL_BUS_RESET <<16 ); + *value = val; +break ; + } +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -549,6 +566,17 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus);break ; +case PCI_INTERRUPT_LINE : +if (mask & (PCI_BRIDGE_CTL_BUS_RESET <<16 )) { +u32 ctrl =mvebu_readl (port,PCIE_CTRL_OFF ); +if (new & (PCI_BRIDGE_CTL_BUS_RESET <<16 )) + ctrl |=PCIE_CTRL_MASTER_HOT_RESET ; +else + ctrl &= ~PCIE_CTRL_MASTER_HOT_RESET ; +mvebu_writel (port, ctrl,PCIE_CTRL_OFF ); + } +break ; +default :break ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 9/262 KVM: arm64: vgic: Read HW interrupt pending state from the HW
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 5bfa685e62e9ba93c303a9a8db646c7228b9b570 ]
It appears that a read access to GIC[DR]_I[CS]PENDRn doesn't always result in the pending interrupts being accurately reported if they are mapped to a HW interrupt. This is particularily visible when acking the timer interrupt and reading the GICR_ISPENDR1 register immediately after, for example (the interrupt appears as not-pending while it really is...).
This is because a HW interrupt has its 'active and pending state' kept in the *physical* distributor, and not in the virtual one, as mandated by the spec (this is what allows the direct deactivation). The virtual distributor only caries the pending and active *states* (note the plural, as these are two independent and non-overlapping states).
Fix it by reading the HW state back, either from the timer itself or from the distributor if necessary.
--- arch/arm64/kvm/vgic/vgic-mmio.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kvm/vgic/vgic-mmio.c +2 -0
@@ -248,6 +248,8 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,IRQCHIP_STATE_PENDING , &val);WARN_RATELIMIT (err,"IRQ %d" , irq->host_irq); + }else if (vgic_irq_is_mapped_level (irq)) { + val =vgic_get_phys_line_level (irq); }else { val =irq_is_pending (irq); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 30/262 exfat: fix i_blocks for files truncated over 4 GiB
In reply to Greg Kroah-HartmanFrom: Christophe Vu-Brugier <[email protected]>
[ Upstream commit 92fba084b79e6bc7b12fc118209f1922c1a2df56 ]
In exfat_truncate(), the computation of inode->i_blocks is wrong if the file is larger than 4 GiB because a 32-bit variable is used as a mask. This is fixed and simplified by using round_up().
Also fix the same buggy computation in exfat_read_root() and another (correct) one in exfat_fill_inode(). The latter was fixed another way last month but can be simplified by using round_up() as well. See:
commit 0c336d6e33f4 ("exfat: fix incorrect loading of i_blocks for
large files")
--- fs/exfat/file.c | 4 ++-- fs/exfat/inode.c | 4 ++-- fs/exfat/super.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
fs/exfat/file.c +2 -2
@@ -251,8 +251,8 @@ void exfat_truncate(struct inode *inode, loff_t size)else mark_inode_dirty (inode); - inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & - ~(sbi->cluster_size -1 )) >> inode->i_blkbits; + inode->i_blocks =round_up (i_size_read (inode), sbi->cluster_size) >> + inode->i_blkbits; write_size: aligned_size =i_size_read (inode);if (aligned_size & (blocksize -1 )) {
fs/exfat/inode.c +2 -2
@@ -602,8 +602,8 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)exfat_save_attr (inode, info->attr); - inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & - ~((loff_t )sbi->cluster_size -1 )) >> inode->i_blkbits; + inode->i_blocks =round_up (i_size_read (inode), sbi->cluster_size) >> + inode->i_blkbits; inode->i_mtime = info->mtime; inode->i_ctime = info->mtime; ei->i_crtime = info->crtime;
fs/exfat/super.c +2 -2
@@ -364,8 +364,8 @@ static int exfat_read_root(struct inode *inode) inode->i_op = &exfat_dir_inode_operations; inode->i_fop = &exfat_dir_operations; - inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) - & ~(sbi->cluster_size -1 )) >> inode->i_blkbits; + inode->i_blocks =round_up (i_size_read (inode), sbi->cluster_size) >> + inode->i_blkbits; ei->i_pos = ((loff_t )sbi->root_dir <<32 ) |0xffffffff ; ei->i_size_aligned =i_size_read (inode); ei->i_size_ondisk =i_size_read (inode);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 74/262 PCI: mvebu: Fix support for DEVCAP2, DEVCTL2 and LNKCTL2 registers on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 4ab34548c55fbbb3898306a47dfaccd4860e1ccb ]
Armada XP and new hardware supports access to DEVCAP2, DEVCTL2 and LNKCTL2 configuration registers of PCIe core via PCIE_CAP_PCIEXP. So export them via emulated software root bridge.
Pre-XP hardware does not support these registers and returns zeros.
--- drivers/pci/controller/pci-mvebu.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/pci/controller/pci-mvebu.c +23 -0
@@ -524,6 +524,18 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge, *value =mvebu_readl (port,PCIE_RC_RTSTA );break ; +case PCI_EXP_DEVCAP2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCAP2 ); +break ; + +case PCI_EXP_DEVCTL2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL2 ); +break ; + +case PCI_EXP_LNKCTL2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_LNKCTL2 ); +break ; +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -615,6 +627,17 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,if (new &PCI_EXP_RTSTA_PME )mvebu_writel (port, ~PCIE_INT_PM_PME ,PCIE_INT_CAUSE_OFF );break ; + +case PCI_EXP_DEVCTL2 : +mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL2 ); +break ; + +case PCI_EXP_LNKCTL2 : +mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_LNKCTL2 ); +break ; + +default : +break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 96/262 drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 70897848730470cc477d5d89e6222c0f6a9ac173 ]
[Why]
PSR currently relies on the kernel's delayed vblank on/off mechanism as an implicit bufferring mechanism to prevent excessive entry/exit.
Without this delay the user experience is impacted since it can take a few frames to enter/exit.
[How]
Only allow vblank disable immediate for DC when psr is not supported.
Leave a TODO indicating that this support should be extended in the future to delay independent of the vblank interrupt.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8 -3
@@ -1279,9 +1279,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)adev_to_drm (adev)->mode_config.cursor_width = adev->dm.dc->caps.max_cursor_size;adev_to_drm (adev)->mode_config.cursor_height = adev->dm.dc->caps.max_cursor_size; -/* Disable vblank IRQs aggressively for power-saving */ -adev_to_drm (adev)->vblank_disable_immediate = true; -if (drm_vblank_init (adev_to_drm (adev), adev->dm.display_indexes_num)) {DRM_ERROR ("amdgpu: failed to initialize sw for display support.\n" );
@@ -3866,6 +3863,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) } +/* +* Disable vblank IRQs aggressively for power-saving. +* +* TODO: Fix vblank control helpers to delay PSR entry to allow this when PSR +* is also supported. +*/ +adev_to_drm (adev)->vblank_disable_immediate = !psr_feature_enabled; +/* Software is initialized. Now we can register interrupt handlers. */ switch (adev->asic_type) {#if defined(CONFIG_DRM_AMD_DC_SI )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 119/262 drm/i915/display: Move DRRS code its own file
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
[ Upstream commit a1b63119ee839c8ff622407aab25c9723943638a ]
intel_dp.c is a 5k lines monster, so moving DRRS out of it to reduce some lines from it.
--- Documentation/gpu/i915.rst | 14 +- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 1 + .../drm/i915/display/intel_display_debugfs.c | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 467 +---------------- drivers/gpu/drm/i915/display/intel_dp.h | 11 - drivers/gpu/drm/i915/display/intel_drrs.c | 477 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_drrs.h | 32 ++ .../gpu/drm/i915/display/intel_frontbuffer.c | 1 + 9 files changed, 521 insertions(+), 484 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.c create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.h
Documentation/gpu/i915.rst +7 -7
@@ -183,25 +183,25 @@ Frame Buffer Compression (FBC) Display Refresh Rate Switching (DRRS) ------------------------------------- -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :doc: Display Refresh Rate Switching (DRRS) -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_dp_set_drrs_state -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_edp_drrs_enable -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_edp_drrs_disable -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_edp_drrs_invalidate -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_edp_drrs_flush -.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c +.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c :functions: intel_dp_drrs_init DPIO
drivers/gpu/drm/i915/Makefile +1 -0
@@ -212,6 +212,7 @@ i915-y += \ display/intel_dpll.o \ display/intel_dpll_mgr.o \ display/intel_dpt.o \ + display/intel_drrs.o \ display/intel_dsb.o \ display/intel_fb.o \ display/intel_fbc.o \
drivers/gpu/drm/i915/display/intel_ddi.c +1 -0
@@ -40,6 +40,7 @@#include "intel_dp_link_training.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" +#include "intel_drrs.h" #include "intel_dsi.h" #include "intel_fdi.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_display_debugfs.c +1 -0
@@ -13,6 +13,7 @@#include "intel_display_types.h" #include "intel_dmc.h" #include "intel_dp.h" +#include "intel_drrs.h" #include "intel_fbc.h" #include "intel_hdcp.h" #include "intel_hdmi.h"
drivers/gpu/drm/i915/display/intel_dp.c +1 -466
485 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.h +0 -11
@@ -70,17 +70,6 @@ int intel_dp_max_link_rate(struct intel_dp *intel_dp);int intel_dp_max_lane_count (struct intel_dp *intel_dp);int intel_dp_rate_select (struct intel_dp *intel_dp,int rate); -void intel_edp_drrs_enable (struct intel_dp *intel_dp, -const struct intel_crtc_state *crtc_state); -void intel_edp_drrs_disable (struct intel_dp *intel_dp, -const struct intel_crtc_state *crtc_state); -void intel_edp_drrs_update (struct intel_dp *intel_dp, -const struct intel_crtc_state *crtc_state); -void intel_edp_drrs_invalidate (struct drm_i915_private *dev_priv, -unsigned int frontbuffer_bits); -void intel_edp_drrs_flush (struct drm_i915_private *dev_priv, -unsigned int frontbuffer_bits); -void intel_dp_compute_rate (struct intel_dp *intel_dp,int port_clock,u8 *link_bw,u8 *rate_select);bool intel_dp_source_supports_hbr2 (struct intel_dp *intel_dp);
drivers/gpu/drm/i915/display/intel_drrs.c new file +477 -0
477 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_drrs.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __INTEL_DRRS_H__ +#define __INTEL_DRRS_H__ + +#include <linux/types.h> + +struct drm_i915_private ; +struct intel_crtc_state ; +struct intel_connector ; +struct intel_dp ; + +void intel_edp_drrs_enable (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +void intel_edp_drrs_disable (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +void intel_edp_drrs_update (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +void intel_edp_drrs_invalidate (struct drm_i915_private *dev_priv, +unsigned int frontbuffer_bits); +void intel_edp_drrs_flush (struct drm_i915_private *dev_priv, +unsigned int frontbuffer_bits); +void intel_dp_drrs_compute_config (struct intel_dp *intel_dp, +struct intel_crtc_state *pipe_config, +int output_bpp,bool constant_n); +struct drm_display_mode *intel_dp_drrs_init (struct intel_connector *connector, +struct drm_display_mode *fixed_mode); + +#endif /* __INTEL_DRRS_H__ */
drivers/gpu/drm/i915/display/intel_frontbuffer.c +1 -0
@@ -62,6 +62,7 @@#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_frontbuffer.h" +#include "intel_drrs.h" #include "intel_psr.h" /**
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 120/262 drm/i915: Disable DRRS on IVB/HSW port != A
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit ee59792c97176f12c1da31f29fc4c2aab187f06e ]
Currently we allow DRRS on IVB PCH ports, but we're missing a few programming steps meaning it is guaranteed to not work. And on HSW DRRS is not supported on anything but port A ever as only transcoder EDP has the M2/N2 registers (though I'm not sure if HSW ever has eDP on any other port).
Starting from BDW all transcoders have the dynamically reprogrammable M/N registers so DRRS could work on any port.
Stop initializing DRRS on ports where it cannot possibly work.
--- drivers/gpu/drm/i915/display/intel_drrs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_drrs.c +8 -0
@@ -445,6 +445,7 @@ intel_dp_drrs_init(struct intel_connector *connector, struct drm_display_mode *fixed_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_encoder *encoder = connector->encoder;struct drm_display_mode *downclock_mode =NULL ;INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);
@@ -456,6 +457,13 @@ intel_dp_drrs_init(struct intel_connector *connector,return NULL ; } +if ((DISPLAY_VER (dev_priv) <8 && !HAS_GMCH (dev_priv)) && + encoder->port !=PORT_A ) { +drm_dbg_kms (&dev_priv->drm, +"DRRS only supported on eDP port A\n" ); +return NULL ; + } +if (dev_priv->vbt.drrs_type !=SEAMLESS_DRRS_SUPPORT ) {drm_dbg_kms (&dev_priv->drm,"VBT doesn't support DRRS\n" );return NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 28/262 usb: gadget: clear related members when goto fail
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit 501e38a5531efbd77d5c73c0ba838a889bfc1d74 upstream.
dev->config and dev->hs_config and dev->dev need to be cleaned if dev_config fails to avoid UAF.
--- drivers/usb/gadget/legacy/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/gadget/legacy/inode.c +5 -2
@@ -1878,8 +1878,8 @@ dev_config (struct file *fd, const char value =usb_gadget_probe_driver (&gadgetfs_driver);if (value !=0 ) { -kfree (dev->buf); - dev->buf =NULL ; +spin_lock_irq (&dev->lock); + goto fail; }else {/* at this point "good" hardware has for the first time * let the USB the host see us. alternatively, if users
@@ -1896,6 +1896,9 @@ dev_config (struct file *fd, const charreturn value; fail: + dev->config =NULL ; + dev->hs_config =NULL ; + dev->dev =NULL ;spin_unlock_irq (&dev->lock);pr_debug ("%s: %s fail %zd, %p\n" , shortname, __func__, value, dev);kfree (dev->buf);
Greg Kroah-Hartman
maintainerPATCH 121/262 gve: Recording rx queue before sending to napi
In reply to Greg Kroah-HartmanFrom: Tao Liu <[email protected]>
[ Upstream commit 084cbb2ec3af2d23be9de65fcc9493e21e265859 ]
This caused a significant performance degredation when using generic XDP with multiple queues.
--- drivers/net/ethernet/google/gve/gve_rx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/google/gve/gve_rx.c +1 -0
@@ -450,6 +450,7 @@ static bool gve_rx(struct gve_rx_ring *rx, struct gve_rx_desc *rx_desc,skb_set_hash (skb,be32_to_cpu (rx_desc->rss_hash),gve_rss_type (rx_desc->flags_seq)); +skb_record_rx_queue (skb, rx->q_num);if (skb_is_nonlinear (skb))napi_gro_frags (napi);else
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 122/262 net: dsa: ocelot: seville: utilize of_mdiobus_register
In reply to Greg Kroah-HartmanFrom: Colin Foster <[email protected]>
[ Upstream commit 5186c4a05b9713138b762a49467a8ab9753cdb36 ]
Switch seville to use of_mdiobus_register(bus, NULL) instead of just mdiobus_register. This code is about to be pulled into a separate module that can optionally define ports by the device_node.
--- drivers/net/dsa/ocelot/seville_vsc9953.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/dsa/ocelot/seville_vsc9953.c +2 -1
@@ -10,6 +10,7 @@#include <linux/pcs-lynx.h> #include <linux/dsa/ocelot.h> #include <linux/iopoll.h> +#include <linux/of_mdio.h> #include "felix.h" #define MSCC_MIIM_CMD_OPR_WRITE BIT(1)
@@ -1110,7 +1111,7 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)snprintf (bus->id,MII_BUS_ID_SIZE ,"%s-imdio" ,dev_name (dev));/* Needed in order to initialize the bus mutex lock */ - rc =mdiobus_register (bus); + rc =of_mdiobus_register (bus,NULL );if (rc <0 ) {dev_err (dev,"failed to register MDIO bus\n" );return rc;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 123/262 net: dsa: seville: register the mdiobus under devres
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit bd488afc3b39e045ba71aab472233f2a78726e7b ]
As explained in commits:74b6d7d13307 ("net: dsa: realtek: register the MDIO bus under devres") 5135e96a3dd2 ("net: dsa: don't allocate the slave_mii_bus using devres")
mdiobus_free() will panic when called from devm_mdiobus_free() <- devres_release_all() <- __device_release_driver(), and that mdiobus was not previously unregistered.
The Seville VSC9959 switch is a platform device, so the initial set of constraints that I thought would cause this (I2C or SPI buses which call ->remove on ->shutdown) do not apply. But there is one more which applies here.
If the DSA master itself is on a bus that calls ->remove from ->shutdown (like dpaa2-eth, which is on the fsl-mc bus), there is a device link between the switch and the DSA master, and device_links_unbind_consumers() will unbind the seville switch driver on shutdown.
So the same treatment must be applied to all DSA switch drivers, which
is: either use devres for both the mdiobus allocation and registration, or don't use devres at all.
The seville driver has a code structure that could accommodate both the mdiobus_unregister and mdiobus_free calls, but it has an external dependency upon mscc_miim_setup() from mdio-mscc-miim.c, which calls devm_mdiobus_alloc_size() on its behalf. So rather than restructuring that, and exporting yet one more symbol mscc_miim_teardown(), let's work with devres and replace of_mdiobus_register with the devres variant. When we use all-devres, we can ensure that devres doesn't free a still-registered bus (it either runs both callbacks, or none).
--- drivers/net/dsa/ocelot/seville_vsc9953.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/dsa/ocelot/seville_vsc9953.c +3 -2
@@ -1111,7 +1111,7 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)snprintf (bus->id,MII_BUS_ID_SIZE ,"%s-imdio" ,dev_name (dev));/* Needed in order to initialize the bus mutex lock */ - rc =of_mdiobus_register (bus,NULL ); + rc =devm_of_mdiobus_register (dev, bus,NULL );if (rc <0 ) {dev_err (dev,"failed to register MDIO bus\n" );return rc;
@@ -1163,7 +1163,8 @@ static void vsc9953_mdio_bus_free(struct ocelot *ocelot)mdio_device_free (pcs->mdio);lynx_pcs_destroy (pcs); } -mdiobus_unregister (felix->imdio); + +/* mdiobus_unregister and mdiobus_free handled by devres */ }static const struct felix_info seville_info_vsc9953 = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 88/262 i3c: master: dw: check return of dw_i3c_master_get_free_pos()
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 13462ba1815db5a96891293a9cfaa2451f7bd623 ]
Clang static analysis reports this problem dw-i3c-master.c:799:9: warning: The result of the left shift is
undefined because the left operand is negative
COMMAND_PORT_DEV_INDEX(pos) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~pos can be negative because dw_i3c_master_get_free_pos() can return an error. So check for an error.
--- drivers/i3c/master/dw-i3c-master.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i3c/master/dw-i3c-master.c +4 -0
@@ -793,6 +793,10 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)return -ENOMEM ; pos =dw_i3c_master_get_free_pos (master); +if (pos <0 ) { +dw_i3c_master_free_xfer (xfer); +return pos; + } cmd = &xfer->cmds[0 ]; cmd->cmd_hi =0x1 ; cmd->cmd_lo = COMMAND_PORT_DEV_COUNT(master->maxdevs - pos) |
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 124/262 ibmvnic: dont release napi in __ibmvnic_open()
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 61772b0908c640d0309c40f7d41d062ca4e979fa ]
If __ibmvnic_open() encounters an error such as when setting link state, it calls release_resources() which frees the napi structures needlessly. Instead, have __ibmvnic_open() only clean up the work it did so far (i.e. disable napi and irqs) and leave the rest to the callers.
If caller of __ibmvnic_open() is ibmvnic_open(), it should release the resources immediately. If the caller is do_reset() or do_hard_reset(), they will release the resources on the next reset.
This fixes following crash that occurred when running the drmgr command several times to add/remove a vnic interface:
[102056] ibmvnic 30000003 env3: Disabling rx_scrq[6] irq [102056] ibmvnic 30000003 env3: Disabling rx_scrq[7] irq [102056] ibmvnic 30000003 env3: Replenished 8 pools Kernel attempted to read user page (10) - exploit attempt? (uid: 0) BUG: Kernel NULL pointer dereference on read at 0x00000010 Faulting instruction address: 0xc000000000a3c840 Oops: Kernel access of bad area, sig: 11 [#1] LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries ... CPU: 9 PID: 102056 Comm: kworker/9:2 Kdump: loaded Not tainted 5.16.0-rc5-autotest-g6441998e2e37 #1 Workqueue: events_long __ibmvnic_reset [ibmvnic] NIP: c000000000a3c840 LR: c0080000029b5378 CTR: c000000000a3c820 REGS: c0000000548e37e0 TRAP: 0300 Not tainted (5.16.0-rc5-autotest-g6441998e2e37) MSR: 8000000000009033 <SF,EE,ME,IR,DR,RI,LE> CR: 28248484 XER: 00000004 CFAR: c0080000029bdd24 DAR: 0000000000000010 DSISR: 40000000 IRQMASK: 0 GPR00: c0080000029b55d0 c0000000548e3a80 c0000000028f0200 0000000000000000 ... NIP [c000000000a3c840] napi_enable+0x20/0xc0 LR [c0080000029b5378] __ibmvnic_open+0xf0/0x430 [ibmvnic] Call Trace: [c0000000548e3a80] [0000000000000006] 0x6 (unreliable) [c0000000548e3ab0] [c0080000029b55d0] __ibmvnic_open+0x348/0x430 [ibmvnic] [c0000000548e3b40] [c0080000029bcc28] __ibmvnic_reset+0x500/0xdf0 [ibmvnic] [c0000000548e3c60] [c000000000176228] process_one_work+0x288/0x570 [c0000000548e3d00] [c000000000176588] worker_thread+0x78/0x660 [c0000000548e3da0] [c0000000001822f0] kthread+0x1c0/0x1d0 [c0000000548e3e10] [c00000000000cf64] ret_from_kernel_thread+0x5c/0x64 Instruction dump: 7d2948f8 792307e0 4e800020 60000000 3c4c01eb 384239e0 f821ffd1 39430010 38a0fff6 e92d1100 f9210028 39200000 <e9030010> f9010020 60420000 e9210020 ---[ end trace 5f8033b08fd27706 ]---
--- drivers/net/ethernet/ibm/ibmvnic.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +7 -2
@@ -108,6 +108,7 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter);static int send_query_phys_parms (struct ibmvnic_adapter *adapter);static void ibmvnic_tx_scrq_clean_buffer (struct ibmvnic_adapter *adapter,struct ibmvnic_sub_crq_queue *tx_scrq); +static void ibmvnic_disable_irqs (struct ibmvnic_adapter *adapter);struct ibmvnic_stat {char name[ETH_GSTRING_LEN ];
@@ -1245,7 +1246,7 @@ static int __ibmvnic_open(struct net_device *netdev) rc =set_link_state (adapter,IBMVNIC_LOGICAL_LNK_UP );if (rc) {ibmvnic_napi_disable (adapter); -release_resources (adapter); +ibmvnic_disable_irqs (adapter);return rc; }
@@ -1295,7 +1296,6 @@ static int ibmvnic_open(struct net_device *netdev) rc =init_resources (adapter);if (rc) {netdev_err (netdev,"failed to initialize resources\n" ); -release_resources (adapter); goto out; } }
@@ -1312,6 +1312,11 @@ static int ibmvnic_open(struct net_device *netdev) adapter->state =VNIC_OPEN ; rc =0 ; } + +if (rc) { +release_resources (adapter); + } +return rc; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 125/262 of: net: move of_net under net/
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e330fb14590c5c80f7195c3d8c9b4bcf79e1a5cd ]
Rob suggests to move of_net.c from under drivers/of/ somewhere to the networking code.
---
drivers/net/ethernet/amd/Kconfig | 2 +-
drivers/net/ethernet/arc/Kconfig | 4 ++--
drivers/net/ethernet/ezchip/Kconfig | 2 +-
drivers/net/ethernet/litex/Kconfig | 2 +-
drivers/net/ethernet/mscc/Kconfig | 2 +-
drivers/of/Kconfig | 4 ----
drivers/of/Makefile | 1 -
include/linux/of_net.h | 2 +-
net/core/Makefile | 1 +
net/core/net-sysfs.c | 2 +-
{drivers/of => net/core}/of_net.c | 0
11 files changed, 9 insertions(+), 13 deletions(-)
rename {drivers/of => net/core}/of_net.c (100%)drivers/net/ethernet/amd/Kconfig +1 -1
@@ -168,7 +168,7 @@ config SUNLANCE config AMD_XGBE tristate "AMD 10GbE Ethernet driver" - depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM + depends on (OF_ADDRESS || ACPI || PCI) && HAS_IOMEM depends on X86 || ARM64 || COMPILE_TEST depends on PTP_1588_CLOCK_OPTIONAL select BITREVERSE
drivers/net/ethernet/arc/Kconfig +2 -2
@@ -26,7 +26,7 @@ config ARC_EMAC_CORE config ARC_EMAC tristate "ARC EMAC support" select ARC_EMAC_CORE - depends on OF_IRQ && OF_NET + depends on OF_IRQ depends on ARC || COMPILE_TEST help On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
@@ -36,7 +36,7 @@ config ARC_EMAC config EMAC_ROCKCHIP tristate "Rockchip EMAC support" select ARC_EMAC_CORE - depends on OF_IRQ && OF_NET && REGULATOR + depends on OF_IRQ && REGULATOR depends on ARCH_ROCKCHIP || COMPILE_TEST help Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.
drivers/net/ethernet/ezchip/Kconfig +1 -1
@@ -18,7 +18,7 @@ if NET_VENDOR_EZCHIP config EZCHIP_NPS_MANAGEMENT_ENET tristate "EZchip NPS management enet support" - depends on OF_IRQ && OF_NET + depends on OF_IRQ depends on HAS_IOMEM help Simple LAN device for debug or management purposes.
drivers/net/ethernet/litex/Kconfig +1 -1
@@ -17,7 +17,7 @@ if NET_VENDOR_LITEX config LITEX_LITEETH tristate "LiteX Ethernet support" - depends on OF_NET + depends on OF help If you wish to compile a kernel for hardware with a LiteX LiteEth device then you should answer Y to this.
drivers/net/ethernet/mscc/Kconfig +1 -1
@@ -28,7 +28,7 @@ config MSCC_OCELOT_SWITCH depends on BRIDGE || BRIDGE=n depends on NET_SWITCHDEV depends on HAS_IOMEM - depends on OF_NET + depends on OF select MSCC_OCELOT_SWITCH_LIB select GENERIC_PHY help
drivers/of/Kconfig +0 -4
@@ -70,10 +70,6 @@ config OF_IRQ def_bool y depends on !SPARC && IRQ_DOMAIN -config OF_NET - depends on NETDEVICES - def_bool y - config OF_RESERVED_MEM def_bool OF_EARLY_FLATTREE
drivers/of/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o obj-$(CONFIG_OF_PROMTREE) += pdt.o obj-$(CONFIG_OF_ADDRESS) += address.o obj-$(CONFIG_OF_IRQ) += irq.o -obj-$(CONFIG_OF_NET) += of_net.o obj-$(CONFIG_OF_UNITTEST) += unittest.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o obj-$(CONFIG_OF_RESOLVE) += resolver.o
include/linux/of_net.h +1 -1
@@ -8,7 +8,7 @@#include <linux/phy.h> -#ifdef CONFIG_OF_NET +#ifdef CONFIG_OF #include <linux/of.h> struct net_device ;
net/core/Makefile +1 -0
@@ -36,3 +36,4 @@ obj-$(CONFIG_FAILOVER) += failover.o obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o obj-$(CONFIG_BPF_SYSCALL) += sock_map.o obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o +obj-$(CONFIG_OF) += of_net.o
net/core/net-sysfs.c +1 -1
@@ -1927,7 +1927,7 @@ static struct class net_class __ro_after_init = { .get_ownership = net_get_ownership, }; -#ifdef CONFIG_OF_NET +#ifdef CONFIG_OF static int of_dev_node_match (struct device *dev,const void *data) {for (; dev; dev = dev->parent) {
net/core/of_net.c renamed from drivers/of/of_net.c +0 -0
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 89/262 dma-buf: cma_heap: Fix mutex locking section
In reply to Greg Kroah-HartmanFrom: Weizhao Ouyang <[email protected]>
[ Upstream commit 54329e6f7beea6af56c1230da293acc97d6a6ee7 ]
Fix cma_heap_buffer mutex locking critical section to protect vmap_cnt and vaddr.
--- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma-buf/heaps/cma_heap.c +4 -2
@@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,struct cma_heap_buffer *buffer = dmabuf->priv;struct dma_heap_attachment *a; +mutex_lock (&buffer->lock); +if (buffer->vmap_cnt)invalidate_kernel_vmap_range (buffer->vaddr, buffer->len); -mutex_lock (&buffer->lock);list_for_each_entry (a, &buffer->attachments, list) {if (!a->mapped)continue ;
@@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf,struct cma_heap_buffer *buffer = dmabuf->priv;struct dma_heap_attachment *a; +mutex_lock (&buffer->lock); +if (buffer->vmap_cnt)flush_kernel_vmap_range (buffer->vaddr, buffer->len); -mutex_lock (&buffer->lock);list_for_each_entry (a, &buffer->attachments, list) {if (!a->mapped)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 126/262 net: ethernet: litex: Add the dependency on HAS_IOMEM
In reply to Greg Kroah-HartmanFrom: Cai Huoqing <[email protected]>
[ Upstream commit 2427f03fb42f9dc14c53108f2c9b5563eb37e770 ]
The LiteX driver uses devm io function API which needs HAS_IOMEM enabled, so add the dependency on HAS_IOMEM.
--- drivers/net/ethernet/litex/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/litex/Kconfig +1 -1
@@ -17,7 +17,7 @@ if NET_VENDOR_LITEX config LITEX_LITEETH tristate "LiteX Ethernet support" - depends on OF + depends on OF && HAS_IOMEM help If you wish to compile a kernel for hardware with a LiteX LiteEth device then you should answer Y to this.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 90/262 tracing/uprobes: Check the return value of kstrdup() for tu->filename
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 8c7224245557707c613f130431cafbaaa4889615 ]
kstrdup() returns NULL when some internal memory errors happen, it is better to check the return value of it so to catch the memory error in time.
--- kernel/trace/trace_uprobe.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/trace_uprobe.c +5 -0
@@ -1619,6 +1619,11 @@ create_local_trace_uprobe(char *name, unsigned long offs, tu->path = path; tu->ref_ctr_offset = ref_ctr_offset; tu->filename =kstrdup (name,GFP_KERNEL ); +if (!tu->filename) { + ret = -ENOMEM ; + goto error; + } +init_trace_event_call (tu); ptype =is_ret_probe (tu) ?PROBE_PRINT_RETURN :PROBE_PRINT_NORMAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 92/262 mm: defer kmemleak object creation of module_alloc()
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
[ Upstream commit 60115fa54ad7b913b7cb5844e6b7ffeb842d55f2 ]
Yongqiang reports a kmemleak panic when module insmod/rmmod with KASAN enabled(without KASAN_VMALLOC) on x86[1].
When the module area allocates memory, it's kmemleak_object is created successfully, but the KASAN shadow memory of module allocation is not ready, so when kmemleak scan the module's pointer, it will panic due to no shadow memory with KASAN check.
module_alloc
__vmalloc_node_range
kmemleak_vmalloc
kmemleak_scan
update_checksum
kasan_module_alloc
kmemleak_ignore
Note, there is no problem if KASAN_VMALLOC enabled, the modules area entire shadow memory is preallocated. Thus, the bug only exits on ARCH which supports dynamic allocation of module area per module load, for now, only x86/arm64/s390 are involved.
Add a VM_DEFER_KMEMLEAK flags, defer vmalloc'ed object register of kmemleak in module_alloc() to fix this issue.
[1] https://lore.kernel.org/all/[email protected]/
--- arch/arm64/kernel/module.c | 4 ++-- arch/s390/kernel/module.c | 5 +++-- arch/x86/kernel/module.c | 7 ++++--- include/linux/kasan.h | 4 ++-- include/linux/vmalloc.h | 7 +++++++ mm/kasan/shadow.c | 9 +++++++-- mm/vmalloc.c | 3 ++- 7 files changed, 27 insertions(+), 12 deletions(-)
arch/arm64/kernel/module.c +2 -2
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size) module_alloc_end =MODULES_END ; p =__vmalloc_node_range (size,MODULE_ALIGN , module_alloc_base, - module_alloc_end, gfp_mask,PAGE_KERNEL ,0 , + module_alloc_end, gfp_mask,PAGE_KERNEL ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)PAGE_KERNEL ,0 ,NUMA_NO_NODE , __builtin_return_address(0)); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/s390/kernel/module.c +3 -2
@@ -37,14 +37,15 @@void *module_alloc (unsigned long size) { +gfp_t gfp_mask =GFP_KERNEL ;void *p;if (PAGE_ALIGN (size) >MODULES_LEN )return NULL ; p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR ,MODULES_END , -GFP_KERNEL ,PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE , + gfp_mask,PAGE_KERNEL_EXEC ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/x86/kernel/module.c +4 -3
@@ -67,6 +67,7 @@ static unsigned long int get_module_load_offset(void)void *module_alloc (unsigned long size) { +gfp_t gfp_mask =GFP_KERNEL ;void *p;if (PAGE_ALIGN (size) >MODULES_LEN )
@@ -74,10 +75,10 @@ void *module_alloc(unsigned long size) p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR +get_module_load_offset (), -MODULES_END ,GFP_KERNEL , -PAGE_KERNEL ,0 ,NUMA_NO_NODE , +MODULES_END , gfp_mask, +PAGE_KERNEL ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
include/linux/kasan.h +2 -2
@@ -461,12 +461,12 @@ static inline void kasan_release_vmalloc(unsigned long start,* allocations with real shadow memory. With KASAN vmalloc, the special * case is unnecessary, as the work is handled in the generic case. */ -int kasan_module_alloc (void *addr,size_t size); +int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask);void kasan_free_shadow (const struct vm_struct *vm);#else /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */ -static inline int kasan_module_alloc (void *addr,size_t size) {return 0 ; } +static inline int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) {return 0 ; }static inline void kasan_free_shadow (const struct vm_struct *vm) {}#endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
include/linux/vmalloc.h +7 -0
@@ -28,6 +28,13 @@ struct notifier_block; /* in notifier.h */#define VM_MAP_PUT_PAGES 0x00000200/* put pages and free array in vfree */ #define VM_NO_HUGE_VMAP 0x00000400/* force PAGE_SIZE pte mapping */ +#if (defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS )) && \ + !defined(CONFIG_KASAN_VMALLOC ) +#define VM_DEFER_KMEMLEAK 0x00000800/* defer kmemleak object creation */ +#else +#define VM_DEFER_KMEMLEAK 0 +#endif +/* * VM_KASAN is used slightly differently depending on CONFIG_KASAN_VMALLOC. *
mm/kasan/shadow.c +7 -2
@@ -493,7 +493,7 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end,#else /* CONFIG_KASAN_VMALLOC */ -int kasan_module_alloc (void *addr,size_t size) +int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) {void *ret;size_t scaled_size;
@@ -515,9 +515,14 @@ int kasan_module_alloc(void *addr, size_t size) __builtin_return_address(0));if (ret) { +struct vm_struct *vm =find_vm_area (addr);__memset (ret,KASAN_SHADOW_INIT , shadow_size); -find_vm_area (addr)->flags |=VM_KASAN ; + vm->flags |=VM_KASAN ;kmemleak_ignore (ret); + +if (vm->flags &VM_DEFER_KMEMLEAK ) +kmemleak_vmalloc (vm, size, gfp_mask); +return 0 ; }
mm/vmalloc.c +2 -1
@@ -3032,7 +3032,8 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,clear_vm_uninitialized_flag (area); size =PAGE_ALIGN (size); -kmemleak_vmalloc (area, size, gfp_mask); +if (!(vm_flags &VM_DEFER_KMEMLEAK )) +kmemleak_vmalloc (area, size, gfp_mask);return addr;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 91/262 tracing/probes: check the return value of kstrndup() for pbuf
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 1c1857d400355e96f0fe8b32adc6fa7594d03b52 ]
kstrndup() is a memory allocation-related function, it returns NULL when some internal memory errors happen. It is better to check the return value of it so to catch the memory error in time.
--- kernel/trace/trace_probe.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/trace_probe.c +2 -0
@@ -356,6 +356,8 @@ static int __parse_imm_string(char *str, char **pbuf, int offs)return -EINVAL ; } *pbuf =kstrndup (str, len -1 ,GFP_KERNEL ); +if (!*pbuf) +return -ENOMEM ;return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 93/262 kasan: fix quarantine conflicting with init_on_free
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
[ Upstream commit 26dca996ea7b1ac7008b6b6063fc88b849e3ac3e ]
KASAN's quarantine might save its metadata inside freed objects. As this happens after the memory is zeroed by the slab allocator when init_on_free is enabled, the memory coming out of quarantine is not properly zeroed.
This causes lib/test_meminit.c tests to fail with Generic KASAN.
Zero the metadata when the object is removed from quarantine.
--- mm/kasan/quarantine.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
mm/kasan/quarantine.c +11 -0
@@ -132,11 +132,22 @@ static void *qlink_to_object(struct qlist_node *qlink, struct kmem_cache *cache)static void qlink_free (struct qlist_node *qlink,struct kmem_cache *cache) {void *object =qlink_to_object (qlink, cache); +struct kasan_free_meta *meta =kasan_get_free_meta (cache, object);unsigned long flags;if (IS_ENABLED (CONFIG_SLAB ))local_irq_save (flags); +/* +* If init_on_free is enabled and KASAN's free metadata is stored in +* the object, zero the metadata. Otherwise, the object's memory will +* not be properly zeroed, as KASAN saves the metadata after the slab +* allocator zeroes the object. +*/ +if (slab_want_init_on_free (cache) && + cache->kasan_info.free_meta_offset ==0 ) +memzero_explicit (meta,sizeof (*meta)); +/* * As the object now gets freed from the quarantine, assume that its * free track is no longer valid.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 84/262 ntb_hw_switchtec: Fix pff ioread to read into mmio_part_cfg_all
In reply to Greg Kroah-HartmanFrom: Jeremy Pallotta <[email protected]>
[ Upstream commit 32c3d375b0ed84b6acb51ae5ebef35ff0d649d85 ]
Array mmio_part_cfg_all holds the partition configuration of all partitions, with partition number as index. Fix this by reading into mmio_part_cfg_all for pff.
--- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ntb/hw/mscc/ntb_hw_switchtec.c +2 -2
@@ -419,8 +419,8 @@ static void switchtec_ntb_part_link_speed(struct switchtec_ntb *sndev, enum ntb_width *width) {struct switchtec_dev *stdev = sndev->stdev; - -u32 pff =ioread32 (&stdev->mmio_part_cfg[partition].vep_pff_inst_id); +u32 pff = +ioread32 (&stdev->mmio_part_cfg_all[partition].vep_pff_inst_id);u32 linksta =ioread32 (&stdev->mmio_pff_csr[pff].pci_cap_region[13 ]);if (speed)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 38/262 sched/fair: Fix fault in reweight_entity
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
[ Upstream commit 13765de8148f71fa795e0a6607de37c49ea5915a ]
Syzbot found a GPF in reweight_entity. This has been bisected to commit 4ef0c5c6b5ba ("kernel/sched: Fix sched_fork() access an invalid sched_task_group")
There is a race between sched_post_fork() and setpriority(PRIO_PGRP) within a thread group that causes a null-ptr-deref in reweight_entity() in CFS. The scenario is that the main process spawns number of new threads, which then call setpriority(PRIO_PGRP, 0, -20), wait, and exit. For each of the new threads the copy_process() gets invoked, which adds the new task_struct and calls sched_post_fork() for it.
In the above scenario there is a possibility that setpriority(PRIO_PGRP) and set_one_prio() will be called for a thread in the group that is just being created by copy_process(), and for which the sched_post_fork() has not been executed yet. This will trigger a null pointer dereference in reweight_entity(), as it will try to access the run queue pointer, which hasn't been set.
Before the mentioned change the cfs_rq pointer for the task has been set in sched_fork(), which is called much earlier in copy_process(), before the new task is added to the thread_group. Now it is done in the sched_post_fork(), which is called after that. To fix the issue the remove the update_load param from the update_load param() function and call reweight_task() only if the task flag doesn't have the TASK_NEW flag set.
--- kernel/sched/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
kernel/sched/core.c +6 -5
@@ -1199,8 +1199,9 @@ int tg_nop(struct task_group *tg, void *data) }#endif -static void set_load_weight (struct task_struct *p,bool update_load) +static void set_load_weight (struct task_struct *p) { +bool update_load = !(READ_ONCE (p->__state) &TASK_NEW );int prio = p->static_prio -MAX_RT_PRIO ;struct load_weight *load = &p->se.load;
@@ -4358,7 +4359,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) p->static_prio =NICE_TO_PRIO (0 ); p->prio = p->normal_prio = p->static_prio; -set_load_weight (p, false); +set_load_weight (p);/* * We don't need the reset flag anymore after the fork. It has
@@ -6902,7 +6903,7 @@ void set_user_nice(struct task_struct *p, long nice)put_prev_task (rq, p); p->static_prio =NICE_TO_PRIO (nice); -set_load_weight (p, true); +set_load_weight (p); old_prio = p->prio; p->prio =effective_prio (p);
@@ -7193,7 +7194,7 @@ static void __setscheduler_params(struct task_struct *p,*/ p->rt_priority = attr->sched_priority; p->normal_prio =normal_prio (p); -set_load_weight (p, true); +set_load_weight (p); }/*
@@ -9431,7 +9432,7 @@ void __init sched_init(void)#endif } -set_load_weight (&init_task, false); +set_load_weight (&init_task);/* * The boot idle thread does lazy MMU switching as well:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 128/262 drm/mediatek: mtk_dsi: Avoid EPROBE_DEFER loop with external bridge
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 647474b8d980256b26b1cd112d7333a4dbd4260a ]
DRM bridge drivers are now attaching their DSI device at probe time, which requires us to register our DSI host in order to let the bridge to probe: this recently started producing an endless -EPROBE_DEFER loop on some machines that are using external bridges, like the parade-ps8640, found on the ACER Chromebook R13.
Now that the DSI hosts/devices probe sequence is documented, we can do adjustments to the mtk_dsi driver as to both fix now and make sure to avoid this situation in the future: for this, following what is documented in drm_bridge.c, move the mtk_dsi component_add() to the mtk_dsi_ops.attach callback and delete it in the detach callback; keeping in mind that we are registering a drm_bridge for our DSI, which is only used/attached if the DSI Host is bound, it wouldn't make sense to keep adding our bridge at probe time (as it would be useless to have it if mtk_dsi_ops.attach() fails!), so also move that one to the dsi host attach function (and remove it in detach).
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 167 +++++++++++++++-------------- 1 file changed, 84 insertions(+), 83 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +84 -83
@@ -786,18 +786,101 @@ void mtk_dsi_ddp_stop(struct device *dev)mtk_dsi_poweroff (dsi); } +static int mtk_dsi_encoder_init (struct drm_device *drm,struct mtk_dsi *dsi) +{ +int ret; + + ret =drm_simple_encoder_init (drm, &dsi->encoder, +DRM_MODE_ENCODER_DSI ); +if (ret) { +DRM_ERROR ("Failed to encoder init to drm\n" ); +return ret; + } + + dsi->encoder.possible_crtcs =mtk_drm_find_possible_crtc_by_comp (drm, dsi->host.dev); + + ret =drm_bridge_attach (&dsi->encoder, &dsi->bridge,NULL , +DRM_BRIDGE_ATTACH_NO_CONNECTOR ); +if (ret) + goto err_cleanup_encoder; + + dsi->connector =drm_bridge_connector_init (drm, &dsi->encoder); +if (IS_ERR (dsi->connector)) { +DRM_ERROR ("Unable to create bridge connector\n" ); + ret =PTR_ERR (dsi->connector); + goto err_cleanup_encoder; + } +drm_connector_attach_encoder (dsi->connector, &dsi->encoder); + +return 0 ; + +err_cleanup_encoder: +drm_encoder_cleanup (&dsi->encoder); +return ret; +} + +static int mtk_dsi_bind (struct device *dev,struct device *master,void *data) +{ +int ret; +struct drm_device *drm = data; +struct mtk_dsi *dsi =dev_get_drvdata (dev); + + ret =mtk_dsi_encoder_init (drm, dsi); +if (ret) +return ret; + +return device_reset_optional (dev); +} + +static void mtk_dsi_unbind (struct device *dev,struct device *master, +void *data) +{ +struct mtk_dsi *dsi =dev_get_drvdata (dev); + +drm_encoder_cleanup (&dsi->encoder); +} + +static const struct component_ops mtk_dsi_component_ops = { + .bind = mtk_dsi_bind, + .unbind = mtk_dsi_unbind, +}; +static int mtk_dsi_host_attach (struct mipi_dsi_host *host,struct mipi_dsi_device *device) {struct mtk_dsi *dsi =host_to_dsi (host); +struct device *dev = host->dev; +int ret; dsi->lanes = device->lanes; dsi->format = device->format; dsi->mode_flags = device->mode_flags; + dsi->next_bridge =devm_drm_of_get_bridge (dev, dev->of_node,0 ,0 ); +if (IS_ERR (dsi->next_bridge)) +return PTR_ERR (dsi->next_bridge); + +drm_bridge_add (&dsi->bridge); + + ret =component_add (host->dev, &mtk_dsi_component_ops); +if (ret) { +DRM_ERROR ("failed to add dsi_host component: %d\n" , ret); +drm_bridge_remove (&dsi->bridge); +return ret; + }return 0 ; } +static int mtk_dsi_host_detach (struct mipi_dsi_host *host, +struct mipi_dsi_device *device) +{ +struct mtk_dsi *dsi =host_to_dsi (host); + +component_del (host->dev, &mtk_dsi_component_ops); +drm_bridge_remove (&dsi->bridge); +return 0 ; +} +static void mtk_dsi_wait_for_idle (struct mtk_dsi *dsi) {int ret;
@@ -938,73 +1021,14 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,static const struct mipi_dsi_host_ops mtk_dsi_ops = { .attach = mtk_dsi_host_attach, + .detach = mtk_dsi_host_detach, .transfer = mtk_dsi_host_transfer, }; -static int mtk_dsi_encoder_init (struct drm_device *drm,struct mtk_dsi *dsi) -{ -int ret; - - ret =drm_simple_encoder_init (drm, &dsi->encoder, -DRM_MODE_ENCODER_DSI ); -if (ret) { -DRM_ERROR ("Failed to encoder init to drm\n" ); -return ret; - } - - dsi->encoder.possible_crtcs =mtk_drm_find_possible_crtc_by_comp (drm, dsi->host.dev); - - ret =drm_bridge_attach (&dsi->encoder, &dsi->bridge,NULL , -DRM_BRIDGE_ATTACH_NO_CONNECTOR ); -if (ret) - goto err_cleanup_encoder; - - dsi->connector =drm_bridge_connector_init (drm, &dsi->encoder); -if (IS_ERR (dsi->connector)) { -DRM_ERROR ("Unable to create bridge connector\n" ); - ret =PTR_ERR (dsi->connector); - goto err_cleanup_encoder; - } -drm_connector_attach_encoder (dsi->connector, &dsi->encoder); - -return 0 ; - -err_cleanup_encoder: -drm_encoder_cleanup (&dsi->encoder); -return ret; -} - -static int mtk_dsi_bind (struct device *dev,struct device *master,void *data) -{ -int ret; -struct drm_device *drm = data; -struct mtk_dsi *dsi =dev_get_drvdata (dev); - - ret =mtk_dsi_encoder_init (drm, dsi); -if (ret) -return ret; - -return device_reset_optional (dev); -} - -static void mtk_dsi_unbind (struct device *dev,struct device *master, -void *data) -{ -struct mtk_dsi *dsi =dev_get_drvdata (dev); - -drm_encoder_cleanup (&dsi->encoder); -} - -static const struct component_ops mtk_dsi_component_ops = { - .bind = mtk_dsi_bind, - .unbind = mtk_dsi_unbind, -}; -static int mtk_dsi_probe (struct platform_device *pdev) {struct mtk_dsi *dsi;struct device *dev = &pdev->dev; -struct drm_panel *panel;struct resource *regs;int irq_num;int ret;
@@ -1021,19 +1045,6 @@ static int mtk_dsi_probe(struct platform_device *pdev)return ret; } - ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , - &panel, &dsi->next_bridge); -if (ret) - goto err_unregister_host; - -if (panel) { - dsi->next_bridge =devm_drm_panel_bridge_add (dev, panel); -if (IS_ERR (dsi->next_bridge)) { - ret =PTR_ERR (dsi->next_bridge); - goto err_unregister_host; - } - } - dsi->driver_data =of_device_get_match_data (dev); dsi->engine_clk =devm_clk_get (dev,"engine" );
@@ -1098,14 +1109,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) dsi->bridge.of_node = dev->of_node; dsi->bridge.type =DRM_MODE_CONNECTOR_DSI ; -drm_bridge_add (&dsi->bridge); - - ret =component_add (&pdev->dev, &mtk_dsi_component_ops); -if (ret) { -dev_err (&pdev->dev,"failed to add component: %d\n" , ret); - goto err_unregister_host; - } -return 0 ; err_unregister_host:
@@ -1118,8 +1121,6 @@ static int mtk_dsi_remove(struct platform_device *pdev)struct mtk_dsi *dsi =platform_get_drvdata (pdev);mtk_output_dsi_disable (dsi); -drm_bridge_remove (&dsi->bridge); -component_del (&pdev->dev, &mtk_dsi_component_ops);mipi_dsi_host_unregister (&dsi->host);return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/262 ucounts: Fix systemd LimitNPROC with private users regression
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 0ac983f512033cb7b5e210c9589768ad25b1e36b upstream.
Long story short recursively enforcing RLIMIT_NPROC when it is not enforced on the process that creates a new user namespace, causes currently working code to fail. There is no reason to enforce RLIMIT_NPROC recursively when we don't enforce it normally so update the code to detect this case.
I would like to simply use capable(CAP_SYS_RESOURCE) to detect when RLIMIT_NPROC is not enforced upon the caller. Unfortunately because RLIMIT_NPROC is charged and checked for enforcement based upon the real uid, using capable() which is euid based is inconsistent with reality. Come as close as possible to testing for capable(CAP_SYS_RESOURCE) by testing for when the real uid would match the conditions when CAP_SYS_RESOURCE would be present if the real uid was the effective uid.
--- kernel/user_namespace.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
kernel/user_namespace.c +13 -1
@@ -58,6 +58,18 @@ static void set_cred_user_ns(struct cred cred->user_ns = user_ns; } +static unsigned long enforced_nproc_rlimit (void ) +{ +unsigned long limit =RLIM_INFINITY ; + +/* Is RLIMIT_NPROC currently enforced? */ +if (!uid_eq (current_uid (),GLOBAL_ROOT_UID ) || + (current_user_ns () != &init_user_ns)) + limit =rlimit (RLIMIT_NPROC ); + +return limit; +} +/* * Create a new user namespace, deriving the creator from the user in the * passed credentials, and replacing that user with the new root user for the
@@ -122,7 +134,7 @@ int create_user_ns(struct cred *new)for (i =0 ; i <MAX_PER_NAMESPACE_UCOUNTS ; i++) { ns->ucount_max[i] =INT_MAX ; } -set_rlimit_ucount_max (ns,UCOUNT_RLIMIT_NPROC ,rlimit (RLIMIT_NPROC )); +set_rlimit_ucount_max (ns,UCOUNT_RLIMIT_NPROC ,enforced_nproc_rlimit ());set_rlimit_ucount_max (ns,UCOUNT_RLIMIT_MSGQUEUE ,rlimit (RLIMIT_MSGQUEUE ));set_rlimit_ucount_max (ns,UCOUNT_RLIMIT_SIGPENDING ,rlimit (RLIMIT_SIGPENDING ));set_rlimit_ucount_max (ns,UCOUNT_RLIMIT_MEMLOCK ,rlimit (RLIMIT_MEMLOCK ));
Greg Kroah-Hartman
maintainerPATCH 138/262 riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value
In reply to Greg Kroah-HartmanFrom: Sunil V L <[email protected]>
commit dcf0c838854c86e1f41fb1934aea906845d69782 upstream.
The get_boot_hartid_from_fdt() function currently returns U32_MAX for failure case which is not correct because U32_MAX is a valid hartid value. This patch fixes the issue by returning error code.
--- drivers/firmware/efi/libstub/riscv-stub.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/firmware/efi/libstub/riscv-stub.c +10 -7
@@ -25,7 +25,7 @@ typedef void __noreturn (*jump_kernel_fustatic u32 hartid; -static u32 get_boot_hartid_from_fdt (void ) +static int get_boot_hartid_from_fdt (void ) {const void *fdt;int chosen_node, len;
@@ -33,23 +33,26 @@ static u32 get_boot_hartid_from_fdt(void fdt =get_efi_config_table (DEVICE_TREE_GUID );if (!fdt) -return U32_MAX ; +return -EINVAL ; chosen_node =fdt_path_offset (fdt,"/chosen" );if (chosen_node <0 ) -return U32_MAX ; +return -EINVAL ; prop =fdt_getprop ((void *)fdt, chosen_node,"boot-hartid" , &len);if (!prop || len !=sizeof (u32)) -return U32_MAX ; +return -EINVAL ; -return fdt32_to_cpu (*prop); + hartid =fdt32_to_cpu (*prop); +return 0 ; }efi_status_t check_platform_features (void ) { - hartid =get_boot_hartid_from_fdt (); -if (hartid ==U32_MAX ) { +int ret; + + ret =get_boot_hartid_from_fdt (); +if (ret) {efi_err ("/chosen/boot-hartid missing or invalid!\n" );return EFI_UNSUPPORTED ; }
Greg Kroah-Hartman
maintainerPATCH 139/262 riscv: Fix config KASAN && SPARSEMEM && !SPARSE_VMEMMAP
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
commit a3d328037846d013bb4c7f3777241e190e4c75e1 upstream.
In order to get the pfn of a struct page* when sparsemem is enabled without vmemmap, the mem_section structures need to be initialized which happens in sparse_init.
But kasan_early_init calls pfn_to_page way before sparse_init is called, which then tries to dereference a null mem_section pointer.
Fix this by removing the usage of this function in kasan_early_init.
--- arch/riscv/mm/kasan_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/riscv/mm/kasan_init.c +1 -2
@@ -22,8 +22,7 @@ asmlinkage void __init kasan_early_init(for (i =0 ; i <PTRS_PER_PTE ; ++i)set_pte (kasan_early_shadow_pte + i, -mk_pte (virt_to_page (kasan_early_shadow_page), -PAGE_KERNEL )); +pfn_pte (virt_to_pfn (kasan_early_shadow_page),PAGE_KERNEL ));for (i =0 ; i <PTRS_PER_PMD ; ++i) set_pmd(kasan_early_shadow_pmd + i,
Greg Kroah-Hartman
maintainerPATCH 140/262 riscv: Fix config KASAN && DEBUG_VIRTUAL
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
commit c648c4bb7d02ceb53ee40172fdc4433b37cee9c6 upstream.
__virt_to_phys function is called very early in the boot process (ie kasan_early_init) so it should not be instrumented by KASAN otherwise it bugs.
Fix this by declaring phys_addr.c as non-kasan instrumentable.
--- arch/riscv/mm/Makefile | 3 +++ 1 file changed, 3 insertions(+)
arch/riscv/mm/Makefile +3 -0
@@ -24,6 +24,9 @@ obj-$(CONFIG_KASAN) += kasan_init.o ifdef CONFIG_KASAN KASAN_SANITIZE_kasan_init.o := n KASAN_SANITIZE_init.o := n +ifdef CONFIG_DEBUG_VIRTUAL +KASAN_SANITIZE_physaddr.o := n +endif endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o
Greg Kroah-Hartman
maintainerPATCH 141/262 iwlwifi: mvm: check debugfs_dir ptr before use
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 5a6248c0a22352f09ea041665d3bd3e18f6f872c upstream.
When "debugfs=off" is used on the kernel command line, iwiwifi's mvm module uses an invalid/unchecked debugfs_dir pointer and causes a BUG:
BUG: kernel NULL pointer dereference, address: 000000000000004f #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP CPU: 1 PID: 503 Comm: modprobe Tainted: G W 5.17.0-rc5 #7 Hardware name: Dell Inc. Inspiron 15 5510/076F7Y, BIOS 2.4.1 11/05/2021 RIP: 0010:iwl_mvm_dbgfs_register+0x692/0x700 [iwlmvm] Code: 69 a0 be 80 01 00 00 48 c7 c7 50 73 6a a0 e8 95 cf ee e0 48 8b 83 b0 1e 00 00 48 c7 c2 54 73 6a a0 be 64 00 00 00 48 8d 7d 8c <48> 8b 48 50 e8 15 22 07 e1 48 8b 43 28 48 8d 55 8c 48 c7 c7 5f 73 RSP: 0018:ffffc90000a0ba68 EFLAGS: 00010246 RAX: ffffffffffffffff RBX: ffff88817d6e3328 RCX: ffff88817d6e3328 RDX: ffffffffa06a7354 RSI: 0000000000000064 RDI: ffffc90000a0ba6c RBP: ffffc90000a0bae0 R08: ffffffff824e4880 R09: ffffffffa069d620 R10: ffffc90000a0ba00 R11: ffffffffffffffff R12: 0000000000000000 R13: ffffc90000a0bb28 R14: ffff88817d6e3328 R15: ffff88817d6e3320 FS: 00007f64dd92d740(0000) GS:ffff88847f640000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000004f CR3: 000000016fc79001 CR4: 0000000000770ee0 PKRU: 55555554 Call Trace: <TASK> ? iwl_mvm_mac_setup_register+0xbdc/0xda0 [iwlmvm] iwl_mvm_start_post_nvm+0x71/0x100 [iwlmvm] iwl_op_mode_mvm_start+0xab8/0xb30 [iwlmvm] _iwl_op_mode_start+0x6f/0xd0 [iwlwifi] iwl_opmode_register+0x6a/0xe0 [iwlwifi] ? 0xffffffffa0231000 iwl_mvm_init+0x35/0x1000 [iwlmvm] ? 0xffffffffa0231000 do_one_initcall+0x5a/0x1b0 ? kmem_cache_alloc+0x1e5/0x2f0 ? do_init_module+0x1e/0x220 do_init_module+0x48/0x220 load_module+0x2602/0x2bc0 ? __kernel_read+0x145/0x2e0 ? kernel_read_file+0x229/0x290 __do_sys_finit_module+0xc5/0x130 ? __do_sys_finit_module+0xc5/0x130 __x64_sys_finit_module+0x13/0x20 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f64dda564dd Code: 5b 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 1b 29 0f 00 f7 d8 64 89 01 48 RSP: 002b:00007ffdba393f88 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f64dda564dd RDX: 0000000000000000 RSI: 00005575399e2ab2 RDI: 0000000000000001 RBP: 000055753a91c5e0 R08: 0000000000000000 R09: 0000000000000002 R10: 0000000000000001 R11: 0000000000000246 R12: 00005575399e2ab2 R13: 000055753a91ceb0 R14: 0000000000000000 R15: 000055753a923018 </TASK> Modules linked in: btintel(+) btmtk bluetooth vfat snd_hda_codec_hdmi fat snd_hda_codec_realtek snd_hda_codec_generic iwlmvm(+) snd_sof_pci_intel_tgl mac80211 snd_sof_intel_hda_common soundwire_intel soundwire_generic_allocation soundwire_cadence soundwire_bus snd_sof_intel_hda snd_sof_pci snd_sof snd_sof_xtensa_dsp snd_soc_hdac_hda snd_hda_ext_core snd_soc_acpi_intel_match snd_soc_acpi snd_soc_core btrfs snd_compress snd_hda_intel snd_intel_dspcfg snd_intel_sdw_acpi snd_hda_codec raid6_pq iwlwifi snd_hda_core snd_pcm snd_timer snd soundcore cfg80211 intel_ish_ipc(+) thunderbolt rfkill intel_ishtp ucsi_acpi wmi i2c_hid_acpi i2c_hid evdev CR2: 000000000000004f ---[ end trace 0000000000000000 ]---
Check the debugfs_dir pointer for an error before using it.
--- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +8 -3
@@ -5,6 +5,7 @@* Copyright (C) 2016-2017 Intel Deutschland GmbH */ #include <linux/vmalloc.h> +#include <linux/err.h> #include <linux/ieee80211.h> #include <linux/netdevice.h>
@@ -2044,7 +2045,6 @@ void iwl_mvm_sta_add_debugfs(struct ieeevoid iwl_mvm_dbgfs_register (struct iwl_mvm *mvm) {struct dentry *bcast_dir__maybe_unused ; -char buf[100 ];spin_lock_init (&mvm->drv_stats_lock);
@@ -2140,6 +2140,11 @@ void iwl_mvm_dbgfs_register(struct iwl_m* Create a symlink with mac80211. It will be removed when mac80211 * exists (before the opmode exists which removes the target.) */ -snprintf (buf,100 ,"../../%pd2" , mvm->debugfs_dir->d_parent); -debugfs_create_symlink ("iwlwifi" , mvm->hw->wiphy->debugfsdir, buf); +if (!IS_ERR (mvm->debugfs_dir)) { +char buf[100 ]; + +snprintf (buf,100 ,"../../%pd2" , mvm->debugfs_dir->d_parent); +debugfs_create_symlink ("iwlwifi" , mvm->hw->wiphy->debugfsdir, + buf); + } }