Page MenuHomeFreeBSD
Differential D47285

release: increase VMSIZE for Oracle images
ClosedPublic
Actions

Authored by dch on Oct 25 2024, 3:28 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 11:14 PM
Unknown Object (File)
Thu, Feb 27, 4:28 AM
Unknown Object (File)
Mon, Feb 24, 11:12 AM
Unknown Object (File)
Feb 16 2025, 1:29 PM
Unknown Object (File)
Feb 10 2025, 1:47 AM
Unknown Object (File)
Feb 6 2025, 3:59 PM
Unknown Object (File)
Feb 6 2025, 2:03 AM
Unknown Object (File)
Jan 26 2025, 6:28 PM
View All 30 Files
Subscribers
imp
jrtc27

Details

Reviewers
cperciva
emaste
Group Reviewers
releng
Commits
rG44ef88398e57: release: increase VMSIZE for Oracle images
rG89311e6f987e: release: increase VMSIZE for Oracle images
Summary

While OK for 14.x, both 13.x and 15.0 are failing in snapshot
builds.

Reported by: cperciva
MFC after: 3 days
Sponsored by: SkunkWerks, GmbH

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 60296
Build 57180: arc lint + arc unit

Event Timeline

dch created this revision.Oct 25 2024, 3:28 PM
Herald added subscribers: jrtc27, imp. · View Herald TranscriptOct 25 2024, 3:28 PM
dch requested review of this revision.Oct 25 2024, 3:28 PM
Harbormaster completed remote builds in B60192: Diff 145460.Oct 25 2024, 3:28 PM
dch added a reviewer: releng.Oct 25 2024, 3:28 PM

NB - still waiting on local test build to confirm this is now sufficient.

emaste accepted this revision as: emaste.Oct 25 2024, 3:32 PM
cperciva added a comment.Oct 25 2024, 3:47 PM

On 13 amd64 we need 8 GB I think:

../logs/13-amd64-GENERIC-snap.log:makefs: `/usr/obj/usr/src/amd64.amd64/release/cw-oci' size of 7266697216 is larger than the maxsize of 5368709120.

dch updated this revision to Diff 145774.Oct 31 2024, 7:11 PM

embiggen the image again for 13.x sitting at 6.7GiB

Harbormaster completed remote builds in B60296: Diff 145774.Oct 31 2024, 7:11 PM
cperciva accepted this revision.Oct 31 2024, 7:54 PM
This revision is now accepted and ready to land.Oct 31 2024, 7:54 PM
emaste accepted this revision.Oct 31 2024, 7:55 PM
Closed by commit rG89311e6f987e: release: increase VMSIZE for Oracle images (authored by dch). · Explain WhyOct 31 2024, 8:49 PM
This revision was automatically updated to reflect the committed changes.
dch added a commit: rG89311e6f987e: release: increase VMSIZE for Oracle images.
dch added a commit: rG44ef88398e57: release: increase VMSIZE for Oracle images.

Revision Contents
Changeset List

PathSize
release/
tools/
2 lines

Diff 145774

View Options

release/tools/oracle.conf

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Lines
/* /*
* Raw CP15 maintenance operations * Raw CP15 maintenance operations
* !!! not for external use !!! * !!! not for external use !!!
*/ */
/* TLB */ /* TLB */
_WF0(_CP15_TLBIALL, CP15_TLBIALL) /* Invalidate entire unified TLB */ _WF0(_CP15_TLBIALL, CP15_TLBIALL) /* Invalidate entire unified TLB */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
_WF0(_CP15_TLBIALLIS, CP15_TLBIALLIS) /* Invalidate entire unified TLB IS */ _WF0(_CP15_TLBIALLIS, CP15_TLBIALLIS) /* Invalidate entire unified TLB IS */
#endif #endif
_WF1(_CP15_TLBIASID, CP15_TLBIASID(%0)) /* Invalidate unified TLB by ASID */ _WF1(_CP15_TLBIASID, CP15_TLBIASID(%0)) /* Invalidate unified TLB by ASID */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
_WF1(_CP15_TLBIASIDIS, CP15_TLBIASIDIS(%0)) /* Invalidate unified TLB by ASID IS */ _WF1(_CP15_TLBIASIDIS, CP15_TLBIASIDIS(%0)) /* Invalidate unified TLB by ASID IS */
#endif #endif
_WF1(_CP15_TLBIMVAA, CP15_TLBIMVAA(%0)) /* Invalidate unified TLB by MVA, all ASID */ _WF1(_CP15_TLBIMVAA, CP15_TLBIMVAA(%0)) /* Invalidate unified TLB by MVA, all ASID */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
_WF1(_CP15_TLBIMVAAIS, CP15_TLBIMVAAIS(%0)) /* Invalidate unified TLB by MVA, all ASID IS */ _WF1(_CP15_TLBIMVAAIS, CP15_TLBIMVAAIS(%0)) /* Invalidate unified TLB by MVA, all ASID IS */
#endif #endif
_WF1(_CP15_TLBIMVA, CP15_TLBIMVA(%0)) /* Invalidate unified TLB by MVA */ _WF1(_CP15_TLBIMVA, CP15_TLBIMVA(%0)) /* Invalidate unified TLB by MVA */
_WF1(_CP15_TTB_SET, CP15_TTBR0(%0)) _WF1(_CP15_TTB_SET, CP15_TTBR0(%0))
/* Cache and Branch predictor */ /* Cache and Branch predictor */
_WF0(_CP15_BPIALL, CP15_BPIALL) /* Branch predictor invalidate all */ _WF0(_CP15_BPIALL, CP15_BPIALL) /* Branch predictor invalidate all */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
_WF0(_CP15_BPIALLIS, CP15_BPIALLIS) /* Branch predictor invalidate all IS */ _WF0(_CP15_BPIALLIS, CP15_BPIALLIS) /* Branch predictor invalidate all IS */
#endif #endif
_WF1(_CP15_BPIMVA, CP15_BPIMVA(%0)) /* Branch predictor invalidate by MVA */ _WF1(_CP15_BPIMVA, CP15_BPIMVA(%0)) /* Branch predictor invalidate by MVA */
_WF1(_CP15_DCCIMVAC, CP15_DCCIMVAC(%0)) /* Data cache clean and invalidate by MVA PoC */ _WF1(_CP15_DCCIMVAC, CP15_DCCIMVAC(%0)) /* Data cache clean and invalidate by MVA PoC */
_WF1(_CP15_DCCISW, CP15_DCCISW(%0)) /* Data cache clean and invalidate by set/way */ _WF1(_CP15_DCCISW, CP15_DCCISW(%0)) /* Data cache clean and invalidate by set/way */
_WF1(_CP15_DCCMVAC, CP15_DCCMVAC(%0)) /* Data cache clean by MVA PoC */ _WF1(_CP15_DCCMVAC, CP15_DCCMVAC(%0)) /* Data cache clean by MVA PoC */
#if __ARM_ARCH >= 7 #if __ARM_ARCH >= 7
_WF1(_CP15_DCCMVAU, CP15_DCCMVAU(%0)) /* Data cache clean by MVA PoU */ _WF1(_CP15_DCCMVAU, CP15_DCCMVAU(%0)) /* Data cache clean by MVA PoU */
#endif #endif
_WF1(_CP15_DCCSW, CP15_DCCSW(%0)) /* Data cache clean by set/way */ _WF1(_CP15_DCCSW, CP15_DCCSW(%0)) /* Data cache clean by set/way */
_WF1(_CP15_DCIMVAC, CP15_DCIMVAC(%0)) /* Data cache invalidate by MVA PoC */ _WF1(_CP15_DCIMVAC, CP15_DCIMVAC(%0)) /* Data cache invalidate by MVA PoC */
_WF1(_CP15_DCISW, CP15_DCISW(%0)) /* Data cache invalidate by set/way */ _WF1(_CP15_DCISW, CP15_DCISW(%0)) /* Data cache invalidate by set/way */
_WF0(_CP15_ICIALLU, CP15_ICIALLU) /* Instruction cache invalidate all PoU */ _WF0(_CP15_ICIALLU, CP15_ICIALLU) /* Instruction cache invalidate all PoU */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
_WF0(_CP15_ICIALLUIS, CP15_ICIALLUIS) /* Instruction cache invalidate all PoU IS */ _WF0(_CP15_ICIALLUIS, CP15_ICIALLUIS) /* Instruction cache invalidate all PoU IS */
#endif #endif
_WF1(_CP15_ICIMVAU, CP15_ICIMVAU(%0)) /* Instruction cache invalidate */ _WF1(_CP15_ICIMVAU, CP15_ICIMVAU(%0)) /* Instruction cache invalidate */
/* /*
* Publicly accessible functions * Publicly accessible functions
*/ */
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Linestlb_flush_range_local(vm_offset_t va, vm_size_t size)
dsb(); dsb();
for (; va < eva; va += PAGE_SIZE) for (; va < eva; va += PAGE_SIZE)
_CP15_TLBIMVA(va | CPU_ASID_KERNEL); _CP15_TLBIMVA(va | CPU_ASID_KERNEL);
dsb(); dsb();
} }
/* Broadcasting operations. */ /* Broadcasting operations. */
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
#if defined(CPU_CORTEXA8) #if defined(CPU_CORTEXA8) && \
(defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B))
#define ARM_HAVE_MP_EXTENSIONS (cpuinfo.mp_ext != 0) #define ARM_HAVE_MP_EXTENSIONS (cpuinfo.mp_ext != 0)
#elif defined(CPU_CORTEXA8)
#define ARM_HAVE_MP_EXTENSIONS 0
#else #else
#define ARM_HAVE_MP_EXTENSIONS 1 #define ARM_HAVE_MP_EXTENSIONS 1
#endif #endif
static __inline void static __inline void
tlb_flush_all(void) tlb_flush_all(void)
{ {
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines if (ARM_HAVE_MP_EXTENSIONS) {
for (; va < eva; va += PAGE_SIZE) for (; va < eva; va += PAGE_SIZE)
_CP15_TLBIMVAAIS(va); _CP15_TLBIMVAAIS(va);
} else { } else {
for (; va < eva; va += PAGE_SIZE) for (; va < eva; va += PAGE_SIZE)
_CP15_TLBIMVA(va | CPU_ASID_KERNEL); _CP15_TLBIMVA(va | CPU_ASID_KERNEL);
} }
dsb(); dsb();
} }
#else /* SMP */ #else /* __ARM_ARCH < 7 */
#define tlb_flush_all() tlb_flush_all_local() #define tlb_flush_all() tlb_flush_all_local()
#define tlb_flush_all_ng() tlb_flush_all_ng_local() #define tlb_flush_all_ng() tlb_flush_all_ng_local()
#define tlb_flush(va) tlb_flush_local(va) #define tlb_flush(va) tlb_flush_local(va)
#define tlb_flush_range(va, size) tlb_flush_range_local(va, size) #define tlb_flush_range(va, size) tlb_flush_range_local(va, size)
#endif /* SMP */ #endif /* __ARM_ARCH < 7 */
/* /*
* Cache maintenance operations. * Cache maintenance operations.
*/ */
/* Sync I and D caches to PoU */ /* Sync I and D caches to PoU */
static __inline void static __inline void
icache_sync(vm_offset_t va, vm_size_t size) icache_sync(vm_offset_t va, vm_size_t size)
{ {
vm_offset_t eva = va + size; vm_offset_t eva = va + size;
dsb(); dsb();
va &= ~cpuinfo.dcache_line_mask; va &= ~cpuinfo.dcache_line_mask;
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
if (ARM_HAVE_MP_EXTENSIONS) { if (ARM_HAVE_MP_EXTENSIONS) {
for ( ; va < eva; va += cpuinfo.dcache_line_size) for ( ; va < eva; va += cpuinfo.dcache_line_size)
_CP15_DCCMVAU(va); _CP15_DCCMVAU(va);
} else } else
#endif #endif
{ {
for ( ; va < eva; va += cpuinfo.dcache_line_size) for ( ; va < eva; va += cpuinfo.dcache_line_size)
_CP15_DCCMVAC(va); _CP15_DCCMVAC(va);
} }
dsb(); dsb();
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
if (ARM_HAVE_MP_EXTENSIONS) if (ARM_HAVE_MP_EXTENSIONS)
_CP15_ICIALLUIS(); _CP15_ICIALLUIS();
else else
#endif #endif
_CP15_ICIALLU(); _CP15_ICIALLU();
dsb(); dsb();
isb(); isb();
} }
/* Invalidate I cache */ /* Invalidate I cache */
static __inline void static __inline void
icache_inv_all(void) icache_inv_all(void)
{ {
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
if (ARM_HAVE_MP_EXTENSIONS) if (ARM_HAVE_MP_EXTENSIONS)
_CP15_ICIALLUIS(); _CP15_ICIALLUIS();
else else
#endif #endif
_CP15_ICIALLU(); _CP15_ICIALLU();
dsb(); dsb();
isb(); isb();
} }
/* Invalidate branch predictor buffer */ /* Invalidate branch predictor buffer */
static __inline void static __inline void
bpb_inv_all(void) bpb_inv_all(void)
{ {
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
if (ARM_HAVE_MP_EXTENSIONS) if (ARM_HAVE_MP_EXTENSIONS)
_CP15_BPIALLIS(); _CP15_BPIALLIS();
else else
#endif #endif
_CP15_BPIALL(); _CP15_BPIALL();
dsb(); dsb();
isb(); isb();
} }
/* Write back D-cache to PoU */ /* Write back D-cache to PoU */
static __inline void static __inline void
dcache_wb_pou(vm_offset_t va, vm_size_t size) dcache_wb_pou(vm_offset_t va, vm_size_t size)
{ {
vm_offset_t eva = va + size; vm_offset_t eva = va + size;
dsb(); dsb();
va &= ~cpuinfo.dcache_line_mask; va &= ~cpuinfo.dcache_line_mask;
#if __ARM_ARCH >= 7 && defined SMP #if __ARM_ARCH >= 7
if (ARM_HAVE_MP_EXTENSIONS) { if (ARM_HAVE_MP_EXTENSIONS) {
for ( ; va < eva; va += cpuinfo.dcache_line_size) for ( ; va < eva; va += cpuinfo.dcache_line_size)
_CP15_DCCMVAU(va); _CP15_DCCMVAU(va);
} else } else
#endif #endif
{ {
for ( ; va < eva; va += cpuinfo.dcache_line_size) for ( ; va < eva; va += cpuinfo.dcache_line_size)
_CP15_DCCMVAC(va); _CP15_DCCMVAC(va);
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines