iio: adc: ads124: avoid buffer overflow
Subsystems (21)
Sasha Levin
maintainerPATCH 1/70 iio: adc: ads124: avoid buffer overflow
From: Vincent Stehlé <[email protected]>
[ Upstream commit 0db8aa49a97e7f40852a64fd35abcc1292a7c365 ]
When initializing the priv->data array starting from index 1, there is one less element to consider than when initializing the full array.
--- drivers/iio/adc/ti-ads124s08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads124s08.c +1 -1
@@ -202,7 +202,7 @@ static int ads124s_read(struct iio_dev *indio_dev, unsigned int chan) }; priv->data[0 ] =ADS124S08_CMD_RDATA ; -memset (&priv->data[1 ],ADS124S08_CMD_NOP ,sizeof (priv->data)); +memset (&priv->data[1 ],ADS124S08_CMD_NOP ,sizeof (priv->data) -1 ); ret =spi_sync_transfer (priv->spi, t,ARRAY_SIZE (t));if (ret <0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/70 iio: imu: mpu6050: Fix FIFO layout for ICM20602
From: Steve Moskovchenko <[email protected]>
[ Upstream commit 1615fe41a1959a2ee2814ba62736b2bb54e9802a ]
The MPU6050 driver has recently gained support for the ICM20602 IMU, which is very similar to MPU6xxx. However, the ICM20602's FIFO data specifically includes temperature readings, which were not present on MPU6xxx parts. As a result, the driver will under-read the ICM20602's FIFO register, causing the same (partial) sample to be returned for all reads, until the FIFO overflows.
Fix this by adding a table of scan elements specifically for the ICM20602, which takes the extra temperature data into consideration.
While we're at it, fix the temperature offset and scaling on ICM20602, since it uses different scale/offset constants than the rest of the MPU6xxx devices.
--- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 46 ++++++++++++++++++++-- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 20 +++++++++- drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 3 ++ 3 files changed, 64 insertions(+), 5 deletions(-)
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +42 -4
@@ -471,7 +471,10 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,return IIO_VAL_INT_PLUS_MICRO ;case IIO_TEMP : *val =0 ; - *val2 =INV_MPU6050_TEMP_SCALE ; +if (st->chip_type ==INV_ICM20602 ) + *val2 =INV_ICM20602_TEMP_SCALE ; +else + *val2 =INV_MPU6050_TEMP_SCALE ;return IIO_VAL_INT_PLUS_MICRO ;default :
@@ -480,7 +483,10 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_OFFSET :switch (chan->type) {case IIO_TEMP : - *val =INV_MPU6050_TEMP_OFFSET ; +if (st->chip_type ==INV_ICM20602 ) + *val =INV_ICM20602_TEMP_OFFSET ; +else + *val =INV_MPU6050_TEMP_OFFSET ;return IIO_VAL_INT ;default :
@@ -845,6 +851,32 @@ static const struct iio_chan_spec inv_mpu_channels[] = { INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z), }; +static const struct iio_chan_spec inv_icm20602_channels[] = { +IIO_CHAN_SOFT_TIMESTAMP (INV_ICM20602_SCAN_TIMESTAMP ), + { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) + |BIT (IIO_CHAN_INFO_OFFSET ) + |BIT (IIO_CHAN_INFO_SCALE ), + .scan_index =INV_ICM20602_SCAN_TEMP , + .scan_type = { + .sign ='s' , + .realbits =16 , + .storagebits =16 , + .shift =0 , + .endianness =IIO_BE , + }, + }, + +INV_MPU6050_CHAN (IIO_ANGL_VEL ,IIO_MOD_X ,INV_ICM20602_SCAN_GYRO_X ), +INV_MPU6050_CHAN (IIO_ANGL_VEL ,IIO_MOD_Y ,INV_ICM20602_SCAN_GYRO_Y ), +INV_MPU6050_CHAN (IIO_ANGL_VEL ,IIO_MOD_Z ,INV_ICM20602_SCAN_GYRO_Z ), + +INV_MPU6050_CHAN (IIO_ACCEL ,IIO_MOD_Y ,INV_ICM20602_SCAN_ACCL_Y ), +INV_MPU6050_CHAN (IIO_ACCEL ,IIO_MOD_X ,INV_ICM20602_SCAN_ACCL_X ), +INV_MPU6050_CHAN (IIO_ACCEL ,IIO_MOD_Z ,INV_ICM20602_SCAN_ACCL_Z ), +}; +/* * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the
@@ -1100,8 +1132,14 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, indio_dev->name = name; else indio_dev->name = dev_name(dev); - indio_dev->channels = inv_mpu_channels; - indio_dev->num_channels =ARRAY_SIZE (inv_mpu_channels); + +if (chip_type ==INV_ICM20602 ) { + indio_dev->channels = inv_icm20602_channels; + indio_dev->num_channels =ARRAY_SIZE (inv_icm20602_channels); + }else { + indio_dev->channels = inv_mpu_channels; + indio_dev->num_channels =ARRAY_SIZE (inv_mpu_channels); + } indio_dev->info = &mpu_info; indio_dev->modes =INDIO_BUFFER_TRIGGERED ;
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +19 -1
@@ -208,6 +208,9 @@ struct inv_mpu6050_state {#define INV_MPU6050_BYTES_PER_3AXIS_SENSOR 6#define INV_MPU6050_FIFO_COUNT_BYTE 2 +/* ICM20602 FIFO samples include temperature readings */ +#define INV_ICM20602_BYTES_PER_TEMP_SENSOR 2 +/* mpu6500 registers */ #define INV_MPU6500_REG_ACCEL_CONFIG_2 0x1D#define INV_MPU6500_REG_ACCEL_OFFSET 0x77
@@ -229,6 +232,9 @@ struct inv_mpu6050_state {#define INV_MPU6050_GYRO_CONFIG_FSR_SHIFT 3#define INV_MPU6050_ACCL_CONFIG_FSR_SHIFT 3 +#define INV_ICM20602_TEMP_OFFSET 8170 +#define INV_ICM20602_TEMP_SCALE 3060 +/* 6 + 6 round up and plus 8 */ #define INV_MPU6050_OUTPUT_DATA_SIZE 24
@@ -270,7 +276,7 @@ struct inv_mpu6050_state {#define INV_ICM20608_WHOAMI_VALUE 0xAF#define INV_ICM20602_WHOAMI_VALUE 0x12 -/* scan element definition */ +/* scan element definition for generic MPU6xxx devices */ enum inv_mpu6050_scan {INV_MPU6050_SCAN_ACCL_X ,INV_MPU6050_SCAN_ACCL_Y ,
@@ -281,6 +287,18 @@ enum inv_mpu6050_scan { INV_MPU6050_SCAN_TIMESTAMP, }; +/* scan element definition for ICM20602, which includes temperature */ +enum inv_icm20602_scan { +INV_ICM20602_SCAN_ACCL_X , +INV_ICM20602_SCAN_ACCL_Y , +INV_ICM20602_SCAN_ACCL_Z , +INV_ICM20602_SCAN_TEMP , +INV_ICM20602_SCAN_GYRO_X , +INV_ICM20602_SCAN_GYRO_Y , +INV_ICM20602_SCAN_GYRO_Z , +INV_ICM20602_SCAN_TIMESTAMP , +}; +enum inv_mpu6050_filter_e {INV_MPU6050_FILTER_256HZ_NOLPF2 =0 ,INV_MPU6050_FILTER_188HZ ,
drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c +3 -0
@@ -207,6 +207,9 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p)if (st->chip_config.gyro_fifo_enable) bytes_per_datum +=INV_MPU6050_BYTES_PER_3AXIS_SENSOR ; +if (st->chip_type ==INV_ICM20602 ) + bytes_per_datum +=INV_ICM20602_BYTES_PER_TEMP_SENSOR ; +/* * read fifo_count register to know how many bytes are inside the FIFO * right now
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/70 iio: dac: ds4422/ds4424 fix chip verification
In reply to Sasha LevinFrom: Ruslan Babayev <[email protected]>
[ Upstream commit 60f2208699ec08ff9fdf1f97639a661a92a18f1c ]
The ds4424_get_value function takes channel number as it's 3rd argument and translates it internally into I2C address using DS4424_DAC_ADDR macro. The caller ds4424_verify_chip was passing an already translated I2C address as its last argument.
--- drivers/iio/dac/ds4424.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ds4424.c +1 -1
@@ -166,7 +166,7 @@ static int ds4424_verify_chip(struct iio_dev *indio_dev) {int ret, val; - ret =ds4424_get_value (indio_dev, &val,DS4424_DAC_ADDR (0 )); + ret =ds4424_get_value (indio_dev, &val,0 );if (ret <0 )dev_err (&indio_dev->dev,"%s failed. ret: %d\n" , __func__, ret);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/70 iio: adc: ti-ads8688: fix timestamp is not updated in buffer
In reply to Sasha LevinFrom: Sean Nyekjaer <[email protected]>
[ Upstream commit e6d12298310fa1dc11f1d747e05b168016057fdd ]
When using the hrtimer iio trigger timestamp isn't updated. If we use iio_get_time_ns it is updated correctly.
--- drivers/iio/adc/ti-ads8688.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads8688.c +1 -1
@@ -397,7 +397,7 @@ static irqreturn_t ads8688_trigger_handler(int irq, void *p) }iio_push_to_buffers_with_timestamp (indio_dev, buffer, - pf->timestamp); +iio_get_time_ns (indio_dev));iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/70 staging: erofs: set sb->s_root to NULL when failing from __getname()
In reply to Sasha LevinFrom: Chengguang Xu <[email protected]>
[ Upstream commit f2dcb8841e6b155da098edae09125859ef7e853d ]
Set sb->s_root to NULL when failing from __getname(), so that we can avoid double dput and unnecessary operations in generic_shutdown_super().
--- drivers/staging/erofs/super.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/erofs/super.c +1 -0
@@ -459,6 +459,7 @@ static int erofs_read_super(struct super_block *sb,*/ err_devname:dput (sb->s_root); + sb->s_root =NULL ; err_iget:#ifdef EROFS_FS_HAS_MANAGED_CACHE iput (sbi->managed_cache);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/70 Staging: vc04_services: Fix a couple error codes
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ca4e4efbefbbdde0a7bb3023ea08d491f4daf9b9 ]
These are accidentally returning positive EINVAL instead of negative -EINVAL. Some of the callers treat positive values as success.
--- drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/controls.c +2 -2
@@ -576,7 +576,7 @@ exit: dev->colourfx.enable ?"true" :"false" , dev->colourfx.u, dev->colourfx.v, ret, (ret == 0 ? 0 : -EINVAL)); -return (ret ==0 ?0 :EINVAL ); +return (ret ==0 ?0 : -EINVAL ); } static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
@@ -600,7 +600,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,"%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n" , __func__, mmal_ctrl, ctrl->id, ctrl->val, ret, (ret == 0 ? 0 : -EINVAL)); -return (ret ==0 ?0 :EINVAL ); +return (ret ==0 ?0 : -EINVAL ); } static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/70 staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit fea69916360468e364a4988db25a5afa835f3406 ]
If ->hif_read_reg() or ->hif_write_reg() fail then the code unlocks and keeps executing. It should just return.
--- drivers/staging/wilc1000/wilc_wlan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/staging/wilc1000/wilc_wlan.c +6 -2
@@ -1076,13 +1076,17 @@ void wilc_wlan_cleanup(struct net_device *dev)acquire_bus (wilc,WILC_BUS_ACQUIRE_AND_WAKEUP ); ret = wilc->hif_func->hif_read_reg (wilc,WILC_GP_REG_0 , ®); -if (!ret) +if (!ret) {release_bus (wilc,WILC_BUS_RELEASE_ALLOW_SLEEP ); +return ; + } ret = wilc->hif_func->hif_write_reg (wilc,WILC_GP_REG_0 , (reg |ABORT_INT )); -if (!ret) +if (!ret) {release_bus (wilc,WILC_BUS_RELEASE_ALLOW_SLEEP ); +return ; + }release_bus (wilc,WILC_BUS_RELEASE_ALLOW_SLEEP ); wilc->hif_func->hif_deinit (NULL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/70 pinctrl: intel: Clear interrupt status in mask/unmask callback
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 670784fb4ebe54434e263837390e358405031d9e ]
Commit a939bb57cd47 ("pinctrl: intel: implement gpio_irq_enable") was added because clearing interrupt status bit is required to avoid unexpected behavior.
Turns out the unmask callback also needs the fix, which can solve weird IRQ triggering issues on I2C touchpad ELAN1200.
--- drivers/pinctrl/intel/pinctrl-intel.c | 37 +++++---------------------- 1 file changed, 6 insertions(+), 31 deletions(-)
drivers/pinctrl/intel/pinctrl-intel.c +6 -31
@@ -913,35 +913,6 @@ static void intel_gpio_irq_ack(struct irq_data *d) } } -static void intel_gpio_irq_enable (struct irq_data *d) -{ -struct gpio_chip *gc =irq_data_get_irq_chip_data (d); -struct intel_pinctrl *pctrl =gpiochip_get_data (gc); -const struct intel_community *community; -const struct intel_padgroup *padgrp; -int pin; - - pin =intel_gpio_to_pin (pctrl,irqd_to_hwirq (d), &community, &padgrp); -if (pin >=0 ) { -unsigned int gpp, gpp_offset, is_offset; -unsigned long flags; -u32 value; - - gpp = padgrp->reg_num; - gpp_offset =padgroup_offset (padgrp, pin); - is_offset = community->is_offset + gpp *4 ; - -raw_spin_lock_irqsave (&pctrl->lock, flags); -/* Clear interrupt status first to avoid unexpected interrupt */ -writel (BIT (gpp_offset), community->regs + is_offset); - - value =readl (community->regs + community->ie_offset + gpp *4 ); - value |=BIT (gpp_offset); -writel (value, community->regs + community->ie_offset + gpp *4 ); -raw_spin_unlock_irqrestore (&pctrl->lock, flags); - } -} -static void intel_gpio_irq_mask_unmask (struct irq_data *d,bool mask) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d);
@@ -954,15 +925,20 @@ static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)if (pin >=0 ) {unsigned int gpp, gpp_offset;unsigned long flags; -void __iomem *reg; +void __iomem *reg, *is;u32 value; gpp = padgrp->reg_num; gpp_offset =padgroup_offset (padgrp, pin); reg = community->regs + community->ie_offset + gpp *4 ; + is = community->regs + community->is_offset + gpp *4 ;raw_spin_lock_irqsave (&pctrl->lock, flags); + +/* Clear interrupt status first to avoid unexpected interrupt */ +writel (BIT (gpp_offset), is); + value =readl (reg);if (mask) value &= ~BIT (gpp_offset);
@@ -1106,7 +1082,6 @@ static irqreturn_t intel_gpio_irq(int irq, void *data)static struct irq_chip intel_gpio_irqchip = { .name ="intel-gpio" , - .irq_enable = intel_gpio_irq_enable, .irq_ack = intel_gpio_irq_ack, .irq_mask = intel_gpio_irq_mask, .irq_unmask = intel_gpio_irq_unmask,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/70 netfilter: nf_tables: fix oops during rule dump
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 2c82c7e724ff51cab78e1afd5c2aaa31994fe41e ]
We can oops in nf_tables_fill_rule_info().
Its not possible to fetch previous element in rcu-protected lists when deletions are not prevented somehow: list_del_rcu poisons the ->prev pointer value.
Before rcu-conversion this was safe as dump operations did hold nfnetlink mutex.
Pass previous rule as argument, obtained by keeping a pointer to the previous rule during traversal.
--- net/netfilter/nf_tables_api.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +11 -9
@@ -2256,13 +2256,13 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net, u32 flags, int family, const struct nft_table *table, const struct nft_chain *chain, - const struct nft_rule *rule) + const struct nft_rule *rule, + const struct nft_rule *prule) { struct nlmsghdr *nlh;struct nfgenmsg *nfmsg;const struct nft_expr *expr, *next;struct nlattr *list; -const struct nft_rule *prule;u16 type =nfnl_msg_type (NFNL_SUBSYS_NFTABLES , event); nlh =nlmsg_put (skb, portid, seq, type,sizeof (struct nfgenmsg ), flags);
@@ -2282,8 +2282,7 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net, NFTA_RULE_PAD)) goto nla_put_failure; -if ((event !=NFT_MSG_DELRULE ) && (rule->list.prev != &chain->rules)) { - prule =list_prev_entry (rule, list); +if (event !=NFT_MSG_DELRULE && prule) {if (nla_put_be64 (skb,NFTA_RULE_POSITION ,cpu_to_be64 (prule->handle),NFTA_RULE_PAD ))
@@ -2330,7 +2329,7 @@ static void nf_tables_rule_notify(const struct nft_ctx *ctx, err =nf_tables_fill_rule_info (skb, ctx->net, ctx->portid, ctx->seq, event,0 , ctx->family, ctx->table, - ctx->chain, rule); + ctx->chain, rule,NULL );if (err <0 ) {kfree_skb (skb); goto err;
@@ -2355,12 +2354,13 @@ static int __nf_tables_dump_rules(struct sk_buff *skb, const struct nft_chain *chain) {struct net *net =sock_net (skb->sk); +const struct nft_rule *rule, *prule;unsigned int s_idx = cb->args[0 ]; -const struct nft_rule *rule; + prule =NULL ;list_for_each_entry_rcu (rule, &chain->rules, list) {if (!nft_is_active (net, rule)) - goto cont; + goto cont_skip;if (*idx < s_idx) goto cont;if (*idx > s_idx) {
@@ -2372,11 +2372,13 @@ static int __nf_tables_dump_rules(struct sk_buff *skb,NFT_MSG_NEWRULE ,NLM_F_MULTI |NLM_F_APPEND , table->family, - table, chain, rule) < 0) + table, chain, rule, prule) < 0) return 1;nl_dump_check_consistent (cb,nlmsg_hdr (skb)); cont: + prule = rule; +cont_skip: (*idx)++; }return 0 ;
@@ -2532,7 +2534,7 @@ static int nf_tables_getrule(struct net *net, struct sock *nlsk, err =nf_tables_fill_rule_info (skb2, net,NETLINK_CB (skb).portid, nlh->nlmsg_seq,NFT_MSG_NEWRULE ,0 , - family, table, chain, rule); + family, table, chain, rule,NULL );if (err <0 ) goto err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/70 perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints
In reply to Sasha LevinFrom: Stephane Eranian <[email protected]>
[ Upstream commit 23e3983a466cd540ffdd2bbc6e0c51e31934f941 ]
This patch fixes an bug revealed by the following commit:
6b89d4c1ae85 ("perf/x86/intel: Fix INTEL_FLAGS_EVENT_CONSTRAINT* masking")
That patch modified INTEL_FLAGS_EVENT_CONSTRAINT() to only look at the event code when matching a constraint. If code+umask were needed, then the INTEL_FLAGS_UEVENT_CONSTRAINT() macro was needed instead.
This broke with some of the constraints for PEBS events.
Several of them, including the one used for cycles:p, cycles:pp, cycles:ppp fell in that category and caused the event to be rejected in PEBS mode. In other words, on some platforms a cmdline such as:
$ perf top -e cycles:pp
would fail with -EINVAL.
This patch fixes this bug by properly using INTEL_FLAGS_UEVENT_CONSTRAINT() when needed in the PEBS constraint tables.
--- arch/x86/events/intel/ds.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/x86/events/intel/ds.c +14 -14
@@ -684,7 +684,7 @@ struct event_constraint intel_core2_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x1fc7 ,0x1 ),/* SIMD_INST_RETURED.ANY */ INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ /* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x01 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x01 ), EVENT_CONSTRAINT_END };
@@ -693,7 +693,7 @@ struct event_constraint intel_atom_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x00c5 ,0x1 ),/* MISPREDICTED_BRANCH_RETIRED */ INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ /* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x01 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x01 ),/* Allow all events as PEBS with no flags */ INTEL_ALL_EVENT_CONSTRAINT (0 ,0x1 ),EVENT_CONSTRAINT_END
@@ -701,7 +701,7 @@ struct event_constraint intel_atom_pebs_event_constraints[] = {struct event_constraint intel_slm_pebs_event_constraints[] = {/* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x1 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x1 ),/* Allow all events as PEBS with no flags */ INTEL_ALL_EVENT_CONSTRAINT (0 ,0x1 ),EVENT_CONSTRAINT_END
@@ -726,7 +726,7 @@ struct event_constraint intel_nehalem_pebs_event_constraints[] = {INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ INTEL_FLAGS_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ /* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x0f ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x0f ), EVENT_CONSTRAINT_END };
@@ -743,7 +743,7 @@ struct event_constraint intel_westmere_pebs_event_constraints[] = {INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ INTEL_FLAGS_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ /* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x0f ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x0f ), EVENT_CONSTRAINT_END };
@@ -752,7 +752,7 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {INTEL_PLD_CONSTRAINT (0x01cd ,0x8 ),/* MEM_TRANS_RETIRED.LAT_ABOVE_THR */ INTEL_PST_CONSTRAINT (0x02cd ,0x8 ),/* MEM_TRANS_RETIRED.PRECISE_STORES */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c2 ,0xf ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c2 ,0xf ),INTEL_EXCLEVT_CONSTRAINT (0xd0 ,0xf ),/* MEM_UOP_RETIRED.* */ INTEL_EXCLEVT_CONSTRAINT (0xd1 ,0xf ),/* MEM_LOAD_UOPS_RETIRED.* */ INTEL_EXCLEVT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
@@ -767,9 +767,9 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = {INTEL_PLD_CONSTRAINT (0x01cd ,0x8 ),/* MEM_TRANS_RETIRED.LAT_ABOVE_THR */ INTEL_PST_CONSTRAINT (0x02cd ,0x8 ),/* MEM_TRANS_RETIRED.PRECISE_STORES */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c2 ,0xf ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c2 ,0xf ),/* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c0 ,0x2 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c0 ,0x2 ),INTEL_EXCLEVT_CONSTRAINT (0xd0 ,0xf ),/* MEM_UOP_RETIRED.* */ INTEL_EXCLEVT_CONSTRAINT (0xd1 ,0xf ),/* MEM_LOAD_UOPS_RETIRED.* */ INTEL_EXCLEVT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
@@ -783,9 +783,9 @@ struct event_constraint intel_hsw_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PRECDIST */ INTEL_PLD_CONSTRAINT (0x01cd ,0xf ),/* MEM_TRANS_RETIRED.* */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c2 ,0xf ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c2 ,0xf ),/* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c0 ,0x2 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c0 ,0x2 ),INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA (0x01c2 ,0xf ),/* UOPS_RETIRED.ALL */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_XLD (0x11d0 ,0xf ),/* MEM_UOPS_RETIRED.STLB_MISS_LOADS */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_XLD(0x21d0, 0xf), /* MEM_UOPS_RETIRED.LOCK_LOADS */
@@ -806,9 +806,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PRECDIST */ INTEL_PLD_CONSTRAINT (0x01cd ,0xf ),/* MEM_TRANS_RETIRED.* */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c2 ,0xf ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c2 ,0xf ),/* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c0 ,0x2 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c0 ,0x2 ),INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA (0x01c2 ,0xf ),/* UOPS_RETIRED.ALL */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD (0x11d0 ,0xf ),/* MEM_UOPS_RETIRED.STLB_MISS_LOADS */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x21d0, 0xf), /* MEM_UOPS_RETIRED.LOCK_LOADS */
@@ -829,9 +829,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {struct event_constraint intel_skl_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x1c0 ,0x2 ),/* INST_RETIRED.PREC_DIST */ /* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c0 ,0x2 ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108001c0 ,0x2 ),/* INST_RETIRED.TOTAL_CYCLES_PS (inv=1, cmask=16) (cycles:p). */ -INTEL_FLAGS_EVENT_CONSTRAINT (0x108000c0 ,0x0f ), +INTEL_FLAGS_UEVENT_CONSTRAINT (0x108000c0 ,0x0f ),INTEL_PLD_CONSTRAINT (0x1cd ,0xf ),/* MEM_TRANS_RETIRED.* */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD (0x11d0 ,0xf ),/* MEM_INST_RETIRED.STLB_MISS_LOADS */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST (0x12d0 ,0xf ),/* MEM_INST_RETIRED.STLB_MISS_STORES */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/70 netfilter: nf_queue: fix reinject verdict handling
In reply to Sasha LevinFrom: Jagdish Motwani <[email protected]>
[ Upstream commit 946c0d8e6ed43dae6527e878d0077c1e11015db0 ]
This patch fixes netfilter hook traversal when there are more than 1 hooks returning NF_QUEUE verdict. When the first queue reinjects the packet, 'nf_reinject' starts traversing hooks with a proper hook_index. However, if it again receives a NF_QUEUE verdict (by some other netfilter hook), it queues the packet with a wrong hook_index. So, when the second queue reinjects the packet, it re-executes hooks in between.
--- net/netfilter/nf_queue.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_queue.c +1 -0
@@ -254,6 +254,7 @@ static unsigned int nf_iterate(struct sk_buff *skb, repeat: verdict =nf_hook_entry_hookfn (hook, skb, state);if (verdict !=NF_ACCEPT ) { + *index = i;if (verdict !=NF_REPEAT )return verdict; goto repeat;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/70 netfilter: nft_fib: Fix existence check support
In reply to Sasha LevinFrom: Phil Sutter <[email protected]>
[ Upstream commit e633508a95289489d28faacb68b32c3e7e68ef6f ]
NFTA_FIB_F_PRESENT flag was not always honored since eval functions did not call nft_fib_store_result in all cases.
Given that in all callsites there is a struct net_device pointer available which holds the interface data to be stored in destination register, simplify nft_fib_store_result() to just accept that pointer instead of the nft_pktinfo pointer and interface index. This also allows to drop the index to interface lookup previously needed to get the name associated with given index.
--- include/net/netfilter/nft_fib.h | 2 +- net/ipv4/netfilter/nft_fib_ipv4.c | 23 +++-------------------- net/ipv6/netfilter/nft_fib_ipv6.c | 16 ++-------------- net/netfilter/nft_fib.c | 6 +++--- 4 files changed, 9 insertions(+), 38 deletions(-)
include/net/netfilter/nft_fib.h +1 -1
@@ -34,5 +34,5 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, const struct nft_pktinfo *pkt);void nft_fib_store_result (void *reg,const struct nft_fib *priv, -const struct nft_pktinfo *pkt,int index); +const struct net_device *dev);#endif
net/ipv4/netfilter/nft_fib_ipv4.c +3 -20
@@ -58,11 +58,6 @@ void nft_fib4_eval_type(const struct nft_expr *expr, struct nft_regs *regs, }EXPORT_SYMBOL_GPL (nft_fib4_eval_type); -static int get_ifindex (const struct net_device *dev) -{ -return dev ? dev->ifindex :0 ; -} -void nft_fib4_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt) {
@@ -94,8 +89,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,if (nft_hook (pkt) ==NF_INET_PRE_ROUTING &&nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv, pkt, -nft_in (pkt)->ifindex); +nft_fib_store_result (dest, priv,nft_in (pkt));return ; }
@@ -108,8 +102,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,if (ipv4_is_zeronet (iph->saddr)) {if (ipv4_is_lbcast (iph->daddr) ||ipv4_is_local_multicast (iph->daddr)) { -nft_fib_store_result (dest, priv, pkt, -get_ifindex (pkt->skb->dev)); +nft_fib_store_result (dest, priv, pkt->skb->dev);return ; } }
@@ -150,17 +143,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, found = oif; } -switch (priv->result) { -case NFT_FIB_RESULT_OIF : - *dest = found->ifindex; -break ; -case NFT_FIB_RESULT_OIFNAME : -strncpy ((char *)dest, found->name,IFNAMSIZ ); -break ; -default : -WARN_ON_ONCE (1 ); -break ; - } +nft_fib_store_result (dest, priv, found); }EXPORT_SYMBOL_GPL (nft_fib4_eval);
net/ipv6/netfilter/nft_fib_ipv6.c +2 -14
@@ -169,8 +169,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,if (nft_hook (pkt) ==NF_INET_PRE_ROUTING &&nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv, pkt, -nft_in (pkt)->ifindex); +nft_fib_store_result (dest, priv,nft_in (pkt));return ; }
@@ -187,18 +186,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,if (oif && oif != rt->rt6i_idev->dev) goto put_rt_err; -switch (priv->result) { -case NFT_FIB_RESULT_OIF : - *dest = rt->rt6i_idev->dev->ifindex; -break ; -case NFT_FIB_RESULT_OIFNAME : -strncpy ((char *)dest, rt->rt6i_idev->dev->name,IFNAMSIZ ); -break ; -default : -WARN_ON_ONCE (1 ); -break ; - } - +nft_fib_store_result (dest, priv, rt->rt6i_idev->dev); put_rt_err:ip6_rt_put (rt); }
net/netfilter/nft_fib.c +3 -3
@@ -135,17 +135,17 @@ int nft_fib_dump(struct sk_buff *skb, const struct nft_expr *expr)EXPORT_SYMBOL_GPL (nft_fib_dump);void nft_fib_store_result (void *reg,const struct nft_fib *priv, -const struct nft_pktinfo *pkt,int index) +const struct net_device *dev) { -struct net_device *dev;u32 *dreg = reg; +int index;switch (priv->result) {case NFT_FIB_RESULT_OIF : + index = dev ? dev->ifindex :0 ; *dreg = (priv->flags &NFTA_FIB_F_PRESENT ) ? !!index : index;break ;case NFT_FIB_RESULT_OIFNAME : - dev =dev_get_by_index_rcu (nft_net (pkt), index);if (priv->flags &NFTA_FIB_F_PRESENT ) *dreg = !!dev;else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/70 ipvs: Fix use-after-free in ip_vs_in
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 719c7d563c17b150877cee03a4b812a424989dfa ]
BUG: KASAN: use-after-free in ip_vs_in.part.29+0xe8/0xd20 [ip_vs] Read of size 4 at addr ffff8881e9b26e2c by task sshd/5603 CPU: 0 PID: 5603 Comm: sshd Not tainted 4.19.39+ #30 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 Call Trace: dump_stack+0x71/0xab print_address_description+0x6a/0x270 kasan_report+0x179/0x2c0 ip_vs_in.part.29+0xe8/0xd20 [ip_vs] ip_vs_in+0xd8/0x170 [ip_vs] nf_hook_slow+0x5f/0xe0 __ip_local_out+0x1d5/0x250 ip_local_out+0x19/0x60 __tcp_transmit_skb+0xba1/0x14f0 tcp_write_xmit+0x41f/0x1ed0 ? _copy_from_iter_full+0xca/0x340 __tcp_push_pending_frames+0x52/0x140 tcp_sendmsg_locked+0x787/0x1600 ? tcp_sendpage+0x60/0x60 ? inet_sk_set_state+0xb0/0xb0 tcp_sendmsg+0x27/0x40 sock_sendmsg+0x6d/0x80 sock_write_iter+0x121/0x1c0 ? sock_sendmsg+0x80/0x80 __vfs_write+0x23e/0x370 vfs_write+0xe7/0x230 ksys_write+0xa1/0x120 ? __ia32_sys_read+0x50/0x50 ? __audit_syscall_exit+0x3ce/0x450 do_syscall_64+0x73/0x200 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7ff6f6147c60 Code: 73 01 c3 48 8b 0d 28 12 2d 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 5d 73 2d 00 00 75 10 b8 01 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 RSP: 002b:00007ffd772ead18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000034 RCX: 00007ff6f6147c60 RDX: 0000000000000034 RSI: 000055df30a31270 RDI: 0000000000000003 RBP: 000055df30a31270 R08: 0000000000000000 R09: 0000000000000000 R10: 00007ffd772ead70 R11: 0000000000000246 R12: 00007ffd772ead74 R13: 00007ffd772eae20 R14: 00007ffd772eae24 R15: 000055df2f12ddc0 Allocated by task 6052: kasan_kmalloc+0xa0/0xd0 __kmalloc+0x10a/0x220 ops_init+0x97/0x190 register_pernet_operations+0x1ac/0x360 register_pernet_subsys+0x24/0x40 0xffffffffc0ea016d do_one_initcall+0x8b/0x253 do_init_module+0xe3/0x335 load_module+0x2fc0/0x3890 __do_sys_finit_module+0x192/0x1c0 do_syscall_64+0x73/0x200 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 6067: __kasan_slab_free+0x130/0x180 kfree+0x90/0x1a0 ops_free_list.part.7+0xa6/0xc0 unregister_pernet_operations+0x18b/0x1f0 unregister_pernet_subsys+0x1d/0x30 ip_vs_cleanup+0x1d/0xd2f [ip_vs] __x64_sys_delete_module+0x20c/0x300 do_syscall_64+0x73/0x200 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff8881e9b26600 which belongs to the cache kmalloc-4096 of size 4096 The buggy address is located 2092 bytes inside of 4096-byte region [ffff8881e9b26600, ffff8881e9b27600) The buggy address belongs to the page: page:ffffea0007a6c800 count:1 mapcount:0 mapping:ffff888107c0e600 index:0x0 compound_mapcount: 0 flags: 0x17ffffc0008100(slab|head) raw: 0017ffffc0008100 dead000000000100 dead000000000200 ffff888107c0e600 raw: 0000000000000000 0000000080070007 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected
while unregistering ipvs module, ops_free_list calls __ip_vs_cleanup, then nf_unregister_net_hooks be called to do remove nf hook entries. It need a RCU period to finish, however net->ipvs is set to NULL immediately, which will trigger NULL pointer dereference when a packet is hooked and handled by ip_vs_in where net->ipvs is dereferenced.
Another scene is ops_free_list call ops_free to free the net_generic directly while __ip_vs_cleanup finished, then calling ip_vs_in will triggers use-after-free.
This patch moves nf_unregister_net_hooks from __ip_vs_cleanup() to __ip_vs_dev_cleanup(), where rcu_barrier() is called by unregister_pernet_device -> unregister_pernet_operations, that will do the needed grace period.
--- net/netfilter/ipvs/ip_vs_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -2312,7 +2312,6 @@ static void __net_exit __ip_vs_cleanup(struct net *net) {struct netns_ipvs *ipvs =net_ipvs (net); -nf_unregister_net_hooks (net, ip_vs_ops,ARRAY_SIZE (ip_vs_ops));ip_vs_service_net_cleanup (ipvs);/* ip_vs_flush() with locks */ ip_vs_conn_net_cleanup (ipvs);ip_vs_app_net_cleanup (ipvs);
@@ -2327,6 +2326,7 @@ static void __net_exit __ip_vs_dev_cleanup(struct net *net) {struct netns_ipvs *ipvs =net_ipvs (net);EnterFunction (2 ); +nf_unregister_net_hooks (net, ip_vs_ops,ARRAY_SIZE (ip_vs_ops)); ipvs->enable =0 ;/* Disable packet reception */ smp_wmb ();ip_vs_sync_net_cleanup (ipvs);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/70 selftests: netfilter: missing error check when setting up veth interface
In reply to Sasha LevinFrom: Jeffrin Jose T <[email protected]>
[ Upstream commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 ]
A test for the basic NAT functionality uses ip command which needs veth device. There is a condition where the kernel support for veth is not compiled into the kernel and the test script breaks. This patch contains code for reasonable error display and correct code exit.
--- tools/testing/selftests/netfilter/nft_nat.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/testing/selftests/netfilter/nft_nat.sh +5 -1
@@ -23,7 +23,11 @@ ip netns add ns0 ip netns add ns1 ip netns add ns2 -ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 +ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: No virtual ethernet pair device support in kernel" + exit $ksft_skip +fi ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 ip -net ns0 link set lo up
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/70 netfilter: nat: fix udp checksum corruption
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 6bac76db1da3cb162c425d58ae421486f8e43955 ]
Due to copy&paste error nf_nat_mangle_udp_packet passes IPPROTO_TCP, resulting in incorrect udp checksum when payload had to be mangled.
--- net/netfilter/nf_nat_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_nat_helper.c +1 -1
@@ -170,7 +170,7 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,if (!udph->check && skb->ip_summed !=CHECKSUM_PARTIAL )return true; -nf_nat_csum_recalc (skb,nf_ct_l3num (ct),IPPROTO_TCP , +nf_nat_csum_recalc (skb,nf_ct_l3num (ct),IPPROTO_UDP , udph, &udph->check, datalen, oldlen);return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/70 clk: ti: clkctrl: Fix clkdm_clk handling
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 1cc54078d104f5b4d7e9f8d55362efa5a8daffdb ]
We need to always call clkdm_clk_enable() and clkdm_clk_disable() even the clkctrl clock(s) enabled for the domain do not have any gate register bits. Otherwise clockdomains may never get enabled except when devices get probed with the legacy "ti,hwmods" devicetree property.
--- drivers/clk/ti/clkctrl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/ti/clkctrl.c +4 -4
@@ -137,9 +137,6 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)int ret;union omap4_timeout timeout = {0 }; -if (!clk->enable_bit) -return 0 ; -if (clk->clkdm) { ret = ti_clk_ll_ops->clkdm_clk_enable (clk->clkdm, hw->clk);if (ret) {
@@ -151,6 +148,9 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw) } } +if (!clk->enable_bit) +return 0 ; + val = ti_clk_ll_ops->clk_readl (&clk->enable_reg); val &= ~OMAP4_MODULEMODE_MASK ;
@@ -179,7 +179,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)union omap4_timeout timeout = {0 };if (!clk->enable_bit) -return ; + goto exit; val = ti_clk_ll_ops->clk_readl (&clk->enable_reg);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/70 powerpc/powernv: Return for invalid IMC domain
In reply to Sasha LevinFrom: Anju T Sudhakar <[email protected]>
[ Upstream commit b59bd3527fe3c1939340df558d7f9d568fc9f882 ]
Currently init_imc_pmu() can fail either because we try to register an IMC unit with an invalid domain (i.e an IMC node not supported by the kernel) or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Register failed' error message.
For example when trace-imc node is not supported by the kernel, but skiboot advertises a trace-imc node we print:
IMC Unknown Device type
IMC PMU (null) Register failed
To avoid confusion just print the unknown device type message, before attempting PMU registration, so the second message isn't printed.
--- arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/platforms/powernv/opal-imc.c +4 -0
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)struct imc_pmu *pmu_ptr;u32 offset; +/* Return for unknown domain */ +if (domain <0 ) +return -EINVAL ; +/* memory for pmu */ pmu_ptr =kzalloc (sizeof (*pmu_ptr),GFP_KERNEL );if (!pmu_ptr)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/70 usb: xhci: Fix a potential null pointer dereference in xhci_debugfs_create_endpoint()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 5bce256f0b528624a34fe907db385133bb7be33e ]
In xhci_debugfs_create_slot(), kzalloc() can fail and dev->debugfs_private will be NULL.
In xhci_debugfs_create_endpoint(), dev->debugfs_private is used without any null-pointer check, and can cause a null pointer dereference.
To fix this bug, a null-pointer check is added inxhci_debugfs_create_endpoint().
This bug is found by a runtime fuzzing tool named FIZZER written by us.
--- drivers/usb/host/xhci-debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-debugfs.c +3 -0
@@ -440,6 +440,9 @@ void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,struct xhci_ep_priv *epriv;struct xhci_slot_priv *spriv = dev->debugfs_private; +if (!spriv) +return ; +if (spriv->eps[ep_index])return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/70 mISDN: make sure device name is NUL terminated
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ccfb62f27beb295103e9392462b20a6ed807d0ea ]
The user can change the device_name with the IMSETDEVNAME ioctl, but we need to ensure that the user's name is NUL terminated. Otherwise it could result in a buffer overflow when we copy the name back to the user with IMGETDEVINFO ioctl.
I also changed two strcpy() calls which handle the name to strscpy(). Hopefully, there aren't any other ways to create a too long name, but it's nice to do this as a kernel hardening measure.
--- drivers/isdn/mISDN/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/isdn/mISDN/socket.c +3 -2
@@ -393,7 +393,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)memcpy (di.channelmap, dev->channelmap,sizeof (di.channelmap)); di.nrbchan = dev->nrbchan; -strcpy (di.name,dev_name (&dev->dev)); +strscpy (di.name,dev_name (&dev->dev),sizeof (di.name));if (copy_to_user ((void __user *)arg, &di,sizeof (di))) err = -EFAULT ; }else
@@ -676,7 +676,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)memcpy (di.channelmap, dev->channelmap,sizeof (di.channelmap)); di.nrbchan = dev->nrbchan; -strcpy (di.name,dev_name (&dev->dev)); +strscpy (di.name,dev_name (&dev->dev),sizeof (di.name));if (copy_to_user ((void __user *)arg, &di,sizeof (di))) err = -EFAULT ; }else
@@ -690,6 +690,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) err = -EFAULT ;break ; } + dn.name[sizeof (dn.name) -1 ] ='\0' ; dev =get_mdevice (dn.id);if (dev) err =device_rename (&dev->dev, dn.name);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/70 x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor
In reply to Sasha LevinFrom: Frank van der Linden <[email protected]>
[ Upstream commit 2ac44ab608705948564791ce1d15d43ba81a1e38 ]
For F17h AMD CPUs, the CPB capability ('Core Performance Boost') is forcibly set, because some versions of that chip incorrectly report that they do not have it.
However, a hypervisor may filter out the CPB capability, for good reasons. For example, KVM currently does not emulate setting the CPB bit in MSR_K7_HWCR, and unchecked MSR access errors will be thrown when trying to set it as a guest:
unchecked MSR access error: WRMSR to 0xc0010015 (tried to write 0x0000000001000011) at rIP: 0xffffffff890638f4 (native_write_msr+0x4/0x20) Call Trace: boost_set_msr+0x50/0x80 [acpi_cpufreq] cpuhp_invoke_callback+0x86/0x560 sort_range+0x20/0x20 cpuhp_thread_fun+0xb0/0x110 smpboot_thread_fn+0xef/0x160 kthread+0x113/0x130 kthread_create_worker_on_cpu+0x70/0x70 ret_from_fork+0x35/0x40
To avoid this issue, don't forcibly set the CPB capability for a CPU when running under a hypervisor.
--- arch/x86/kernel/cpu/amd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/amd.c +5 -2
@@ -820,8 +820,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c) {set_cpu_cap (c,X86_FEATURE_ZEN ); -/* Fix erratum 1076: CPB feature bit not being set in CPUID. */ -if (!cpu_has (c,X86_FEATURE_CPB )) +/* +* Fix erratum 1076: CPB feature bit not being set in CPUID. +* Always set it, except when running under a hypervisor. +*/ +if (!cpu_has (c,X86_FEATURE_HYPERVISOR ) && !cpu_has (c,X86_FEATURE_CPB ))set_cpu_cap (c,X86_FEATURE_CPB ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/70 perf/ring_buffer: Fix exposing a temporarily decreased data_head
In reply to Sasha LevinFrom: Yabin Cui <[email protected]>
[ Upstream commit 1b038c6e05ff70a1e66e3e571c2e6106bdb75f53 ]
In perf_output_put_handle(), an IRQ/NMI can happen in below location and write records to the same ring buffer:
... local_dec_and_test(&rb->nest) ... <-- an IRQ/NMI can happen here rb->user_page->data_head = head; ...
In this case, a value A is written to data_head in the IRQ, then a value B is written to data_head after the IRQ. And A > B. As a result, data_head is temporarily decreased from A to B. And a reader may see data_head < data_tail if it read the buffer frequently enough, which creates unexpected behaviors.
This can be fixed by moving dec(&rb->nest) to after updating data_head, which prevents the IRQ/NMI above from updating data_head.
[ Split up by peterz. ]
--- kernel/events/ring_buffer.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
kernel/events/ring_buffer.c +20 -4
@@ -51,11 +51,18 @@ again: head =local_read (&rb->head);/* -* IRQ/NMI can happen here, which means we can miss a head update. +* IRQ/NMI can happen here and advance @rb->head, causing our +* load above to be stale. */ -if (!local_dec_and_test (&rb->nest)) +/* +* If this isn't the outermost nesting, we don't have to update +* @rb->user_page->data_head. +*/ +if (local_read (&rb->nest) >1 ) { +local_dec (&rb->nest); goto out; + }/* * Since the mmap() consumer (userspace) can run on a different CPU:
@@ -87,9 +94,18 @@ again: rb->user_page->data_head = head;/* -* Now check if we missed an update -- rely on previous implied -* compiler barriers to force a re-read. +* We must publish the head before decrementing the nest count, +* otherwise an IRQ/NMI can publish a more recent head value and our +* write will (temporarily) publish a stale value. +*/ +barrier (); +local_set (&rb->nest,0 ); + +/* +* Ensure we decrement @rb->nest before we validate the @rb->head. +* Otherwise we cannot be sure we caught the 'last' nested update. */ +barrier ();if (unlikely (head !=local_read (&rb->head))) {local_inc (&rb->nest); goto again;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/70 perf/ring_buffer: Add ordering to rb->nest increment
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 3f9fbe9bd86c534eba2faf5d840fd44c6049f50e ]
Similar to how decrementing rb->next too early can cause data_head to (temporarily) be observed to go backward, so too can this happen when we increment too late.
This barrier() ensures the rb->head load happens after the increment, both the one in the 'goto again' path, as the one from perf_output_get_handle() -- albeit very unlikely to matter for the latter.
--- kernel/events/ring_buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/events/ring_buffer.c +9 -0
@@ -48,6 +48,15 @@ static void perf_output_put_handle(struct perf_output_handle *handle)unsigned long head; again: +/* +* In order to avoid publishing a head value that goes backwards, +* we must ensure the load of @rb->head happens after we've +* incremented @rb->nest. +* +* Otherwise we can observe a @rb->head value before one published +* by an IRQ/NMI happening between the load and the increment. +*/ +barrier (); head =local_read (&rb->head);/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/70 perf/ring-buffer: Always use {READ,WRITE}_ONCE() for rb->user_page data
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 4d839dd9e4356bbacf3eb0ab13a549b83b008c21 ]
We must use {READ,WRITE}_ONCE() on rb->user_page data such that concurrent usage will see whole values. A few key sites were missing this.
--- kernel/events/ring_buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/events/ring_buffer.c +3 -3
@@ -100,7 +100,7 @@ again:* See perf_output_begin(). */ smp_wmb ();/* B, matches C */ - rb->user_page->data_head = head; +WRITE_ONCE (rb->user_page->data_head, head);/* * We must publish the head before decrementing the nest count,
@@ -496,7 +496,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size)perf_event_aux_event (handle->event, aux_head, size, handle->aux_flags); - rb->user_page->aux_head = rb->aux_head; +WRITE_ONCE (rb->user_page->aux_head, rb->aux_head);if (rb_need_aux_wakeup (rb)) wakeup = true;
@@ -528,7 +528,7 @@ int perf_aux_output_skip(struct perf_output_handle *handle, unsigned long size) rb->aux_head += size; - rb->user_page->aux_head = rb->aux_head; +WRITE_ONCE (rb->user_page->aux_head, rb->aux_head);if (rb_need_aux_wakeup (rb)) {perf_output_wakeup (handle); handle->wakeup = rb->aux_wakeup + rb->aux_watermark;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/70 gpio: fix gpio-adp5588 build errors
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit e9646f0f5bb62b7d43f0968f39d536cfe7123b53 ]
The gpio-adp5588 driver uses interfaces that are provided by GPIOLIB_IRQCHIP, so select that symbol in its Kconfig entry.
Fixes these build errors:
../drivers/gpio/gpio-adp5588.c: In function ‘adp5588_irq_handler’:../drivers/gpio/gpio-adp5588.c:266:26: error: ‘struct gpio_chip’ has no member named ‘irq’
dev->gpio_chip.irq.domain, gpio));
^../drivers/gpio/gpio-adp5588.c: In function ‘adp5588_irq_setup’:../drivers/gpio/gpio-adp5588.c:298:2: error: implicit declaration of function ‘gpiochip_irqchip_add_nested’ [-Werror=implicit-function-declaration]
ret = gpiochip_irqchip_add_nested(&dev->gpio_chip,
^../drivers/gpio/gpio-adp5588.c:307:2: error: implicit declaration of function ‘gpiochip_set_nested_irqchip’ [-Werror=implicit-function-declaration]
gpiochip_set_nested_irqchip(&dev->gpio_chip,
^
--- drivers/gpio/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/Kconfig +1 -0
@@ -824,6 +824,7 @@ config GPIO_ADP5588 config GPIO_ADP5588_IRQ bool "Interrupt controller support for ADP5588" depends on GPIO_ADP5588=y + select GPIOLIB_IRQCHIP help Say yes here to enable the adp5588 to be used as an interrupt controller. It requires the driver to be built in the kernel.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/70 efi/x86/Add missing error handling to old_memmap 1:1 mapping code
In reply to Sasha LevinFrom: Gen Zhang <[email protected]>
[ Upstream commit 4e78921ba4dd0aca1cc89168f45039add4183f8e ]
The old_memmap flow in efi_call_phys_prolog() performs numerous memory allocations, and either does not check for failure at all, or it does but fails to propagate it back to the caller, which may end up calling into the firmware with an incomplete 1:1 mapping.
So let's fix this by returning NULL from efi_call_phys_prolog() on memory allocation failures only, and by handling this condition in the caller. Also, clean up any half baked sets of page tables that we may have created before returning with a NULL return value.
Note that any failure at this level will trigger a panic() two levels up, so none of this makes a huge difference, but it is a nice cleanup nonetheless.
[ardb: update commit log, add efi_call_phys_epilog() call on error path]
--- arch/x86/platform/efi/efi.c | 2 ++ arch/x86/platform/efi/efi_64.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/x86/platform/efi/efi.c +2 -0
@@ -85,6 +85,8 @@ static efi_status_t __init phys_efi_set_virtual_address_map(pgd_t *save_pgd; save_pgd =efi_call_phys_prolog (); +if (!save_pgd) +return EFI_ABORTED ;/* Disable interrupts around EFI calls: */ local_irq_save (flags);
arch/x86/platform/efi/efi_64.c +6 -3
@@ -84,13 +84,15 @@ pgd_t * __init efi_call_phys_prolog(void)if (!efi_enabled (EFI_OLD_MEMMAP )) {efi_switch_mm (&efi_mm); -return NULL ; +return efi_mm.pgd; }early_code_mapping_set_exec (1 ); n_pgds =DIV_ROUND_UP ((max_pfn <<PAGE_SHIFT ),PGDIR_SIZE ); save_pgd =kmalloc_array (n_pgds,sizeof (*save_pgd),GFP_KERNEL ); +if (!save_pgd) +return NULL ;/* * Build 1:1 identity mapping for efi=old_map usage. Note that
@@ -138,10 +140,11 @@ pgd_t * __init efi_call_phys_prolog(void)pgd_offset_k (pgd *PGDIR_SIZE )->pgd &= ~_PAGE_NX; } -out:__flush_tlb_all (); -return save_pgd; +out: +efi_call_phys_epilog (save_pgd); +return NULL ; }void __init efi_call_phys_epilog (pgd_t *save_pgd)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/70 net: stmmac: update rx tail pointer register to fix rx dma hang issue.
In reply to Sasha LevinFrom: Biao Huang <[email protected]>
[ Upstream commit 4523a5611526709ec9b4e2574f1bb7818212651e ]
Currently we will not update the receive descriptor tail pointer in stmmac_rx_refill. Rx dma will think no available descriptors and stop once received packets exceed DMA_RX_SIZE, so that the rx only test will fail.
Update the receive tail pointer in stmmac_rx_refill to add more descriptors to the rx channel, so packets can be received continually
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
@@ -3338,6 +3338,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) entry =STMMAC_GET_ENTRY (entry,DMA_RX_SIZE ); } rx_q->dirty_rx = entry; +stmmac_set_rx_tail_ptr (priv, priv->ioaddr, rx_q->rx_tail_addr, queue); }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/70 net: stmmac: fix csr_clk can't be zero issue
In reply to Sasha LevinFrom: Biao Huang <[email protected]>
[ Upstream commit 5e7f7fc538d894b2d9aa41876b8dcf35f5fe11e6 ]
The specific clk_csr value can be zero, andstmmac_clk is necessary for MDC clock which can be set dynamically. So, change the condition from plat->clk_csr to plat->stmmac_clk to fix clk_csr can't be zero issue.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -3
@@ -4380,10 +4380,10 @@ int stmmac_dvr_probe(struct device *device,* set the MDC clock dynamically according to the csr actual * clock input. */ -if (!priv->plat->clk_csr) -stmmac_clk_csr_set (priv); -else +if (priv->plat->clk_csr >=0 ) priv->clk_csr = priv->plat->clk_csr; +else +stmmac_clk_csr_set (priv);stmmac_check_pcs_mode (priv);
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +4 -1
@@ -408,7 +408,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)/* Default to phy auto-detection */ plat->phy_addr =-1 ; -/* Get clk_csr from device tree */ +/* Default to get clk_csr from stmmac_clk_crs_set(), +* or get clk_csr from device tree. +*/ + plat->clk_csr =-1 ;of_property_read_u32 (np,"clk_csr" , &plat->clk_csr);/* "snps,phy-addr" is not a standard property. Mark it as deprecated
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/70 net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail
In reply to Sasha LevinFrom: Biao Huang <[email protected]>
[ Upstream commit f4ca7a9260dfe700f2a16f0881825de625067515 ]
1. the frequency of csr clock is 66.5MHz, so the csr_clk value should be 0 other than 5.
2. the csr_clk can be got from device tree, so remove initialization here.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +0 -2
@@ -346,8 +346,6 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; -/* clk_csr_i = 250-300MHz & MDC = clk_csr_i/124 */ - plat_dat->clk_csr =5 ; plat_dat->has_gmac4 =1 ; plat_dat->has_gmac =0 ; plat_dat->pmt =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/70 io_uring: Fix __io_uring_register() false success
In reply to Sasha LevinFrom: Pavel Begunkov <[email protected]>
[ Upstream commit a278682dad37fd2f8d2f30d8e84e376a856ab472 ]
If io_copy_iov() fails, it will break the loop and report success, albeit partially completed operation.
--- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/io_uring.c +1 -1
@@ -2505,7 +2505,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg, ret =io_copy_iov (ctx, &iov, arg, i);if (ret) -break ; + goto err;/* * Don't impose further limits on the size and buffer
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/70 dpaa2-eth: Fix potential spectre issue
In reply to Sasha LevinFrom: Ioana Radulescu <[email protected]>
[ Upstream commit 5a20a093d965560f632b2ec325f8876918f78165 ]
Smatch reports a potential spectre vulnerability in the dpaa2-eth driver, where the value of rxnfc->fs.location (which is provided from user-space) is used as index in an array.
Add a call to array_index_nospec() to sanitize the access.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +3 -0
@@ -4,6 +4,7 @@*/ #include <linux/net_tstamp.h> +#include <linux/nospec.h> #include "dpni.h" /* DPNI_LINK_OPT_* */ #include "dpaa2-eth.h"
@@ -589,6 +590,8 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,case ETHTOOL_GRXCLSRULE :if (rxnfc->fs.location >= max_rules)return -EINVAL ; + rxnfc->fs.location =array_index_nospec (rxnfc->fs.location, + max_rules);if (!priv->cls_rules[rxnfc->fs.location].in_use)return -EINVAL ; rxnfc->fs = priv->cls_rules[rxnfc->fs.location].fs;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/70 dpaa2-eth: Use PTR_ERR_OR_ZERO where appropriate
In reply to Sasha LevinFrom: Ioana Radulescu <[email protected]>
[ Upstream commit bd8460fa4de46e9d6177af4fe33bf0763a7af4b7 ]
Use PTR_ERR_OR_ZERO instead of PTR_ERR in cases where zero is a valid input. Reported by smatch.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +2 -2
@@ -1966,7 +1966,7 @@ alloc_channel(struct dpaa2_eth_priv *priv) channel->dpcon =setup_dpcon (priv);if (IS_ERR_OR_NULL (channel->dpcon)) { - err =PTR_ERR (channel->dpcon); + err =PTR_ERR_OR_ZERO (channel->dpcon); goto err_setup; }
@@ -2022,7 +2022,7 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)/* Try to allocate a channel */ channel =alloc_channel (priv);if (IS_ERR_OR_NULL (channel)) { - err =PTR_ERR (channel); + err =PTR_ERR_OR_ZERO (channel);if (err != -EPROBE_DEFER )dev_info (dev,"No affine channel for cpu %d and above\n" , i);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/70 net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
In reply to Sasha LevinFrom: Kees Cook <[email protected]>
[ Upstream commit 3e66b7cc50ef921121babc91487e1fb98af1ba6e ]
Building with Clang reports the redundant use of MODULE_DEVICE_TABLE():
drivers/net/ethernet/dec/tulip/de4x5.c:2110:1: error: redefinition of '__mod_eisa__de4x5_eisa_ids_device_table' MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
^./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
extern typeof(name) __mod_##type##__##name##_device_table \
^<scratch space>:90:1: note: expanded from here __mod_eisa__de4x5_eisa_ids_device_table
^drivers/net/ethernet/dec/tulip/de4x5.c:2100:1: note: previous definition is here MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
^./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
extern typeof(name) __mod_##type##__##name##_device_table \
^<scratch space>:85:1: note: expanded from here__mod_eisa__de4x5_eisa_ids_device_table
^
This drops the one further from the table definition to match the common use of MODULE_DEVICE_TABLE().
--- drivers/net/ethernet/dec/tulip/de4x5.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/dec/tulip/de4x5.c +0 -1
@@ -2107,7 +2107,6 @@ static struct eisa_driver de4x5_eisa_driver = { .remove = de4x5_eisa_remove, } }; -MODULE_DEVICE_TABLE (eisa, de4x5_eisa_ids);#endif #ifdef CONFIG_PCI
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/70 ACPI/PCI: PM: Add missing wakeup.flags.valid checks
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 9a51c6b1f9e0239a9435db036b212498a2a3b75c ]
Both acpi_pci_need_resume() and acpi_dev_needs_resume() check if the current ACPI wakeup configuration of the device matches what is expected as far as system wakeup from sleep states is concerned, as reflected by the device_may_wakeup() return value for the device.
However, they only should do that if wakeup.flags.valid is set for the device's ACPI companion, because otherwise the wakeup.prepare_count value for it is meaningless.
Add the missing wakeup.flags.valid checks to these functions.
--- drivers/acpi/device_pm.c | 4 ++-- drivers/pci/pci-acpi.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/acpi/device_pm.c +2 -2
@@ -949,8 +949,8 @@ static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev)u32 sys_target =acpi_target_system_state ();int ret, state; -if (!pm_runtime_suspended (dev) || !adev || -device_may_wakeup (dev) != !!adev->wakeup.prepare_count) +if (!pm_runtime_suspended (dev) || !adev || (adev->wakeup.flags.valid && +device_may_wakeup (dev) != !!adev->wakeup.prepare_count))return true;if (sys_target ==ACPI_STATE_S0 )
drivers/pci/pci-acpi.c +2 -1
@@ -666,7 +666,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)if (!adev || !acpi_device_power_manageable (adev))return false; -if (device_may_wakeup (&dev->dev) != !!adev->wakeup.prepare_count) +if (adev->wakeup.flags.valid && +device_may_wakeup (&dev->dev) != !!adev->wakeup.prepare_count)return true;if (acpi_target_system_state () ==ACPI_STATE_S0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/70 PCI: PM: Avoid possible suspend-to-idle issue
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit d491f2b75237ef37d8867830ab7fad8d9659e853 ]
If a PCI driver leaves the device handled by it in D0 and calls pci_save_state() on the device in its ->suspend() or ->suspend_late() callback, it can expect the device to stay in D0 over the whole s2idle cycle. However, that may not be the case if there is a spurious wakeup while the system is suspended, because in that case pci_pm_suspend_noirq() will run again after pci_pm_resume_noirq() which calls pci_restore_state(), via pci_pm_default_resume_early(), so state_saved is cleared and the second iteration of pci_pm_suspend_noirq() will invoke pci_prepare_to_sleep() which may change the power state of the device.
To avoid that, add a new internal flag, skip_bus_pm, that will be set by pci_pm_suspend_noirq() when it runs for the first time during the given system suspend-resume cycle if the state of the device has been saved already and the device is still in D0. Setting that flag will cause the next iterations of pci_pm_suspend_noirq() to set state_saved for pci_pm_resume_noirq(), so that it always restores the device state from the originally saved data, and avoid calling pci_prepare_to_sleep() for the device.
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/pci/pci-driver.c +16 -1
@@ -734,6 +734,8 @@ static int pci_pm_suspend(struct device *dev)struct pci_dev *pci_dev =to_pci_dev (dev);const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm :NULL ; + pci_dev->skip_bus_pm = false; +if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_suspend (dev,PMSG_SUSPEND );
@@ -827,7 +829,20 @@ static int pci_pm_suspend_noirq(struct device *dev) } } -if (!pci_dev->state_saved) { +if (pci_dev->skip_bus_pm) { +/* +* The function is running for the second time in a row without +* going through full resume, which is possible only during +* suspend-to-idle in a spurious wakeup case. Moreover, the +* device was originally left in D0, so its power state should +* not be changed here and the device register values saved +* originally should be restored on resume again. +*/ + pci_dev->state_saved = true; + }else if (pci_dev->state_saved) { +if (pci_dev->current_state ==PCI_D0 ) + pci_dev->skip_bus_pm = true; + }else {pci_save_state (pci_dev);if (pci_power_manageable (pci_dev))pci_prepare_to_sleep (pci_dev);
include/linux/pci.h +1 -0
@@ -344,6 +344,7 @@ struct pci_dev {D3cold, not set for devices powered on/off by the corresponding bridge */ + unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */ unsigned int ignore_hotplug:1; /* Ignore hotplug events */ unsigned int hotplug_user_indicators:1; /* SlotCtl indicatorscontrolled exclusively by
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/70 loop: Don't change loop device under exclusive opener
In reply to Sasha LevinFrom: Jan Kara <[email protected]>
[ Upstream commit 33ec3e53e7b1869d7851e59e126bdb0fe0bd1982 ]
Loop module allows calling LOOP_SET_FD while there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev() lo_ioctl()
udf_fill_super()
udf_load_vrs()
sb_set_blocksize() - sets desired block size B
udf_tread()
sb_bread()
__bread_gfp(bdev, block, B)
loop_set_fd()
set_blocksize()
- now __getblk_slow() indefinitely loops because B != bdev
block sizeFix the problem by disallowing LOOP_SET_FD ioctl when there are exclusive openers of a loop device.
[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/block/loop.c +17 -1
@@ -919,9 +919,20 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,if (!file) goto out; +/* +* If we don't hold exclusive handle for the device, upgrade to it +* here to avoid changing device under exclusive owner. +*/ +if (!(mode &FMODE_EXCL )) { +bdgrab (bdev); + error =blkdev_get (bdev, mode |FMODE_EXCL , loop_set_fd); +if (error) + goto out_putf; + } + error =mutex_lock_killable (&loop_ctl_mutex);if (error) - goto out_putf; + goto out_bdev; error = -EBUSY ;if (lo->lo_state != Lo_unbound)
@@ -985,10 +996,15 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,mutex_unlock (&loop_ctl_mutex);if (partscan)loop_reread_partitions (lo, bdev); +if (!(mode &FMODE_EXCL )) +blkdev_put (bdev, mode |FMODE_EXCL );return 0 ; out_unlock:mutex_unlock (&loop_ctl_mutex); +out_bdev: +if (!(mode &FMODE_EXCL )) +blkdev_put (bdev, mode |FMODE_EXCL ); out_putf:fput (file); out:
Signature · 1 line
2.20.1
Jan Kara
reviewerRe: [PATCH AUTOSEL 5.1 35/70] loop: Don't change loop device under exclusive opener
Quoted 3 lines · Sasha Levin
From: Jan Kara <[email protected]>
[ Upstream commit
33ec3e53e7b1869d7851e59e126bdb0fe0bd1982]
Please don't push this to stable kernels because...
Quoted 3 lines
[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
... of this. Thanks!
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.1 35/70] loop: Don't change loop device under exclusive opener
Quoted 6 lines · Jan Kara
Quoted 3 lines · Sasha Levin
From: Jan Kara <[email protected]>
[ Upstream commit
33ec3e53e7b1869d7851e59e126bdb0fe0bd1982]Please don't push this to stable kernels because...
I've dropped this, but...
Quoted 5 lines
Quoted 3 lines
[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
... of this. Thanks!
Can't this be triggered by an "innocent" user, rather as part of an attack? Why can't this race happen during regular usage?
--
Thanks,
Sasha
Jan Kara
reviewerRe: [PATCH AUTOSEL 5.1 35/70] loop: Don't change loop device under exclusive opener
Quoted 9 lines · Sasha Levin
Quoted 6 lines · Jan Kara
Quoted 3 lines · Sasha Levin
From: Jan Kara <[email protected]>
[ Upstream commit
33ec3e53e7b1869d7851e59e126bdb0fe0bd1982]Please don't push this to stable kernels because...
I've dropped this, but...
OK, thanks.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
... of this. Thanks!
Can't this be triggered by an "innocent" user, rather as part of an attack? Why can't this race happen during regular usage?
Well, the problem happens when mount happens on loop device when someone modifies the backing file of the loop device. So for this to be triggerable, you have to have control over assignment of backing files to loop devices (you have to be owner of these loop devices to be able to do this - pretty much means root in most setups) and be able to trigger mount on this device. If you have these capabilities, there are much more efficient ways to gain full administrator priviledges on the system, deadlocking the kernel is thus the least of your worries.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Sasha Levin
maintainerPATCH 36/70 drm/etnaviv: lock MMU while dumping core
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit 1396500d673bd027683a0609ff84dca7eb6ea2e7 ]
The devcoredump needs to operate on a stable state of the MMU while it is writing the MMU state to the coredump. The missing lock allowed both the userspace submit, as well as the GPU job finish paths to mutate the MMU state while a coredump is under way.
--- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_dump.c +5 -0
@@ -125,6 +125,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)return ; etnaviv_dump_core = false; +mutex_lock (&gpu->mmu->lock); + mmu_size =etnaviv_iommu_dump_size (gpu->mmu);/* We always dump registers, mmu, ring and end marker */
@@ -167,6 +169,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) iter.start =__vmalloc (file_size,GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,PAGE_KERNEL );if (!iter.start) { +mutex_unlock (&gpu->mmu->lock);dev_warn (gpu->dev,"failed to allocate devcoredump file\n" );return ; }
@@ -234,6 +237,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) obj->base.size); } +mutex_unlock (&gpu->mmu->lock); +etnaviv_core_dump_header (&iter,ETDUMP_BUF_END , iter.data);dev_coredumpv (gpu->dev, iter.start, iter.data - iter.start,GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/70 net: aquantia: tx clean budget logic error
In reply to Sasha LevinFrom: Igor Russkikh <[email protected]>
[ Upstream commit 31bafc49a7736989e4c2d9f7280002c66536e590 ]
In case no other traffic happening on the ring, full tx cleanup may not be completed. That may cause socket buffer to overflow and tx traffic to stuck until next activity on the ring happens.
This is due to logic error in budget variable decrementor. Variable is compared with zero, and then post decremented, causing it to become MAX_INT. Solution is remove decrementor from the for statement and rewrite it in a clear way.
--- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +4 -3
@@ -139,10 +139,10 @@ void aq_ring_queue_stop(struct aq_ring_s *ring)bool aq_ring_tx_clean (struct aq_ring_s *self) {struct device *dev =aq_nic_get_dev (self->aq_nic); -unsigned int budget =AQ_CFG_TX_CLEAN_BUDGET ; +unsigned int budget; -for (; self->sw_head != self->hw_head && budget--; - self->sw_head =aq_ring_next_dx (self, self->sw_head)) { +for (budget =AQ_CFG_TX_CLEAN_BUDGET ; + budget && self->sw_head != self->hw_head; budget--) {struct aq_ring_buff_s *buff = &self->buff_ring[self->sw_head];if (likely (buff->is_mapped)) {
@@ -167,6 +167,7 @@ bool aq_ring_tx_clean(struct aq_ring_s *self) buff->pa =0U ; buff->eop_index =0xffffU ; + self->sw_head =aq_ring_next_dx (self, self->sw_head); }return !!budget;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/70 net: aquantia: fix LRO with FCS error
In reply to Sasha LevinFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit eaeb3b7494ba9159323814a8ce8af06a9277d99b ]
Driver stops producing skbs on ring if a packet with FCS error was coalesced into LRO session. Ring gets hang forever.
Thats a logical error in driver processing descriptors:
When rx_stat indicates MAC Error, next pointer and eop flags are not filled. This confuses driver so it waits for descriptor 0 to be filled by HW.
Solution is fill next pointer and eop flag even for packets with FCS error.
--- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +32 -29
@@ -702,38 +702,41 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,if ((rx_stat &BIT (0 )) || rxd_wb->type &0x1000U ) {/* MAC error or DMA error */ buff->is_error =1U ; - }else { -if (self->aq_nic_cfg->is_rss) { -/* last 4 byte */ -u16 rss_type = rxd_wb->type &0xFU ; - -if (rss_type && rss_type <0x8U ) { - buff->is_hash_l4 = (rss_type ==0x4 || - rss_type ==0x5 ); - buff->rss_hash = rxd_wb->rss_hash; - } + } +if (self->aq_nic_cfg->is_rss) { +/* last 4 byte */ +u16 rss_type = rxd_wb->type &0xFU ; + +if (rss_type && rss_type <0x8U ) { + buff->is_hash_l4 = (rss_type ==0x4 || + rss_type ==0x5 ); + buff->rss_hash = rxd_wb->rss_hash; } + } -if (HW_ATL_B0_RXD_WB_STAT2_EOP & rxd_wb->status) { - buff->len = rxd_wb->pkt_len % -AQ_CFG_RX_FRAME_MAX ; - buff->len = buff->len ? - buff->len :AQ_CFG_RX_FRAME_MAX ; - buff->next =0U ; - buff->is_eop =1U ; +if (HW_ATL_B0_RXD_WB_STAT2_EOP & rxd_wb->status) { + buff->len = rxd_wb->pkt_len % +AQ_CFG_RX_FRAME_MAX ; + buff->len = buff->len ? + buff->len :AQ_CFG_RX_FRAME_MAX ; + buff->next =0U ; + buff->is_eop =1U ; + }else { + buff->len = + rxd_wb->pkt_len >AQ_CFG_RX_FRAME_MAX ? +AQ_CFG_RX_FRAME_MAX : rxd_wb->pkt_len; + +if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT & + rxd_wb->status) { +/* LRO */ + buff->next = rxd_wb->next_desc_ptr; + ++ring->stats.rx.lro_packets; }else { -if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT & - rxd_wb->status) { -/* LRO */ - buff->next = rxd_wb->next_desc_ptr; - ++ring->stats.rx.lro_packets; - }else { -/* jumbo */ - buff->next = -aq_ring_next_dx (ring, - ring->hw_head); - ++ring->stats.rx.jumbo_packets; - } +/* jumbo */ + buff->next = +aq_ring_next_dx (ring, + ring->hw_head); + ++ring->stats.rx.jumbo_packets; } } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/70 i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr
In reply to Sasha LevinFrom: Yingjoe Chen <[email protected]>
[ Upstream commit a0692f0eef91354b62c2b4c94954536536be5425 ]
If I2C_M_RECV_LEN check failed, msgs[i].buf allocated by memdup_user will not be freed. Pump index up so it will be freed.
--- drivers/i2c/i2c-dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/i2c-dev.c +1 -0
@@ -283,6 +283,7 @@ static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client, msgs[i].len < 1 || msgs[i].buf[0] < 1 || msgs[i].len < msgs[i].buf[0] + I2C_SMBUS_BLOCK_MAX) { + i++; res = -EINVAL ;break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/70 i2c: mlxcpld: Fix wrong initialization order in probe
In reply to Sasha LevinFrom: Vadim Pasternak <[email protected]>
[ Upstream commit 13067ef73f337336e3149f5bb9f3fd05fe7f87a0 ]
Fix wrong order in probing routine initialization - field base_addr' is used before it's initialized. Move assignment of 'priv->base_addr to the beginning, prior the call to mlxcpld_i2c_read_comm(). Wrong order caused the first read of capability register to be executed at wrong offset 0x0 instead of 0x2000. By chance it was a "good garbage" at 0x0 offset.
--- drivers/i2c/busses/i2c-mlxcpld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-mlxcpld.c +1 -1
@@ -503,6 +503,7 @@ static int mlxcpld_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); priv->dev = &pdev->dev; + priv->base_addr =MLXPLAT_CPLD_LPC_I2C_BASE_ADDR ;/* Register with i2c layer */ mlxcpld_i2c_adapter.timeout =usecs_to_jiffies (MLXCPLD_I2C_XFER_TO );
@@ -518,7 +519,6 @@ static int mlxcpld_i2c_probe(struct platform_device *pdev) mlxcpld_i2c_adapter.nr = pdev->id; priv->adap = mlxcpld_i2c_adapter; priv->adap.dev.parent = &pdev->dev; - priv->base_addr =MLXPLAT_CPLD_LPC_I2C_BASE_ADDR ;i2c_set_adapdata (&priv->adap, priv); err =i2c_add_numbered_adapter (&priv->adap);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/70 ALSA: hda - Force polling mode on CNL for fixing codec communication
In reply to Sasha LevinFrom: Bard Liao <[email protected]>
[ Upstream commit fa763f1b2858752e6150ffff46886a1b7faffc82 ]
We observed the same issue as reported by commit a8d7bde23e7130686b7662 ("ALSA: hda - Force polling mode on CFL for fixing codec communication") We don't have a better solution. So apply the same workaround to CNL.
--- sound/pci/hda/hda_intel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/hda/hda_intel.c +3 -2
@@ -375,6 +375,7 @@ enum {#define IS_BXT (pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)#define IS_CFL (pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) +#define IS_CNL (pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8)static char *driver_short_names[] = { [AZX_DRIVER_ICH ] ="HDA Intel" ,
@@ -1700,8 +1701,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,else chip->bdl_pos_adj = bdl_pos_adj[dev]; -/* Workaround for a communication error on CFL (bko#199007) */ -if (IS_CFL (pci)) +/* Workaround for a communication error on CFL (bko#199007) and CNL */ +if (IS_CFL (pci) ||IS_CNL (pci)) chip->polling_mode =1 ; err =azx_bus_init (chip, model[dev], &pci_hda_io_ops);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/70 configfs: Fix use-after-free when accessing sd->s_dentry
In reply to Sasha LevinFrom: Sahitya Tummala <[email protected]>
[ Upstream commit f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 ]
In the vfs_statx() context, during path lookup, the dentry gets added to sd->s_dentry via configfs_attach_attr(). In the end, vfs_statx() kills the dentry by calling path_put(), which invokes configfs_d_iput(). Ideally, this dentry must be removed from sd->s_dentry but it doesn't if the sd->s_count >= 3. As a result, sd->s_dentry is holding reference to a stale dentry pointer whose memory is already freed up. This results in use-after-free issue, when this stale sd->s_dentry is accessed later in configfs_readdir() path.
This issue can be easily reproduced, by running the LTP test case - sh fs_racer_file_list.sh /config
(https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/fs/racer/fs_racer_file_list.sh)
--- fs/configfs/dir.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/configfs/dir.c +6 -8
@@ -58,15 +58,13 @@ static void configfs_d_iput(struct dentry * dentry,if (sd) {/* Coordinate with configfs_readdir */ spin_lock (&configfs_dirent_lock); -/* Coordinate with configfs_attach_attr where will increase -* sd->s_count and update sd->s_dentry to new allocated one. -* Only set sd->dentry to null when this dentry is the only -* sd owner. -* If not do so, configfs_d_iput may run just after -* configfs_attach_attr and set sd->s_dentry to null -* even it's still in use. +/* +* Set sd->s_dentry to null only when this dentry is the one +* that is going to be killed. Otherwise configfs_d_iput may +* run just after configfs_attach_attr and set sd->s_dentry to +* NULL even it's still in use. */ -if (atomic_read (&sd->s_count) <=2 ) +if (sd->s_dentry == dentry) sd->s_dentry =NULL ;spin_unlock (&configfs_dirent_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/70 perf data: Fix 'strncat may truncate' build failure with recent gcc
In reply to Sasha LevinFrom: Shawn Landden <[email protected]>
[ Upstream commit 97acec7df172cd1e450f81f5e293c0aa145a2797 ]
This strncat() is safe because the buffer was allocated with zalloc(), however gcc doesn't know that. Since the string always has 4 non-null bytes, just use memcpy() here.
CC /home/shawn/linux/tools/perf/util/data-convert-bt.o
In file included from /usr/include/string.h:494,
from /home/shawn/linux/tools/lib/traceevent/event-parse.h:27,
from util/data-convert-bt.c:22:
In function ‘strncat’,
inlined from ‘string_set_value’ at util/data-convert-bt.c:274:4:
/usr/include/powerpc64le-linux-gnu/bits/string_fortified.h:136:10: error: ‘__builtin_strncat’ output may be truncated copying 4 bytes from a string of length 4 [-Werror=stringop-truncation]
136 | return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~LPU-Reference: [email protected]
--- tools/perf/util/data-convert-bt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/data-convert-bt.c +1 -1
@@ -271,7 +271,7 @@ static int string_set_value(struct bt_ctf_field *field, const char *string)if (i >0 )strncpy (buffer, string, i); } -strncat (buffer + p, numstr,4 ); +memcpy (buffer + p, numstr,4 ); p +=3 ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/70 s390/zcrypt: Fix wrong dispatching for control domain CPRBs
In reply to Sasha LevinFrom: Harald Freudenberger <[email protected]>
[ Upstream commit 7379e652797c0b9b5f6caea1576f2dff9ce6a708 ]
The zcrypt device driver does not handle CPRBs which address a control domain correctly. This fix introduces a workaround:
The domain field of the request CPRB is checked if there is a valid domain value in there. If this is true and the value is a control only domain (a domain which is enabled in the crypto config ADM mask but disabled in the AQM mask) the CPRB is forwarded to the default usage domain. If there is no default domain, the request is rejected with an ENODEV.
This fix is important for maintaining crypto adapters. For example one LPAR can use a crypto adapter domain ('Control and Usage') but another LPAR needs to be able to maintain this adapter domain ('Control'). Scenarios like this did not work properly and the patch enables this.
--- arch/s390/include/asm/ap.h | 4 ++-- drivers/s390/crypto/ap_bus.c | 26 ++++++++++++++++++++++---- drivers/s390/crypto/ap_bus.h | 3 +++ drivers/s390/crypto/zcrypt_api.c | 17 ++++++++++++++--- 4 files changed, 41 insertions(+), 9 deletions(-)
arch/s390/include/asm/ap.h +2 -2
@@ -160,8 +160,8 @@ struct ap_config_info {unsigned char Nd;/* max # of Domains - 1 */ unsigned char _reserved3[10 ];unsigned int apm[8 ];/* AP ID mask */ -unsigned int aqm[8 ];/* AP queue mask */ -unsigned int adm[8 ];/* AP domain mask */ +unsigned int aqm[8 ];/* AP (usage) queue mask */ +unsigned int adm[8 ];/* AP (control) domain mask */ unsigned char _reserved4[16 ]; }__aligned(8) ;
drivers/s390/crypto/ap_bus.c +22 -4
@@ -254,19 +254,37 @@ static inline int ap_test_config_card_id(unsigned int id) }/* -* ap_test_config_domain(): Test, whether an AP usage domain is configured. +* ap_test_config_usage_domain(): Test, whether an AP usage domain +* is configured. * @domain AP usage domain ID * * Returns 0 if the usage domain is not configured * 1 if the usage domain is configured or * if the configuration information is not available */ -static inline int ap_test_config_domain (unsigned int domain) +int ap_test_config_usage_domain (unsigned int domain) {if (!ap_configuration)/* QCI not supported */ return domain <16 ;return ap_test_config (ap_configuration->aqm, domain); } +EXPORT_SYMBOL (ap_test_config_usage_domain); + +/* +* ap_test_config_ctrl_domain(): Test, whether an AP control domain +* is configured. +* @domain AP control domain ID +* +* Returns 1 if the control domain is configured +* 0 in all other cases +*/ +int ap_test_config_ctrl_domain (unsigned int domain) +{ +if (!ap_configuration)/* QCI not supported */ +return 0 ; +return ap_test_config (ap_configuration->adm, domain); +} +EXPORT_SYMBOL (ap_test_config_ctrl_domain);/** * ap_query_queue(): Check if an AP queue is available.
@@ -1267,7 +1285,7 @@ static void ap_select_domain(void) best_domain =-1 ; max_count =0 ;for (i =0 ; i <AP_DOMAINS ; i++) { -if (!ap_test_config_domain (i) || +if (!ap_test_config_usage_domain (i) || !test_bit_inv (i, ap_perms.aqm))continue ; count =0 ;
@@ -1442,7 +1460,7 @@ static void _ap_scan_bus_adapter(int id) (void *)(long ) qid, __match_queue_device_with_qid); aq = dev ?to_ap_queue (dev) :NULL ; -if (!ap_test_config_domain (dom)) { +if (!ap_test_config_usage_domain (dom)) {if (dev) {/* Queue device exists but has been * removed from configuration.
drivers/s390/crypto/ap_bus.h +3 -0
@@ -251,6 +251,9 @@ void ap_wait(enum ap_wait wait);void ap_request_timeout (struct timer_list *t);void ap_bus_force_rescan (void ); +int ap_test_config_usage_domain (unsigned int domain); +int ap_test_config_ctrl_domain (unsigned int domain); +void ap_queue_init_reply (struct ap_queue *aq,struct ap_message *ap_msg);struct ap_queue *ap_queue_create (ap_qid_t qid,int device_type);void ap_queue_prepare_remove (struct ap_queue *aq);
drivers/s390/crypto/zcrypt_api.c +14 -3
@@ -822,7 +822,7 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,struct ap_message ap_msg;unsigned int weight, pref_weight;unsigned int func_code; -unsigned short *domain; +unsigned short *domain, tdom;int qid =0 , rc = -ENODEV ;struct module *mod;
@@ -834,6 +834,17 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,if (rc) goto out; +/* +* If a valid target domain is set and this domain is NOT a usage +* domain but a control only domain, use the default domain as target. +*/ + tdom = *domain; +if (tdom >=0 && tdom <AP_DOMAINS && + !ap_test_config_usage_domain (tdom) && +ap_test_config_ctrl_domain (tdom) && + ap_domain_index >=0 ) + tdom = ap_domain_index; + pref_zc =NULL ; pref_zq =NULL ;spin_lock (&zcrypt_list_lock);
@@ -856,8 +867,8 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,/* check if device is online and eligible */ if (!zq->online || !zq->ops->send_cprb || - ((*domain != (unsigned short )AUTOSELECT ) && - (*domain !=AP_QID_QUEUE (zq->queue->qid)))) + (tdom != (unsigned short )AUTOSELECT && + tdom !=AP_QID_QUEUE (zq->queue->qid)))continue ;/* check if device node has admission for this queue */ if (!zcrypt_check_queue(perms,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/70 perf namespace: Protect reading thread's namespace
In reply to Sasha LevinFrom: Namhyung Kim <[email protected]>
[ Upstream commit 6584140ba9e6762dd7ec73795243289b914f31f9 ]
It seems that the current code lacks holding the namespace lock in thread__namespaces(). Otherwise it can see inconsistent results.
--- tools/perf/util/thread.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/perf/util/thread.c +13 -2
@@ -132,7 +132,7 @@ void thread__put(struct thread *thread) } } -struct namespaces *thread__namespaces (const struct thread *thread) +static struct namespaces *__thread__namespaces (const struct thread *thread) {if (list_empty (&thread->namespaces_list))return NULL ;
@@ -140,10 +140,21 @@ struct namespaces *thread__namespaces(const struct thread *thread) return list_first_entry(&thread->namespaces_list, struct namespaces, list); } +struct namespaces *thread__namespaces (const struct thread *thread) +{ +struct namespaces *ns; + +down_read ((struct rw_semaphore *)&thread->namespaces_lock); + ns =__thread__namespaces (thread); +up_read ((struct rw_semaphore *)&thread->namespaces_lock); + +return ns; +} +static int __thread__set_namespaces (struct thread *thread,u64 timestamp,struct namespaces_event *event) { -struct namespaces *new, *curr =thread__namespaces (thread); +struct namespaces *new, *curr =__thread__namespaces (thread); new =namespaces__new (event);if (!new)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/70 perf record: Fix s390 missing module symbol and warning for non-root users
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 6738028dd57df064b969d8392c943ef3b3ae705d ]
Command 'perf record' and 'perf report' on a system without kernel debuginfo packages uses /proc/kallsyms and /proc/modules to find addresses for kernel and module symbols. On x86 this works for root and non-root users.
On s390, when invoked as non-root user, many of the following warnings are shown and module symbols are missing:
proc/{kallsyms,modules} inconsistency while looking for
"[sha1_s390]" module!
Command 'perf record' creates a list of module start addresses by parsing the output of /proc/modules and creates a PERF_RECORD_MMAP record for the kernel and each module. The following function call sequence is executed:
machine__create_kernel_maps
machine__create_module
modules__parse
machine__create_module --> for each line in /proc/modules
arch__fix_module_text_startFunction arch__fix_module_text_start() is s390 specific. It opens file /sys/module/<name>/sections/.text to extract the module's .text section start address. On s390 the module loader prepends a header before the first section, whereas on x86 the module's text section address is identical the the module's load address.
However module section files are root readable only. For non-root the read operation fails and machine__create_module() returns an error. Command perf record does not generate any PERF_RECORD_MMAP record for loaded modules. Later command perf report complains about missing module maps.
To fix this function arch__fix_module_text_start() always returns success. For root users there is no change, for non-root users the module's load address is used as module's text start address (the prepended header then counts as part of the text section).
This enable non-root users to use module symbols and avoid the warning when perf report is executed.
Output before:
[tmricht@m83lp54 perf]$ ./perf report -D | fgrep MMAP 0 0x168 [0x50]: PERF_RECORD_MMAP ... x [kernel.kallsyms]_text
Output after:
[tmricht@m83lp54 perf]$ ./perf report -D | fgrep MMAP
0 0x168 [0x50]: PERF_RECORD_MMAP ... x [kernel.kallsyms]_text 0 0x1b8 [0x98]: PERF_RECORD_MMAP ... x /lib/modules/.../autofs4.ko.xz 0 0x250 [0xa8]: PERF_RECORD_MMAP ... x /lib/modules/.../sha_common.ko.xz 0 0x2f8 [0x98]: PERF_RECORD_MMAP ... x /lib/modules/.../des_generic.ko.xz
--- tools/perf/arch/s390/util/machine.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
tools/perf/arch/s390/util/machine.c +6 -3
@@ -5,16 +5,19 @@#include "util.h" #include "machine.h" #include "api/fs/fs.h" +#include "debug.h" int arch__fix_module_text_start (u64 *start,const char *name) { +u64 m_start = *start;char path[PATH_MAX ];snprintf (path,PATH_MAX ,"module/%.*s/sections/.text" , (int )strlen (name) -2 , name +1 ); - -if (sysfs__read_ull (path, (unsigned long long *)start) <0 ) -return -1 ; +if (sysfs__read_ull (path, (unsigned long long *)start) <0 ) { +pr_debug2 ("Using module %s start:%#lx\n" , path, m_start); + *start = m_start; + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/70 ia64: fix build errors by exporting paddr_to_nid()
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit 9a626c4a6326da4433a0d4d4a8a7d1571caf1ed3 ]
Fix build errors on ia64 when DISCONTIGMEM=y and NUMA=y by exporting paddr_to_nid().
Fixes these build errors:
ERROR: "paddr_to_nid" [sound/core/snd-pcm.ko] undefined!
ERROR: "paddr_to_nid" [net/sunrpc/sunrpc.ko] undefined!
ERROR: "paddr_to_nid" [fs/cifs/cifs.ko] undefined!
ERROR: "paddr_to_nid" [drivers/video/fbdev/core/fb.ko] undefined!
ERROR: "paddr_to_nid" [drivers/usb/mon/usbmon.ko] undefined!
ERROR: "paddr_to_nid" [drivers/usb/core/usbcore.ko] undefined!
ERROR: "paddr_to_nid" [drivers/md/raid1.ko] undefined!
ERROR: "paddr_to_nid" [drivers/md/dm-mod.ko] undefined!
ERROR: "paddr_to_nid" [drivers/md/dm-crypt.ko] undefined!
ERROR: "paddr_to_nid" [drivers/md/dm-bufio.ko] undefined!
ERROR: "paddr_to_nid" [drivers/ide/ide-core.ko] undefined!
ERROR: "paddr_to_nid" [drivers/ide/ide-cd_mod.ko] undefined!
ERROR: "paddr_to_nid" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "paddr_to_nid" [drivers/char/agp/agpgart.ko] undefined!
ERROR: "paddr_to_nid" [drivers/block/nbd.ko] undefined!
ERROR: "paddr_to_nid" [drivers/block/loop.ko] undefined!
ERROR: "paddr_to_nid" [drivers/block/brd.ko] undefined!
ERROR: "paddr_to_nid" [crypto/ccm.ko] undefined!
--- arch/ia64/mm/numa.c | 1 + 1 file changed, 1 insertion(+)
arch/ia64/mm/numa.c +1 -0
@@ -55,6 +55,7 @@ paddr_to_nid(unsigned long paddr)return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ?-1 :0 ); } +EXPORT_SYMBOL (paddr_to_nid);#if defined(CONFIG_SPARSEMEM ) && defined(CONFIG_NUMA )/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 48/70 dpaa_eth: use only online CPU portals
In reply to Sasha LevinFrom: Madalin Bucur <[email protected]>
[ Upstream commit 7aae703f8096d21e34ce5f34f16715587bc30902 ]
Make sure only the portals for the online CPUs are used. Without this change, there are issues when someone boots with maxcpus=n, with n < actual number of cores available as frames either received or corresponding to the transmit confirmation path would be offered for dequeue to the offline CPU portals, getting lost.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 ++++----- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +4 -5
@@ -780,7 +780,7 @@ static void dpaa_eth_add_channel(u16 channel)struct qman_portal *portal;int cpu; -for_each_cpu (cpu, cpus) { +for_each_cpu_and (cpu, cpus, cpu_online_mask) { portal =qman_get_affine_portal (cpu);qman_p_static_dequeue_add (portal, pool); }
@@ -896,7 +896,7 @@ static void dpaa_fq_setup(struct dpaa_priv *priv,u16 channels[NR_CPUS ];struct dpaa_fq *fq; -for_each_cpu (cpu, affine_cpus) +for_each_cpu_and (cpu, affine_cpus, cpu_online_mask) channels[num_portals++] =qman_affine_channel (cpu);if (num_portals ==0 )
@@ -2174,7 +2174,6 @@ static int dpaa_eth_poll(struct napi_struct *napi, int budget)if (cleaned < budget) {napi_complete_done (napi, cleaned);qman_p_irqsource_add (np->p,QM_PIRQ_DQRI ); - }else if (np->down) {qman_p_irqsource_add (np->p,QM_PIRQ_DQRI ); }
@@ -2448,7 +2447,7 @@ static void dpaa_eth_napi_enable(struct dpaa_priv *priv)struct dpaa_percpu_priv *percpu_priv;int i; -for_each_possible_cpu (i) { +for_each_online_cpu (i) { percpu_priv =per_cpu_ptr (priv->percpu_priv, i); percpu_priv->np.down =0 ;
@@ -2461,7 +2460,7 @@ static void dpaa_eth_napi_disable(struct dpaa_priv *priv)struct dpaa_percpu_priv *percpu_priv;int i; -for_each_possible_cpu (i) { +for_each_online_cpu (i) { percpu_priv =per_cpu_ptr (priv->percpu_priv, i); percpu_priv->np.down =1 ;
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +2 -2
@@ -569,7 +569,7 @@ static int dpaa_set_coalesce(struct net_device *dev,qman_dqrr_get_ithresh (portal, &prev_thresh);/* set new values */ -for_each_cpu (cpu, cpus) { +for_each_cpu_and (cpu, cpus, cpu_online_mask) { portal =qman_get_affine_portal (cpu); res =qman_portal_set_iperiod (portal, period);if (res)
@@ -586,7 +586,7 @@ static int dpaa_set_coalesce(struct net_device *dev, revert_values:/* restore previous values */ -for_each_cpu (cpu, cpus) { +for_each_cpu_and (cpu, cpus, cpu_online_mask) {if (!needs_revert[cpu])continue ; portal =qman_get_affine_portal (cpu);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 49/70 xen/pvcalls: Remove set but not used variable
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 41349672e3cbc2e8349831f21253509c3415aa2b ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/xen/pvcalls-front.c: In function pvcalls_front_sendmsg:drivers/xen/pvcalls-front.c:543:25: warning: variable bedata set but not used [-Wunused-but-set-variable] drivers/xen/pvcalls-front.c: In function pvcalls_front_recvmsg:drivers/xen/pvcalls-front.c:638:25: warning: variable bedata set but not used [-Wunused-but-set-variable]
They are never used since introduction.
--- drivers/xen/pvcalls-front.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/xen/pvcalls-front.c +0 -4
@@ -540,7 +540,6 @@ out:int pvcalls_front_sendmsg (struct socket *sock,struct msghdr *msg,size_t len) { -struct pvcalls_bedata *bedata;struct sock_mapping *map;int sent, tot_sent =0 ;int count =0 , flags;
@@ -552,7 +551,6 @@ int pvcalls_front_sendmsg(struct socket *sock, struct msghdr *msg, map =pvcalls_enter_sock (sock);if (IS_ERR (map))return PTR_ERR (map); - bedata =dev_get_drvdata (&pvcalls_front_dev->dev);mutex_lock (&map->active.out_mutex);if ((flags &MSG_DONTWAIT ) && !pvcalls_front_write_todo (map)) {
@@ -635,7 +633,6 @@ out:int pvcalls_front_recvmsg (struct socket *sock,struct msghdr *msg,size_t len,int flags) { -struct pvcalls_bedata *bedata;int ret;struct sock_mapping *map;
@@ -645,7 +642,6 @@ int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, map =pvcalls_enter_sock (sock);if (IS_ERR (map))return PTR_ERR (map); - bedata =dev_get_drvdata (&pvcalls_front_dev->dev);mutex_lock (&map->active.in_mutex);if (len >XEN_FLEX_RING_SIZE (PVCALLS_RING_ORDER ))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 50/70 xenbus: Avoid deadlock during suspend due to open transactions
In reply to Sasha LevinFrom: Ross Lagerwall <[email protected]>
[ Upstream commit d10e0cc113c9e1b64b5c6e3db37b5c839794f3df ]
During a suspend/resume, the xenwatch thread waits for all outstanding xenstore requests and transactions to complete. This does not work correctly for transactions started by userspace because it waits for them to complete after freezing userspace threads which means the transactions have no way of completing, resulting in a deadlock. This is trivial to reproduce by running this script and then suspending the VM:
import pyxs, time
c = pyxs.client.Client(xen_bus_path="/dev/xen/xenbus") c.connect()
c.transaction()
time.sleep(3600)
Even if this deadlock were resolved, misbehaving userspace should not prevent a VM from being migrated. So, instead of waiting for these transactions to complete before suspending, store the current generation id for each transaction when it is started. The global generation id is incremented during resume. If the caller commits the transaction and the generation id does not match the current generation id, return EAGAIN so that they try again. If the transaction was instead discarded, return OK since no changes were made anyway.
This only affects users of the xenbus file interface. In-kernel users of xenbus are assumed to be well-behaved and complete all transactions before freezing.
--- drivers/xen/xenbus/xenbus.h | 3 +++ drivers/xen/xenbus/xenbus_dev_frontend.c | 18 ++++++++++++++++++ drivers/xen/xenbus/xenbus_xs.c | 7 +++++-- 3 files changed, 26 insertions(+), 2 deletions(-)
drivers/xen/xenbus/xenbus.h +3 -0
@@ -83,6 +83,7 @@ struct xb_req_data {int num_vecs;int err;enum xb_req_state state; +bool user_req;void (*cb)(struct xb_req_data *);void *par; };
@@ -133,4 +134,6 @@ void xenbus_ring_ops_init(void);int xenbus_dev_request_and_reply (struct xsd_sockmsg *msg,void *par);void xenbus_dev_queue_reply (struct xb_req_data *req); +extern unsigned int xb_dev_generation_id; +#endif
drivers/xen/xenbus/xenbus_dev_frontend.c +18 -0
@@ -62,6 +62,8 @@#include "xenbus.h" +unsigned int xb_dev_generation_id; +/* * An element of a list of outstanding transactions, for which we're * still waiting a reply.
@@ -69,6 +71,7 @@struct xenbus_transaction_holder {struct list_head list;struct xenbus_transaction handle; +unsigned int generation_id; };/*
@@ -441,6 +444,7 @@ static int xenbus_write_transaction(unsigned msg_type, rc = -ENOMEM ; goto out; } + trans->generation_id = xb_dev_generation_id;list_add (&trans->list, &u->transactions); }else if (msg->hdr.tx_id !=0 && !xenbus_get_transaction (u, msg->hdr.tx_id))
@@ -449,6 +453,20 @@ static int xenbus_write_transaction(unsigned msg_type, !(msg->hdr.len == 2 && (!strcmp(msg->body, "T") || !strcmp(msg->body, "F"))))return xenbus_command_reply (u,XS_ERROR ,"EINVAL" ); + else if (msg_type == XS_TRANSACTION_END) { + trans =xenbus_get_transaction (u, msg->hdr.tx_id); +if (trans && trans->generation_id != xb_dev_generation_id) { +list_del (&trans->list); +kfree (trans); +if (!strcmp (msg->body,"T" )) +return xenbus_command_reply (u,XS_ERROR , +"EAGAIN" ); +else +return xenbus_command_reply (u, +XS_TRANSACTION_END , +"OK" ); + } + } rc =xenbus_dev_request_and_reply (&msg->hdr, u);if (rc && trans) {
drivers/xen/xenbus/xenbus_xs.c +5 -2
@@ -105,6 +105,7 @@ static void xs_suspend_enter(void)static void xs_suspend_exit (void ) { + xb_dev_generation_id++;spin_lock (&xs_state_lock); xs_suspend_active--;spin_unlock (&xs_state_lock);
@@ -125,7 +126,7 @@ static uint32_t xs_request_enter(struct xb_req_data *req)spin_lock (&xs_state_lock); } -if (req->type ==XS_TRANSACTION_START ) +if (req->type ==XS_TRANSACTION_START && !req->user_req) xs_state_users++; xs_state_users++; rq_id = xs_request_id++;
@@ -140,7 +141,7 @@ void xs_request_exit(struct xb_req_data *req)spin_lock (&xs_state_lock); xs_state_users--;if ((req->type ==XS_TRANSACTION_START && req->msg.type ==XS_ERROR ) || - (req->type ==XS_TRANSACTION_END && + (req->type ==XS_TRANSACTION_END && !req->user_req && !WARN_ON_ONCE (req->msg.type ==XS_ERROR && !strcmp (req->body,"ENOENT" )))) xs_state_users--;
@@ -286,6 +287,7 @@ int xenbus_dev_request_and_reply(struct xsd_sockmsg *msg, void *par) req->num_vecs =1 ; req->cb = xenbus_dev_queue_reply; req->par = par; + req->user_req = true;xs_send (req, msg);
@@ -313,6 +315,7 @@ static void *xs_talkv(struct xenbus_transaction t, req->vec = iovec; req->num_vecs = num_vecs; req->cb = xs_wake_up; + req->user_req = false; msg.req_id =0 ; msg.tx_id = t.id;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 51/70 dfs_cache: fix a wrong use of kfree in flush_cache_ent()
In reply to Sasha LevinFrom: Gen Zhang <[email protected]>
[ Upstream commit 50fbc13dc12666f3604dc2555a47fc8c4e29162b ]
In flush_cache_ent(), 'ce->ce_path' is allocated by kstrdup_const(). It should be freed by kfree_const(), rather than kfree().
--- fs/cifs/dfs_cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/dfs_cache.c +2 -2
@@ -131,7 +131,7 @@ static inline void flush_cache_ent(struct dfs_cache_entry *ce)return ;hlist_del_init_rcu (&ce->ce_hlist); -kfree (ce->ce_path); +kfree_const (ce->ce_path);free_tgts (ce); dfs_cache_count--;call_rcu (&ce->ce_rcu, free_cache_entry);
@@ -421,7 +421,7 @@ alloc_cache_entry(const char *path, const struct dfs_info3_param *refs, rc =copy_ref_data (refs, numrefs, ce,NULL );if (rc) { -kfree (ce->ce_path); +kfree_const (ce->ce_path);kmem_cache_free (dfs_cache_slab, ce); ce =ERR_PTR (rc); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/70 KVM: PPC: Book3S HV: Use new mutex to synchronize MMU setup
In reply to Sasha LevinFrom: Paul Mackerras <[email protected]>
[ Upstream commit 0d4ee88d92884c661fcafd5576da243aa943dc24 ]
Currently the HV KVM code uses kvm->lock in conjunction with a flag, kvm->arch.mmu_ready, to synchronize MMU setup and hold off vcpu execution until the MMU-related data structures are ready. However, this means that kvm->lock is being taken inside vcpu->mutex, which is contrary to Documentation/virtual/kvm/locking.txt and results in lockdep warnings.
To fix this, we add a new mutex, kvm->arch.mmu_setup_lock, which nests inside the vcpu mutexes, and is taken in the places where kvm->lock was taken that are related to MMU setup.
Additionally we take the new mutex in the vcpu creation code at the point where we are creating a new vcore, in order to provide mutual exclusion with kvmppc_update_lpcr() and ensure that an update to kvm->arch.lpcr doesn't get missed, which could otherwise lead to a stale vcore->lpcr value.
--- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kvm/book3s_64_mmu_hv.c | 36 ++++++++++++++--------------- arch/powerpc/kvm/book3s_hv.c | 31 ++++++++++++++++++------- 3 files changed, 42 insertions(+), 26 deletions(-)
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -317,6 +317,7 @@ struct kvm_arch {#endif struct kvmppc_ops *kvm_ops;#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +struct mutex mmu_setup_lock;/* nests inside vcpu mutexes */ u64 l1_ptcr;int max_nested_lpid;struct kvm_nested_guest *nested_guests[KVM_MAX_NESTED_GUESTS ];
arch/powerpc/kvm/book3s_64_mmu_hv.c +18 -18
@@ -63,7 +63,7 @@ struct kvm_resize_hpt {struct work_struct work;u32 order; -/* These fields protected by kvm->lock */ +/* These fields protected by kvm->arch.mmu_setup_lock */ /* Possible values and their usage: * <0 an error occurred during allocation,
@@ -73,7 +73,7 @@ struct kvm_resize_hpt {int error;/* Private to the work thread, until error != -EBUSY, -* then protected by kvm->lock. +* then protected by kvm->arch.mmu_setup_lock. */ struct kvm_hpt_info hpt; };
@@ -139,7 +139,7 @@ long kvmppc_alloc_reset_hpt(struct kvm *kvm, int order)long err = -EBUSY ;struct kvm_hpt_info info; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock);if (kvm->arch.mmu_ready) { kvm->arch.mmu_ready =0 ;/* order mmu_ready vs. vcpus_running */
@@ -183,7 +183,7 @@ out:/* Ensure that each vcpu will flush its TLB on next entry. */ cpumask_setall (&kvm->arch.need_tlb_flush); -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return err; }
@@ -1447,7 +1447,7 @@ static void resize_hpt_pivot(struct kvm_resize_hpt *resize)static void resize_hpt_release (struct kvm *kvm,struct kvm_resize_hpt *resize) { -if (WARN_ON (!mutex_is_locked (&kvm->lock))) +if (WARN_ON (!mutex_is_locked (&kvm->arch.mmu_setup_lock)))return ;if (!resize)
@@ -1474,14 +1474,14 @@ static void resize_hpt_prepare_work(struct work_struct *work)if (WARN_ON (resize->error != -EBUSY ))return ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock);/* Request is still current? */ if (kvm->arch.resize_hpt = resize) {/* We may request large allocations here: -* do not sleep with kvm->lock held for a while. +* do not sleep with kvm->arch.mmu_setup_lock held for a while. */ -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);resize_hpt_debug (resize,"resize_hpt_prepare_work(): order = %d\n" , resize->order);
@@ -1494,9 +1494,9 @@ static void resize_hpt_prepare_work(struct work_struct *work)if (WARN_ON (err = -EBUSY )) err = -EINPROGRESS ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock);/* It is possible that kvm->arch.resize_hpt != resize -* after we grab kvm->lock again. +* after we grab kvm->arch.mmu_setup_lock again. */ }
@@ -1505,7 +1505,7 @@ static void resize_hpt_prepare_work(struct work_struct *work)if (kvm->arch.resize_hpt != resize)resize_hpt_release (kvm, resize); -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock); } long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm,
@@ -1522,7 +1522,7 @@ long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm,if (shift && ((shift <18 ) || (shift >46 )))return -EINVAL ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock); resize = kvm->arch.resize_hpt;
@@ -1565,7 +1565,7 @@ long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm, ret =100 ;/* estimated time in ms */ out: -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return ret; }
@@ -1588,7 +1588,7 @@ long kvm_vm_ioctl_resize_hpt_commit(struct kvm *kvm,if (shift && ((shift <18 ) || (shift >46 )))return -EINVAL ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock); resize = kvm->arch.resize_hpt;
@@ -1625,7 +1625,7 @@ out:smp_mb (); out_no_hpt:resize_hpt_release (kvm, resize); -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return ret; }
@@ -1868,7 +1868,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,return -EINVAL ;/* lock out vcpus from running while we're doing this */ -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock); mmu_ready = kvm->arch.mmu_ready;if (mmu_ready) { kvm->arch.mmu_ready =0 ;/* temporarily */
@@ -1876,7 +1876,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,smp_mb ();if (atomic_read (&kvm->arch.vcpus_running)) { kvm->arch.mmu_ready =1 ; -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return -EBUSY ; } }
@@ -1963,7 +1963,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,/* Order HPTE updates vs. mmu_ready */ smp_wmb (); kvm->arch.mmu_ready = mmu_ready; -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);if (err)return err;
arch/powerpc/kvm/book3s_hv.c +23 -8
@@ -2257,11 +2257,17 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,pr_devel ("KVM: collision on id %u" , id); vcore =NULL ; }else if (!vcore) { +/* +* Take mmu_setup_lock for mutual exclusion +* with kvmppc_update_lpcr(). +*/ err = -ENOMEM ; vcore =kvmppc_vcore_create (kvm, id & ~(kvm->arch.smt_mode -1 )); +mutex_lock (&kvm->arch.mmu_setup_lock); kvm->arch.vcores[core] = vcore; kvm->arch.online_vcores++; +mutex_unlock (&kvm->arch.mmu_setup_lock); } }mutex_unlock (&kvm->lock);
@@ -3820,7 +3826,7 @@ static int kvmhv_setup_mmu(struct kvm_vcpu *vcpu)int r =0 ;struct kvm *kvm = vcpu->kvm; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock);if (!kvm->arch.mmu_ready) {if (!kvm_is_radix (kvm)) r =kvmppc_hv_setup_htab_rma (vcpu);
@@ -3830,7 +3836,7 @@ static int kvmhv_setup_mmu(struct kvm_vcpu *vcpu) kvm->arch.mmu_ready =1 ; } } -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return r; }
@@ -4435,7 +4441,8 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,/* * Update LPCR values in kvm->arch and in vcores. -* Caller must hold kvm->lock. +* Caller must hold kvm->arch.mmu_setup_lock (for mutual exclusion +* of kvm->arch.lpcr update). */ void kvmppc_update_lpcr (struct kvm *kvm,unsigned long lpcr,unsigned long mask) {
@@ -4487,7 +4494,7 @@ void kvmppc_setup_partition_table(struct kvm *kvm)/* * Set up HPT (hashed page table) and RMA (real-mode area). -* Must be called with kvm->lock held. +* Must be called with kvm->arch.mmu_setup_lock held. */ static int kvmppc_hv_setup_htab_rma (struct kvm_vcpu *vcpu) {
@@ -4575,7 +4582,10 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu) goto out_srcu; } -/* Must be called with kvm->lock held and mmu_ready = 0 and no vcpus running */ +/* +* Must be called with kvm->arch.mmu_setup_lock held and +* mmu_ready = 0 and no vcpus running. +*/ int kvmppc_switch_mmu_to_hpt (struct kvm *kvm) {if (nesting_enabled (kvm))
@@ -4592,7 +4602,10 @@ int kvmppc_switch_mmu_to_hpt(struct kvm *kvm)return 0 ; } -/* Must be called with kvm->lock held and mmu_ready = 0 and no vcpus running */ +/* +* Must be called with kvm->arch.mmu_setup_lock held and +* mmu_ready = 0 and no vcpus running. +*/ int kvmppc_switch_mmu_to_radix (struct kvm *kvm) {int err;
@@ -4697,6 +4710,8 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)char buf[32 ];int ret; +mutex_init (&kvm->arch.mmu_setup_lock); +/* Allocate the guest's logical partition ID */ lpid =kvmppc_alloc_lpid ();
@@ -5222,7 +5237,7 @@ static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg)if (kvmhv_on_pseries () && !radix)return -EINVAL ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.mmu_setup_lock);if (radix !=kvm_is_radix (kvm)) {if (kvm->arch.mmu_ready) { kvm->arch.mmu_ready =0 ;
@@ -5250,7 +5265,7 @@ static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg) err =0 ; out_unlock: -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.mmu_setup_lock);return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 53/70 KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list
In reply to Sasha LevinFrom: Paul Mackerras <[email protected]>
[ Upstream commit 1659e27d2bc1ef47b6d031abe01b467f18cb72d9 ]
Currently the Book 3S KVM code uses kvm->lock to synchronize access to the kvm->arch.rtas_tokens list. Because this list is scanned inside kvmppc_rtas_hcall(), which is called with the vcpu mutex held, taking kvm->lock cause a lock inversion problem, which could lead to a deadlock.
To fix this, we add a new mutex, kvm->arch.rtas_token_lock, which nests inside the vcpu mutexes, and use that instead of kvm->lock when accessing the rtas token list.
This removes the lockdep_assert_held() in kvmppc_rtas_tokens_free(). At this point we don't hold the new mutex, but that is OK because kvmppc_rtas_tokens_free() is only called when the whole VM is being destroyed, and at that point nothing can be looking up a token in the list.
--- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kvm/book3s.c | 1 + arch/powerpc/kvm/book3s_rtas.c | 14 ++++++-------- 3 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -305,6 +305,7 @@ struct kvm_arch {#ifdef CONFIG_PPC_BOOK3S_64 struct list_head spapr_tce_tables;struct list_head rtas_tokens; +struct mutex rtas_token_lock;DECLARE_BITMAP (enabled_hcalls,MAX_HCALL_OPCODE /4 +1 );#endif #ifdef CONFIG_KVM_MPIC
arch/powerpc/kvm/book3s.c +1 -0
@@ -878,6 +878,7 @@ int kvmppc_core_init_vm(struct kvm *kvm)#ifdef CONFIG_PPC64 INIT_LIST_HEAD_RCU (&kvm->arch.spapr_tce_tables);INIT_LIST_HEAD (&kvm->arch.rtas_tokens); +mutex_init (&kvm->arch.rtas_token_lock);#endif return kvm->arch.kvm_ops->init_vm (kvm);
arch/powerpc/kvm/book3s_rtas.c +6 -8
@@ -146,7 +146,7 @@ static int rtas_token_undefine(struct kvm *kvm, char *name) {struct rtas_token_definition *d, *tmp; -lockdep_assert_held (&kvm->lock); +lockdep_assert_held (&kvm->arch.rtas_token_lock);list_for_each_entry_safe (d, tmp, &kvm->arch.rtas_tokens, list) {if (rtas_name_matches (d->handler->name, name)) {
@@ -167,7 +167,7 @@ static int rtas_token_define(struct kvm *kvm, char *name, u64 token)bool found;int i; -lockdep_assert_held (&kvm->lock); +lockdep_assert_held (&kvm->arch.rtas_token_lock);list_for_each_entry (d, &kvm->arch.rtas_tokens, list) {if (d->token = token)
@@ -206,14 +206,14 @@ int kvm_vm_ioctl_rtas_define_token(struct kvm *kvm, void __user *argp)if (copy_from_user (&args, argp,sizeof (args)))return -EFAULT ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->arch.rtas_token_lock);if (args.token) rc =rtas_token_define (kvm, args.name, args.token);else rc =rtas_token_undefine (kvm, args.name); -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->arch.rtas_token_lock);return rc; }
@@ -245,7 +245,7 @@ int kvmppc_rtas_hcall(struct kvm_vcpu *vcpu) orig_rets = args.rets; args.rets = &args.args[be32_to_cpu (args.nargs)]; -mutex_lock (&vcpu->kvm->lock); +mutex_lock (&vcpu->kvm->arch.rtas_token_lock); rc = -ENOENT ;list_for_each_entry (d, &vcpu->kvm->arch.rtas_tokens, list) {
@@ -256,7 +256,7 @@ int kvmppc_rtas_hcall(struct kvm_vcpu *vcpu) } } -mutex_unlock (&vcpu->kvm->lock); +mutex_unlock (&vcpu->kvm->arch.rtas_token_lock);if (rc =0 ) { args.rets = orig_rets;
@@ -282,8 +282,6 @@ void kvmppc_rtas_tokens_free(struct kvm *kvm) {struct rtas_token_definition *d, *tmp; -lockdep_assert_held (&kvm->lock); -list_for_each_entry_safe (d, tmp, &kvm->arch.rtas_tokens, list) {list_del (&d->list);kfree (d);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 54/70 KVM: PPC: Book3S HV: Don't take kvm->lock around kvm_for_each_vcpu
In reply to Sasha LevinFrom: Paul Mackerras <[email protected]>
[ Upstream commit 5a3f49364c3ffa1107bd88f8292406e98c5d206c ]
Currently the HV KVM code takes the kvm->lock around calls to kvm_for_each_vcpu() and kvm_get_vcpu_by_id() (which can call kvm_for_each_vcpu() internally). However, that leads to a lock order inversion problem, because these are called in contexts where the vcpu mutex is held, but the vcpu mutexes nest within kvm->lock according to Documentation/virtual/kvm/locking.txt. Hence there is a possibility of deadlock.
To fix this, we simply don't take the kvm->lock mutex around these calls. This is safe because the implementations of kvm_for_each_vcpu() and kvm_get_vcpu_by_id() have been designed to be able to be called locklessly.
--- arch/powerpc/kvm/book3s_hv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/powerpc/kvm/book3s_hv.c +1 -8
@@ -445,12 +445,7 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu)static struct kvm_vcpu *kvmppc_find_vcpu (struct kvm *kvm,int id) { -struct kvm_vcpu *ret; - -mutex_lock (&kvm->lock); - ret =kvm_get_vcpu_by_id (kvm, id); -mutex_unlock (&kvm->lock); -return ret; +return kvm_get_vcpu_by_id (kvm, id); }static void init_vpa (struct kvm_vcpu *vcpu,struct lppaca *vpa)
@@ -1502,7 +1497,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,struct kvmppc_vcore *vc = vcpu->arch.vcore;u64 mask; -mutex_lock (&kvm->lock);spin_lock (&vc->lock);/* * If ILE (interrupt little-endian) has changed, update the
@@ -1542,7 +1536,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, mask &=0xFFFFFFFF ; vc->lpcr = (vc->lpcr & ~mask) | (new_lpcr & mask);spin_unlock (&vc->lock); -mutex_unlock (&kvm->lock); } static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/70 ALSA: fireface: Use ULL suffixes for 64-bit constants
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6954158a16404e7091cea494cd0a435ca2f90388 ]
With gcc 4.1:
sound/firewire/fireface/ff-protocol-latter.c: In function ‘latter_switch_fetching_mode’:
sound/firewire/fireface/ff-protocol-latter.c:97: warning: integer constant is too large for ‘long’ type sound/firewire/fireface/ff-protocol-latter.c: In function ‘latter_begin_session’:
sound/firewire/fireface/ff-protocol-latter.c:170: warning: integer constant is too large for ‘long’ type sound/firewire/fireface/ff-protocol-latter.c:197: warning: integer constant is too large for ‘long’ type sound/firewire/fireface/ff-protocol-latter.c:205: warning: integer constant is too large for ‘long’ type sound/firewire/fireface/ff-protocol-latter.c: In function ‘latter_finish_session’:
sound/firewire/fireface/ff-protocol-latter.c:214: warning: integer constant is too large for ‘long’ type
Fix this by adding the missing "ULL" suffixes.
Add the same suffix to the last constant, to maintain consistency.
--- sound/firewire/fireface/ff-protocol-latter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/firewire/fireface/ff-protocol-latter.c +5 -5
@@ -9,11 +9,11 @@#include "ff.h" -#define LATTER_STF 0xffff00000004 -#define LATTER_ISOC_CHANNELS 0xffff00000008 -#define LATTER_ISOC_START 0xffff0000000c -#define LATTER_FETCH_MODE 0xffff00000010 -#define LATTER_SYNC_STATUS 0x0000801c0000 +#define LATTER_STF 0xffff00000004ULL +#define LATTER_ISOC_CHANNELS 0xffff00000008ULL +#define LATTER_ISOC_START 0xffff0000000cULL +#define LATTER_FETCH_MODE 0xffff00000010ULL +#define LATTER_SYNC_STATUS 0x0000801c0000ULLstatic int parse_clock_bits (u32 data,unsigned int *rate,enum snd_ff_clock_src *src)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 56/70 arm64: fix syscall_fn_t type
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 8ef8f368ce72b5e17f7c1f1ef15c38dcfd0fef64 ]
Syscall wrappers in <asm/syscall_wrapper.h> use const struct pt_regs * as the argument type. Use const in syscall_fn_t as well to fix indirect call type mismatches with Control-Flow Integrity checking.
--- arch/arm64/include/asm/syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/syscall.h +1 -1
@@ -20,7 +20,7 @@#include <linux/compat.h> #include <linux/err.h> -typedef long (*syscall_fn_t )(struct pt_regs *regs); +typedef long (*syscall_fn_t )(const struct pt_regs *regs);extern const syscall_fn_t sys_call_table[];
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 57/70 arm64: use the correct function type in SYSCALL_DEFINE0
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 0e358bd7b7ebd27e491dabed938eae254c17fe3b ]
Although a syscall defined using SYSCALL_DEFINE0 doesn't accept parameters, use the correct function type to avoid indirect call type mismatches with Control-Flow Integrity checking.
--- arch/arm64/include/asm/syscall_wrapper.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/arm64/include/asm/syscall_wrapper.h +9 -9
@@ -30,10 +30,10 @@ } \ static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) -#define COMPAT_SYSCALL_DEFINE0 (sname) \ - asmlinkage long __arm64_compat_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \ - asmlinkage long __arm64_compat_sys_##sname(void) +#define COMPAT_SYSCALL_DEFINE0 (sname) \ + asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused); \ + ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \ + asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)#define COND_SYSCALL_COMPAT (name) \ cond_syscall(__arm64_compat_sys_##name);
@@ -62,11 +62,11 @@ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))#ifndef SYSCALL_DEFINE0 -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __arm64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ - asmlinkage long __arm64_sys_##sname(void) +#define SYSCALL_DEFINE0 (sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \ + ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ + asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)#endif #ifndef COND_SYSCALL
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 58/70 arm64: use the correct function type for __arm64_sys_ni_syscall
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 1e29ab3186e33c77dbb2d7566172a205b59fa390 ]
Calling sys_ni_syscall through a syscall_fn_t pointer trips indirect call Control-Flow Integrity checking due to a function type mismatch. Use SYSCALL_DEFINE0 for __arm64_sys_ni_syscall instead and remove the now unnecessary casts.
--- arch/arm64/kernel/sys.c | 14 +++++++++----- arch/arm64/kernel/sys32.c | 7 ++----- 2 files changed, 11 insertions(+), 10 deletions(-)
arch/arm64/kernel/sys.c +9 -5
@@ -47,22 +47,26 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality)return ksys_personality (personality); } +asmlinkage long sys_ni_syscall (void ); + +asmlinkage long __arm64_sys_ni_syscall (const struct pt_regs *__unused) +{ +return sys_ni_syscall (); +} +/* * Wrappers to pass the pt_regs argument. */ #define sys_personality sys_arm64_personality -asmlinkage long sys_ni_syscall (const struct pt_regs *); -#define __arm64_sys_ni_syscall sys_ni_syscall -#undef __SYSCALL#define __SYSCALL (nr, sym) asmlinkage long __arm64_##sym(const struct pt_regs *);#include <asm/unistd.h> #undef __SYSCALL -#define __SYSCALL (nr, sym) [nr] = (syscall_fn_t)__arm64_##sym, +#define __SYSCALL (nr, sym) [nr] = __arm64_##sym,const syscall_fn_t sys_call_table[__NR_syscalls] = { - [0 ... __NR_syscalls -1 ] = (syscall_fn_t )sys_ni_syscall, + [0 ... __NR_syscalls -1 ] = __arm64_sys_ni_syscall, #include <asm/unistd.h> };
arch/arm64/kernel/sys32.c +2 -5
@@ -133,17 +133,14 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode,return ksys_fallocate (fd, mode,arg_u64 (offset),arg_u64 (len)); } -asmlinkage long sys_ni_syscall (const struct pt_regs *); -#define __arm64_sys_ni_syscall sys_ni_syscall -#undef __SYSCALL#define __SYSCALL (nr, sym) asmlinkage long __arm64_##sym(const struct pt_regs *);#include <asm/unistd32.h> #undef __SYSCALL -#define __SYSCALL (nr, sym) [nr] = (syscall_fn_t)__arm64_##sym, +#define __SYSCALL (nr, sym) [nr] = __arm64_##sym,const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = { - [0 ... __NR_compat_syscalls -1 ] = (syscall_fn_t )sys_ni_syscall, + [0 ... __NR_compat_syscalls -1 ] = __arm64_sys_ni_syscall, #include <asm/unistd32.h> };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 59/70 net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs
In reply to Sasha LevinFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 315ca92dd863fecbffc0bb52ae0ac11e0398726a ]
The sh_eth_close() resets the MAC and then calls phy_stop() so that mdio read access result is incorrect without any error according to kernel trace like below:
ifconfig-216 [003] .n.. 109.133124: mdio_access: ee700000.ethernet-ffffffff read phy:0x01 reg:0x00 val:0xffff
According to the hardware manual, the RMII mode should be set to 1 before operation the Ethernet MAC. However, the previous code was not set to 1 after the driver issued the soft_reset in sh_eth_dev_exit() so that the mdio read access result seemed incorrect. To fix the issue, this patch adds a condition and set the RMII mode register in sh_eth_dev_exit() for R-Car Gen2 and RZ/A1 SoCs.
Note that when I have tried to move the sh_eth_dev_exit() calling after phy_stop() on sh_eth_close(), but it gets worse (kernel panic happened and it seems that a register is accessed while the clock is off).
--- drivers/net/ethernet/renesas/sh_eth.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/renesas/sh_eth.c +4 -0
@@ -1594,6 +1594,10 @@ static void sh_eth_dev_exit(struct net_device *ndev)sh_eth_get_stats (ndev); mdp->cd->soft_reset (ndev); +/* Set the RMII mode again if required */ +if (mdp->cd->rmiimode) +sh_eth_write (ndev,0x1 ,RMIIMODE ); +/* Set MAC address again */ update_mac_address (ndev); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/70 blk-mq: Fix memory leak in error handling
In reply to Sasha LevinFrom: Jes Sorensen <[email protected]>
[ Upstream commit 41de54c64811bf087c8464fdeb43c6ad8be2686b ]
If blk_mq_init_allocated_queue() fails, make sure to free the poll stat callback struct allocated.
--- block/blk-mq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
block/blk-mq.c +4 -1
@@ -2844,7 +2844,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, goto err_exit;if (blk_mq_alloc_ctxs (q)) - goto err_exit; + goto err_poll;/* init q->mq_kobj and sw queues' kobjects */ blk_mq_sysfs_init (q);
@@ -2905,6 +2905,9 @@ err_hctxs:kfree (q->queue_hw_ctx); err_sys_init:blk_mq_sysfs_deinit (q); +err_poll: +blk_stat_free_callback (q->poll_cb); + q->poll_cb =NULL ; err_exit: q->mq_ops =NULL ;return ERR_PTR (-ENOMEM );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 61/70 net: phylink: ensure consistent phy interface mode
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit c678726305b9425454be7c8a7624290b602602fc ]
Ensure that we supply the same phy interface mode to mac_link_down() as we did for the corresponding mac_link_up() call. This ensures that MAC drivers that use the phy interface mode in these methods can depend on mac_link_down() always corresponding to a mac_link_up() call for the same interface mode.
--- drivers/net/phy/phylink.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/phy/phylink.c +7 -3
@@ -51,6 +51,10 @@ struct phylink {/* The link configuration settings */ struct phylink_link_state link_config; + +/* The current settings */ +phy_interface_t cur_interface; +struct gpio_desc *link_gpio;struct timer_list link_poll; void (*get_fixed_state)(struct net_device *dev,
@@ -453,12 +457,12 @@ static void phylink_resolve(struct work_struct *w)if (!link_state.link) {netif_carrier_off (ndev); pl->ops->mac_link_down (ndev, pl->link_an_mode, - pl->phy_state.interface); + pl->cur_interface);netdev_info (ndev,"Link is Down\n" ); }else { + pl->cur_interface = link_state.interface; pl->ops->mac_link_up (ndev, pl->link_an_mode, - pl->phy_state.interface, - pl->phydev); + pl->cur_interface, pl->phydev);netif_carrier_on (ndev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 62/70 net: phy: dp83867: fix speed 10 in sgmii mode
In reply to Sasha LevinFrom: Max Uvarov <[email protected]>
[ Upstream commit 333061b924539c0de081339643f45514f5f1c1e6 ]
For supporting 10Mps speed in SGMII mode DP83867_10M_SGMII_RATE_ADAPT bit of DP83867_10M_SGMII_CFG register has to be cleared by software. That does not affect speeds 100 and 1000 so can be done on init.
--- drivers/net/phy/dp83867.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/phy/dp83867.c +17 -0
@@ -30,6 +30,8 @@#define DP83867_STRAP_STS1 0x006E#define DP83867_RGMIIDCTL 0x0086#define DP83867_IO_MUX_CFG 0x0170 +#define DP83867_10M_SGMII_CFG 0x016F +#define DP83867_10M_SGMII_RATE_ADAPT_MASK BIT(7)#define DP83867_SW_RESET BIT(15)#define DP83867_SW_RESTART BIT(14)
@@ -277,6 +279,21 @@ static int dp83867_config_init(struct phy_device *phydev) DP83867_IO_MUX_CFG_IO_IMPEDANCE_CTRL); } +if (phydev->interface ==PHY_INTERFACE_MODE_SGMII ) { +/* For support SPEED_10 in SGMII mode +* DP83867_10M_SGMII_RATE_ADAPT bit +* has to be cleared by software. That +* does not affect SPEED_100 and +* SPEED_1000. +*/ + ret =phy_modify_mmd (phydev,DP83867_DEVADDR , +DP83867_10M_SGMII_CFG , +DP83867_10M_SGMII_RATE_ADAPT_MASK , +0 ); +if (ret) +return ret; + } +/* Enable Interrupt output INT_OE in CFG3 register */ if (phy_interrupt_is_valid (phydev)) { val =phy_read (phydev,DP83867_CFG3 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 63/70 net: phy: dp83867: increase SGMII autoneg timer duration
In reply to Sasha LevinFrom: Max Uvarov <[email protected]>
[ Upstream commit 1a97a477e666cbdededab93bd3754e508f0c09d7 ]
After reset SGMII Autoneg timer is set to 2us (bits 6 and 5 are 01). That is not enough to finalize autonegatiation on some devices. Increase this timer duration to maximum supported 16ms.
--- drivers/net/phy/dp83867.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/phy/dp83867.c +18 -0
@@ -26,6 +26,12 @@/* Extended Registers */ #define DP83867_CFG4 0x0031 +#define DP83867_CFG4_SGMII_ANEG_MASK (BIT(5) | BIT(6)) +#define DP83867_CFG4_SGMII_ANEG_TIMER_11MS (3 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_800US (2 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_2US (1 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_16MS (0 << 5) +#define DP83867_RGMIICTL 0x0032#define DP83867_STRAP_STS1 0x006E#define DP83867_RGMIIDCTL 0x0086
@@ -292,6 +298,18 @@ static int dp83867_config_init(struct phy_device *phydev) 0);if (ret)return ret; + +/* After reset SGMII Autoneg timer is set to 2us (bits 6 and 5 +* are 01). That is not enough to finalize autoneg on some +* devices. Increase this timer duration to maximum 16ms. +*/ + ret =phy_modify_mmd (phydev,DP83867_DEVADDR , +DP83867_CFG4 , +DP83867_CFG4_SGMII_ANEG_MASK , +DP83867_CFG4_SGMII_ANEG_TIMER_16MS ); + +if (ret) +return ret; }/* Enable Interrupt output INT_OE in CFG3 register */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 64/70 net: phy: dp83867: Set up RGMII TX delay
In reply to Sasha LevinFrom: Max Uvarov <[email protected]>
[ Upstream commit 2b892649254fec01678c64f16427622b41fa27f4 ]
PHY_INTERFACE_MODE_RGMII_RXID is less then TXID
so code to set tx delay is never called.
--- drivers/net/phy/dp83867.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/phy/dp83867.c +1 -3
@@ -255,10 +255,8 @@ static int dp83867_config_init(struct phy_device *phydev) ret =phy_write (phydev,MII_DP83867_PHYCTRL , val);if (ret)return ret; - } -if ((phydev->interface >=PHY_INTERFACE_MODE_RGMII_ID ) && - (phydev->interface <=PHY_INTERFACE_MODE_RGMII_RXID )) { +/* Set up RGMII delays */ val =phy_read_mmd (phydev,DP83867_DEVADDR ,DP83867_RGMIICTL );if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/70 scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route()
In reply to Sasha LevinFrom: Varun Prakash <[email protected]>
[ Upstream commit cc555759117e8349088e0c5d19f2f2a500bafdbd ]
ip_dev_find() can return NULL so add a check for NULL pointer.
--- drivers/scsi/cxgbi/libcxgbi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/cxgbi/libcxgbi.c +4 -0
@@ -641,6 +641,10 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)if (ndev->flags &IFF_LOOPBACK ) { ndev =ip_dev_find (&init_net, daddr->sin_addr.s_addr); +if (!ndev) { + err = -ENETUNREACH ; + goto rel_neigh; + } mtu = ndev->mtu;pr_info ("rt dev %s, loopback -> %s, mtu %u.\n" , n->dev->name, ndev->name, mtu);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 66/70 scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask
In reply to Sasha LevinFrom: Lianbo Jiang <[email protected]>
[ Upstream commit 1d94f06e7f5df4064ef336b7b710f50143b64a53 ]
When SME is enabled, the smartpqi driver won't work on the HP DL385 G10 machine, which causes the failure of kernel boot because it fails to allocate pqi error buffer. Please refer to the kernel log:
....
[ 9.431749] usbcore: registered new interface driver uas
[ 9.441524] Microsemi PQI Driver (v1.1.4-130)
[ 9.442956] i40e 0000:04:00.0: fw 6.70.48768 api 1.7 nvm 10.2.5
[ 9.447237] smartpqi 0000:23:00.0: Microsemi Smart Family Controller found
Starting dracut initqueue hook...[ OK ] Started Show Plymouth Boot Scre[ 9.471654] Broadcom NetXtreme-C/E driver bnxt_en v1.9.1
en.
[ OK ] Started Forward Password Requests to Plymouth Directory Watch.
[[0;[ 9.487108] smartpqi 0000:23:00.0: failed to allocate PQI error buffer
....
[ 139.050544] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts [ 139.589779] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts
Basically, the fact that the coherent DMA mask value wasn't set caused the driver to fall back to SWIOTLB when SME is active.
For correct operation, lets call the dma_set_mask_and_coherent() to properly set the mask for both streaming and coherent, in order to inform the kernel about the devices DMA addressing capabilities.
--- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +1 -1
@@ -7285,7 +7285,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)else mask =DMA_BIT_MASK (32 ); - rc =dma_set_mask (&ctrl_info->pci_dev->dev, mask); + rc =dma_set_mask_and_coherent (&ctrl_info->pci_dev->dev, mask);if (rc) {dev_err (&ctrl_info->pci_dev->dev,"failed to set DMA mask\n" ); goto disable_device;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 67/70 scsi: scsi_dh_alua: Fix possible null-ptr-deref
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 12e750bc62044de096ab9a95201213fd912b9994 ]
If alloc_workqueue fails in alua_init, it should return -ENOMEM, otherwise it will trigger null-ptr-deref while unloading module which calls destroy_workqueue dereferencewq->lock like this:
BUG: KASAN: null-ptr-deref in __lock_acquire+0x6b4/0x1ee0 Read of size 8 at addr 0000000000000080 by task syz-executor.0/7045 CPU: 0 PID: 7045 Comm: syz-executor.0 Tainted: G C 5.1.0+ #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 Call Trace: dump_stack+0xa9/0x10e __kasan_report+0x171/0x18d ? __lock_acquire+0x6b4/0x1ee0 kasan_report+0xe/0x20 __lock_acquire+0x6b4/0x1ee0 lock_acquire+0xb4/0x1b0 __mutex_lock+0xd8/0xb90 drain_workqueue+0x25/0x290 destroy_workqueue+0x1f/0x3f0 __x64_sys_delete_module+0x244/0x330 do_syscall_64+0x72/0x2a0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/scsi/device_handler/scsi_dh_alua.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/device_handler/scsi_dh_alua.c +2 -4
@@ -1174,10 +1174,8 @@ static int __init alua_init(void)int r; kaluad_wq =alloc_workqueue ("kaluad" ,WQ_MEM_RECLAIM ,0 ); -if (!kaluad_wq) { -/* Temporary failure, bypass */ -return SCSI_DH_DEV_TEMP_BUSY ; - } +if (!kaluad_wq) +return -ENOMEM ; r =scsi_register_device_handler (&alua_dh);if (r !=0 ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/70 scsi: libsas: delete sas port if expander discover failed
In reply to Sasha LevinFrom: Jason Yan <[email protected]>
[ Upstream commit 3b0541791453fbe7f42867e310e0c9eb6295364d ]
The sas_port(phy->port) allocated in sas_ex_discover_expander() will not be deleted when the expander failed to discover. This will cause resource leak and a further issue of kernel BUG like below:
[159785.843156] port-2:17:29: trying to add phy phy-2:17:29 fails: it's already part of another port [159785.852144] ------------[ cut here ]------------ [159785.856833] kernel BUG at drivers/scsi/scsi_transport_sas.c:1086! [159785.863000] Internal error: Oops - BUG: 0 [#1] SMP [159785.867866] CPU: 39 PID: 16993 Comm: kworker/u96:2 Tainted: G W OE 4.19.25-vhulk1901.1.0.h111.aarch64 #1 [159785.878458] Hardware name: Huawei Technologies Co., Ltd. Hi1620EVBCS/Hi1620EVBCS, BIOS Hi1620 CS B070 1P TA 03/21/2019 [159785.889231] Workqueue: 0000:74:02.0_disco_q sas_discover_domain [159785.895224] pstate: 40c00009 (nZcv daif +PAN +UAO) [159785.900094] pc : sas_port_add_phy+0x188/0x1b8 [159785.904524] lr : sas_port_add_phy+0x188/0x1b8 [159785.908952] sp : ffff0001120e3b80 [159785.912341] x29: ffff0001120e3b80 x28: 0000000000000000 [159785.917727] x27: ffff802ade8f5400 x26: ffff0000681b7560 [159785.923111] x25: ffff802adf11a800 x24: ffff0000680e8000 [159785.928496] x23: ffff802ade8f5728 x22: ffff802ade8f5708 [159785.933880] x21: ffff802adea2db40 x20: ffff802ade8f5400 [159785.939264] x19: ffff802adea2d800 x18: 0000000000000010 [159785.944649] x17: 00000000821bf734 x16: ffff00006714faa0 [159785.950033] x15: ffff0000e8ab4ecf x14: 7261702079646165 [159785.955417] x13: 726c612073277469 x12: ffff00006887b830 [159785.960802] x11: ffff00006773eaa0 x10: 7968702079687020 [159785.966186] x9 : 0000000000002453 x8 : 726f702072656874 [159785.971570] x7 : 6f6e6120666f2074 x6 : ffff802bcfb21290 [159785.976955] x5 : ffff802bcfb21290 x4 : 0000000000000000 [159785.982339] x3 : ffff802bcfb298c8 x2 : 337752b234c2ab00 [159785.987723] x1 : 337752b234c2ab00 x0 : 0000000000000000 [159785.993108] Process kworker/u96:2 (pid: 16993, stack limit = 0x0000000072dae094) [159786.000576] Call trace: [159786.003097] sas_port_add_phy+0x188/0x1b8 [159786.007179] sas_ex_get_linkrate.isra.5+0x134/0x140 [159786.012130] sas_ex_discover_expander+0x128/0x408 [159786.016906] sas_ex_discover_dev+0x218/0x4c8 [159786.021249] sas_ex_discover_devices+0x9c/0x1a8 [159786.025852] sas_discover_root_expander+0x134/0x160 [159786.030802] sas_discover_domain+0x1b8/0x1e8 [159786.035148] process_one_work+0x1b4/0x3f8 [159786.039230] worker_thread+0x54/0x470 [159786.042967] kthread+0x134/0x138 [159786.046269] ret_from_fork+0x10/0x18 [159786.049918] Code: 91322300 f0004402 91178042 97fe4c9b (d4210000) [159786.056083] Modules linked in: hns3_enet_ut(OE) hclge(OE) hnae3(OE) hisi_sas_test_hw(OE) hisi_sas_test_main(OE) serdes(OE) [159786.067202] ---[ end trace 03622b9e2d99e196 ]--- [159786.071893] Kernel panic - not syncing: Fatal exception [159786.077190] SMP: stopping secondary CPUs [159786.081192] Kernel Offset: disabled [159786.084753] CPU features: 0x2,a2a00a38
--- drivers/scsi/libsas/sas_expander.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/libsas/sas_expander.c +2 -0
@@ -1014,6 +1014,8 @@ static struct domain_device *sas_ex_discover_expander(list_del (&child->dev_list_node);spin_unlock_irq (&parent->port->dev_list_lock);sas_put_device (child); +sas_port_delete (phy->port); + phy->port =NULL ;return NULL ; }list_add_tail (&child->siblings, &parent->ex_dev.children);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/70 mlxsw: spectrum: Prevent force of 56G
In reply to Sasha LevinFrom: Amit Cohen <[email protected]>
[ Upstream commit 275e928f19117d22f6d26dee94548baf4041b773 ]
Force of 56G is not supported by hardware in Ethernet devices. This configuration fails with a bad parameter error from firmware.
Add check of this case. Instead of trying to set 56G with autoneg off, return a meaningful error.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +4 -0
@@ -3110,6 +3110,10 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev, ops->reg_ptys_eth_unpack (mlxsw_sp, ptys_pl, ð_proto_cap,NULL ,NULL ); autoneg = cmd->base.autoneg ==AUTONEG_ENABLE ; +if (!autoneg && cmd->base.speed ==SPEED_56000 ) { +netdev_err (dev,"56G not supported with autoneg off\n" ); +return -EINVAL ; + } eth_proto_new = autoneg ? ops->to_ptys_advert_link (mlxsw_sp, cmd) : ops->to_ptys_speed (mlxsw_sp, cmd->base.speed);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 70/70 ocfs2: fix error path kobject memory leak
In reply to Sasha LevinFrom: "Tobin C. Harding" <[email protected]>
[ Upstream commit b9fba67b3806e21b98bd5a98dc3921a8e9b42d61 ]
If a call to kobject_init_and_add() fails we should call kobject_put() otherwise we leak memory.
Add call to kobject_put() in the error path of call to kobject_init_and_add(). Please note, this has the side effect that the release method is called if kobject_init_and_add() fails.
--- fs/ocfs2/filecheck.c | 1 + 1 file changed, 1 insertion(+)
fs/ocfs2/filecheck.c +1 -0
@@ -193,6 +193,7 @@ int ocfs2_filecheck_create_sysfs(struct ocfs2_super *osb) ret =kobject_init_and_add (&entry->fs_kobj, &ocfs2_ktype_filecheck,NULL ,"filecheck" );if (ret) { +kobject_put (&entry->fs_kobj);kfree (fcheck);return ret; }
Signature · 1 line
2.20.1