Commit 33d06d1d authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Jakub Kicinski
Browse files

niu: Use page->private instead of page->index 



We are close to removing page->index.  Use page->private instead, which
is least likely to be removed.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Link: https://patch.msgid.link/20241216155124.3114-1-willy@infradead.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1ba06ca9

drivers/net/ethernet/sun/niu.c

+11 −11
Original line number Diff line number Diff line
@@ -3303,7 +3303,7 @@ static struct page *niu_find_rxpage(struct rx_ring_info *rp, u64 addr, 
	addr &= PAGE_MASK;

	pp = &rp->rxhash[h];

	for (; (p = *pp) != NULL; pp = &niu_next_page(p)) {

		if (p->index == addr) {

		if (p->private == addr) {

			*link = pp;

			goto found;

		}
@@ -3318,7 +3318,7 @@ static void niu_hash_page(struct rx_ring_info *rp, struct page *page, u64 base) 
{

	unsigned int h = niu_hash_rxaddr(rp, base);



	page->index = base;

	page->private = base;

	niu_next_page(page) = rp->rxhash[h];

	rp->rxhash[h] = page;

}
@@ -3400,11 +3400,11 @@ static int niu_rx_pkt_ignore(struct niu *np, struct rx_ring_info *rp) 


		rcr_size = rp->rbr_sizes[(val & RCR_ENTRY_PKTBUFSZ) >>

					 RCR_ENTRY_PKTBUFSZ_SHIFT];

		if ((page->index + PAGE_SIZE) - rcr_size == addr) {

		if ((page->private + PAGE_SIZE) - rcr_size == addr) {

			*link = niu_next_page(page);

			np->ops->unmap_page(np->device, page->index,

			np->ops->unmap_page(np->device, page->private,

					    PAGE_SIZE, DMA_FROM_DEVICE);

			page->index = 0;

			page->private = 0;

			niu_next_page(page) = NULL;

			__free_page(page);

			rp->rbr_refill_pending++;
@@ -3469,11 +3469,11 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np, 
			append_size = append_size - skb->len;



		niu_rx_skb_append(skb, page, off, append_size, rcr_size);

		if ((page->index + rp->rbr_block_size) - rcr_size == addr) {

		if ((page->private + rp->rbr_block_size) - rcr_size == addr) {

			*link = niu_next_page(page);

			np->ops->unmap_page(np->device, page->index,

			np->ops->unmap_page(np->device, page->private,

					    PAGE_SIZE, DMA_FROM_DEVICE);

			page->index = 0;

			page->private = 0;

			niu_next_page(page) = NULL;

			rp->rbr_refill_pending++;

		} else
@@ -3538,11 +3538,11 @@ static void niu_rbr_free(struct niu *np, struct rx_ring_info *rp) 
		page = rp->rxhash[i];

		while (page) {

			struct page *next = niu_next_page(page);

			u64 base = page->index;

			u64 base = page->private;



			np->ops->unmap_page(np->device, base, PAGE_SIZE,

					    DMA_FROM_DEVICE);

			page->index = 0;

			page->private = 0;

			niu_next_page(page) = NULL;



			__free_page(page);
@@ -6460,7 +6460,7 @@ static void niu_reset_buffers(struct niu *np) 
				page = rp->rxhash[j];

				while (page) {

					struct page *next = niu_next_page(page);

					u64 base = page->index;

					u64 base = page->private;

					base = base >> RBR_DESCR_ADDR_SHIFT;

					rp->rbr[k++] = cpu_to_le32(base);

					page = next;