Skip to content

Commit 5e3f5b8

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from bpf and netfilter. Current release - regressions: - veth: fix packet segmentation in veth_convert_skb_to_xdp_buff Current release - new code bugs: - tcp: assorted fixes to the new Auth Option support Older releases - regressions: - tcp: fix mid stream window clamp - tls: fix incorrect splice handling - ipv4: ip_gre: handle skb_pull() failure in ipgre_xmit() - dsa: mv88e6xxx: restore USXGMII support for 6393X - arcnet: restore support for multiple Sohard Arcnet cards Older releases - always broken: - tcp: do not accept ACK of bytes we never sent - require admin privileges to receive packet traces via netlink - packet: move reference count in packet_sock to atomic_long_t - bpf: - fix incorrect branch offset comparison with cpu=v4 - fix prog_array_map_poke_run map poke update - netfilter: - three fixes for crashes on bad admin commands - xt_owner: fix race accessing sk->sk_socket, TOCTOU null-deref - nf_tables: fix 'exist' matching on bigendian arches - leds: netdev: fix RTNL handling to prevent potential deadlock - eth: tg3: prevent races in error/reset handling - eth: r8169: fix rtl8125b PAUSE storm when suspended - eth: r8152: improve reset and surprise removal handling - eth: hns: fix race between changing features and sending - eth: nfp: fix sleep in atomic for bonding offload" * tag 'net-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits) vsock/virtio: fix "comparison of distinct pointer types lacks a cast" warning net/smc: fix missing byte order conversion in CLC handshake net: dsa: microchip: provide a list of valid protocols for xmit handler drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group psample: Require 'CAP_NET_ADMIN' when joining "packets" group bpf: sockmap, updating the sg structure should also update curr net: tls, update curr on splice as well nfp: flower: fix for take a mutex lock in soft irq context and rcu lock net: dsa: mv88e6xxx: Restore USXGMII support for 6393X tcp: do not accept ACK of bytes we never sent selftests/bpf: Add test for early update in prog_array_map_poke_run bpf: Fix prog_array_map_poke_run map poke update netfilter: xt_owner: Fix for unsafe access of sk->sk_socket netfilter: nf_tables: validate family when identifying table via handle netfilter: nf_tables: bail out on mismatching dynset and set expressions netfilter: nf_tables: fix 'exist' matching on bigendian arches netfilter: nft_set_pipapo: skip inactive elements during set walk netfilter: bpf: fix bad registration on nf_defrag leds: trigger: netdev: fix RTNL handling to prevent potential deadlock octeontx2-af: Update Tx link register range ...
2 parents 9ace34a + b0a930e commit 5e3f5b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+821
-356
lines changed

‎Documentation/networking/tcp_ao.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ also [6.1]::
9999
when it is no longer considered permitted.
100100

101101
Linux TCP-AO will try its best to prevent you from removing a key that's
102-
being used, considering it a key management failure. But sine keeping
102+
being used, considering it a key management failure. But since keeping
103103
an outdated key may become a security issue and as a peer may
104104
unintentionally prevent the removal of an old key by always setting
105105
it as RNextKeyID - a forced key removal mechanism is provided, where

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15066,6 +15066,7 @@ F: lib/random32.c
1506615066
F: net/
1506715067
F: tools/net/
1506815068
F: tools/testing/selftests/net/
15069+
X: net/9p/
1506915070
X: net/bluetooth/
1507015071

1507115072
NETWORKING [IPSEC]

