Commit 608f1b13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf, wifi and bluetooth.

  Current release - regressions:

   - wifi: mt76: mt7915: add back 160MHz channel width support for
     MT7915

   - libbpf: revert poisoning of strlcpy, it broke uClibc-ng

  Current release - new code bugs:

   - bpf: improve the coverage of the "allow reads from uninit stack"
     feature to fix verification complexity problems

   - eth: am65-cpts: reset PPS genf adj settings on enable

  Previous releases - regressions:

   - wifi: mac80211: serialize ieee80211_handle_wake_tx_queue()

   - wifi: mt76: do not run mt76_unregister_device() on unregistered hw,
     fix null-deref

   - Bluetooth: btqcomsmd: fix command timeout after setting BD address

   - eth: igb: revert rtnl_lock() that causes a deadlock

   - dsa: mscc: ocelot: fix device specific statistics

  Previous releases - always broken:

   - xsk: add missing overflow check in xdp_umem_reg()

   - wifi: mac80211:
      - fix QoS on mesh interfaces
      - fix mesh path discovery based on unicast packets

   - Bluetooth:
      - ISO: fix timestamped HCI ISO data packet parsing
      - remove "Power-on" check from Mesh feature

   - usbnet: more fixes to drivers trusting packet length

   - wifi: iwlwifi: mvm: fix mvmtxq->stopped handling

   - Bluetooth: btintel: iterate only bluetooth device ACPI entries

   - eth: iavf: fix inverted Rx hash condition leading to disabled hash

   - eth: igc: fix the validation logic for taprio's gate list

   - dsa: tag_brcm: legacy: fix daisy-chained switches

  Misc:

   - bpf: adjust insufficient default bpf_jit_limit to account for
     growth of BPF use over the last 5 years

   - xdp: bpf_xdp_metadata() use EOPNOTSUPP as unique errno indicating
     no driver support"

* tag 'net-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits)
  Bluetooth: HCI: Fix global-out-of-bounds
  Bluetooth: mgmt: Fix MGMT add advmon with RSSI command
  Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work
  Bluetooth: L2CAP: Fix responding with wrong PDU type
  Bluetooth: btqcomsmd: Fix command timeout after setting BD address
  Bluetooth: btinel: Check ACPI handle for NULL before accessing
  net: mdio: thunder: Add missing fwnode_handle_put()
  net: dsa: mt7530: move setting ssc_delta to PHY_INTERFACE_MODE_TRGMII case
  net: dsa: mt7530: move lowering TRGMII driving to mt7530_setup()
  net: dsa: mt7530: move enabling disabling core clock to mt7530_pll_setup()
  net: asix: fix modprobe "sysfs: cannot create duplicate filename"
  gve: Cache link_speed value from device
  tools: ynl: Fix genlmsg header encoding formats
  net: enetc: fix aggregate RMON counters not showing the ranges
  Bluetooth: Remove "Power-on" check from Mesh feature
  Bluetooth: Fix race condition in hci_cmd_sync_clear
  Bluetooth: btintel: Iterate only bluetooth device ACPI entries
  Bluetooth: ISO: fix timestamped HCI ISO data packet parsing
  Bluetooth: btusb: Remove detection of ISO packets over bulk
  Bluetooth: hci_core: Detect if an ACL packet is in fact an ISO packet
  ...
parents 28506304 1b4ae19e

Documentation/networking/xdp-rx-metadata.rst

+5 −2
Original line number Diff line number Diff line
@@ -23,10 +23,13 @@ metadata is supported, this set will grow: 
An XDP program can use these kfuncs to read the metadata into stack

variables for its own consumption. Or, to pass the metadata on to other

consumers, an XDP program can store it into the metadata area carried

ahead of the packet.

ahead of the packet. Not all packets will necessary have the requested

metadata available in which case the driver returns ``-ENODATA``.



Not all kfuncs have to be implemented by the device driver; when not

implemented, the default ones that return ``-EOPNOTSUPP`` will be used.

