pf: print rule number in debug output
ClosedPublic
Actions

Authored by kp on Sep 7 2024, 9:35 AM.

Details

Reviewers

None

Group Reviewers

network
pfsense

Commits

rG650dcb48b06f: pf: print rule number in debug output

Summary

When printing states in debug output, print the rule number that created
it if we have it.

Requested by dlg, ok henning.

Obtained from: OpenBSD, mcbride <mcbride@openbsd.org>, c06d1661a6
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kp created this revision.Sep 7 2024, 9:35 AM

Herald added subscribers: vegeta_tuxpowered.net, glebius, melifaro and 2 others. · View Herald TranscriptSep 7 2024, 9:35 AM

kp requested review of this revision.Sep 7 2024, 9:35 AM

Harbormaster completed remote builds in B59373: Diff 143081.Sep 7 2024, 9:35 AM

kp added a parent revision: D46584: pfctl: improve bitmask printing.Sep 7 2024, 9:35 AM

kp added a child revision: D46586: pf: factor out pf_setup_pdesc().

This revision was not accepted when it landed; it landed in state Needs Review.Sep 19 2024, 8:21 PM

Closed by commit rG650dcb48b06f: pf: print rule number in debug output (authored by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rG650dcb48b06f: pf: print rule number in debug output.

Revision Contents
Changeset List

Path

Size

sys/

netpfil/

pf/

pf.c

2 lines

Diff 143482

View Options

sys/netpfil/pf/pf.c

Show First 20 Lines • Show All 1,747 Lines • ▼ Show 20 Lines	vm_page_alloc_after(vm_object_t object, vm_pindex_t pindex,
int domain;		int domain;

vm_domainset_iter_page_init(&di, object, pindex, &domain, &req);		vm_domainset_iter_page_init(&di, object, pindex, &domain, &req);
do {		do {
m = vm_page_alloc_domain_after(object, pindex, domain, req,		m = vm_page_alloc_domain_after(object, pindex, domain, req,
mpred);		mpred);
if (m != NULL)		if (m != NULL)
break;		break;
} while (vm_domainset_iter_page(&di, &domain, &req) == 0);		} while (vm_domainset_iter_page(&di, object, &domain) == 0);

return (m);		return (m);
}		}

/*		/*
* Returns true if the number of free pages exceeds the minimum		* Returns true if the number of free pages exceeds the minimum
* for the request class and false otherwise.		* for the request class and false otherwise.
*/		*/
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines	vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req,
int domain;		int domain;

vm_domainset_iter_page_init(&di, object, pindex, &domain, &req);		vm_domainset_iter_page_init(&di, object, pindex, &domain, &req);
do {		do {
m = vm_page_alloc_contig_domain(object, pindex, domain, req,		m = vm_page_alloc_contig_domain(object, pindex, domain, req,
npages, low, high, alignment, boundary, memattr);		npages, low, high, alignment, boundary, memattr);
if (m != NULL)		if (m != NULL)
break;		break;
} while (vm_domainset_iter_page(&di, &domain, &req) == 0);		} while (vm_domainset_iter_page(&di, object, &domain) == 0);

return (m);		return (m);
}		}

vm_page_t		vm_page_t
vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain,		vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain,
int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,		int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
vm_paddr_t boundary, vm_memattr_t memattr)		vm_paddr_t boundary, vm_memattr_t memattr)
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines	vm_page_alloc_freelist(int freelist, int req)
vm_page_t m;		vm_page_t m;
int domain;		int domain;

vm_domainset_iter_page_init(&di, NULL, 0, &domain, &req);		vm_domainset_iter_page_init(&di, NULL, 0, &domain, &req);
do {		do {
m = vm_page_alloc_freelist_domain(domain, freelist, req);		m = vm_page_alloc_freelist_domain(domain, freelist, req);
if (m != NULL)		if (m != NULL)
break;		break;
} while (vm_domainset_iter_page(&di, &domain, &req) == 0);		} while (vm_domainset_iter_page(&di, NULL, &domain) == 0);

return (m);		return (m);
}		}

vm_page_t		vm_page_t
vm_page_alloc_freelist_domain(int domain, int freelist, int req)		vm_page_alloc_freelist_domain(int domain, int freelist, int req)
{		{
struct vm_domain *vmd;		struct vm_domain *vmd;
▲ Show 20 Lines • Show All 622 Lines • ▼ Show 20 Lines	vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, vm_paddr_t high,
bool ret;		bool ret;

vm_domainset_iter_page_init(&di, NULL, 0, &domain, &req);		vm_domainset_iter_page_init(&di, NULL, 0, &domain, &req);
do {		do {
ret = vm_page_reclaim_contig_domain(domain, req, npages, low,		ret = vm_page_reclaim_contig_domain(domain, req, npages, low,
high, alignment, boundary);		high, alignment, boundary);
if (ret)		if (ret)
break;		break;
} while (vm_domainset_iter_page(&di, &domain, &req) == 0);		} while (vm_domainset_iter_page(&di, NULL, &domain) == 0);

return (ret);		return (ret);
}		}

/*		/*
* Set the domain in the appropriate page level domainset.		* Set the domain in the appropriate page level domainset.
*/		*/
void		void
▲ Show 20 Lines • Show All 1,678 Lines • Show Last 20 Lines

pf: print rule number in debug outputClosedPublicActions