‎arch/x86/net/bpf_jit_comp.c

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,3 +3025,49 @@ void arch_bpf_stack_walk(bool (*consume_fn)(void *cookie, u64 ip, u64 sp, u64 bp
30253025
#endif
30263026
WARN(1, "verification of programs using bpf_throw should have failed\n");
30273027
}
3028+
3029+
void bpf_arch_poke_desc_update(struct bpf_jit_poke_descriptor *poke,
3030+
struct bpf_prog *new, struct bpf_prog *old)
3031+
{
3032+
u8 *old_addr, *new_addr, *old_bypass_addr;
3033+
int ret;
3034+
3035+
old_bypass_addr = old ? NULL : poke->bypass_addr;
3036+
old_addr = old ? (u8 *)old->bpf_func + poke->adj_off : NULL;
3037+
new_addr = new ? (u8 *)new->bpf_func + poke->adj_off : NULL;
3038+
3039+
/*
3040+
* On program loading or teardown, the program's kallsym entry
3041+
* might not be in place, so we use __bpf_arch_text_poke to skip
3042+
* the kallsyms check.
3043+
*/
3044+
if (new) {
3045+
ret = __bpf_arch_text_poke(poke->tailcall_target,
3046+
BPF_MOD_JUMP,
3047+
old_addr, new_addr);
3048+
BUG_ON(ret < 0);
3049+
if (!old) {
3050+
ret = __bpf_arch_text_poke(poke->tailcall_bypass,
3051+
BPF_MOD_JUMP,
3052+
poke->bypass_addr,
3053+
NULL);
3054+
BUG_ON(ret < 0);
3055+
}
3056+
} else {
3057+
ret = __bpf_arch_text_poke(poke->tailcall_bypass,
3058+
BPF_MOD_JUMP,
3059+
old_bypass_addr,
3060+
poke->bypass_addr);
3061+
BUG_ON(ret < 0);
3062+
/* let other CPUs finish the execution of program
3063+
* so that it will not possible to expose them
3064+
* to invalid nop, stack unwind, nop state
3065+
*/
3066+
if (!ret)
3067+
synchronize_rcu();
3068+
ret = __bpf_arch_text_poke(poke->tailcall_target,
3069+
BPF_MOD_JUMP,
3070+
old_addr, NULL);
3071+
BUG_ON(ret < 0);
3072+
}
3073+
}

‎drivers/leds/trigger/ledtrig-netdev.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ static int set_device_name(struct led_netdev_data *trigger_data,
226226

227227
cancel_delayed_work_sync(&trigger_data->work);
228228

229+
/*
230+
* Take RTNL lock before trigger_data lock to prevent potential
231+
* deadlock with netdev notifier registration.
232+
*/
233+
rtnl_lock();
229234
mutex_lock(&trigger_data->lock);
230235

231236
if (trigger_data->net_dev) {
@@ -245,16 +250,14 @@ static int set_device_name(struct led_netdev_data *trigger_data,
245250
trigger_data->carrier_link_up = false;
246251
trigger_data->link_speed = SPEED_UNKNOWN;
247252
trigger_data->duplex = DUPLEX_UNKNOWN;
248-
if (trigger_data->net_dev != NULL) {
249-
rtnl_lock();
253+
if (trigger_data->net_dev)
250254
get_device_state(trigger_data);
251-
rtnl_unlock();
252-
}
253255

254256
trigger_data->last_activity = 0;
255257

256258
set_baseline_state(trigger_data);
257259
mutex_unlock(&trigger_data->lock);
260+
rtnl_unlock();
258261

259262
return 0;
260263
}

‎drivers/net/arcnet/arcdevice.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ do { \
186186
#define ARC_IS_5MBIT 1 /* card default speed is 5MBit */
187187
#define ARC_CAN_10MBIT 2 /* card uses COM20022, supporting 10MBit,
188188
but default is 2.5MBit. */
189+
#define ARC_HAS_LED 4 /* card has software controlled LEDs */
190+
#define ARC_HAS_ROTARY 8 /* card has rotary encoder */
189191

190192
/* information needed to define an encapsulation driver */
191193
struct ArcProto {

‎drivers/net/arcnet/com20020-pci.c

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,13 @@ static int com20020pci_probe(struct pci_dev *pdev,
213213
if (!strncmp(ci->name, "EAE PLX-PCI FB2", 15))
214214
lp->backplane = 1;
215215

216-
/* Get the dev_id from the PLX rotary coder */
217-
if (!strncmp(ci->name, "EAE PLX-PCI MA1", 15))
218-
dev_id_mask = 0x3;
219-
dev->dev_id = (inb(priv->misc + ci->rotary) >> 4) & dev_id_mask;
220-
221-
snprintf(dev->name, sizeof(dev->name), "arc%d-%d", dev->dev_id, i);
216+
if (ci->flags & ARC_HAS_ROTARY) {
217+
/* Get the dev_id from the PLX rotary coder */
218+
if (!strncmp(ci->name, "EAE PLX-PCI MA1", 15))
219+
dev_id_mask = 0x3;
220+
dev->dev_id = (inb(priv->misc + ci->rotary) >> 4) & dev_id_mask;
221+
snprintf(dev->name, sizeof(dev->name), "arc%d-%d", dev->dev_id, i);
222+
}
222223

223224
if (arcnet_inb(ioaddr, COM20020_REG_R_STATUS) == 0xFF) {
224225
pr_err("IO address %Xh is empty!\n", ioaddr);
@@ -230,6 +231,10 @@ static int com20020pci_probe(struct pci_dev *pdev,
230231
goto err_free_arcdev;
231232
}
232233

234+
ret = com20020_found(dev, IRQF_SHARED);
235+
if (ret)
236+
goto err_free_arcdev;
237+
233238
card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
234239
GFP_KERNEL);
235240
if (!card) {
@@ -239,41 +244,39 @@ static int com20020pci_probe(struct pci_dev *pdev,
239244

240245
card->index = i;
241246
card->pci_priv = priv;
242-
card->tx_led.brightness_set = led_tx_set;
243-
card->tx_led.default_trigger = devm_kasprintf(&pdev->dev,
244-
GFP_KERNEL, "arc%d-%d-tx",
245-
dev->dev_id, i);
246-
card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
247-
"pci:green:tx:%d-%d",
248-
dev->dev_id, i);
249-
250-
card->tx_led.dev = &dev->dev;
251-
card->recon_led.brightness_set = led_recon_set;
252-
card->recon_led.default_trigger = devm_kasprintf(&pdev->dev,
253-
GFP_KERNEL, "arc%d-%d-recon",
254-
dev->dev_id, i);
255-
card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
256-
"pci:red:recon:%d-%d",
257-
dev->dev_id, i);
258-
card->recon_led.dev = &dev->dev;
259-
card->dev = dev;
260-
261-
ret = devm_led_classdev_register(&pdev->dev, &card->tx_led);
262-
if (ret)
263-
goto err_free_arcdev;
264247

265-
ret = devm_led_classdev_register(&pdev->dev, &card->recon_led);
266-
if (ret)
267-
goto err_free_arcdev;
268-
269-
dev_set_drvdata(&dev->dev, card);
270-
271-
ret = com20020_found(dev, IRQF_SHARED);
272-
if (ret)
273-
goto err_free_arcdev;
274-
275-
devm_arcnet_led_init(dev, dev->dev_id, i);
248+
if (ci->flags & ARC_HAS_LED) {
249+
card->tx_led.brightness_set = led_tx_set;
250+
card->tx_led.default_trigger = devm_kasprintf(&pdev->dev,
251+
GFP_KERNEL, "arc%d-%d-tx",
252+
dev->dev_id, i);
253+
card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
254+
"pci:green:tx:%d-%d",
255+
dev->dev_id, i);
256+
257+
card->tx_led.dev = &dev->dev;
258+
card->recon_led.brightness_set = led_recon_set;
259+
card->recon_led.default_trigger = devm_kasprintf(&pdev->dev,
260+
GFP_KERNEL, "arc%d-%d-recon",
261+
dev->dev_id, i);
262+
card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
263+
"pci:red:recon:%d-%d",
264+
dev->dev_id, i);
265+
card->recon_led.dev = &dev->dev;
266+
267+
ret = devm_led_classdev_register(&pdev->dev, &card->tx_led);
268+
if (ret)
269+
goto err_free_arcdev;
270+
271+
ret = devm_led_classdev_register(&pdev->dev, &card->recon_led);
272+
if (ret)
273+
goto err_free_arcdev;
274+
275+
dev_set_drvdata(&dev->dev, card);
276+
devm_arcnet_led_init(dev, dev->dev_id, i);
277+
}
276278

279+
card->dev = dev;
277280
list_add(&card->list, &priv->list_dev);
278281
continue;
279282

@@ -329,7 +332,7 @@ static struct com20020_pci_card_info card_info_5mbit = {
329332
};
330333

331334
static struct com20020_pci_card_info card_info_sohard = {
332-
.name = "PLX-PCI",
335+
.name = "SOHARD SH ARC-PCI",
333336
.devcount = 1,
334337
/* SOHARD needs PCI base addr 4 */
335338
.chan_map_tbl = {
@@ -364,7 +367,7 @@ static struct com20020_pci_card_info card_info_eae_arc1 = {
364367
},
365368
},
366369
.rotary = 0x0,
367-
.flags = ARC_CAN_10MBIT,
370+
.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,
368371
};
369372

370373
static struct com20020_pci_card_info card_info_eae_ma1 = {
@@ -396,7 +399,7 @@ static struct com20020_pci_card_info card_info_eae_ma1 = {
396399
},
397400
},
398401
.rotary = 0x0,
399-
.flags = ARC_CAN_10MBIT,
402+
.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,
400403
};
401404

402405
static struct com20020_pci_card_info card_info_eae_fb2 = {
@@ -421,7 +424,7 @@ static struct com20020_pci_card_info card_info_eae_fb2 = {
421424
},
422425
},
423426
.rotary = 0x0,
424-
.flags = ARC_CAN_10MBIT,
427+
.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,
425428
};
426429

427430
static const struct pci_device_id com20020pci_id_table[] = {

‎drivers/net/dsa/microchip/ksz_common.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,10 +2713,18 @@ static int ksz_connect_tag_protocol(struct dsa_switch *ds,
27132713
{
27142714
struct ksz_tagger_data *tagger_data;
27152715

2716-
tagger_data = ksz_tagger_data(ds);
2717-
tagger_data->xmit_work_fn = ksz_port_deferred_xmit;
2718-
2719-
return 0;
2716+
switch (proto) {
2717+
case DSA_TAG_PROTO_KSZ8795:
2718+
return 0;
2719+
case DSA_TAG_PROTO_KSZ9893:
2720+
case DSA_TAG_PROTO_KSZ9477:
2721+
case DSA_TAG_PROTO_LAN937X:
2722+
tagger_data = ksz_tagger_data(ds);
2723+
tagger_data->xmit_work_fn = ksz_port_deferred_xmit;
2724+
return 0;
2725+
default:
2726+
return -EPROTONOSUPPORT;
2727+
}
27202728
}
27212729

27222730
static int ksz_port_vlan_filtering(struct dsa_switch *ds, int port,

‎drivers/net/dsa/mv88e6xxx/pcs-639x.c

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ mv88e639x_pcs_select(struct mv88e6xxx_chip *chip, int port,
465465
case PHY_INTERFACE_MODE_10GBASER:
466466
case PHY_INTERFACE_MODE_XAUI:
467467
case PHY_INTERFACE_MODE_RXAUI:
468+
case PHY_INTERFACE_MODE_USXGMII:
468469
return &mpcs->xg_pcs;
469470

470471
default:
@@ -873,7 +874,8 @@ static int mv88e6393x_xg_pcs_post_config(struct phylink_pcs *pcs,
873874
struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);
874875
int err;
875876

876-
if (interface == PHY_INTERFACE_MODE_10GBASER) {
877+
if (interface == PHY_INTERFACE_MODE_10GBASER ||
878+
interface == PHY_INTERFACE_MODE_USXGMII) {
877879
err = mv88e6393x_erratum_5_2(mpcs);
878880
if (err)
879881
return err;
@@ -886,12 +888,37 @@ static int mv88e6393x_xg_pcs_post_config(struct phylink_pcs *pcs,
886888
return mv88e639x_xg_pcs_enable(mpcs);
887889
}
888890

891+
static void mv88e6393x_xg_pcs_get_state(struct phylink_pcs *pcs,
892+
struct phylink_link_state *state)
893+
{
894+
struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);
895+
u16 status, lp_status;
896+
int err;
897+
898+
if (state->interface != PHY_INTERFACE_MODE_USXGMII)
899+
return mv88e639x_xg_pcs_get_state(pcs, state);
900+
901+
state->link = false;
902+
903+
err = mv88e639x_read(mpcs, MV88E6390_USXGMII_PHY_STATUS, &status);
904+
err = err ? : mv88e639x_read(mpcs, MV88E6390_USXGMII_LP_STATUS, &lp_status);
905+
if (err) {
906+
dev_err(mpcs->mdio.dev.parent,
907+
"can't read USXGMII status: %pe\n", ERR_PTR(err));
908+
return;
909+
}
910+
911+
state->link = !!(status & MDIO_USXGMII_LINK);
912+
state->an_complete = state->link;
913+
phylink_decode_usxgmii_word(state, lp_status);
914+
}
915+
889916
static const struct phylink_pcs_ops mv88e6393x_xg_pcs_ops = {
890917
.pcs_enable = mv88e6393x_xg_pcs_enable,
891918
.pcs_disable = mv88e6393x_xg_pcs_disable,
892919
.pcs_pre_config = mv88e6393x_xg_pcs_pre_config,
893920
.pcs_post_config = mv88e6393x_xg_pcs_post_config,
894-
.pcs_get_state = mv88e639x_xg_pcs_get_state,
921+
.pcs_get_state = mv88e6393x_xg_pcs_get_state,
895922
.pcs_config = mv88e639x_xg_pcs_config,
896923
};
897924

‎drivers/net/ethernet/aquantia/atlantic/aq_ptp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,17 +553,17 @@ void aq_ptp_tx_hwtstamp(struct aq_nic_s *aq_nic, u64 timestamp)
553553

554554
/* aq_ptp_rx_hwtstamp - utility function which checks for RX time stamp
555555
* @adapter: pointer to adapter struct
556-
* @skb: particular skb to send timestamp with
556+
* @shhwtstamps: particular skb_shared_hwtstamps to save timestamp
557557
*
558558
* if the timestamp is valid, we convert it into the timecounter ns
559559
* value, then store that result into the hwtstamps structure which
560560
* is passed up the network stack
561561
*/
562-
static void aq_ptp_rx_hwtstamp(struct aq_ptp_s *aq_ptp, struct sk_buff *skb,
562+
static void aq_ptp_rx_hwtstamp(struct aq_ptp_s *aq_ptp, struct skb_shared_hwtstamps *shhwtstamps,
563563
u64 timestamp)
564564
{
565565
timestamp -= atomic_read(&aq_ptp->offset_ingress);
566-
aq_ptp_convert_to_hwtstamp(aq_ptp, skb_hwtstamps(skb), timestamp);
566+
aq_ptp_convert_to_hwtstamp(aq_ptp, shhwtstamps, timestamp);
567567
}
568568

569569
void aq_ptp_hwtstamp_config_get(struct aq_ptp_s *aq_ptp,
@@ -639,7 +639,7 @@ bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring)
639639
&aq_ptp->ptp_rx == ring || &aq_ptp->hwts_rx == ring;
640640
}
641641

642-
u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct sk_buff *skb, u8 *p,
642+
u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct skb_shared_hwtstamps *shhwtstamps, u8 *p,
643643
unsigned int len)
644644
{
645645
struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;
@@ -648,7 +648,7 @@ u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct sk_buff *skb, u8 *p,
648648
p, len, &timestamp);
649649

650650
if (ret > 0)
651-
aq_ptp_rx_hwtstamp(aq_ptp, skb, timestamp);
651+
aq_ptp_rx_hwtstamp(aq_ptp, shhwtstamps, timestamp);
652652

653653
return ret;
654654
}

‎drivers/net/ethernet/aquantia/atlantic/aq_ptp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int aq_ptp_hwtstamp_config_set(struct aq_ptp_s *aq_ptp,
6767
/* Return either ring is belong to PTP or not*/
6868
bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring);
6969

70-
u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct sk_buff *skb, u8 *p,
70+
u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct skb_shared_hwtstamps *shhwtstamps, u8 *p,
7171
unsigned int len);
7272

7373
struct ptp_clock *aq_ptp_get_ptp_clock(struct aq_ptp_s *aq_ptp);
@@ -143,7 +143,7 @@ static inline bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring)
143143
}
144144

145145
static inline u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic,
146-
struct sk_buff *skb, u8 *p,
146+
struct skb_shared_hwtstamps *shhwtstamps, u8 *p,
147147
unsigned int len)
148148
{
149149
return 0;

0 commit comments

Comments
 (0)