implemented, the default ones that return ``-EOPNOTSUPP`` will be used

to indicate the device driver have not implemented this kfunc.





Within an XDP frame, the metadata layout (accessed via ``xdp_buff``) is

as follows::

drivers/atm/idt77252.c

+11 −0
Original line number Diff line number Diff line
@@ -2909,6 +2909,7 @@ close_card_oam(struct idt77252_dev *card) 


				recycle_rx_pool_skb(card, &vc->rcv.rx_pool);

			}

			kfree(vc);

		}

	}

}
@@ -2952,6 +2953,15 @@ open_card_ubr0(struct idt77252_dev *card) 
	return 0;

}



static void

close_card_ubr0(struct idt77252_dev *card)

{

	struct vc_map *vc = card->vcs[0];



	free_scq(card, vc->scq);

	kfree(vc);

}



static int

idt77252_dev_open(struct idt77252_dev *card)

{
@@ -3001,6 +3011,7 @@ static void idt77252_dev_close(struct atm_dev *dev) 
	struct idt77252_dev *card = dev->dev_data;

	u32 conf;



	close_card_ubr0(card);

	close_card_oam(card);



	conf = SAR_CFG_RXPTH |	/* enable receive path           */

drivers/bluetooth/btintel.c

+33 −18
Original line number Diff line number Diff line
@@ -26,7 +26,14 @@ 
#define ECDSA_HEADER_LEN	320



#define BTINTEL_PPAG_NAME   "PPAG"

#define BTINTEL_PPAG_PREFIX "\\_SB_.PCI0.XHCI.RHUB"



/* structure to store the PPAG data read from ACPI table */

struct btintel_ppag {

	u32	domain;

	u32     mode;

	acpi_status status;

	struct hci_dev *hdev;

};



#define CMD_WRITE_BOOT_PARAMS	0xfc0e

struct cmd_write_boot_params {
@@ -1295,17 +1302,16 @@ static acpi_status btintel_ppag_callback(acpi_handle handle, u32 lvl, void *data 


	status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);

	if (ACPI_FAILURE(status)) {

		bt_dev_warn(hdev, "ACPI Failure: %s", acpi_format_exception(status));

		bt_dev_warn(hdev, "PPAG-BT: ACPI Failure: %s", acpi_format_exception(status));

		return status;

	}



	if (strncmp(BTINTEL_PPAG_PREFIX, string.pointer,

		    strlen(BTINTEL_PPAG_PREFIX))) {

	len = strlen(string.pointer);

	if (len < strlen(BTINTEL_PPAG_NAME)) {

		kfree(string.pointer);

		return AE_OK;

	}



	len = strlen(string.pointer);

	if (strncmp((char *)string.pointer + len - 4, BTINTEL_PPAG_NAME, 4)) {

		kfree(string.pointer);

		return AE_OK;
@@ -1314,7 +1320,8 @@ static acpi_status btintel_ppag_callback(acpi_handle handle, u32 lvl, void *data 


	status = acpi_evaluate_object(handle, NULL, NULL, &buffer);

	if (ACPI_FAILURE(status)) {

		bt_dev_warn(hdev, "ACPI Failure: %s", acpi_format_exception(status));

		ppag->status = status;

		bt_dev_warn(hdev, "PPAG-BT: ACPI Failure: %s", acpi_format_exception(status));

		return status;

	}
@@ -1323,8 +1330,9 @@ static acpi_status btintel_ppag_callback(acpi_handle handle, u32 lvl, void *data 


	if (p->type != ACPI_TYPE_PACKAGE || p->package.count != 2) {

		kfree(buffer.pointer);

		bt_dev_warn(hdev, "Invalid object type: %d or package count: %d",

		bt_dev_warn(hdev, "PPAG-BT: Invalid object type: %d or package count: %d",

			    p->type, p->package.count);

		ppag->status = AE_ERROR;

		return AE_ERROR;

	}
@@ -1335,6 +1343,7 @@ static acpi_status btintel_ppag_callback(acpi_handle handle, u32 lvl, void *data 


	ppag->domain = (u32)p->package.elements[0].integer.value;

	ppag->mode = (u32)p->package.elements[1].integer.value;

	ppag->status = AE_OK;

	kfree(buffer.pointer);

	return AE_CTRL_TERMINATE;

}
@@ -2314,10 +2323,10 @@ static int btintel_configure_offload(struct hci_dev *hdev) 


static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver)

{

	acpi_status status;

	struct btintel_ppag ppag;

	struct sk_buff *skb;

	struct btintel_loc_aware_reg ppag_cmd;

	acpi_handle handle;



	/* PPAG is not supported if CRF is HrP2, Jfp2, JfP1 */

	switch (ver->cnvr_top & 0xFFF) {
@@ -2327,29 +2336,35 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver 
		return;

	}



	handle = ACPI_HANDLE(GET_HCIDEV_DEV(hdev));

	if (!handle) {

		bt_dev_info(hdev, "No support for BT device in ACPI firmware");

		return;

	}



	memset(&ppag, 0, sizeof(ppag));



	ppag.hdev = hdev;

	status = acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,

				     ACPI_UINT32_MAX, NULL,

	ppag.status = AE_NOT_FOUND;

	acpi_walk_namespace(ACPI_TYPE_PACKAGE, handle, 1, NULL,

			    btintel_ppag_callback, &ppag, NULL);



	if (ACPI_FAILURE(status)) {

		/* Do not log warning message if ACPI entry is not found */

		if (status == AE_NOT_FOUND)

	if (ACPI_FAILURE(ppag.status)) {

		if (ppag.status == AE_NOT_FOUND) {

			bt_dev_dbg(hdev, "PPAG-BT: ACPI entry not found");

			return;

		bt_dev_warn(hdev, "PPAG: ACPI Failure: %s", acpi_format_exception(status));

		}

		return;

	}



	if (ppag.domain != 0x12) {

		bt_dev_warn(hdev, "PPAG-BT Domain disabled");

		bt_dev_warn(hdev, "PPAG-BT: domain is not bluetooth");

		return;

	}



	/* PPAG mode, BIT0 = 0 Disabled, BIT0 = 1 Enabled */

	if (!(ppag.mode & BIT(0))) {

		bt_dev_dbg(hdev, "PPAG disabled");

		bt_dev_dbg(hdev, "PPAG-BT: disabled");

		return;

	}

drivers/bluetooth/btintel.h

+0 −7
Original line number Diff line number Diff line
@@ -137,13 +137,6 @@ struct intel_offload_use_cases { 
	__u8	preset[8];

} __packed;



/* structure to store the PPAG data read from ACPI table */

struct btintel_ppag {

	u32	domain;

	u32     mode;

	struct hci_dev *hdev;

};



struct btintel_loc_aware_reg {

	__le32 mcc;

	__le32 sel;

drivers/bluetooth/btqcomsmd.c

+16 −1
Original line number Diff line number Diff line
@@ -122,6 +122,21 @@ static int btqcomsmd_setup(struct hci_dev *hdev) 
	return 0;

}



static int btqcomsmd_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)

{

	int ret;



	ret = qca_set_bdaddr_rome(hdev, bdaddr);

	if (ret)

		return ret;



	/* The firmware stops responding for a while after setting the bdaddr,

	 * causing timeouts for subsequent commands. Sleep a bit to avoid this.

	 */

	usleep_range(1000, 10000);

	return 0;

}



static int btqcomsmd_probe(struct platform_device *pdev)

{

	struct btqcomsmd *btq;
@@ -162,7 +177,7 @@ static int btqcomsmd_probe(struct platform_device *pdev) 
	hdev->close = btqcomsmd_close;

	hdev->send = btqcomsmd_send;

	hdev->setup = btqcomsmd_setup;

	hdev->set_bdaddr = qca_set_bdaddr_rome;

	hdev->set_bdaddr = btqcomsmd_set_bdaddr;



	ret = hci_register_dev(hdev);

	if (ret < 0)