October 2023 - Linux-stable-mirror

[PATCH v2 1/7] serial: Do not hold the port lock when setting rx-during-tx GPIO

by Lino Sanfilippo

Both the imx and stm32 driver set the rx-during-tx GPIO in the rs485_config() function by means of gpiod_set_value(). Since rs485_config() is called with the port lock held, this can be an problem in case that setting the GPIO line can sleep (e.g. if a GPIO expander is used which is connected via SPI or I2C). Avoid this issue by setting the GPIO outside of the port lock in the serial core and by using gpiod_set_value_cansleep() instead of gpiod_set_value(). Since now both the term and the rx-during-tx GPIO are set within the serial core use a common function uart_set_rs485_gpios() to set both. With moving it into the serial core setting the rx-during-tx GPIO is now automatically done for all drivers that support such a GPIO. Fixes: c54d48543689 ("serial: stm32: Add support for rs485 RX_DURING_TX output GPIO") Fixes: ca530cfa968c ("serial: imx: Add support for RS485 RX_DURING_TX output GPIO") Cc: stable(a)vger.kernel.org Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/imx.c | 4 ---- drivers/tty/serial/serial_core.c | 10 ++++++---- drivers/tty/serial/stm32-usart.c | 5 +---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 13cb78340709..edb2ec6a5567 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1947,10 +1947,6 @@ static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termio rs485conf->flags & SER_RS485_RX_DURING_TX) imx_uart_start_rx(port); - if (port->rs485_rx_during_tx_gpio) - gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, - !!(rs485conf->flags & SER_RS485_RX_DURING_TX)); - return 0; } diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 7bdc21d5e13b..ef0500be3553 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1391,14 +1391,16 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4 memset(rs485->padding1, 0, sizeof(rs485->padding1)); } -static void uart_set_rs485_termination(struct uart_port *port, - const struct serial_rs485 *rs485) +static void uart_set_rs485_gpios(struct uart_port *port, + const struct serial_rs485 *rs485) { if (!(rs485->flags & SER_RS485_ENABLED)) return; gpiod_set_value_cansleep(port->rs485_term_gpio, !!(rs485->flags & SER_RS485_TERMINATE_BUS)); + gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, + !!(rs485->flags & SER_RS485_RX_DURING_TX)); } static int uart_rs485_config(struct uart_port *port) @@ -1407,7 +1409,7 @@ static int uart_rs485_config(struct uart_port *port) int ret; uart_sanitize_serial_rs485(port, rs485); - uart_set_rs485_termination(port, rs485); + uart_set_rs485_gpios(port, rs485); ret = port->rs485_config(port, NULL, rs485); if (ret) @@ -1449,7 +1451,7 @@ static int uart_set_rs485_config(struct tty_struct *tty, struct uart_port *port, if (ret) return ret; uart_sanitize_serial_rs485(port, &rs485); - uart_set_rs485_termination(port, &rs485); + uart_set_rs485_gpios(port, &rs485); spin_lock_irqsave(&port->lock, flags); ret = port->rs485_config(port, &tty->termios, &rs485); diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 5e9cf0c48813..8eb13bf055f2 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -226,10 +226,7 @@ static int stm32_usart_config_rs485(struct uart_port *port, struct ktermios *ter stm32_usart_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); - if (port->rs485_rx_during_tx_gpio) - gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, - !!(rs485conf->flags & SER_RS485_RX_DURING_TX)); - else + if (!port->rs485_rx_during_tx_gpio) rs485conf->flags |= SER_RS485_RX_DURING_TX; if (rs485conf->flags & SER_RS485_ENABLED) { -- 2.40.1

2 years

1
0
0 0

Can you reach your supplier at 3 p.m

by rattan furniture

2 years

1
0
0 0

[PATCH] perf/core: Introduce cpuctx->cgrp_ctx_list

by Namhyung Kim

The commit bd2756811766 ("perf: Rewrite core context handling") removed cgrp_cpuctx_list to link active cpu (pmu) contexts together. It's used in the perf_cgroup_switch() to access cgroup events only. But after the change, it ended up iterating all pmus/events in the cpu context if there's a cgroup event somewhere on the cpu context. Unfortunately it includes uncore pmus which have much longer latency to control. That regressed some load tests occasionally (only when unrelated perf stat with cgroup events and uncore events ran on the same cpu) due to increased context switch time. AFAIK we don't have a tool to measure the context switch overhead directly. (I think I should add one to perf ftrace latency). But I can see it with a simple perf bench command like this. $ perf bench sched pipe -l 100000 # Running 'sched/pipe' benchmark: # Executed 100000 pipe operations between two processes Total time: 0.650 [sec] 6.505740 usecs/op 153710 ops/sec It runs two tasks communicate each other using a pipe so it should stress the context switch code. This is the normal numbers on my system. But after I run these two perf stat commands in background, the numbers vary a lot. $ sudo perf stat -a -e cycles -G user.slice -- sleep 100000 & $ sudo perf stat -a -e uncore_imc/cas_count_read/ -- sleep 10000 & I will show the last two lines of perf bench sched pipe output for three runs. 58.597060 usecs/op # run 1 17065 ops/sec 11.329240 usecs/op # run 2 88267 ops/sec 88.481920 usecs/op # run 3 11301 ops/sec I think the deviation comes from the fact that uncore events are managed a certain number of cpus only. If the target process runs on a cpu that manages uncore pmu, it'd take longer. Otherwise it won't affect the performance much. To fix the issue, I restored a linked list equivalent to cgrp_cpuctx_list in the perf_cpu_context and link perf_cpu_pmu_contexts that have cgroup events only. Also add new helpers to enable/disable and does ctx sched in/out for cgroups. After the change, I got something like this constantly. It's slightly higher than the normal, but it includes actual cgroup event switch time. 8.970910 usecs/op 111471 ops/sec Fixes: bd2756811766 ("perf: Rewrite core context handling") Cc: stable(a)vger.kernel.org Signed-off-by: Namhyung Kim <namhyung(a)kernel.org> --- include/linux/perf_event.h | 5 ++ kernel/events/core.c | 117 +++++++++++++++++++++++++++++++++---- 2 files changed, 111 insertions(+), 11 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e85cd1c0eaf3..7d56d7aa6b34 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -972,6 +972,10 @@ struct perf_cpu_pmu_context { struct perf_event_pmu_context epc; struct perf_event_pmu_context *task_epc; +#ifdef CONFIG_CGROUP_PERF + struct list_head cgrp_ctx_entry; +#endif + struct list_head sched_cb_entry; int sched_cb_usage; @@ -994,6 +998,7 @@ struct perf_cpu_context { #ifdef CONFIG_CGROUP_PERF struct perf_cgroup *cgrp; + struct list_head cgrp_ctx_list; #endif /* diff --git a/kernel/events/core.c b/kernel/events/core.c index 4c72a41f11af..06b39b8066a9 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -700,11 +700,73 @@ static void perf_ctx_enable(struct perf_event_context *ctx) perf_pmu_enable(pmu_ctx->pmu); } +static int __ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type); static void ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type); +static int __ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type); static void ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type); +static void __pmu_ctx_sched_out(struct perf_event_pmu_context *pmu_ctx, + enum event_type_t event_type); +static void ctx_pinned_sched_in(struct perf_event_context *ctx, struct pmu *pmu); +static void ctx_flexible_sched_in(struct perf_event_context *ctx, struct pmu *pmu); #ifdef CONFIG_CGROUP_PERF +static void perf_cgrp_ctx_disable(struct perf_event_context *ctx) +{ + struct perf_cpu_context *cpuctx; + struct perf_cpu_pmu_context *cpc; + + cpuctx = container_of(ctx, struct perf_cpu_context, ctx); + list_for_each_entry(cpc, &cpuctx->cgrp_ctx_list, cgrp_ctx_entry) + perf_pmu_disable(cpc->epc.pmu); +} + +static void perf_cgrp_ctx_enable(struct perf_event_context *ctx) +{ + struct perf_cpu_context *cpuctx; + struct perf_cpu_pmu_context *cpc; + + cpuctx = container_of(ctx, struct perf_cpu_context, ctx); + list_for_each_entry(cpc, &cpuctx->cgrp_ctx_list, cgrp_ctx_entry) + perf_pmu_enable(cpc->epc.pmu); +} + +static void cgrp_ctx_sched_out(struct perf_cpu_context *cpuctx, + enum event_type_t event_type) +{ + struct perf_cpu_pmu_context *cpc; + int is_active = __ctx_sched_out(&cpuctx->ctx, event_type); + + if (is_active < 0) + return; + + list_for_each_entry(cpc, &cpuctx->cgrp_ctx_list, cgrp_ctx_entry) + __pmu_ctx_sched_out(&cpc->epc, is_active); +} + +static void cgrp_ctx_sched_in(struct perf_cpu_context *cpuctx, + enum event_type_t event_type) +{ + struct perf_cpu_pmu_context *cpc; + int is_active = __ctx_sched_in(&cpuctx->ctx, event_type); + + if (is_active < 0) + return; + + list_for_each_entry(cpc, &cpuctx->cgrp_ctx_list, cgrp_ctx_entry) { + /* + * First go through the list and put on any pinned groups + * in order to give them the best chance of going on. + */ + if (is_active & EVENT_PINNED) + ctx_pinned_sched_in(&cpuctx->ctx, cpc->epc.pmu); + + /* Then walk through the lower prio flexible groups */ + if (is_active & EVENT_FLEXIBLE) + ctx_flexible_sched_in(&cpuctx->ctx, cpc->epc.pmu); + } +} + static inline bool perf_cgroup_match(struct perf_event *event) { @@ -856,9 +918,9 @@ static void perf_cgroup_switch(struct task_struct *task) return; perf_ctx_lock(cpuctx, cpuctx->task_ctx); - perf_ctx_disable(&cpuctx->ctx); + perf_cgrp_ctx_disable(&cpuctx->ctx); - ctx_sched_out(&cpuctx->ctx, EVENT_ALL); + cgrp_ctx_sched_out(cpuctx, EVENT_ALL); /* * must not be done before ctxswout due * to update_cgrp_time_from_cpuctx() in @@ -870,9 +932,9 @@ static void perf_cgroup_switch(struct task_struct *task) * perf_cgroup_set_timestamp() in ctx_sched_in() * to not have to pass task around */ - ctx_sched_in(&cpuctx->ctx, EVENT_ALL); + cgrp_ctx_sched_in(cpuctx, EVENT_ALL); - perf_ctx_enable(&cpuctx->ctx); + perf_cgrp_ctx_enable(&cpuctx->ctx); perf_ctx_unlock(cpuctx, cpuctx->task_ctx); } @@ -961,6 +1023,7 @@ static inline void perf_cgroup_event_enable(struct perf_event *event, struct perf_event_context *ctx) { struct perf_cpu_context *cpuctx; + struct perf_cpu_pmu_context *cpc; if (!is_cgroup_event(event)) return; @@ -975,12 +1038,16 @@ perf_cgroup_event_enable(struct perf_event *event, struct perf_event_context *ct return; cpuctx->cgrp = perf_cgroup_from_task(current, ctx); + + cpc = container_of(event->pmu_ctx, struct perf_cpu_pmu_context, epc); + list_add(&cpc->cgrp_ctx_entry, &cpuctx->cgrp_ctx_list); } static inline void perf_cgroup_event_disable(struct perf_event *event, struct perf_event_context *ctx) { struct perf_cpu_context *cpuctx; + struct perf_cpu_pmu_context *cpc; if (!is_cgroup_event(event)) return; @@ -995,6 +1062,9 @@ perf_cgroup_event_disable(struct perf_event *event, struct perf_event_context *c return; cpuctx->cgrp = NULL; + + cpc = container_of(event->pmu_ctx, struct perf_cpu_pmu_context, epc); + list_del(&cpc->cgrp_ctx_entry); } #else /* !CONFIG_CGROUP_PERF */ @@ -3238,11 +3308,10 @@ static void __pmu_ctx_sched_out(struct perf_event_pmu_context *pmu_ctx, perf_pmu_enable(pmu); } -static void -ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type) +static int +__ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type) { struct perf_cpu_context *cpuctx = this_cpu_ptr(&perf_cpu_context); - struct perf_event_pmu_context *pmu_ctx; int is_active = ctx->is_active; lockdep_assert_held(&ctx->lock); @@ -3254,7 +3323,7 @@ ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type) WARN_ON_ONCE(ctx->is_active); if (ctx->task) WARN_ON_ONCE(cpuctx->task_ctx); - return; + return -1; } /* @@ -3290,6 +3359,18 @@ ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type) is_active ^= ctx->is_active; /* changed bits */ + return is_active; +} + +static void +ctx_sched_out(struct perf_event_context *ctx, enum event_type_t event_type) +{ + struct perf_event_pmu_context *pmu_ctx; + int is_active = __ctx_sched_out(ctx, event_type); + + if (is_active < 0) + return; + list_for_each_entry(pmu_ctx, &ctx->pmu_ctx_list, pmu_ctx_entry) __pmu_ctx_sched_out(pmu_ctx, is_active); } @@ -3861,8 +3942,8 @@ static void __pmu_ctx_sched_in(struct perf_event_context *ctx, struct pmu *pmu) ctx_flexible_sched_in(ctx, pmu); } -static void -ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) +static int +__ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) { struct perf_cpu_context *cpuctx = this_cpu_ptr(&perf_cpu_context); int is_active = ctx->is_active; @@ -3870,7 +3951,7 @@ ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) lockdep_assert_held(&ctx->lock); if (likely(!ctx->nr_events)) - return; + return -1; if (!(is_active & EVENT_TIME)) { /* start ctx time */ @@ -3893,6 +3974,17 @@ ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) is_active ^= ctx->is_active; /* changed bits */ + return is_active; +} + +static void +ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) +{ + int is_active = __ctx_sched_in(ctx, event_type); + + if (is_active < 0) + return; + /* * First go through the list and put on any pinned groups * in order to give them the best chance of going on. @@ -13541,6 +13633,9 @@ static void __init perf_event_init_all_cpus(void) cpuctx->online = cpumask_test_cpu(cpu, perf_online_mask); cpuctx->heap_size = ARRAY_SIZE(cpuctx->heap_default); cpuctx->heap = cpuctx->heap_default; +#ifdef CONFIG_CGROUP_PERF + INIT_LIST_HEAD(&cpuctx->cgrp_ctx_list); +#endif } } -- 2.42.0.582.g8ccd20d70d-goog

2 years

3
12
0 0

[git:media_stage/master] media: sharp: fix sharp encoding

by Hans Verkuil

This is an automatic generated email to let you know that the following patch were queued: Subject: media: sharp: fix sharp encoding Author: Sean Young <sean(a)mess.org> Date: Fri Oct 6 12:54:25 2023 +0100 The Sharp protocol[1] encoding has incorrect timings for bit space. [1] https://www.sbprojects.net/knowledge/ir/sharp.php Fixes: d35afc5fe097 ("[media] rc: ir-sharp-decoder: Add encode capability") Cc: stable(a)vger.kernel.org Reported-by: Joe Ferner <joe.m.ferner(a)gmail.com> Closes: https://sourceforge.net/p/lirc/mailman/message/38604507/ Signed-off-by: Sean Young <sean(a)mess.org> Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drivers/media/rc/ir-sharp-decoder.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c index 3d8488c39c56..3311099cbd57 100644 --- a/drivers/media/rc/ir-sharp-decoder.c +++ b/drivers/media/rc/ir-sharp-decoder.c @@ -15,7 +15,9 @@ #define SHARP_UNIT 40 /* us */ #define SHARP_BIT_PULSE (8 * SHARP_UNIT) /* 320us */ #define SHARP_BIT_0_PERIOD (25 * SHARP_UNIT) /* 1ms (680us space) */ -#define SHARP_BIT_1_PERIOD (50 * SHARP_UNIT) /* 2ms (1680ms space) */ +#define SHARP_BIT_1_PERIOD (50 * SHARP_UNIT) /* 2ms (1680us space) */ +#define SHARP_BIT_0_SPACE (17 * SHARP_UNIT) /* 680us space */ +#define SHARP_BIT_1_SPACE (42 * SHARP_UNIT) /* 1680us space */ #define SHARP_ECHO_SPACE (1000 * SHARP_UNIT) /* 40 ms */ #define SHARP_TRAILER_SPACE (125 * SHARP_UNIT) /* 5 ms (even longer) */ @@ -168,8 +170,8 @@ static const struct ir_raw_timings_pd ir_sharp_timings = { .header_pulse = 0, .header_space = 0, .bit_pulse = SHARP_BIT_PULSE, - .bit_space[0] = SHARP_BIT_0_PERIOD, - .bit_space[1] = SHARP_BIT_1_PERIOD, + .bit_space[0] = SHARP_BIT_0_SPACE, + .bit_space[1] = SHARP_BIT_1_SPACE, .trailer_pulse = SHARP_BIT_PULSE, .trailer_space = SHARP_ECHO_SPACE, .msb_first = 1,

2 years

1
0
0 0

[git:media_stage/master] media: lirc: drop trailing space from scancode transmit

by Hans Verkuil

This is an automatic generated email to let you know that the following patch were queued: Subject: media: lirc: drop trailing space from scancode transmit Author: Sean Young <sean(a)mess.org> Date: Fri Oct 6 22:31:52 2023 +0100 When transmitting, infrared drivers expect an odd number of samples; iow without a trailing space. No problems have been observed so far, so this is just belt and braces. Fixes: 9b6192589be7 ("media: lirc: implement scancode sending") Cc: stable(a)vger.kernel.org Signed-off-by: Sean Young <sean(a)mess.org> Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drivers/media/rc/lirc_dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index 043d23aaa3cb..a537734832c5 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -276,7 +276,11 @@ static ssize_t lirc_transmit(struct file *file, const char __user *buf, if (ret < 0) goto out_kfree_raw; - count = ret; + /* drop trailing space */ + if (!(ret % 2)) + count = ret - 1; + else + count = ret; txbuf = kmalloc_array(count, sizeof(unsigned int), GFP_KERNEL); if (!txbuf) {

2 years

1
0
0 0

[git:media_stage/fixes] media: subdev: Don't report V4L2_SUBDEV_CAP_STREAMS when the streams API is disabled

by Hans Verkuil

This is an automatic generated email to let you know that the following patch were queued: Subject: media: subdev: Don't report V4L2_SUBDEV_CAP_STREAMS when the streams API is disabled Author: Hans de Goede <hdegoede(a)redhat.com> Date: Tue Oct 10 12:24:58 2023 +0200 Since the stream API is still experimental it is currently locked away behind the internal, default disabled, v4l2_subdev_enable_streams_api flag. Advertising V4L2_SUBDEV_CAP_STREAMS when the streams API is disabled confuses userspace. E.g. it causes the following libcamera error: ERROR SimplePipeline simple.cpp:1497 Failed to reset routes for /dev/v4l-subdev1: Inappropriate ioctl for device Don't report V4L2_SUBDEV_CAP_STREAMS when the streams API is disabled to avoid problems like this. Reported-by: Dennis Bonke <admin(a)dennisbonke.com> Fixes: 9a6b5bf4c1bb ("media: add V4L2_SUBDEV_CAP_STREAMS") Cc: stable(a)vger.kernel.org # for >= 6.3 Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drivers/media/v4l2-core/v4l2-subdev.c | 7 +++++++ 1 file changed, 7 insertions(+) --- diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index b92348ad61f6..31752c06d1f0 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -502,6 +502,13 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg, V4L2_SUBDEV_CLIENT_CAP_STREAMS; int rval; + /* + * If the streams API is not enabled, remove V4L2_SUBDEV_CAP_STREAMS. + * Remove this when the API is no longer experimental. + */ + if (!v4l2_subdev_enable_streams_api) + streams_subdev = false; + switch (cmd) { case VIDIOC_SUBDEV_QUERYCAP: { struct v4l2_subdev_capability *cap = arg;

2 years

1
0
0 0

[PATCH net] nfp: flower: avoid rmmod nfp crash issues

by Louis Peens

From: Yanguo Li <yanguo.li(a)corigine.com> When there are CT table entries, and you rmmod nfp, the following events can happen: task1： nfp_net_pci_remove ↓ nfp_flower_stop->(asynchronous)tcf_ct_flow_table_cleanup_work(3) ↓ nfp_zone_table_entry_destroy(1) task2： nfp_fl_ct_handle_nft_flow(2) When the execution order is (1)->(2)->(3), it will crash. Therefore, in the function nfp_fl_ct_del_flow, nf_flow_table_offload_del_cb needs to be executed synchronously. At the same time, in order to solve the deadlock problem and the problem of rtnl_lock sometimes failing, replace rtnl_lock with the private nfp_fl_lock. Fixes: 7cc93d888df7 ("nfp: flower-ct: remove callback delete deadlock") Cc: stable(a)vger.kernel.org Signed-off-by: Yanguo Li <yanguo.li(a)corigine.com> Signed-off-by: Louis Peens <louis.peens(a)corigine.com> --- .../net/ethernet/netronome/nfp/flower/cmsg.c | 10 ++++---- .../ethernet/netronome/nfp/flower/conntrack.c | 19 ++++++++++----- .../net/ethernet/netronome/nfp/flower/main.h | 2 ++ .../ethernet/netronome/nfp/flower/metadata.c | 2 ++ .../ethernet/netronome/nfp/flower/offload.c | 24 ++++++++++++++----- .../ethernet/netronome/nfp/flower/qos_conf.c | 20 ++++++++++------ 6 files changed, 54 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c index f21cf1f40f98..153533cd8f08 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c @@ -210,6 +210,7 @@ nfp_flower_cmsg_merge_hint_rx(struct nfp_app *app, struct sk_buff *skb) unsigned int msg_len = nfp_flower_cmsg_get_data_len(skb); struct nfp_flower_cmsg_merge_hint *msg; struct nfp_fl_payload *sub_flows[2]; + struct nfp_flower_priv *priv; int err, i, flow_cnt; msg = nfp_flower_cmsg_get_data(skb); @@ -228,14 +229,15 @@ nfp_flower_cmsg_merge_hint_rx(struct nfp_app *app, struct sk_buff *skb) return; } - rtnl_lock(); + priv = app->priv; + mutex_lock(&priv->nfp_fl_lock); for (i = 0; i < flow_cnt; i++) { u32 ctx = be32_to_cpu(msg->flow[i].host_ctx); sub_flows[i] = nfp_flower_get_fl_payload_from_ctx(app, ctx); if (!sub_flows[i]) { nfp_flower_cmsg_warn(app, "Invalid flow in merge hint\n"); - goto err_rtnl_unlock; + goto err_mutex_unlock; } } @@ -244,8 +246,8 @@ nfp_flower_cmsg_merge_hint_rx(struct nfp_app *app, struct sk_buff *skb) if (err == -ENOMEM) nfp_flower_cmsg_warn(app, "Flow merge memory fail.\n"); -err_rtnl_unlock: - rtnl_unlock(); +err_mutex_unlock: + mutex_unlock(&priv->nfp_fl_lock); } static void diff --git a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c index 2643c4b3ff1f..2967bab72505 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c +++ b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c @@ -2131,8 +2131,6 @@ nfp_fl_ct_offload_nft_flow(struct nfp_fl_ct_zone_entry *zt, struct flow_cls_offl struct nfp_fl_ct_flow_entry *ct_entry; struct netlink_ext_ack *extack = NULL; - ASSERT_RTNL(); - extack = flow->common.extack; switch (flow->command) { case FLOW_CLS_REPLACE: @@ -2178,9 +2176,13 @@ int nfp_fl_ct_handle_nft_flow(enum tc_setup_type type, void *type_data, void *cb switch (type) { case TC_SETUP_CLSFLOWER: - rtnl_lock(); + while (!mutex_trylock(&zt->priv->nfp_fl_lock)) { + if (!zt->nft) /* avoid deadlock */ + return err; + msleep(20); + } err = nfp_fl_ct_offload_nft_flow(zt, flow); - rtnl_unlock(); + mutex_unlock(&zt->priv->nfp_fl_lock); break; default: return -EOPNOTSUPP; @@ -2208,6 +2210,7 @@ int nfp_fl_ct_del_flow(struct nfp_fl_ct_map_entry *ct_map_ent) struct nfp_fl_ct_flow_entry *ct_entry; struct nfp_fl_ct_zone_entry *zt; struct rhashtable *m_table; + struct nf_flowtable *nft; if (!ct_map_ent) return -ENOENT; @@ -2226,8 +2229,12 @@ int nfp_fl_ct_del_flow(struct nfp_fl_ct_map_entry *ct_map_ent) if (ct_map_ent->cookie > 0) kfree(ct_map_ent); - if (!zt->pre_ct_count) { - zt->nft = NULL; + if (!zt->pre_ct_count && zt->nft) { + nft = zt->nft; + zt->nft = NULL; /* avoid deadlock */ + nf_flow_table_offload_del_cb(nft, + nfp_fl_ct_handle_nft_flow, + zt); nfp_fl_ct_clean_nft_entries(zt); } break; diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h index 40372545148e..2b7c947ff4f2 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/main.h +++ b/drivers/net/ethernet/netronome/nfp/flower/main.h @@ -297,6 +297,7 @@ struct nfp_fl_internal_ports { * @predt_list: List to keep track of decap pretun flows * @neigh_table: Table to keep track of neighbor entries * @predt_lock: Lock to serialise predt/neigh table updates + * @nfp_fl_lock: Lock to protect the flow offload operation */ struct nfp_flower_priv { struct nfp_app *app; @@ -339,6 +340,7 @@ struct nfp_flower_priv { struct list_head predt_list; struct rhashtable neigh_table; spinlock_t predt_lock; /* Lock to serialise predt/neigh table updates */ + struct mutex nfp_fl_lock; /* Protect the flow operation */ }; /** diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c index 0f06ef6e24bf..80e4675582bf 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c +++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c @@ -528,6 +528,8 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count, if (err) goto err_free_stats_ctx_table; + mutex_init(&priv->nfp_fl_lock); + err = rhashtable_init(&priv->ct_zone_table, &nfp_zone_table_params); if (err) goto err_free_merge_table; diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c index c153f0575b92..0aceef9fe582 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c @@ -1009,8 +1009,6 @@ int nfp_flower_merge_offloaded_flows(struct nfp_app *app, u64 parent_ctx = 0; int err; - ASSERT_RTNL(); - if (sub_flow1 == sub_flow2 || nfp_flower_is_merge_flow(sub_flow1) || nfp_flower_is_merge_flow(sub_flow2)) @@ -1727,19 +1725,30 @@ static int nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev, struct flow_cls_offload *flower) { + struct nfp_flower_priv *priv = app->priv; + int ret; + if (!eth_proto_is_802_3(flower->common.protocol)) return -EOPNOTSUPP; + mutex_lock(&priv->nfp_fl_lock); switch (flower->command) { case FLOW_CLS_REPLACE: - return nfp_flower_add_offload(app, netdev, flower); + ret = nfp_flower_add_offload(app, netdev, flower); + break; case FLOW_CLS_DESTROY: - return nfp_flower_del_offload(app, netdev, flower); + ret = nfp_flower_del_offload(app, netdev, flower); + break; case FLOW_CLS_STATS: - return nfp_flower_get_stats(app, netdev, flower); + ret = nfp_flower_get_stats(app, netdev, flower); + break; default: - return -EOPNOTSUPP; + ret = -EOPNOTSUPP; + break; } + mutex_unlock(&priv->nfp_fl_lock); + + return ret; } static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type, @@ -1778,6 +1787,7 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, repr_priv = repr->app_priv; repr_priv->block_shared = f->block_shared; f->driver_block_list = &nfp_block_cb_list; + f->unlocked_driver_cb = true; switch (f->command) { case FLOW_BLOCK_BIND: @@ -1876,6 +1886,8 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct Qdisc *sch, str nfp_flower_internal_port_can_offload(app, netdev))) return -EOPNOTSUPP; + f->unlocked_driver_cb = true; + switch (f->command) { case FLOW_BLOCK_BIND: cb_priv = nfp_flower_indr_block_cb_priv_lookup(app, netdev); diff --git a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c index 99052a925d9e..e7180b4793c7 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c +++ b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c @@ -523,25 +523,31 @@ int nfp_flower_setup_qos_offload(struct nfp_app *app, struct net_device *netdev, { struct netlink_ext_ack *extack = flow->common.extack; struct nfp_flower_priv *fl_priv = app->priv; + int ret; if (!(fl_priv->flower_ext_feats & NFP_FL_FEATS_VF_RLIM)) { NL_SET_ERR_MSG_MOD(extack, "unsupported offload: loaded firmware does not support qos rate limit offload"); return -EOPNOTSUPP; } + mutex_lock(&fl_priv->nfp_fl_lock); switch (flow->command) { case TC_CLSMATCHALL_REPLACE: - return nfp_flower_install_rate_limiter(app, netdev, flow, - extack); + ret = nfp_flower_install_rate_limiter(app, netdev, flow, extack); + break; case TC_CLSMATCHALL_DESTROY: - return nfp_flower_remove_rate_limiter(app, netdev, flow, - extack); + ret = nfp_flower_remove_rate_limiter(app, netdev, flow, extack); + break; case TC_CLSMATCHALL_STATS: - return nfp_flower_stats_rate_limiter(app, netdev, flow, - extack); + ret = nfp_flower_stats_rate_limiter(app, netdev, flow, extack); + break; default: - return -EOPNOTSUPP; + ret = -EOPNOTSUPP; + break; } + mutex_unlock(&fl_priv->nfp_fl_lock); + + return ret; } /* Offload tc action, currently only for tc police */ -- 2.34.1

2 years

2
1
0 0

[PATCH 6.1 000/162] 6.1.57-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.57 release. There are 162 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.57-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.1.57-rc1 Jakub Kicinski <kuba(a)kernel.org> netlink: remove the flex array from struct nlmsghdr Filipe Manana <fdmanana(a)suse.com> btrfs: fix fscrypt name leak after failure to join log transaction Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> btrfs: fix an error handling path in btrfs_rename() Ido Schimmel <idosch(a)nvidia.com> vrf: Fix lockdep splat in output path Eric Dumazet <edumazet(a)google.com> ipv6: remove nexthop_fib6_nh_bh() John David Anglin <dave(a)parisc-linux.org> parisc: Restore __ldcw_align for PA-RISC 2.0 processors luosili <rootlab(a)huawei.com> ksmbd: fix uaf in smb20_oplock_break_ack Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: fix race condition between session lookup and expire Tom Lendacky <thomas.lendacky(a)amd.com> x86/sev: Use the GHCB protocol when available for SNP CPUID requests Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fixed two speaker platform Colin Ian King <colin.i.king(a)gmail.com> ALSA: hda/realtek: Fix spelling mistake "powe" -> "power" Shay Drory <shayd(a)nvidia.com> RDMA/mlx5: Fix NULL string error Hamdan Igbaria <hamdani(a)nvidia.com> RDMA/mlx5: Fix mutex unlocking on error flow for steering anchor creation Bernard Metzler <bmt(a)zurich.ibm.com> RDMA/siw: Fix connection failure handling Bart Van Assche <bvanassche(a)acm.org> RDMA/srp: Do not call scsi_done() from srp_abort() Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> RDMA/uverbs: Fix typo of sizeof argument Leon Romanovsky <leon(a)kernel.org> RDMA/cma: Fix truncation compilation warning in make_cma_ports Mark Zhang <markzhang(a)nvidia.com> RDMA/cma: Initialize ib_sa_multicast structure to 0 when join Duje Mihanović <duje.mihanovic(a)skole.hr> gpio: pxa: disable pinctrl calls for MMP_GPIO Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org> gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> IB/mlx4: Fix the size of a buffer in add_port_entries() Dan Carpenter <dan.carpenter(a)linaro.org> of: dynamic: Fix potential memory leak in of_changeset_action() Leon Romanovsky <leon(a)kernel.org> RDMA/core: Require admin capabilities to set system parameters Fedor Pchelkin <pchelkin(a)ispras.ru> dm zoned: free dmz->ddev array in dmz_put_zoned_devices Helge Deller <deller(a)gmx.de> parisc: Fix crash with nr_cpus=1 option Jordan Rife <jrife(a)google.com> smb: use kernel_connect() and kernel_bind() Artem Bityutskiy <artem.bityutskiy(a)linux.intel.com> intel_idle: add Emerald Rapids Xeon support Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit Jiri Kosina <jkosina(a)suse.cz> HID: sony: remove duplicate NULL check before calling usb_free_urb() Eric Dumazet <edumazet(a)google.com> netlink: annotate data-races around sk->sk_err Tao Chen <chentao.kernel(a)linux.alibaba.com> netlink: Fix potential skb memleak in netlink_ack Jakub Kicinski <kuba(a)kernel.org> netlink: split up copies in the ack construction Xin Long <lucien.xin(a)gmail.com> sctp: update hb timer immediately after users change hb_interval Xin Long <lucien.xin(a)gmail.com> sctp: update transport state when processing a dupcook packet Neal Cardwell <ncardwell(a)google.com> tcp: fix delayed ACKs for MSS boundary condition Neal Cardwell <ncardwell(a)google.com> tcp: fix quick-ack counting to count actual ACKs of new data Chengfeng Ye <dg573847474(a)gmail.com> tipc: fix a potential deadlock on &tx->lock Ben Wolsieffer <ben.wolsieffer(a)hefring.com> net: stmmac: dwmac-stm32: fix resume on STM32 MCU Benjamin Poirier <bpoirier(a)nvidia.com> ipv4: Set offload_failed flag in fibmatch results Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure Phil Sutter <phil(a)nwl.cc> netfilter: nf_tables: Deduplicate nft_register_obj audit logs Phil Sutter <phil(a)nwl.cc> selftests: netfilter: Extend nft_audit.sh Phil Sutter <phil(a)nwl.cc> selftests: netfilter: Test nf_tables audit logging Xin Long <lucien.xin(a)gmail.com> netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp David Wilder <dwilder(a)us.ibm.com> ibmveth: Remove condition to recompute TCP header checksum. Dan Carpenter <dan.carpenter(a)linaro.org> net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns() Jeremy Cline <jeremy(a)jcline.org> net: nfc: llcp: Add lock when modifying device list Shigeru Yoshida <syoshida(a)redhat.com> net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Ilya Maximets <i.maximets(a)ovn.org> ipv6: tcp: add a missing nf_reset_ct() in 3WHS handling Fabio Estevam <festevam(a)denx.de> net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent Dinghao Liu <dinghao.liu(a)zju.edu.cn> ptp: ocp: Fix error handling in ptp_ocp_device_init David Howells <dhowells(a)redhat.com> ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data() Eric Dumazet <edumazet(a)google.com> neighbour: fix data-races around n->output Eric Dumazet <edumazet(a)google.com> neighbour: switch to standard rcu, instead of rcu_bh Eric Dumazet <edumazet(a)google.com> neighbour: annotate lockless accesses to n->nud_state Martin KaFai Lau <martin.lau(a)kernel.org> bpf: Add BPF_FIB_LOOKUP_SKIP_NEIGH for bpf_fib_lookup Eric Dumazet <edumazet(a)google.com> net: fix possible store tearing in neigh_periodic_work() Mauricio Faria de Oliveira <mfo(a)canonical.com> modpost: add missing else to the "of" check Jakub Sitnicki <jakub(a)cloudflare.com> bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap: Do not inc copied_seq when PEEK flag set John Fastabend <john.fastabend(a)gmail.com> bpf: tcp_read_skb needs to pop skb regardless of seq Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a nfs4_state_manager() race Arnd Bergmann <arnd(a)arndb.de> ima: rework CONFIG_IMA dependency block Junxiao Bi <junxiao.bi(a)oracle.com> scsi: target: core: Fix deadlock due to recursive locking Oleksandr Tymoshenko <ovt(a)google.com> ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig Michał Mirosław <mirq-linux(a)rere.qmqm.pl> regulator/core: regulator_register: set device->class earlier Yong Wu <yong.wu(a)mediatek.com> iommu/mediatek: Fix share pgtable for iova over 4GB Breno Leitao <leitao(a)debian.org> perf/x86/amd: Do not WARN() on every IRQ Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211: fix potential key use-after-free Richard Fitzgerald <rf(a)opensource.cirrus.com> regmap: rbtree: Fix wrong register marked as in-cache when creating new node Sandipan Das <sandipan.das(a)amd.com> perf/x86/amd/core: Fix overflow reset on hotplug Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling Alexandra Diupina <adiupina(a)astralinux.ru> drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close() Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: ISO: Fix handling of listen for unicast Yao Xiao <xiaoyao(a)rock-chips.com> Bluetooth: Delete unused hci_req_prepare_suspend() declaration Chen-Yu Tsai <wenst(a)chromium.org> regulator: mt6358: split ops for buck and linear range LDO regulators Chen-Yu Tsai <wenst(a)chromium.org> regulator: mt6358: Use linear voltage helpers for single range regulators Chen-Yu Tsai <wenst(a)chromium.org> regulator: mt6358: Drop *_SSHUB regulators Leon Hwang <hffilwlqm(a)gmail.com> bpf: Fix tr dereferencing Marek Behún <kabel(a)kernel.org> leds: Drop BUG_ON check for LED_COLOR_ID_MULTI Pin-yen Lin <treapking(a)chromium.org> wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: add missing kernel-doc for cqm_rssi_work Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: fix cqm_config access race Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: add a work abstraction with special semantics Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: move wowlan disable under locks Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: hold wiphy lock in auto-disconnect Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> wifi: iwlwifi: mvm: Fix a memory corruption issue Arnd Bergmann <arnd(a)arndb.de> wifi: iwlwifi: dbg_ini: fix structure packing Gao Xiang <xiang(a)kernel.org> erofs: fix memory leak of LZMA global compressed deduplication Zhihao Cheng <chengzhihao1(a)huawei.com> ubi: Refuse attaching if mtd's erasesize is 0 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> HID: sony: Fix a potential memory leak in sony_probe() Rob Herring <robh(a)kernel.org> arm64: errata: Add Cortex-A520 speculative unprivileged load workaround Rob Herring <robh(a)kernel.org> arm64: Add Cortex-A520 CPU part definition Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Fix logic error in sienna_cichlid_update_pcie_parameters() Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Fix detection of _PR3 on the PCIe root port Jordan Rife <jrife(a)google.com> net: prevent rewrite of msg_name in sock_sendmsg() Qu Wenruo <wqu(a)suse.com> btrfs: reject unknown mount options early Jordan Rife <jrife(a)google.com> net: replace calls to sock->ops->connect() with kernel_connect() Sricharan Ramabadhran <quic_srichara(a)quicinc.com> PCI: qcom: Fix IPQ8074 enumeration David Jeffery <djeffery(a)redhat.com> md/raid5: release batch_last before waiting for another stripe_head Gustavo A. R. Silva <gustavoars(a)kernel.org> wifi: mwifiex: Fix tlv_buf_left calculation Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_codec: Fix leaking content of local_codecs Gustavo A. R. Silva <gustavoars(a)kernel.org> qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info Geliang Tang <geliang.tang(a)suse.com> mptcp: userspace pm allow creating id 0 subflow Christian Marangi <ansuelsmth(a)gmail.com> net: ethernet: mediatek: disable irq before schedule napi Stefano Garzarella <sgarzare(a)redhat.com> vringh: don't use vringh_kiov_advance() in vringh_iov_xfer() Zhang Rui <rui.zhang(a)intel.com> iommu/vt-d: Avoid memory allocation in iommu_suspend() Dinghao Liu <dinghao.liu(a)zju.edu.cn> scsi: zfcp: Fix a double put in zfcp_port_enqueue() Yajun Deng <yajun.deng(a)linux.dev> i40e: fix the wrong PTP frequency calculation Aleksandr Mezin <mezin.alexander(a)gmail.com> hwmon: (nzxt-smart2) add another USB ID Herman Fries <baracoder(a)googlemail.com> hwmon: (nzxt-smart2) Add device id Ming Lei <ming.lei(a)redhat.com> block: fix use-after-free of q->q_usage_counter Ilya Dryomov <idryomov(a)gmail.com> rbd: take header_rwsem in rbd_dev_refresh() only when updating Ilya Dryomov <idryomov(a)gmail.com> rbd: decouple parent info read-in from updating rbd_dev Ilya Dryomov <idryomov(a)gmail.com> rbd: decouple header read-in from updating rbd_dev->header Ilya Dryomov <idryomov(a)gmail.com> rbd: move rbd_dev_refresh() definition Robin Murphy <robin.murphy(a)arm.com> iommu/arm-smmu-v3: Avoid constructing invalid range commands Robin Murphy <robin.murphy(a)arm.com> iommu/arm-smmu-v3: Set TTL invalidation hint better Wayne Lin <wayne.lin(a)amd.com> drm/amd/display: Adjust the MST resume flow Kristina Martsenko <kristina.martsenko(a)arm.com> arm64: cpufeature: Fix CLRBHB and BC detection Patrick Rohr <prohr(a)google.com> net: release reference to inet6_dev pointer Patrick Rohr <prohr(a)google.com> net: change accept_ra_min_rtr_lft to affect all RA lifetimes Patrick Rohr <prohr(a)google.com> net: add sysctl accept_ra_min_rtr_lft Gabriel Krisman Bertazi <krisman(a)suse.de> arm64: Avoid repeated AA64MMFR1_EL1 register read on pagefault path Benjamin Coddington <bcodding(a)redhat.com> Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return" Sweet Tea Dorminy <sweettea-kernel(a)dorminy.me> btrfs: use struct fscrypt_str instead of struct qstr Sweet Tea Dorminy <sweettea-kernel(a)dorminy.me> btrfs: setup qstr from dentrys using fscrypt helper Sweet Tea Dorminy <sweettea-kernel(a)dorminy.me> btrfs: use struct qstr instead of name and namelen pairs Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Fix bytes info in per_cpu buffer stats Vlastimil Babka <vbabka(a)suse.cz> ring-buffer: remove obsolete comment for free_buffer_page() Johannes Weiner <hannes(a)cmpxchg.org> mm: page_alloc: fix CMA and HIGHATOMIC landing on the wrong buddy list Mel Gorman <mgorman(a)techsingularity.net> mm/page_alloc: leave IRQs enabled for per-cpu page allocations Mel Gorman <mgorman(a)techsingularity.net> mm/page_alloc: always remove pages from temporary list Yang Shi <yang(a)os.amperecomputing.com> mm: mempolicy: keep VMA walk if both MPOL_MF_STRICT and MPOL_MF_MOVE are specified Vishal Moola (Oracle) <vishal.moola(a)gmail.com> mm/mempolicy: convert migrate_page_add() to migrate_folio_add() Vishal Moola (Oracle) <vishal.moola(a)gmail.com> mm/mempolicy: convert queue_pages_pte_range() to queue_folios_pte_range() Vishal Moola (Oracle) <vishal.moola(a)gmail.com> mm/mempolicy: convert queue_pages_pmd() to queue_folios_pmd() Vishal Moola (Oracle) <vishal.moola(a)gmail.com> mm/memory: add vm_normal_folio() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a state manager thread deadlock regression Benjamin Coddington <bcodding(a)redhat.com> NFS: rename nfs_client_kset to nfs_kset Benjamin Coddington <bcodding(a)redhat.com> NFS: Cleanup unused rpc_clnt variable Damien Le Moal <dlemoal(a)kernel.org> ata: libata-scsi: Fix delayed scsi_rescan_device() execution Damien Le Moal <dlemoal(a)kernel.org> scsi: Do not attempt to rescan suspended devices Bart Van Assche <bvanassche(a)acm.org> scsi: core: Improve type safety of scsi_rescan_device() Damien Le Moal <dlemoal(a)kernel.org> scsi: sd: Do not issue commands to suspended disks on shutdown Damien Le Moal <dlemoal(a)kernel.org> scsi: sd: Differentiate system and runtime start/stop management Damien Le Moal <dlemoal(a)kernel.org> ata,scsi: do not issue START STOP UNIT on resume Paolo Abeni <pabeni(a)redhat.com> mptcp: process pending subflow error on close Paolo Abeni <pabeni(a)redhat.com> mptcp: move __mptcp_error_report in protocol.c Eric Dumazet <edumazet(a)google.com> mptcp: annotate lockless accesses to sk->sk_err Paolo Abeni <pabeni(a)redhat.com> mptcp: fix dangling connection hang-up Paolo Abeni <pabeni(a)redhat.com> mptcp: rename timer related helper to less confusing names Sameer Pujar <spujar(a)nvidia.com> ASoC: tegra: Fix redundant PLLA and PLLA_OUT0 updates Sameer Pujar <spujar(a)nvidia.com> ASoC: soc-utils: Export snd_soc_dai_is_dummy() symbol Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - ALC287 I2S speaker platform support Fabian Vogt <fabian(a)ritter-vogt.de> ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx SungHwan Jung <onenowy(a)gmail.com> ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute LED Shenghao Ding <shenghao-ding(a)ti.com> ALSA: hda/tas2781: Add tas2781 HDA driver Johan Hovold <johan+linaro(a)kernel.org> spi: zynqmp-gqspi: fix clock imbalance on probe failure Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi: zynqmp-gqspi: Convert to platform remove callback returning void ------------- Diffstat: Documentation/arm64/silicon-errata.rst | 2 + Documentation/networking/ip-sysctl.rst | 8 + Makefile | 4 +- arch/arm64/Kconfig | 13 + arch/arm64/include/asm/cpufeature.h | 8 +- arch/arm64/include/asm/cputype.h | 2 + arch/arm64/kernel/cpu_errata.c | 8 + arch/arm64/kernel/cpufeature.c | 3 +- arch/arm64/kernel/entry.S | 4 + arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 6 +- arch/parisc/include/asm/ldcw.h | 36 +- arch/parisc/include/asm/spinlock_types.h | 5 - arch/parisc/kernel/smp.c | 4 +- arch/x86/events/amd/core.c | 24 +- arch/x86/kernel/sev-shared.c | 69 +++- block/blk-sysfs.c | 3 +- drivers/ata/libata-core.c | 16 + drivers/ata/libata-scsi.c | 43 ++- drivers/base/regmap/regcache-rbtree.c | 3 +- drivers/block/rbd.c | 412 +++++++++++---------- drivers/firewire/sbp2.c | 9 +- drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpio-pxa.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 93 ++++- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 41 +- drivers/hid/hid-sony.c | 2 + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 8 + drivers/hwmon/nzxt-smart2.c | 2 + drivers/idle/intel_idle.c | 2 + drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/nldev.c | 1 + drivers/infiniband/core/uverbs_main.c | 2 +- drivers/infiniband/hw/mlx4/sysfs.c | 2 +- drivers/infiniband/hw/mlx5/fs.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/sw/siw/siw_cm.c | 16 +- drivers/infiniband/ulp/srp/ib_srp.c | 16 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 18 +- drivers/iommu/intel/iommu.c | 16 - drivers/iommu/intel/iommu.h | 2 +- drivers/iommu/mtk_iommu.c | 9 +- drivers/leds/led-core.c | 4 - drivers/md/dm-zoned-target.c | 15 +- drivers/md/raid5.c | 7 + drivers/mtd/ubi/build.c | 7 + drivers/net/dsa/mv88e6xxx/chip.c | 6 +- drivers/net/dsa/mv88e6xxx/global1.c | 31 -- drivers/net/dsa/mv88e6xxx/global1.h | 1 - drivers/net/dsa/mv88e6xxx/global2.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.h | 1 + drivers/net/ethernet/ibm/ibmveth.c | 25 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + drivers/net/usb/smsc75xx.c | 4 +- drivers/net/vrf.c | 12 +- drivers/net/vxlan/vxlan_core.c | 4 +- drivers/net/wan/fsl_ucc_hdlc.c | 12 +- drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 +- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +- .../net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 - drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 +- drivers/of/dynamic.c | 6 +- drivers/pci/controller/dwc/pcie-qcom.c | 4 +- drivers/ptp/ptp_ocp.c | 1 - drivers/regulator/core.c | 4 +- drivers/regulator/mt6358-regulator.c | 153 +++----- drivers/s390/scsi/zfcp_aux.c | 9 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/mvumi.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 20 +- drivers/scsi/scsi_sysfs.c | 4 +- drivers/scsi/sd.c | 110 ++++-- drivers/scsi/sd.h | 1 + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- drivers/spi/spi-zynqmp-gqspi.c | 18 +- drivers/target/target_core_device.c | 11 +- drivers/vhost/vringh.c | 12 +- fs/btrfs/ctree.h | 28 +- fs/btrfs/dir-item.c | 50 ++- fs/btrfs/inode-item.c | 73 ++-- fs/btrfs/inode-item.h | 20 +- fs/btrfs/inode.c | 267 ++++++++----- fs/btrfs/ioctl.c | 7 +- fs/btrfs/root-tree.c | 19 +- fs/btrfs/send.c | 12 +- fs/btrfs/super.c | 7 +- fs/btrfs/transaction.c | 40 +- fs/btrfs/tree-log.c | 279 +++++++------- fs/btrfs/tree-log.h | 4 +- fs/erofs/decompressor_lzma.c | 5 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs/nfs4state.c | 47 ++- fs/nfs/sysfs.c | 16 +- fs/smb/client/connect.c | 10 +- fs/smb/server/connection.c | 2 + fs/smb/server/connection.h | 1 + fs/smb/server/mgmt/user_session.c | 10 +- fs/smb/server/smb2pdu.c | 4 +- include/linux/bpf.h | 2 +- include/linux/ipv6.h | 1 + include/linux/mm.h | 2 + include/linux/netfilter/nf_conntrack_sctp.h | 1 + include/linux/regulator/mt6358-regulator.h | 4 - include/net/arp.h | 8 +- include/net/cfg80211.h | 99 ++++- include/net/ndisc.h | 12 +- include/net/neighbour.h | 10 +- include/net/netlink.h | 21 ++ include/net/nexthop.h | 23 -- include/net/tcp.h | 6 +- include/scsi/scsi_device.h | 6 +- include/scsi/scsi_host.h | 2 +- include/uapi/linux/bpf.h | 6 + include/uapi/linux/ipv6.h | 1 + kernel/trace/ring_buffer.c | 32 +- mm/memory.c | 10 + mm/mempolicy.c | 122 +++--- mm/page_alloc.c | 138 ++++--- net/bluetooth/hci_core.c | 1 + net/bluetooth/hci_event.c | 1 + net/bluetooth/hci_request.h | 2 - net/bluetooth/hci_sync.c | 14 +- net/bluetooth/iso.c | 9 +- net/bridge/br_arp_nd_proxy.c | 4 +- net/bridge/br_netfilter_hooks.c | 5 +- net/core/filter.c | 59 +-- net/core/neighbour.c | 106 +++--- net/core/sock_map.c | 4 + net/ipv4/arp.c | 8 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/ip_output.c | 6 +- net/ipv4/nexthop.c | 12 +- net/ipv4/route.c | 8 +- net/ipv4/tcp.c | 10 +- net/ipv4/tcp_bpf.c | 4 +- net/ipv4/tcp_input.c | 13 + net/ipv4/tcp_output.c | 7 +- net/ipv6/addrconf.c | 27 +- net/ipv6/ip6_fib.c | 16 +- net/ipv6/ip6_output.c | 12 +- net/ipv6/ndisc.c | 17 +- net/ipv6/route.c | 14 +- net/ipv6/tcp_ipv6.c | 10 +- net/l2tp/l2tp_ip6.c | 2 +- net/mac80211/cfg.c | 3 + net/mac80211/key.c | 2 +- net/mptcp/pm_netlink.c | 2 +- net/mptcp/pm_userspace.c | 6 - net/mptcp/protocol.c | 177 +++++---- net/mptcp/protocol.h | 24 +- net/mptcp/subflow.c | 41 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 43 ++- net/netfilter/nf_tables_api.c | 44 ++- net/netfilter/nft_set_rbtree.c | 46 ++- net/netlink/af_netlink.c | 37 +- net/nfc/llcp_core.c | 2 + net/rds/tcp_connect.c | 2 +- net/sctp/associola.c | 3 +- net/sctp/socket.c | 1 + net/socket.c | 29 +- net/tipc/crypto.c | 4 +- net/wireless/core.c | 150 +++++++- net/wireless/core.h | 14 +- net/wireless/nl80211.c | 93 +++-- net/wireless/sme.c | 4 +- net/wireless/sysfs.c | 8 +- scripts/mod/file2alias.c | 2 +- security/integrity/ima/Kconfig | 22 +- sound/pci/hda/patch_realtek.c | 154 +++++++- sound/soc/soc-utils.c | 1 + sound/soc/tegra/tegra_audio_graph_card.c | 30 +- tools/include/uapi/linux/bpf.h | 6 + tools/testing/selftests/netfilter/.gitignore | 1 + tools/testing/selftests/netfilter/Makefile | 4 +- tools/testing/selftests/netfilter/audit_logread.c | 165 +++++++++ tools/testing/selftests/netfilter/config | 1 + tools/testing/selftests/netfilter/nft_audit.sh | 193 ++++++++++ 190 files changed, 2961 insertions(+), 1642 deletions(-)

2 years

15
183
0 0

Money-Gram Payment Notification!

by Mr Louis Holland

Attention Dear Customer, This is to bring to your notice that your long awaited fund of USD$ 4,800.000.00) Four Million Eight Hundred Thousand United State Dollars has been deposited with MoneyGram Global Money Transfer Services. New Delhi, INDIA. After cross-checking your record last week Friday, we noted that your record is clear and you are free to receive your long awaited fund without delay. Be advised to contact MoneyGram Global Money Transfer Services Manager NEW DELHI INDIA immediately for urgent access to your payment file so that you will start receiving your daily amount today. Find their contact email below: MR HASSANAND MASAND/ Manager MoneyGram Address: 13&14 OLD MARKET TILAK NAGAR NEW DELHI E-mail: officedesk1978(a)email.cz Please you have to contact the MoneyGram Office immediately you receive this message because your payment files are on their desk right now. They are waiting to hear from you to give you more details on how you will receive your daily payment. Thanks for your time and patience. Mr Louis Holland.

2 years

1
0
0 0

Money-Gram Payment Notification!

by Mr Louis Holland

Attention Dear Customer, This is to bring to your notice that your long awaited fund of USD$ 4,800.000.00) Four Million Eight Hundred Thousand United State Dollars has been deposited with MoneyGram Global Money Transfer Services. New Delhi, INDIA. After cross-checking your record last week Friday, we noted that your record is clear and you are free to receive your long awaited fund without delay. Be advised to contact MoneyGram Global Money Transfer Services Manager NEW DELHI INDIA immediately for urgent access to your payment file so that you will start receiving your daily amount today. Find their contact email below: MR HASSANAND MASAND/ Manager MoneyGram Address: 13&14 OLD MARKET TILAK NAGAR NEW DELHI E-mail: officedesk1978(a)email.cz Please you have to contact the MoneyGram Office immediately you receive this message because your payment files are on their desk right now. They are waiting to hear from you to give you more details on how you will receive your daily payment. Thanks for your time and patience. Mr Louis Holland.

2 years

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023