Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67b07609 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Fix up several Kconfig dependencies in netfilter, from Martin Willi
    and Florian Westphal.

 2) Memory leak in be2net driver, from Petr Oros.

 3) Memory leak in E-Switch handling of mlx5 driver, from Raed Salem.

 4) mlx5_attach_interface needs to check for errors, from Huy Nguyen.

 5) tipc_release() needs to orphan the sock, from Cong Wang.

 6) Need to program TxConfig register after TX/RX is enabled in r8169
    driver, not beforehand, from Maciej S. Szmigiero.

 7) Handle 64K PAGE_SIZE properly in ena driver, from Netanel Belgazal.

 8) Fix crash regression in ip_do_fragment(), from Taehee Yoo.

 9) syzbot can create conditions where kernel log is flooded with
    synflood warnings due to creation of many listening sockets, fix
    that. From Willem de Bruijn.

10) Fix RCU issues in rds socket layer, from Cong Wang.

11) Fix vlan matching in nfp driver, from Pieter Jansen van Vuuren.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)
  nfp: flower: reject tunnel encap with ipv6 outer headers for offloading
  nfp: flower: fix vlan match by checking both vlan id and vlan pcp
  tipc: check return value of __tipc_dump_start()
  s390/qeth: don't dump past end of unknown HW header
  s390/qeth: use vzalloc for QUERY OAT buffer
  s390/qeth: switch on SG by default for IQD devices
  s390/qeth: indicate error when netdev allocation fails
  rds: fix two RCU related problems
  r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
  erspan: fix error handling for erspan tunnel
  erspan: return PACKET_REJECT when the appropriate tunnel is not found
  tcp: rate limit synflood warnings further
  MIPS: lantiq: dma: add dev pointer
  netfilter: xt_hashlimit: use s->file instead of s->private
  netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT
  netfilter: cttimeout: ctnl_timeout_find_get() returns incorrect pointer to type
  netfilter: conntrack: timeout interface depend on CONFIG_NF_CONNTRACK_TIMEOUT
  netfilter: conntrack: reset tcp maxwin on re-register
  qmi_wwan: Support dynamic config on Quectel EP06
  ethernet: renesas: convert to SPDX identifiers
  ...
parents 96eddb81 4851bfd6

arch/mips/include/asm/mach-lantiq/xway/xway_dma.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct ltq_dma_channel { 
	int desc;			/* the current descriptor */

	struct ltq_dma_desc *desc_base; /* the descriptor base */

	int phys;			/* physical addr */

	struct device *dev;

};



enum {

arch/mips/lantiq/xway/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ ltq_dma_alloc(struct ltq_dma_channel *ch) 
	unsigned long flags;



	ch->desc = 0;

	ch->desc_base = dma_zalloc_coherent(NULL,

	ch->desc_base = dma_zalloc_coherent(ch->dev,

				LTQ_DESC_NUM * LTQ_DESC_SIZE,

				&ch->phys, GFP_ATOMIC);
@@ -182,7 +182,7 @@ ltq_dma_free(struct ltq_dma_channel *ch) 
	if (!ch->desc_base)

		return;

	ltq_dma_close(ch);

	dma_free_coherent(NULL, LTQ_DESC_NUM * LTQ_DESC_SIZE,

	dma_free_coherent(ch->dev, LTQ_DESC_NUM * LTQ_DESC_SIZE,

		ch->desc_base, ch->phys);

}

EXPORT_SYMBOL_GPL(ltq_dma_free);

drivers/net/ethernet/amazon/ena/ena_com.c

+11 −13
Original line number Diff line number Diff line
@@ -459,12 +459,12 @@ static void ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_qu 
	cqe = &admin_queue->cq.entries[head_masked];



	/* Go over all the completions */

	while ((cqe->acq_common_descriptor.flags &

	while ((READ_ONCE(cqe->acq_common_descriptor.flags) &

			ENA_ADMIN_ACQ_COMMON_DESC_PHASE_MASK) == phase) {

		/* Do not read the rest of the completion entry before the

		 * phase bit was validated

		 */

		rmb();

		dma_rmb();

		ena_com_handle_single_admin_completion(admin_queue, cqe);



		head_masked++;
@@ -627,17 +627,10 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset) 
	mmio_read_reg |= mmio_read->seq_num &

			ENA_REGS_MMIO_REG_READ_REQ_ID_MASK;



	/* make sure read_resp->req_id get updated before the hw can write

	 * there

	 */

	wmb();



	writel_relaxed(mmio_read_reg,

		       ena_dev->reg_bar + ENA_REGS_MMIO_REG_READ_OFF);

	writel(mmio_read_reg, ena_dev->reg_bar + ENA_REGS_MMIO_REG_READ_OFF);



	mmiowb();

	for (i = 0; i < timeout; i++) {

		if (read_resp->req_id == mmio_read->seq_num)

		if (READ_ONCE(read_resp->req_id) == mmio_read->seq_num)

			break;



		udelay(1);
@@ -1796,8 +1789,13 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data) 
	aenq_common = &aenq_e->aenq_common_desc;



	/* Go over all the events */

	while ((aenq_common->flags & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) ==

	       phase) {

	while ((READ_ONCE(aenq_common->flags) &

		ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {

		/* Make sure the phase bit (ownership) is as expected before

		 * reading the rest of the descriptor.

		 */

		dma_rmb();



		pr_debug("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n",

			 aenq_common->group, aenq_common->syndrom,

			 (u64)aenq_common->timestamp_low +

drivers/net/ethernet/amazon/ena/ena_eth_com.c

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc( 
	if (desc_phase != expected_phase)

		return NULL;



	/* Make sure we read the rest of the descriptor after the phase bit

	 * has been read

	 */

	dma_rmb();



	return cdesc;

}
@@ -493,6 +498,7 @@ int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq, u16 *req_id) 
	if (cdesc_phase != expected_phase)

		return -EAGAIN;



	dma_rmb();

	if (unlikely(cdesc->req_id >= io_cq->q_depth)) {

		pr_err("Invalid req id %d\n", cdesc->req_id);

		return -EINVAL;

drivers/net/ethernet/amazon/ena/ena_eth_com.h

+2 −6
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ static inline int ena_com_sq_empty_space(struct ena_com_io_sq *io_sq) 
	return io_sq->q_depth - 1 - cnt;

}



static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq,

					    bool relaxed)

static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq)

{

	u16 tail;
@@ -117,9 +116,6 @@ static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq, 
	pr_debug("write submission queue doorbell for queue: %d tail: %d\n",

		 io_sq->qid, tail);



	if (relaxed)

		writel_relaxed(tail, io_sq->db_addr);

	else

	writel(tail, io_sq->db_addr);



	return 0;