patch-realtime 795 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092609360946095609660976098609961006101610261036104610561066107610861096110611161126113611461156116611761186119612061216122612361246125612661276128612961306131613261336134613561366137613861396140614161426143614461456146614761486149615061516152615361546155615661576158615961606161616261636164616561666167616861696170617161726173617461756176617761786179618061816182618361846185618661876188618961906191619261936194619561966197619861996200620162026203620462056206620762086209621062116212621362146215621662176218621962206221622262236224622562266227622862296230623162326233623462356236623762386239624062416242624362446245624662476248624962506251625262536254625562566257625862596260626162626263626462656266626762686269627062716272627362746275627662776278627962806281628262836284628562866287628862896290629162926293629462956296629762986299630063016302630363046305630663076308630963106311631263136314631563166317631863196320632163226323632463256326632763286329633063316332633363346335633663376338633963406341634263436344634563466347634863496350635163526353635463556356635763586359636063616362636363646365636663676368636963706371637263736374637563766377637863796380638163826383638463856386638763886389639063916392639363946395639663976398639964006401640264036404640564066407640864096410641164126413641464156416641764186419642064216422642364246425642664276428642964306431643264336434643564366437643864396440644164426443644464456446644764486449645064516452645364546455645664576458645964606461646264636464646564666467646864696470647164726473647464756476647764786479648064816482648364846485648664876488648964906491649264936494649564966497649864996500650165026503650465056506650765086509651065116512651365146515651665176518651965206521652265236524652565266527652865296530653165326533653465356536653765386539654065416542654365446545654665476548654965506551655265536554655565566557655865596560656165626563656465656566656765686569657065716572657365746575657665776578657965806581658265836584658565866587658865896590659165926593659465956596659765986599660066016602660366046605660666076608660966106611661266136614661566166617661866196620662166226623662466256626662766286629663066316632663366346635663666376638663966406641664266436644664566466647664866496650665166526653665466556656665766586659666066616662666366646665666666676668666966706671667266736674667566766677667866796680668166826683668466856686668766886689669066916692669366946695669666976698669967006701670267036704670567066707670867096710671167126713671467156716671767186719672067216722672367246725672667276728672967306731673267336734673567366737673867396740674167426743674467456746674767486749675067516752675367546755675667576758675967606761676267636764676567666767676867696770677167726773677467756776677767786779678067816782678367846785678667876788678967906791679267936794679567966797679867996800680168026803680468056806680768086809681068116812681368146815681668176818681968206821682268236824682568266827682868296830683168326833683468356836683768386839684068416842684368446845684668476848684968506851685268536854685568566857685868596860686168626863686468656866686768686869687068716872687368746875687668776878687968806881688268836884688568866887688868896890689168926893689468956896689768986899690069016902690369046905690669076908690969106911691269136914691569166917691869196920692169226923692469256926692769286929693069316932693369346935693669376938693969406941694269436944694569466947694869496950695169526953695469556956695769586959696069616962696369646965696669676968696969706971697269736974697569766977697869796980698169826983698469856986698769886989699069916992699369946995699669976998699970007001700270037004700570067007700870097010701170127013701470157016701770187019702070217022702370247025702670277028702970307031703270337034703570367037703870397040704170427043704470457046704770487049705070517052705370547055705670577058705970607061706270637064706570667067706870697070707170727073707470757076707770787079708070817082708370847085708670877088708970907091709270937094709570967097709870997100710171027103710471057106710771087109711071117112711371147115711671177118711971207121712271237124712571267127712871297130713171327133713471357136713771387139714071417142714371447145714671477148714971507151715271537154715571567157715871597160716171627163716471657166716771687169717071717172717371747175717671777178717971807181718271837184718571867187718871897190719171927193719471957196719771987199720072017202720372047205720672077208720972107211721272137214721572167217721872197220722172227223722472257226722772287229723072317232723372347235723672377238723972407241724272437244724572467247724872497250725172527253725472557256725772587259726072617262726372647265726672677268726972707271727272737274727572767277727872797280728172827283728472857286728772887289729072917292729372947295729672977298729973007301730273037304730573067307730873097310731173127313731473157316731773187319732073217322732373247325732673277328732973307331733273337334733573367337733873397340734173427343734473457346734773487349735073517352735373547355735673577358735973607361736273637364736573667367736873697370737173727373737473757376737773787379738073817382738373847385738673877388738973907391739273937394739573967397739873997400740174027403740474057406740774087409741074117412741374147415741674177418741974207421742274237424742574267427742874297430743174327433743474357436743774387439744074417442744374447445744674477448744974507451745274537454745574567457745874597460746174627463746474657466746774687469747074717472747374747475747674777478747974807481748274837484748574867487748874897490749174927493749474957496749774987499750075017502750375047505750675077508750975107511751275137514751575167517751875197520752175227523752475257526752775287529753075317532753375347535753675377538753975407541754275437544754575467547754875497550755175527553755475557556755775587559756075617562756375647565756675677568756975707571757275737574757575767577757875797580758175827583758475857586758775887589759075917592759375947595759675977598759976007601760276037604760576067607760876097610761176127613761476157616761776187619762076217622762376247625762676277628762976307631763276337634763576367637763876397640764176427643764476457646764776487649765076517652765376547655765676577658765976607661766276637664766576667667766876697670767176727673767476757676767776787679768076817682768376847685768676877688768976907691769276937694769576967697769876997700770177027703770477057706770777087709771077117712771377147715771677177718771977207721772277237724772577267727772877297730773177327733773477357736773777387739774077417742774377447745774677477748774977507751775277537754775577567757775877597760776177627763776477657766776777687769777077717772777377747775777677777778777977807781778277837784778577867787778877897790779177927793779477957796779777987799780078017802780378047805780678077808780978107811781278137814781578167817781878197820782178227823782478257826782778287829783078317832783378347835783678377838783978407841784278437844784578467847784878497850785178527853785478557856785778587859786078617862786378647865786678677868786978707871787278737874787578767877787878797880788178827883788478857886788778887889789078917892789378947895789678977898789979007901790279037904790579067907790879097910791179127913791479157916791779187919792079217922792379247925792679277928792979307931793279337934793579367937793879397940794179427943794479457946794779487949795079517952795379547955795679577958795979607961796279637964796579667967796879697970797179727973797479757976797779787979798079817982798379847985798679877988798979907991799279937994799579967997799879998000800180028003800480058006800780088009801080118012801380148015801680178018801980208021802280238024802580268027802880298030803180328033803480358036803780388039804080418042804380448045804680478048804980508051805280538054805580568057805880598060806180628063806480658066806780688069807080718072807380748075807680778078807980808081808280838084808580868087808880898090809180928093809480958096809780988099810081018102810381048105810681078108810981108111811281138114811581168117811881198120812181228123812481258126812781288129813081318132813381348135813681378138813981408141814281438144814581468147814881498150815181528153815481558156815781588159816081618162816381648165816681678168816981708171817281738174817581768177817881798180818181828183818481858186818781888189819081918192819381948195819681978198819982008201820282038204820582068207820882098210821182128213821482158216821782188219822082218222822382248225822682278228822982308231823282338234823582368237823882398240824182428243824482458246824782488249825082518252825382548255825682578258825982608261826282638264826582668267826882698270827182728273827482758276827782788279828082818282828382848285828682878288828982908291829282938294829582968297829882998300830183028303830483058306830783088309831083118312831383148315831683178318831983208321832283238324832583268327832883298330833183328333833483358336833783388339834083418342834383448345834683478348834983508351835283538354835583568357835883598360836183628363836483658366836783688369837083718372837383748375837683778378837983808381838283838384838583868387838883898390839183928393839483958396839783988399840084018402840384048405840684078408840984108411841284138414841584168417841884198420842184228423842484258426842784288429843084318432843384348435843684378438843984408441844284438444844584468447844884498450845184528453845484558456845784588459846084618462846384648465846684678468846984708471847284738474847584768477847884798480848184828483848484858486848784888489849084918492849384948495849684978498849985008501850285038504850585068507850885098510851185128513851485158516851785188519852085218522852385248525852685278528852985308531853285338534853585368537853885398540854185428543854485458546854785488549855085518552855385548555855685578558855985608561856285638564856585668567856885698570857185728573857485758576857785788579858085818582858385848585858685878588858985908591859285938594859585968597859885998600860186028603860486058606860786088609861086118612861386148615861686178618861986208621862286238624862586268627862886298630863186328633863486358636863786388639864086418642864386448645864686478648864986508651865286538654865586568657865886598660866186628663866486658666866786688669867086718672867386748675867686778678867986808681868286838684868586868687868886898690869186928693869486958696869786988699870087018702870387048705870687078708870987108711871287138714871587168717871887198720872187228723872487258726872787288729873087318732873387348735873687378738873987408741874287438744874587468747874887498750875187528753875487558756875787588759876087618762876387648765876687678768876987708771877287738774877587768777877887798780878187828783878487858786878787888789879087918792879387948795879687978798879988008801880288038804880588068807880888098810881188128813881488158816881788188819882088218822882388248825882688278828882988308831883288338834883588368837883888398840884188428843884488458846884788488849885088518852885388548855885688578858885988608861886288638864886588668867886888698870887188728873887488758876887788788879888088818882888388848885888688878888888988908891889288938894889588968897889888998900890189028903890489058906890789088909891089118912891389148915891689178918891989208921892289238924892589268927892889298930893189328933893489358936893789388939894089418942894389448945894689478948894989508951895289538954895589568957895889598960896189628963896489658966896789688969897089718972897389748975897689778978897989808981898289838984898589868987898889898990899189928993899489958996899789988999900090019002900390049005900690079008900990109011901290139014901590169017901890199020902190229023902490259026902790289029903090319032903390349035903690379038903990409041904290439044904590469047904890499050905190529053905490559056905790589059906090619062906390649065906690679068906990709071907290739074907590769077907890799080908190829083908490859086908790889089909090919092909390949095909690979098909991009101910291039104910591069107910891099110911191129113911491159116911791189119912091219122912391249125912691279128912991309131913291339134913591369137913891399140914191429143914491459146914791489149915091519152915391549155915691579158915991609161916291639164916591669167916891699170917191729173917491759176917791789179918091819182918391849185918691879188918991909191919291939194919591969197919891999200920192029203920492059206920792089209921092119212921392149215921692179218921992209221922292239224922592269227922892299230923192329233923492359236923792389239924092419242924392449245924692479248924992509251925292539254925592569257925892599260926192629263926492659266926792689269927092719272927392749275927692779278927992809281928292839284928592869287928892899290929192929293929492959296929792989299930093019302930393049305930693079308930993109311931293139314931593169317931893199320932193229323932493259326932793289329933093319332933393349335933693379338933993409341934293439344934593469347934893499350935193529353935493559356935793589359936093619362936393649365936693679368936993709371937293739374937593769377937893799380938193829383938493859386938793889389939093919392939393949395939693979398939994009401940294039404940594069407940894099410941194129413941494159416941794189419942094219422942394249425942694279428942994309431943294339434943594369437943894399440944194429443944494459446944794489449945094519452945394549455945694579458945994609461946294639464946594669467946894699470947194729473947494759476947794789479948094819482948394849485948694879488948994909491949294939494949594969497949894999500950195029503950495059506950795089509951095119512951395149515951695179518951995209521952295239524952595269527952895299530953195329533953495359536953795389539954095419542954395449545954695479548954995509551955295539554955595569557955895599560956195629563956495659566956795689569957095719572957395749575957695779578957995809581958295839584958595869587958895899590959195929593959495959596959795989599960096019602960396049605960696079608960996109611961296139614961596169617961896199620962196229623962496259626962796289629963096319632963396349635963696379638963996409641964296439644964596469647964896499650965196529653965496559656965796589659966096619662966396649665966696679668966996709671967296739674967596769677967896799680968196829683968496859686968796889689969096919692969396949695969696979698969997009701970297039704970597069707970897099710971197129713971497159716971797189719972097219722972397249725972697279728972997309731973297339734973597369737973897399740974197429743974497459746974797489749975097519752975397549755975697579758975997609761976297639764976597669767976897699770977197729773977497759776977797789779978097819782978397849785978697879788978997909791979297939794979597969797979897999800980198029803980498059806980798089809981098119812981398149815981698179818981998209821982298239824982598269827982898299830983198329833983498359836983798389839984098419842984398449845984698479848984998509851985298539854985598569857985898599860986198629863986498659866986798689869987098719872987398749875987698779878987998809881988298839884988598869887988898899890989198929893989498959896989798989899990099019902990399049905990699079908990999109911991299139914991599169917991899199920992199229923992499259926992799289929993099319932993399349935993699379938993999409941994299439944994599469947994899499950995199529953995499559956995799589959996099619962996399649965996699679968996999709971997299739974997599769977997899799980998199829983998499859986998799889989999099919992999399949995999699979998999910000100011000210003100041000510006100071000810009100101001110012100131001410015100161001710018100191002010021100221002310024100251002610027100281002910030100311003210033100341003510036100371003810039100401004110042100431004410045100461004710048100491005010051100521005310054100551005610057100581005910060100611006210063100641006510066100671006810069100701007110072100731007410075100761007710078100791008010081100821008310084100851008610087100881008910090100911009210093100941009510096100971009810099101001010110102101031010410105101061010710108101091011010111101121011310114101151011610117101181011910120101211012210123101241012510126101271012810129101301013110132101331013410135101361013710138101391014010141101421014310144101451014610147101481014910150101511015210153101541015510156101571015810159101601016110162101631016410165101661016710168101691017010171101721017310174101751017610177101781017910180101811018210183101841018510186101871018810189101901019110192101931019410195101961019710198101991020010201102021020310204102051020610207102081020910210102111021210213102141021510216102171021810219102201022110222102231022410225102261022710228102291023010231102321023310234102351023610237102381023910240102411024210243102441024510246102471024810249102501025110252102531025410255102561025710258102591026010261102621026310264102651026610267102681026910270102711027210273102741027510276102771027810279102801028110282102831028410285102861028710288102891029010291102921029310294102951029610297102981029910300103011030210303103041030510306103071030810309103101031110312103131031410315103161031710318103191032010321103221032310324103251032610327103281032910330103311033210333103341033510336103371033810339103401034110342103431034410345103461034710348103491035010351103521035310354103551035610357103581035910360103611036210363103641036510366103671036810369103701037110372103731037410375103761037710378103791038010381103821038310384103851038610387103881038910390103911039210393103941039510396103971039810399104001040110402104031040410405104061040710408104091041010411104121041310414104151041610417104181041910420104211042210423104241042510426104271042810429104301043110432104331043410435104361043710438104391044010441104421044310444104451044610447104481044910450104511045210453104541045510456104571045810459104601046110462104631046410465104661046710468104691047010471104721047310474104751047610477104781047910480104811048210483104841048510486104871048810489104901049110492104931049410495104961049710498104991050010501105021050310504105051050610507105081050910510105111051210513105141051510516105171051810519105201052110522105231052410525105261052710528105291053010531105321053310534105351053610537105381053910540105411054210543105441054510546105471054810549105501055110552105531055410555105561055710558105591056010561105621056310564105651056610567105681056910570105711057210573105741057510576105771057810579105801058110582105831058410585105861058710588105891059010591105921059310594105951059610597105981059910600106011060210603106041060510606106071060810609106101061110612106131061410615106161061710618106191062010621106221062310624106251062610627106281062910630106311063210633106341063510636106371063810639106401064110642106431064410645106461064710648106491065010651106521065310654106551065610657106581065910660106611066210663106641066510666106671066810669106701067110672106731067410675106761067710678106791068010681106821068310684106851068610687106881068910690106911069210693106941069510696106971069810699107001070110702107031070410705107061070710708107091071010711107121071310714107151071610717107181071910720107211072210723107241072510726107271072810729107301073110732107331073410735107361073710738107391074010741107421074310744107451074610747107481074910750107511075210753107541075510756107571075810759107601076110762107631076410765107661076710768107691077010771107721077310774107751077610777107781077910780107811078210783107841078510786107871078810789107901079110792107931079410795107961079710798107991080010801108021080310804108051080610807108081080910810108111081210813108141081510816108171081810819108201082110822108231082410825108261082710828108291083010831108321083310834108351083610837108381083910840108411084210843108441084510846108471084810849108501085110852108531085410855108561085710858108591086010861108621086310864108651086610867108681086910870108711087210873108741087510876108771087810879108801088110882108831088410885108861088710888108891089010891108921089310894108951089610897108981089910900109011090210903109041090510906109071090810909109101091110912109131091410915109161091710918109191092010921109221092310924109251092610927109281092910930109311093210933109341093510936109371093810939109401094110942109431094410945109461094710948109491095010951109521095310954109551095610957109581095910960109611096210963109641096510966109671096810969109701097110972109731097410975109761097710978109791098010981109821098310984109851098610987109881098910990109911099210993109941099510996109971099810999110001100111002110031100411005110061100711008110091101011011110121101311014110151101611017110181101911020110211102211023110241102511026110271102811029110301103111032110331103411035110361103711038110391104011041110421104311044110451104611047110481104911050110511105211053110541105511056110571105811059110601106111062110631106411065110661106711068110691107011071110721107311074110751107611077110781107911080110811108211083110841108511086110871108811089110901109111092110931109411095110961109711098110991110011101111021110311104111051110611107111081110911110111111111211113111141111511116111171111811119111201112111122111231112411125111261112711128111291113011131111321113311134111351113611137111381113911140111411114211143111441114511146111471114811149111501115111152111531115411155111561115711158111591116011161111621116311164111651116611167111681116911170111711117211173111741117511176111771117811179111801118111182111831118411185111861118711188111891119011191111921119311194111951119611197111981119911200112011120211203112041120511206112071120811209112101121111212112131121411215112161121711218112191122011221112221122311224112251122611227112281122911230112311123211233112341123511236112371123811239112401124111242112431124411245112461124711248112491125011251112521125311254112551125611257112581125911260112611126211263112641126511266112671126811269112701127111272112731127411275112761127711278112791128011281112821128311284112851128611287112881128911290112911129211293112941129511296112971129811299113001130111302113031130411305113061130711308113091131011311113121131311314113151131611317113181131911320113211132211323113241132511326113271132811329113301133111332113331133411335113361133711338113391134011341113421134311344113451134611347113481134911350113511135211353113541135511356113571135811359113601136111362113631136411365113661136711368113691137011371113721137311374113751137611377113781137911380113811138211383113841138511386113871138811389113901139111392113931139411395113961139711398113991140011401114021140311404114051140611407114081140911410114111141211413114141141511416114171141811419114201142111422114231142411425114261142711428114291143011431114321143311434114351143611437114381143911440114411144211443114441144511446114471144811449114501145111452114531145411455114561145711458114591146011461114621146311464114651146611467114681146911470114711147211473114741147511476114771147811479114801148111482114831148411485114861148711488114891149011491114921149311494114951149611497114981149911500115011150211503115041150511506115071150811509115101151111512115131151411515115161151711518115191152011521115221152311524115251152611527115281152911530115311153211533115341153511536115371153811539115401154111542115431154411545115461154711548115491155011551115521155311554115551155611557115581155911560115611156211563115641156511566115671156811569115701157111572115731157411575115761157711578115791158011581115821158311584115851158611587115881158911590115911159211593115941159511596115971159811599116001160111602116031160411605116061160711608116091161011611116121161311614116151161611617116181161911620116211162211623116241162511626116271162811629116301163111632116331163411635116361163711638116391164011641116421164311644116451164611647116481164911650116511165211653116541165511656116571165811659116601166111662116631166411665116661166711668116691167011671116721167311674116751167611677116781167911680116811168211683116841168511686116871168811689116901169111692116931169411695116961169711698116991170011701117021170311704117051170611707117081170911710117111171211713117141171511716117171171811719117201172111722117231172411725117261172711728117291173011731117321173311734117351173611737117381173911740117411174211743117441174511746117471174811749117501175111752117531175411755117561175711758117591176011761117621176311764117651176611767117681176911770117711177211773117741177511776117771177811779117801178111782117831178411785117861178711788117891179011791117921179311794117951179611797117981179911800118011180211803118041180511806118071180811809118101181111812118131181411815118161181711818118191182011821118221182311824118251182611827118281182911830118311183211833118341183511836118371183811839118401184111842118431184411845118461184711848118491185011851118521185311854118551185611857118581185911860118611186211863118641186511866118671186811869118701187111872118731187411875118761187711878118791188011881118821188311884118851188611887118881188911890118911189211893118941189511896118971189811899119001190111902119031190411905119061190711908119091191011911119121191311914119151191611917119181191911920119211192211923119241192511926119271192811929119301193111932119331193411935119361193711938119391194011941119421194311944119451194611947119481194911950119511195211953119541195511956119571195811959119601196111962119631196411965119661196711968119691197011971119721197311974119751197611977119781197911980119811198211983119841198511986119871198811989119901199111992119931199411995119961199711998119991200012001120021200312004120051200612007120081200912010120111201212013120141201512016120171201812019120201202112022120231202412025120261202712028120291203012031120321203312034120351203612037120381203912040120411204212043120441204512046120471204812049120501205112052120531205412055120561205712058120591206012061120621206312064120651206612067120681206912070120711207212073120741207512076120771207812079120801208112082120831208412085120861208712088120891209012091120921209312094120951209612097120981209912100121011210212103121041210512106121071210812109121101211112112121131211412115121161211712118121191212012121121221212312124121251212612127121281212912130121311213212133121341213512136121371213812139121401214112142121431214412145121461214712148121491215012151121521215312154121551215612157121581215912160121611216212163121641216512166121671216812169121701217112172121731217412175121761217712178121791218012181121821218312184121851218612187121881218912190121911219212193121941219512196121971219812199122001220112202122031220412205122061220712208122091221012211122121221312214122151221612217122181221912220122211222212223122241222512226122271222812229122301223112232122331223412235122361223712238122391224012241122421224312244122451224612247122481224912250122511225212253122541225512256122571225812259122601226112262122631226412265122661226712268122691227012271122721227312274122751227612277122781227912280122811228212283122841228512286122871228812289122901229112292122931229412295122961229712298122991230012301123021230312304123051230612307123081230912310123111231212313123141231512316123171231812319123201232112322123231232412325123261232712328123291233012331123321233312334123351233612337123381233912340123411234212343123441234512346123471234812349123501235112352123531235412355123561235712358123591236012361123621236312364123651236612367123681236912370123711237212373123741237512376123771237812379123801238112382123831238412385123861238712388123891239012391123921239312394123951239612397123981239912400124011240212403124041240512406124071240812409124101241112412124131241412415124161241712418124191242012421124221242312424124251242612427124281242912430124311243212433124341243512436124371243812439124401244112442124431244412445124461244712448124491245012451124521245312454124551245612457124581245912460124611246212463124641246512466124671246812469124701247112472124731247412475124761247712478124791248012481124821248312484124851248612487124881248912490124911249212493124941249512496124971249812499125001250112502125031250412505125061250712508125091251012511125121251312514125151251612517125181251912520125211252212523125241252512526125271252812529125301253112532125331253412535125361253712538125391254012541125421254312544125451254612547125481254912550125511255212553125541255512556125571255812559125601256112562125631256412565125661256712568125691257012571125721257312574125751257612577125781257912580125811258212583125841258512586125871258812589125901259112592125931259412595125961259712598125991260012601126021260312604126051260612607126081260912610126111261212613126141261512616126171261812619126201262112622126231262412625126261262712628126291263012631126321263312634126351263612637126381263912640126411264212643126441264512646126471264812649126501265112652126531265412655126561265712658126591266012661126621266312664126651266612667126681266912670126711267212673126741267512676126771267812679126801268112682126831268412685126861268712688126891269012691126921269312694126951269612697126981269912700127011270212703127041270512706127071270812709127101271112712127131271412715127161271712718127191272012721127221272312724127251272612727127281272912730127311273212733127341273512736127371273812739127401274112742127431274412745127461274712748127491275012751127521275312754127551275612757127581275912760127611276212763127641276512766127671276812769127701277112772127731277412775127761277712778127791278012781127821278312784127851278612787127881278912790127911279212793127941279512796127971279812799128001280112802128031280412805128061280712808128091281012811128121281312814128151281612817128181281912820128211282212823128241282512826128271282812829128301283112832128331283412835128361283712838128391284012841128421284312844128451284612847128481284912850128511285212853128541285512856128571285812859128601286112862128631286412865128661286712868128691287012871128721287312874128751287612877128781287912880128811288212883128841288512886128871288812889128901289112892128931289412895128961289712898128991290012901129021290312904129051290612907129081290912910129111291212913129141291512916129171291812919129201292112922129231292412925129261292712928129291293012931129321293312934129351293612937129381293912940129411294212943129441294512946129471294812949129501295112952129531295412955129561295712958129591296012961129621296312964129651296612967129681296912970129711297212973129741297512976129771297812979129801298112982129831298412985129861298712988129891299012991129921299312994129951299612997129981299913000130011300213003130041300513006130071300813009130101301113012130131301413015130161301713018130191302013021130221302313024130251302613027130281302913030130311303213033130341303513036130371303813039130401304113042130431304413045130461304713048130491305013051130521305313054130551305613057130581305913060130611306213063130641306513066130671306813069130701307113072130731307413075130761307713078130791308013081130821308313084130851308613087130881308913090130911309213093130941309513096130971309813099131001310113102131031310413105131061310713108131091311013111131121311313114131151311613117131181311913120131211312213123131241312513126131271312813129131301313113132131331313413135131361313713138131391314013141131421314313144131451314613147131481314913150131511315213153131541315513156131571315813159131601316113162131631316413165131661316713168131691317013171131721317313174131751317613177131781317913180131811318213183131841318513186131871318813189131901319113192131931319413195131961319713198131991320013201132021320313204132051320613207132081320913210132111321213213132141321513216132171321813219132201322113222132231322413225132261322713228132291323013231132321323313234132351323613237132381323913240132411324213243132441324513246132471324813249132501325113252132531325413255132561325713258132591326013261132621326313264132651326613267132681326913270132711327213273132741327513276132771327813279132801328113282132831328413285132861328713288132891329013291132921329313294132951329613297132981329913300133011330213303133041330513306133071330813309133101331113312133131331413315133161331713318133191332013321133221332313324133251332613327133281332913330133311333213333133341333513336133371333813339133401334113342133431334413345133461334713348133491335013351133521335313354133551335613357133581335913360133611336213363133641336513366133671336813369133701337113372133731337413375133761337713378133791338013381133821338313384133851338613387133881338913390133911339213393133941339513396133971339813399134001340113402134031340413405134061340713408134091341013411134121341313414134151341613417134181341913420134211342213423134241342513426134271342813429134301343113432134331343413435134361343713438134391344013441134421344313444134451344613447134481344913450134511345213453134541345513456134571345813459134601346113462134631346413465134661346713468134691347013471134721347313474134751347613477134781347913480134811348213483134841348513486134871348813489134901349113492134931349413495134961349713498134991350013501135021350313504135051350613507135081350913510135111351213513135141351513516135171351813519135201352113522135231352413525135261352713528135291353013531135321353313534135351353613537135381353913540135411354213543135441354513546135471354813549135501355113552135531355413555135561355713558135591356013561135621356313564135651356613567135681356913570135711357213573135741357513576135771357813579135801358113582135831358413585135861358713588135891359013591135921359313594135951359613597135981359913600136011360213603136041360513606136071360813609136101361113612136131361413615136161361713618136191362013621136221362313624136251362613627136281362913630136311363213633136341363513636136371363813639136401364113642136431364413645136461364713648136491365013651136521365313654136551365613657136581365913660136611366213663136641366513666136671366813669136701367113672136731367413675136761367713678136791368013681136821368313684136851368613687136881368913690136911369213693136941369513696136971369813699137001370113702137031370413705137061370713708137091371013711137121371313714137151371613717137181371913720137211372213723137241372513726137271372813729137301373113732137331373413735137361373713738137391374013741137421374313744137451374613747137481374913750137511375213753137541375513756137571375813759137601376113762137631376413765137661376713768137691377013771137721377313774137751377613777137781377913780137811378213783137841378513786137871378813789137901379113792137931379413795137961379713798137991380013801138021380313804138051380613807138081380913810138111381213813138141381513816138171381813819138201382113822138231382413825138261382713828138291383013831138321383313834138351383613837138381383913840138411384213843138441384513846138471384813849138501385113852138531385413855138561385713858138591386013861138621386313864138651386613867138681386913870138711387213873138741387513876138771387813879138801388113882138831388413885138861388713888138891389013891138921389313894138951389613897138981389913900139011390213903139041390513906139071390813909139101391113912139131391413915139161391713918139191392013921139221392313924139251392613927139281392913930139311393213933139341393513936139371393813939139401394113942139431394413945139461394713948139491395013951139521395313954139551395613957139581395913960139611396213963139641396513966139671396813969139701397113972139731397413975139761397713978139791398013981139821398313984139851398613987139881398913990139911399213993139941399513996139971399813999140001400114002140031400414005140061400714008140091401014011140121401314014140151401614017140181401914020140211402214023140241402514026140271402814029140301403114032140331403414035140361403714038140391404014041140421404314044140451404614047140481404914050140511405214053140541405514056140571405814059140601406114062140631406414065140661406714068140691407014071140721407314074140751407614077140781407914080140811408214083140841408514086140871408814089140901409114092140931409414095140961409714098140991410014101141021410314104141051410614107141081410914110141111411214113141141411514116141171411814119141201412114122141231412414125141261412714128141291413014131141321413314134141351413614137141381413914140141411414214143141441414514146141471414814149141501415114152141531415414155141561415714158141591416014161141621416314164141651416614167141681416914170141711417214173141741417514176141771417814179141801418114182141831418414185141861418714188141891419014191141921419314194141951419614197141981419914200142011420214203142041420514206142071420814209142101421114212142131421414215142161421714218142191422014221142221422314224142251422614227142281422914230142311423214233142341423514236142371423814239142401424114242142431424414245142461424714248142491425014251142521425314254142551425614257142581425914260142611426214263142641426514266142671426814269142701427114272142731427414275142761427714278142791428014281142821428314284142851428614287142881428914290142911429214293142941429514296142971429814299143001430114302143031430414305143061430714308143091431014311143121431314314143151431614317143181431914320143211432214323143241432514326143271432814329143301433114332143331433414335143361433714338143391434014341143421434314344143451434614347143481434914350143511435214353143541435514356143571435814359143601436114362143631436414365143661436714368143691437014371143721437314374143751437614377143781437914380143811438214383143841438514386143871438814389143901439114392143931439414395143961439714398143991440014401144021440314404144051440614407144081440914410144111441214413144141441514416144171441814419144201442114422144231442414425144261442714428144291443014431144321443314434144351443614437144381443914440144411444214443144441444514446144471444814449144501445114452144531445414455144561445714458144591446014461144621446314464144651446614467144681446914470144711447214473144741447514476144771447814479144801448114482144831448414485144861448714488144891449014491144921449314494144951449614497144981449914500145011450214503145041450514506145071450814509145101451114512145131451414515145161451714518145191452014521145221452314524145251452614527145281452914530145311453214533145341453514536145371453814539145401454114542145431454414545145461454714548145491455014551145521455314554145551455614557145581455914560145611456214563145641456514566145671456814569145701457114572145731457414575145761457714578145791458014581145821458314584145851458614587145881458914590145911459214593145941459514596145971459814599146001460114602146031460414605146061460714608146091461014611146121461314614146151461614617146181461914620146211462214623146241462514626146271462814629146301463114632146331463414635146361463714638146391464014641146421464314644146451464614647146481464914650146511465214653146541465514656146571465814659146601466114662146631466414665146661466714668146691467014671146721467314674146751467614677146781467914680146811468214683146841468514686146871468814689146901469114692146931469414695146961469714698146991470014701147021470314704147051470614707147081470914710147111471214713147141471514716147171471814719147201472114722147231472414725147261472714728147291473014731147321473314734147351473614737147381473914740147411474214743147441474514746147471474814749147501475114752147531475414755147561475714758147591476014761147621476314764147651476614767147681476914770147711477214773147741477514776147771477814779147801478114782147831478414785147861478714788147891479014791147921479314794147951479614797147981479914800148011480214803148041480514806148071480814809148101481114812148131481414815148161481714818148191482014821148221482314824148251482614827148281482914830148311483214833148341483514836148371483814839148401484114842148431484414845148461484714848148491485014851148521485314854148551485614857148581485914860148611486214863148641486514866148671486814869148701487114872148731487414875148761487714878148791488014881148821488314884148851488614887148881488914890148911489214893148941489514896148971489814899149001490114902149031490414905149061490714908149091491014911149121491314914149151491614917149181491914920149211492214923149241492514926149271492814929149301493114932149331493414935149361493714938149391494014941149421494314944149451494614947149481494914950149511495214953149541495514956149571495814959149601496114962149631496414965149661496714968149691497014971149721497314974149751497614977149781497914980149811498214983149841498514986149871498814989149901499114992149931499414995149961499714998149991500015001150021500315004150051500615007150081500915010150111501215013150141501515016150171501815019150201502115022150231502415025150261502715028150291503015031150321503315034150351503615037150381503915040150411504215043150441504515046150471504815049150501505115052150531505415055150561505715058150591506015061150621506315064150651506615067150681506915070150711507215073150741507515076150771507815079150801508115082150831508415085150861508715088150891509015091150921509315094150951509615097150981509915100151011510215103151041510515106151071510815109151101511115112151131511415115151161511715118151191512015121151221512315124151251512615127151281512915130151311513215133151341513515136151371513815139151401514115142151431514415145151461514715148151491515015151151521515315154151551515615157151581515915160151611516215163151641516515166151671516815169151701517115172151731517415175151761517715178151791518015181151821518315184151851518615187151881518915190151911519215193151941519515196151971519815199152001520115202152031520415205152061520715208152091521015211152121521315214152151521615217152181521915220152211522215223152241522515226152271522815229152301523115232152331523415235152361523715238152391524015241152421524315244152451524615247152481524915250152511525215253152541525515256152571525815259152601526115262152631526415265152661526715268152691527015271152721527315274152751527615277152781527915280152811528215283152841528515286152871528815289152901529115292152931529415295152961529715298152991530015301153021530315304153051530615307153081530915310153111531215313153141531515316153171531815319153201532115322153231532415325153261532715328153291533015331153321533315334153351533615337153381533915340153411534215343153441534515346153471534815349153501535115352153531535415355153561535715358153591536015361153621536315364153651536615367153681536915370153711537215373153741537515376153771537815379153801538115382153831538415385153861538715388153891539015391153921539315394153951539615397153981539915400154011540215403154041540515406154071540815409154101541115412154131541415415154161541715418154191542015421154221542315424154251542615427154281542915430154311543215433154341543515436154371543815439154401544115442154431544415445154461544715448154491545015451154521545315454154551545615457154581545915460154611546215463154641546515466154671546815469154701547115472154731547415475154761547715478154791548015481154821548315484154851548615487154881548915490154911549215493154941549515496154971549815499155001550115502155031550415505155061550715508155091551015511155121551315514155151551615517155181551915520155211552215523155241552515526155271552815529155301553115532155331553415535155361553715538155391554015541155421554315544155451554615547155481554915550155511555215553155541555515556155571555815559155601556115562155631556415565155661556715568155691557015571155721557315574155751557615577155781557915580155811558215583155841558515586155871558815589155901559115592155931559415595155961559715598155991560015601156021560315604156051560615607156081560915610156111561215613156141561515616156171561815619156201562115622156231562415625156261562715628156291563015631156321563315634156351563615637156381563915640156411564215643156441564515646156471564815649156501565115652156531565415655156561565715658156591566015661156621566315664156651566615667156681566915670156711567215673156741567515676156771567815679156801568115682156831568415685156861568715688156891569015691156921569315694156951569615697156981569915700157011570215703157041570515706157071570815709157101571115712157131571415715157161571715718157191572015721157221572315724157251572615727157281572915730157311573215733157341573515736157371573815739157401574115742157431574415745157461574715748157491575015751157521575315754157551575615757157581575915760157611576215763157641576515766157671576815769157701577115772157731577415775157761577715778157791578015781157821578315784157851578615787157881578915790157911579215793157941579515796157971579815799158001580115802158031580415805158061580715808158091581015811158121581315814158151581615817158181581915820158211582215823158241582515826158271582815829158301583115832158331583415835158361583715838158391584015841158421584315844158451584615847158481584915850158511585215853158541585515856158571585815859158601586115862158631586415865158661586715868158691587015871158721587315874158751587615877158781587915880158811588215883158841588515886158871588815889158901589115892158931589415895158961589715898158991590015901159021590315904159051590615907159081590915910159111591215913159141591515916159171591815919159201592115922159231592415925159261592715928159291593015931159321593315934159351593615937159381593915940159411594215943159441594515946159471594815949159501595115952159531595415955159561595715958159591596015961159621596315964159651596615967159681596915970159711597215973159741597515976159771597815979159801598115982159831598415985159861598715988159891599015991159921599315994159951599615997159981599916000160011600216003160041600516006160071600816009160101601116012160131601416015160161601716018160191602016021160221602316024160251602616027160281602916030160311603216033160341603516036160371603816039160401604116042160431604416045160461604716048160491605016051160521605316054160551605616057160581605916060160611606216063160641606516066160671606816069160701607116072160731607416075160761607716078160791608016081160821608316084160851608616087160881608916090160911609216093160941609516096160971609816099161001610116102161031610416105161061610716108161091611016111161121611316114161151611616117161181611916120161211612216123161241612516126161271612816129161301613116132161331613416135161361613716138161391614016141161421614316144161451614616147161481614916150161511615216153161541615516156161571615816159161601616116162161631616416165161661616716168161691617016171161721617316174161751617616177161781617916180161811618216183161841618516186161871618816189161901619116192161931619416195161961619716198161991620016201162021620316204162051620616207162081620916210162111621216213162141621516216162171621816219162201622116222162231622416225162261622716228162291623016231162321623316234162351623616237162381623916240162411624216243162441624516246162471624816249162501625116252162531625416255162561625716258162591626016261162621626316264162651626616267162681626916270162711627216273162741627516276162771627816279162801628116282162831628416285162861628716288162891629016291162921629316294162951629616297162981629916300163011630216303163041630516306163071630816309163101631116312163131631416315163161631716318163191632016321163221632316324163251632616327163281632916330163311633216333163341633516336163371633816339163401634116342163431634416345163461634716348163491635016351163521635316354163551635616357163581635916360163611636216363163641636516366163671636816369163701637116372163731637416375163761637716378163791638016381163821638316384163851638616387163881638916390163911639216393163941639516396163971639816399164001640116402164031640416405164061640716408164091641016411164121641316414164151641616417164181641916420164211642216423164241642516426164271642816429164301643116432164331643416435164361643716438164391644016441164421644316444164451644616447164481644916450164511645216453164541645516456164571645816459164601646116462164631646416465164661646716468164691647016471164721647316474164751647616477164781647916480164811648216483164841648516486164871648816489164901649116492164931649416495164961649716498164991650016501165021650316504165051650616507165081650916510165111651216513165141651516516165171651816519165201652116522165231652416525165261652716528165291653016531165321653316534165351653616537165381653916540165411654216543165441654516546165471654816549165501655116552165531655416555165561655716558165591656016561165621656316564165651656616567165681656916570165711657216573165741657516576165771657816579165801658116582165831658416585165861658716588165891659016591165921659316594165951659616597165981659916600166011660216603166041660516606166071660816609166101661116612166131661416615166161661716618166191662016621166221662316624166251662616627166281662916630166311663216633166341663516636166371663816639166401664116642166431664416645166461664716648166491665016651166521665316654166551665616657166581665916660166611666216663166641666516666166671666816669166701667116672166731667416675166761667716678166791668016681166821668316684166851668616687166881668916690166911669216693166941669516696166971669816699167001670116702167031670416705167061670716708167091671016711167121671316714167151671616717167181671916720167211672216723167241672516726167271672816729167301673116732167331673416735167361673716738167391674016741167421674316744167451674616747167481674916750167511675216753167541675516756167571675816759167601676116762167631676416765167661676716768167691677016771167721677316774167751677616777167781677916780167811678216783167841678516786167871678816789167901679116792167931679416795167961679716798167991680016801168021680316804168051680616807168081680916810168111681216813168141681516816168171681816819168201682116822168231682416825168261682716828168291683016831168321683316834168351683616837168381683916840168411684216843168441684516846168471684816849168501685116852168531685416855168561685716858168591686016861168621686316864168651686616867168681686916870168711687216873168741687516876168771687816879168801688116882168831688416885168861688716888168891689016891168921689316894168951689616897168981689916900169011690216903169041690516906169071690816909169101691116912169131691416915169161691716918169191692016921169221692316924169251692616927169281692916930169311693216933169341693516936169371693816939169401694116942169431694416945169461694716948169491695016951169521695316954169551695616957169581695916960169611696216963169641696516966169671696816969169701697116972169731697416975169761697716978169791698016981169821698316984169851698616987169881698916990169911699216993169941699516996169971699816999170001700117002170031700417005170061700717008170091701017011170121701317014170151701617017170181701917020170211702217023170241702517026170271702817029170301703117032170331703417035170361703717038170391704017041170421704317044170451704617047170481704917050170511705217053170541705517056170571705817059170601706117062170631706417065170661706717068170691707017071170721707317074170751707617077170781707917080170811708217083170841708517086170871708817089170901709117092170931709417095170961709717098170991710017101171021710317104171051710617107171081710917110171111711217113171141711517116171171711817119171201712117122171231712417125171261712717128171291713017131171321713317134171351713617137171381713917140171411714217143171441714517146171471714817149171501715117152171531715417155171561715717158171591716017161171621716317164171651716617167171681716917170171711717217173171741717517176171771717817179171801718117182171831718417185171861718717188171891719017191171921719317194171951719617197171981719917200172011720217203172041720517206172071720817209172101721117212172131721417215172161721717218172191722017221172221722317224172251722617227172281722917230172311723217233172341723517236172371723817239172401724117242172431724417245172461724717248172491725017251172521725317254172551725617257172581725917260172611726217263172641726517266172671726817269172701727117272172731727417275172761727717278172791728017281172821728317284172851728617287172881728917290172911729217293172941729517296172971729817299173001730117302173031730417305173061730717308173091731017311173121731317314173151731617317173181731917320173211732217323173241732517326173271732817329173301733117332173331733417335173361733717338173391734017341173421734317344173451734617347173481734917350173511735217353173541735517356173571735817359173601736117362173631736417365173661736717368173691737017371173721737317374173751737617377173781737917380173811738217383173841738517386173871738817389173901739117392173931739417395173961739717398173991740017401174021740317404174051740617407174081740917410174111741217413174141741517416174171741817419174201742117422174231742417425174261742717428174291743017431174321743317434174351743617437174381743917440174411744217443174441744517446174471744817449174501745117452174531745417455174561745717458174591746017461174621746317464174651746617467174681746917470174711747217473174741747517476174771747817479174801748117482174831748417485174861748717488174891749017491174921749317494174951749617497174981749917500175011750217503175041750517506175071750817509175101751117512175131751417515175161751717518175191752017521175221752317524175251752617527175281752917530175311753217533175341753517536175371753817539175401754117542175431754417545175461754717548175491755017551175521755317554175551755617557175581755917560175611756217563175641756517566175671756817569175701757117572175731757417575175761757717578175791758017581175821758317584175851758617587175881758917590175911759217593175941759517596175971759817599176001760117602176031760417605176061760717608176091761017611176121761317614176151761617617176181761917620176211762217623176241762517626176271762817629176301763117632176331763417635176361763717638176391764017641176421764317644176451764617647176481764917650176511765217653176541765517656176571765817659176601766117662176631766417665176661766717668176691767017671176721767317674176751767617677176781767917680176811768217683176841768517686176871768817689176901769117692176931769417695176961769717698176991770017701177021770317704177051770617707177081770917710177111771217713177141771517716177171771817719177201772117722177231772417725177261772717728177291773017731177321773317734177351773617737177381773917740177411774217743177441774517746177471774817749177501775117752177531775417755177561775717758177591776017761177621776317764177651776617767177681776917770177711777217773177741777517776177771777817779177801778117782177831778417785177861778717788177891779017791177921779317794177951779617797177981779917800178011780217803178041780517806178071780817809178101781117812178131781417815178161781717818178191782017821178221782317824178251782617827178281782917830178311783217833178341783517836178371783817839178401784117842178431784417845178461784717848178491785017851178521785317854178551785617857178581785917860178611786217863178641786517866178671786817869178701787117872178731787417875178761787717878178791788017881178821788317884178851788617887178881788917890178911789217893178941789517896178971789817899179001790117902179031790417905179061790717908179091791017911179121791317914179151791617917179181791917920179211792217923179241792517926179271792817929179301793117932179331793417935179361793717938179391794017941179421794317944179451794617947179481794917950179511795217953179541795517956179571795817959179601796117962179631796417965179661796717968179691797017971179721797317974179751797617977179781797917980179811798217983179841798517986179871798817989179901799117992179931799417995179961799717998179991800018001180021800318004180051800618007180081800918010180111801218013180141801518016180171801818019180201802118022180231802418025180261802718028180291803018031180321803318034180351803618037180381803918040180411804218043180441804518046180471804818049180501805118052180531805418055180561805718058180591806018061180621806318064180651806618067180681806918070180711807218073180741807518076180771807818079180801808118082180831808418085180861808718088180891809018091180921809318094180951809618097180981809918100181011810218103181041810518106181071810818109181101811118112181131811418115181161811718118181191812018121181221812318124181251812618127181281812918130181311813218133181341813518136181371813818139181401814118142181431814418145181461814718148181491815018151181521815318154181551815618157181581815918160181611816218163181641816518166181671816818169181701817118172181731817418175181761817718178181791818018181181821818318184181851818618187181881818918190181911819218193181941819518196181971819818199182001820118202182031820418205182061820718208182091821018211182121821318214182151821618217182181821918220182211822218223182241822518226182271822818229182301823118232182331823418235182361823718238182391824018241182421824318244182451824618247182481824918250182511825218253182541825518256182571825818259182601826118262182631826418265182661826718268182691827018271182721827318274182751827618277182781827918280182811828218283182841828518286182871828818289182901829118292182931829418295182961829718298182991830018301183021830318304183051830618307183081830918310183111831218313183141831518316183171831818319183201832118322183231832418325183261832718328183291833018331183321833318334183351833618337183381833918340183411834218343183441834518346183471834818349183501835118352183531835418355183561835718358183591836018361183621836318364183651836618367183681836918370183711837218373183741837518376183771837818379183801838118382183831838418385183861838718388183891839018391183921839318394183951839618397183981839918400184011840218403184041840518406184071840818409184101841118412184131841418415184161841718418184191842018421184221842318424184251842618427184281842918430184311843218433184341843518436184371843818439184401844118442184431844418445184461844718448184491845018451184521845318454184551845618457184581845918460184611846218463184641846518466184671846818469184701847118472184731847418475184761847718478184791848018481184821848318484184851848618487184881848918490184911849218493184941849518496184971849818499185001850118502185031850418505185061850718508185091851018511185121851318514185151851618517185181851918520185211852218523185241852518526185271852818529185301853118532185331853418535185361853718538185391854018541185421854318544185451854618547185481854918550185511855218553185541855518556185571855818559185601856118562185631856418565185661856718568185691857018571185721857318574185751857618577185781857918580185811858218583185841858518586185871858818589185901859118592185931859418595185961859718598185991860018601186021860318604186051860618607186081860918610186111861218613186141861518616186171861818619186201862118622186231862418625186261862718628186291863018631186321863318634186351863618637186381863918640186411864218643186441864518646186471864818649186501865118652186531865418655186561865718658186591866018661186621866318664186651866618667186681866918670186711867218673186741867518676186771867818679186801868118682186831868418685186861868718688186891869018691186921869318694186951869618697186981869918700187011870218703187041870518706187071870818709187101871118712187131871418715187161871718718187191872018721187221872318724187251872618727187281872918730187311873218733187341873518736187371873818739187401874118742187431874418745187461874718748187491875018751187521875318754187551875618757187581875918760187611876218763187641876518766187671876818769187701877118772187731877418775187761877718778187791878018781187821878318784187851878618787187881878918790187911879218793187941879518796187971879818799188001880118802188031880418805188061880718808188091881018811188121881318814188151881618817188181881918820188211882218823188241882518826188271882818829188301883118832188331883418835188361883718838188391884018841188421884318844188451884618847188481884918850188511885218853188541885518856188571885818859188601886118862188631886418865188661886718868188691887018871188721887318874188751887618877188781887918880188811888218883188841888518886188871888818889188901889118892188931889418895188961889718898188991890018901189021890318904189051890618907189081890918910189111891218913189141891518916189171891818919189201892118922189231892418925189261892718928189291893018931189321893318934189351893618937189381893918940189411894218943189441894518946189471894818949189501895118952189531895418955189561895718958189591896018961189621896318964189651896618967189681896918970189711897218973189741897518976189771897818979189801898118982189831898418985189861898718988189891899018991189921899318994189951899618997189981899919000190011900219003190041900519006190071900819009190101901119012190131901419015190161901719018190191902019021190221902319024190251902619027190281902919030190311903219033190341903519036190371903819039190401904119042190431904419045190461904719048190491905019051190521905319054190551905619057190581905919060190611906219063190641906519066190671906819069190701907119072190731907419075190761907719078190791908019081190821908319084190851908619087190881908919090190911909219093190941909519096190971909819099191001910119102191031910419105191061910719108191091911019111191121911319114191151911619117191181911919120191211912219123191241912519126191271912819129191301913119132191331913419135191361913719138191391914019141191421914319144191451914619147191481914919150191511915219153191541915519156191571915819159191601916119162191631916419165191661916719168191691917019171191721917319174191751917619177191781917919180191811918219183191841918519186191871918819189191901919119192191931919419195191961919719198191991920019201192021920319204192051920619207192081920919210192111921219213192141921519216192171921819219192201922119222192231922419225192261922719228192291923019231192321923319234192351923619237192381923919240192411924219243192441924519246192471924819249192501925119252192531925419255192561925719258192591926019261192621926319264192651926619267192681926919270192711927219273192741927519276192771927819279192801928119282192831928419285192861928719288192891929019291192921929319294192951929619297192981929919300193011930219303193041930519306193071930819309193101931119312193131931419315193161931719318193191932019321193221932319324193251932619327193281932919330193311933219333193341933519336193371933819339193401934119342193431934419345193461934719348193491935019351193521935319354193551935619357193581935919360193611936219363193641936519366193671936819369193701937119372193731937419375193761937719378193791938019381193821938319384193851938619387193881938919390193911939219393193941939519396193971939819399194001940119402194031940419405194061940719408194091941019411194121941319414194151941619417194181941919420194211942219423194241942519426194271942819429194301943119432194331943419435194361943719438194391944019441194421944319444194451944619447194481944919450194511945219453194541945519456194571945819459194601946119462194631946419465194661946719468194691947019471194721947319474194751947619477194781947919480194811948219483194841948519486194871948819489194901949119492194931949419495194961949719498194991950019501195021950319504195051950619507195081950919510195111951219513195141951519516195171951819519195201952119522195231952419525195261952719528195291953019531195321953319534195351953619537195381953919540195411954219543195441954519546195471954819549195501955119552195531955419555195561955719558195591956019561195621956319564195651956619567195681956919570195711957219573195741957519576195771957819579195801958119582195831958419585195861958719588195891959019591195921959319594195951959619597195981959919600196011960219603196041960519606196071960819609196101961119612196131961419615196161961719618196191962019621196221962319624196251962619627196281962919630196311963219633196341963519636196371963819639196401964119642196431964419645196461964719648196491965019651196521965319654196551965619657196581965919660196611966219663196641966519666196671966819669196701967119672196731967419675196761967719678196791968019681196821968319684196851968619687196881968919690196911969219693196941969519696196971969819699197001970119702197031970419705197061970719708197091971019711197121971319714197151971619717197181971919720197211972219723197241972519726197271972819729197301973119732197331973419735197361973719738197391974019741197421974319744197451974619747197481974919750197511975219753197541975519756197571975819759197601976119762197631976419765197661976719768197691977019771197721977319774197751977619777197781977919780197811978219783197841978519786197871978819789197901979119792197931979419795197961979719798197991980019801198021980319804198051980619807198081980919810198111981219813198141981519816198171981819819198201982119822198231982419825198261982719828198291983019831198321983319834198351983619837198381983919840198411984219843198441984519846198471984819849198501985119852198531985419855198561985719858198591986019861198621986319864198651986619867198681986919870198711987219873198741987519876198771987819879198801988119882198831988419885198861988719888198891989019891198921989319894198951989619897198981989919900199011990219903199041990519906199071990819909199101991119912199131991419915199161991719918199191992019921199221992319924199251992619927199281992919930199311993219933199341993519936199371993819939199401994119942199431994419945199461994719948199491995019951199521995319954199551995619957199581995919960199611996219963199641996519966199671996819969199701997119972199731997419975199761997719978199791998019981199821998319984199851998619987199881998919990199911999219993199941999519996199971999819999200002000120002200032000420005200062000720008200092001020011200122001320014200152001620017200182001920020200212002220023200242002520026200272002820029200302003120032200332003420035200362003720038200392004020041200422004320044200452004620047200482004920050200512005220053200542005520056200572005820059200602006120062200632006420065200662006720068200692007020071200722007320074200752007620077200782007920080200812008220083200842008520086200872008820089200902009120092200932009420095200962009720098200992010020101201022010320104201052010620107201082010920110201112011220113201142011520116201172011820119201202012120122201232012420125201262012720128201292013020131201322013320134201352013620137201382013920140201412014220143201442014520146201472014820149201502015120152201532015420155201562015720158201592016020161201622016320164201652016620167201682016920170201712017220173201742017520176201772017820179201802018120182201832018420185201862018720188201892019020191201922019320194201952019620197201982019920200202012020220203202042020520206202072020820209202102021120212202132021420215202162021720218202192022020221202222022320224202252022620227202282022920230202312023220233202342023520236202372023820239202402024120242202432024420245202462024720248202492025020251202522025320254202552025620257202582025920260202612026220263202642026520266202672026820269202702027120272202732027420275202762027720278202792028020281202822028320284202852028620287202882028920290202912029220293202942029520296202972029820299203002030120302203032030420305203062030720308203092031020311203122031320314203152031620317203182031920320203212032220323203242032520326203272032820329203302033120332203332033420335203362033720338203392034020341203422034320344203452034620347203482034920350203512035220353203542035520356203572035820359203602036120362203632036420365203662036720368203692037020371203722037320374203752037620377203782037920380203812038220383203842038520386203872038820389203902039120392203932039420395203962039720398203992040020401204022040320404204052040620407204082040920410204112041220413204142041520416204172041820419204202042120422204232042420425204262042720428204292043020431204322043320434204352043620437204382043920440204412044220443204442044520446204472044820449204502045120452204532045420455204562045720458204592046020461204622046320464204652046620467204682046920470204712047220473204742047520476204772047820479204802048120482204832048420485204862048720488204892049020491204922049320494204952049620497204982049920500205012050220503205042050520506205072050820509205102051120512205132051420515205162051720518205192052020521205222052320524205252052620527205282052920530205312053220533205342053520536205372053820539205402054120542205432054420545205462054720548205492055020551205522055320554205552055620557205582055920560205612056220563205642056520566205672056820569205702057120572205732057420575205762057720578205792058020581205822058320584205852058620587205882058920590205912059220593205942059520596205972059820599206002060120602206032060420605206062060720608206092061020611206122061320614206152061620617206182061920620206212062220623206242062520626206272062820629206302063120632206332063420635206362063720638206392064020641206422064320644206452064620647206482064920650206512065220653206542065520656206572065820659206602066120662206632066420665206662066720668206692067020671206722067320674206752067620677206782067920680206812068220683206842068520686206872068820689206902069120692206932069420695206962069720698206992070020701207022070320704207052070620707207082070920710207112071220713207142071520716207172071820719207202072120722207232072420725207262072720728207292073020731207322073320734207352073620737207382073920740207412074220743207442074520746207472074820749207502075120752207532075420755207562075720758207592076020761207622076320764207652076620767207682076920770207712077220773207742077520776207772077820779207802078120782207832078420785207862078720788207892079020791207922079320794207952079620797207982079920800208012080220803208042080520806208072080820809208102081120812208132081420815208162081720818208192082020821208222082320824208252082620827208282082920830208312083220833208342083520836208372083820839208402084120842208432084420845208462084720848208492085020851208522085320854208552085620857208582085920860208612086220863208642086520866208672086820869208702087120872208732087420875208762087720878208792088020881208822088320884208852088620887208882088920890208912089220893208942089520896208972089820899209002090120902209032090420905209062090720908209092091020911209122091320914209152091620917209182091920920209212092220923209242092520926209272092820929209302093120932209332093420935209362093720938209392094020941209422094320944209452094620947209482094920950209512095220953209542095520956209572095820959209602096120962209632096420965209662096720968209692097020971209722097320974209752097620977209782097920980209812098220983209842098520986209872098820989209902099120992209932099420995209962099720998209992100021001210022100321004210052100621007210082100921010210112101221013210142101521016210172101821019210202102121022210232102421025210262102721028210292103021031210322103321034210352103621037210382103921040210412104221043210442104521046210472104821049210502105121052210532105421055210562105721058210592106021061210622106321064210652106621067210682106921070210712107221073210742107521076210772107821079210802108121082210832108421085210862108721088210892109021091210922109321094210952109621097210982109921100211012110221103211042110521106211072110821109211102111121112211132111421115211162111721118211192112021121211222112321124211252112621127211282112921130211312113221133211342113521136211372113821139211402114121142211432114421145211462114721148211492115021151211522115321154211552115621157211582115921160211612116221163211642116521166211672116821169211702117121172211732117421175211762117721178211792118021181211822118321184211852118621187211882118921190211912119221193211942119521196211972119821199212002120121202212032120421205212062120721208212092121021211212122121321214212152121621217212182121921220212212122221223212242122521226212272122821229212302123121232212332123421235212362123721238212392124021241212422124321244212452124621247212482124921250212512125221253212542125521256212572125821259212602126121262212632126421265212662126721268212692127021271212722127321274212752127621277212782127921280212812128221283212842128521286212872128821289212902129121292212932129421295212962129721298212992130021301213022130321304213052130621307213082130921310213112131221313213142131521316213172131821319213202132121322213232132421325213262132721328213292133021331213322133321334213352133621337213382133921340213412134221343213442134521346213472134821349213502135121352213532135421355213562135721358213592136021361213622136321364213652136621367213682136921370213712137221373213742137521376213772137821379213802138121382213832138421385213862138721388213892139021391213922139321394213952139621397213982139921400214012140221403214042140521406214072140821409214102141121412214132141421415214162141721418214192142021421214222142321424214252142621427214282142921430214312143221433214342143521436214372143821439214402144121442214432144421445214462144721448214492145021451214522145321454214552145621457214582145921460214612146221463214642146521466214672146821469214702147121472214732147421475214762147721478214792148021481214822148321484214852148621487214882148921490214912149221493214942149521496214972149821499215002150121502215032150421505215062150721508215092151021511215122151321514215152151621517215182151921520215212152221523215242152521526215272152821529215302153121532215332153421535215362153721538215392154021541215422154321544215452154621547215482154921550215512155221553215542155521556215572155821559215602156121562215632156421565215662156721568215692157021571215722157321574215752157621577215782157921580215812158221583215842158521586215872158821589215902159121592215932159421595215962159721598215992160021601216022160321604216052160621607216082160921610216112161221613216142161521616216172161821619216202162121622216232162421625216262162721628216292163021631216322163321634216352163621637216382163921640216412164221643216442164521646216472164821649216502165121652216532165421655216562165721658216592166021661216622166321664216652166621667216682166921670216712167221673216742167521676216772167821679216802168121682216832168421685216862168721688216892169021691216922169321694216952169621697216982169921700217012170221703217042170521706217072170821709217102171121712217132171421715217162171721718217192172021721217222172321724217252172621727217282172921730217312173221733217342173521736217372173821739217402174121742217432174421745217462174721748217492175021751217522175321754217552175621757217582175921760217612176221763217642176521766217672176821769217702177121772217732177421775217762177721778217792178021781217822178321784217852178621787217882178921790217912179221793217942179521796217972179821799218002180121802218032180421805218062180721808218092181021811218122181321814218152181621817218182181921820218212182221823218242182521826218272182821829218302183121832218332183421835218362183721838218392184021841218422184321844218452184621847218482184921850218512185221853218542185521856218572185821859218602186121862218632186421865218662186721868218692187021871218722187321874218752187621877218782187921880218812188221883218842188521886218872188821889218902189121892218932189421895218962189721898218992190021901219022190321904219052190621907219082190921910219112191221913219142191521916219172191821919219202192121922219232192421925219262192721928219292193021931219322193321934219352193621937219382193921940219412194221943219442194521946219472194821949219502195121952219532195421955219562195721958219592196021961219622196321964219652196621967219682196921970219712197221973219742197521976219772197821979219802198121982219832198421985219862198721988219892199021991219922199321994219952199621997219982199922000220012200222003220042200522006220072200822009220102201122012220132201422015220162201722018220192202022021220222202322024220252202622027220282202922030220312203222033220342203522036220372203822039220402204122042220432204422045220462204722048220492205022051220522205322054220552205622057220582205922060220612206222063220642206522066220672206822069220702207122072220732207422075220762207722078220792208022081220822208322084220852208622087220882208922090220912209222093220942209522096220972209822099221002210122102221032210422105221062210722108221092211022111221122211322114221152211622117221182211922120221212212222123221242212522126221272212822129221302213122132221332213422135221362213722138221392214022141221422214322144221452214622147221482214922150221512215222153221542215522156221572215822159221602216122162221632216422165221662216722168221692217022171221722217322174221752217622177221782217922180221812218222183221842218522186221872218822189221902219122192221932219422195221962219722198221992220022201222022220322204222052220622207222082220922210222112221222213222142221522216222172221822219222202222122222222232222422225222262222722228222292223022231222322223322234222352223622237222382223922240222412224222243222442224522246222472224822249222502225122252222532225422255222562225722258222592226022261222622226322264222652226622267222682226922270222712227222273222742227522276222772227822279222802228122282222832228422285222862228722288222892229022291222922229322294222952229622297222982229922300223012230222303223042230522306223072230822309223102231122312223132231422315223162231722318223192232022321223222232322324223252232622327223282232922330223312233222333223342233522336223372233822339223402234122342223432234422345223462234722348223492235022351223522235322354223552235622357223582235922360223612236222363223642236522366223672236822369223702237122372223732237422375223762237722378223792238022381223822238322384223852238622387223882238922390223912239222393223942239522396223972239822399224002240122402224032240422405224062240722408224092241022411224122241322414224152241622417224182241922420224212242222423224242242522426224272242822429224302243122432224332243422435224362243722438224392244022441224422244322444224452244622447224482244922450224512245222453224542245522456224572245822459224602246122462224632246422465224662246722468224692247022471224722247322474224752247622477224782247922480224812248222483224842248522486224872248822489224902249122492224932249422495224962249722498224992250022501225022250322504225052250622507225082250922510225112251222513225142251522516225172251822519225202252122522225232252422525225262252722528225292253022531225322253322534225352253622537225382253922540225412254222543225442254522546225472254822549225502255122552225532255422555225562255722558225592256022561225622256322564225652256622567225682256922570225712257222573225742257522576225772257822579225802258122582225832258422585225862258722588225892259022591225922259322594225952259622597225982259922600226012260222603226042260522606226072260822609226102261122612226132261422615226162261722618226192262022621226222262322624226252262622627226282262922630226312263222633226342263522636226372263822639226402264122642226432264422645226462264722648226492265022651226522265322654226552265622657226582265922660226612266222663226642266522666226672266822669226702267122672226732267422675226762267722678226792268022681226822268322684226852268622687226882268922690226912269222693226942269522696226972269822699227002270122702227032270422705227062270722708227092271022711227122271322714227152271622717227182271922720227212272222723227242272522726227272272822729227302273122732227332273422735227362273722738227392274022741227422274322744227452274622747227482274922750227512275222753227542275522756227572275822759227602276122762227632276422765227662276722768227692277022771227722277322774227752277622777227782277922780227812278222783227842278522786227872278822789227902279122792227932279422795227962279722798227992280022801228022280322804228052280622807228082280922810228112281222813228142281522816228172281822819228202282122822228232282422825228262282722828228292283022831228322283322834228352283622837228382283922840228412284222843228442284522846228472284822849228502285122852228532285422855228562285722858228592286022861228622286322864228652286622867228682286922870228712287222873228742287522876228772287822879228802288122882228832288422885228862288722888228892289022891228922289322894228952289622897228982289922900229012290222903229042290522906229072290822909229102291122912229132291422915229162291722918229192292022921229222292322924229252292622927229282292922930229312293222933229342293522936229372293822939229402294122942229432294422945229462294722948229492295022951229522295322954229552295622957229582295922960229612296222963229642296522966229672296822969229702297122972229732297422975229762297722978229792298022981229822298322984229852298622987229882298922990229912299222993229942299522996229972299822999230002300123002230032300423005230062300723008230092301023011230122301323014230152301623017230182301923020230212302223023230242302523026230272302823029230302303123032230332303423035230362303723038230392304023041230422304323044230452304623047230482304923050230512305223053230542305523056230572305823059230602306123062230632306423065230662306723068230692307023071230722307323074230752307623077230782307923080230812308223083230842308523086230872308823089230902309123092230932309423095230962309723098230992310023101231022310323104231052310623107231082310923110231112311223113231142311523116231172311823119231202312123122231232312423125231262312723128231292313023131231322313323134231352313623137231382313923140231412314223143231442314523146231472314823149231502315123152231532315423155231562315723158231592316023161231622316323164231652316623167231682316923170231712317223173231742317523176231772317823179231802318123182231832318423185231862318723188231892319023191231922319323194231952319623197231982319923200232012320223203232042320523206232072320823209232102321123212232132321423215232162321723218232192322023221232222322323224232252322623227232282322923230232312323223233232342323523236232372323823239232402324123242232432324423245232462324723248232492325023251232522325323254232552325623257232582325923260232612326223263232642326523266232672326823269232702327123272232732327423275232762327723278232792328023281232822328323284232852328623287232882328923290232912329223293232942329523296232972329823299233002330123302233032330423305233062330723308233092331023311233122331323314233152331623317233182331923320233212332223323233242332523326233272332823329233302333123332233332333423335233362333723338233392334023341233422334323344233452334623347233482334923350233512335223353233542335523356233572335823359233602336123362233632336423365233662336723368233692337023371233722337323374233752337623377233782337923380233812338223383233842338523386233872338823389233902339123392233932339423395233962339723398233992340023401234022340323404234052340623407234082340923410234112341223413234142341523416234172341823419234202342123422234232342423425234262342723428234292343023431234322343323434234352343623437234382343923440234412344223443234442344523446234472344823449234502345123452234532345423455234562345723458234592346023461234622346323464234652346623467234682346923470234712347223473234742347523476234772347823479234802348123482234832348423485234862348723488234892349023491234922349323494234952349623497234982349923500235012350223503235042350523506235072350823509235102351123512235132351423515235162351723518235192352023521235222352323524235252352623527235282352923530235312353223533235342353523536235372353823539235402354123542235432354423545235462354723548235492355023551235522355323554235552355623557235582355923560235612356223563235642356523566235672356823569235702357123572235732357423575235762357723578235792358023581235822358323584235852358623587235882358923590235912359223593235942359523596235972359823599236002360123602236032360423605236062360723608236092361023611236122361323614236152361623617236182361923620236212362223623236242362523626236272362823629236302363123632236332363423635236362363723638236392364023641236422364323644236452364623647236482364923650236512365223653236542365523656236572365823659236602366123662236632366423665236662366723668236692367023671236722367323674236752367623677236782367923680236812368223683236842368523686236872368823689236902369123692236932369423695236962369723698236992370023701237022370323704237052370623707237082370923710237112371223713237142371523716237172371823719237202372123722237232372423725237262372723728237292373023731237322373323734237352373623737237382373923740237412374223743237442374523746237472374823749237502375123752237532375423755237562375723758237592376023761237622376323764237652376623767237682376923770237712377223773237742377523776237772377823779237802378123782237832378423785237862378723788237892379023791237922379323794237952379623797237982379923800238012380223803238042380523806238072380823809238102381123812238132381423815238162381723818238192382023821238222382323824238252382623827238282382923830238312383223833238342383523836238372383823839238402384123842238432384423845238462384723848238492385023851238522385323854238552385623857238582385923860238612386223863238642386523866238672386823869238702387123872238732387423875238762387723878238792388023881238822388323884238852388623887238882388923890238912389223893238942389523896238972389823899239002390123902239032390423905239062390723908239092391023911239122391323914239152391623917239182391923920239212392223923239242392523926239272392823929239302393123932239332393423935239362393723938239392394023941239422394323944239452394623947239482394923950239512395223953239542395523956239572395823959239602396123962239632396423965239662396723968239692397023971239722397323974239752397623977239782397923980239812398223983239842398523986239872398823989239902399123992239932399423995239962399723998239992400024001240022400324004240052400624007240082400924010240112401224013240142401524016240172401824019240202402124022240232402424025240262402724028240292403024031240322403324034240352403624037240382403924040240412404224043240442404524046240472404824049240502405124052240532405424055240562405724058240592406024061240622406324064240652406624067240682406924070240712407224073240742407524076240772407824079240802408124082240832408424085240862408724088240892409024091240922409324094240952409624097240982409924100241012410224103241042410524106241072410824109241102411124112241132411424115241162411724118241192412024121241222412324124241252412624127241282412924130241312413224133241342413524136241372413824139241402414124142241432414424145241462414724148241492415024151241522415324154241552415624157241582415924160241612416224163241642416524166241672416824169241702417124172241732417424175241762417724178241792418024181241822418324184241852418624187241882418924190241912419224193241942419524196241972419824199242002420124202242032420424205242062420724208242092421024211242122421324214242152421624217242182421924220242212422224223242242422524226242272422824229242302423124232242332423424235242362423724238242392424024241242422424324244242452424624247242482424924250242512425224253242542425524256242572425824259242602426124262242632426424265242662426724268242692427024271242722427324274242752427624277242782427924280242812428224283242842428524286242872428824289242902429124292242932429424295242962429724298242992430024301243022430324304243052430624307243082430924310243112431224313243142431524316243172431824319243202432124322243232432424325243262432724328243292433024331243322433324334243352433624337243382433924340243412434224343243442434524346243472434824349243502435124352243532435424355243562435724358243592436024361243622436324364243652436624367243682436924370243712437224373243742437524376243772437824379243802438124382243832438424385243862438724388243892439024391243922439324394243952439624397243982439924400244012440224403244042440524406244072440824409244102441124412244132441424415244162441724418244192442024421244222442324424244252442624427244282442924430244312443224433244342443524436244372443824439244402444124442244432444424445244462444724448244492445024451244522445324454244552445624457244582445924460244612446224463244642446524466244672446824469244702447124472244732447424475244762447724478244792448024481244822448324484244852448624487244882448924490244912449224493244942449524496244972449824499245002450124502245032450424505245062450724508245092451024511245122451324514245152451624517245182451924520245212452224523245242452524526245272452824529245302453124532245332453424535245362453724538245392454024541245422454324544245452454624547245482454924550245512455224553245542455524556245572455824559245602456124562245632456424565245662456724568245692457024571245722457324574245752457624577245782457924580245812458224583245842458524586245872458824589245902459124592245932459424595245962459724598245992460024601246022460324604246052460624607246082460924610246112461224613246142461524616246172461824619246202462124622246232462424625246262462724628246292463024631246322463324634246352463624637246382463924640246412464224643246442464524646246472464824649246502465124652246532465424655246562465724658246592466024661246622466324664246652466624667246682466924670246712467224673246742467524676246772467824679246802468124682246832468424685246862468724688246892469024691246922469324694246952469624697246982469924700247012470224703247042470524706247072470824709247102471124712247132471424715247162471724718247192472024721247222472324724247252472624727247282472924730247312473224733247342473524736247372473824739247402474124742247432474424745247462474724748247492475024751247522475324754247552475624757247582475924760247612476224763247642476524766247672476824769247702477124772247732477424775247762477724778247792478024781247822478324784247852478624787247882478924790247912479224793247942479524796247972479824799248002480124802248032480424805248062480724808248092481024811248122481324814248152481624817248182481924820248212482224823248242482524826248272482824829248302483124832248332483424835248362483724838248392484024841248422484324844248452484624847248482484924850248512485224853248542485524856248572485824859248602486124862248632486424865248662486724868248692487024871248722487324874248752487624877248782487924880248812488224883248842488524886248872488824889248902489124892248932489424895248962489724898248992490024901249022490324904249052490624907249082490924910249112491224913249142491524916249172491824919249202492124922249232492424925249262492724928249292493024931249322493324934249352493624937249382493924940249412494224943249442494524946249472494824949249502495124952249532495424955249562495724958249592496024961249622496324964249652496624967249682496924970249712497224973249742497524976249772497824979249802498124982249832498424985249862498724988249892499024991249922499324994249952499624997249982499925000250012500225003250042500525006250072500825009250102501125012250132501425015250162501725018250192502025021250222502325024250252502625027250282502925030250312503225033250342503525036250372503825039250402504125042250432504425045250462504725048250492505025051250522505325054250552505625057250582505925060250612506225063250642506525066250672506825069250702507125072250732507425075250762507725078250792508025081250822508325084250852508625087250882508925090250912509225093250942509525096250972509825099251002510125102251032510425105251062510725108251092511025111251122511325114251152511625117251182511925120251212512225123251242512525126251272512825129251302513125132251332513425135251362513725138251392514025141251422514325144251452514625147251482514925150251512515225153251542515525156251572515825159251602516125162251632516425165251662516725168251692517025171251722517325174251752517625177251782517925180251812518225183251842518525186251872518825189251902519125192251932519425195251962519725198251992520025201252022520325204252052520625207252082520925210252112521225213252142521525216252172521825219252202522125222252232522425225252262522725228252292523025231252322523325234252352523625237252382523925240252412524225243252442524525246252472524825249252502525125252252532525425255252562525725258252592526025261252622526325264252652526625267252682526925270252712527225273252742527525276252772527825279252802528125282252832528425285252862528725288252892529025291252922529325294252952529625297252982529925300253012530225303253042530525306253072530825309253102531125312253132531425315253162531725318253192532025321253222532325324253252532625327253282532925330253312533225333253342533525336253372533825339253402534125342253432534425345253462534725348253492535025351253522535325354253552535625357253582535925360253612536225363253642536525366253672536825369253702537125372253732537425375253762537725378253792538025381253822538325384253852538625387253882538925390253912539225393253942539525396253972539825399254002540125402254032540425405254062540725408254092541025411254122541325414254152541625417254182541925420254212542225423254242542525426254272542825429254302543125432254332543425435254362543725438254392544025441254422544325444254452544625447254482544925450254512545225453254542545525456254572545825459254602546125462254632546425465254662546725468254692547025471254722547325474254752547625477254782547925480254812548225483254842548525486254872548825489254902549125492254932549425495254962549725498254992550025501255022550325504255052550625507255082550925510255112551225513255142551525516255172551825519255202552125522255232552425525255262552725528255292553025531255322553325534255352553625537255382553925540255412554225543255442554525546255472554825549255502555125552255532555425555255562555725558255592556025561255622556325564255652556625567255682556925570255712557225573255742557525576255772557825579255802558125582255832558425585255862558725588255892559025591255922559325594255952559625597255982559925600256012560225603256042560525606256072560825609256102561125612256132561425615256162561725618256192562025621256222562325624256252562625627256282562925630256312563225633256342563525636256372563825639256402564125642256432564425645256462564725648256492565025651256522565325654256552565625657256582565925660256612566225663256642566525666256672566825669256702567125672256732567425675256762567725678256792568025681256822568325684256852568625687256882568925690256912569225693256942569525696256972569825699257002570125702257032570425705257062570725708257092571025711257122571325714257152571625717257182571925720257212572225723257242572525726257272572825729257302573125732257332573425735257362573725738257392574025741257422574325744257452574625747257482574925750257512575225753257542575525756257572575825759257602576125762257632576425765257662576725768257692577025771257722577325774257752577625777257782577925780257812578225783257842578525786257872578825789257902579125792257932579425795257962579725798257992580025801258022580325804258052580625807258082580925810258112581225813258142581525816258172581825819258202582125822258232582425825258262582725828258292583025831258322583325834258352583625837258382583925840258412584225843258442584525846258472584825849258502585125852258532585425855258562585725858258592586025861258622586325864258652586625867258682586925870258712587225873258742587525876258772587825879258802588125882258832588425885258862588725888258892589025891258922589325894258952589625897258982589925900259012590225903259042590525906259072590825909259102591125912259132591425915259162591725918259192592025921259222592325924259252592625927259282592925930259312593225933259342593525936259372593825939259402594125942259432594425945259462594725948259492595025951259522595325954259552595625957259582595925960259612596225963259642596525966259672596825969259702597125972259732597425975259762597725978259792598025981259822598325984259852598625987259882598925990259912599225993259942599525996259972599825999260002600126002260032600426005260062600726008260092601026011260122601326014260152601626017260182601926020260212602226023260242602526026260272602826029260302603126032260332603426035260362603726038260392604026041260422604326044260452604626047260482604926050260512605226053260542605526056260572605826059260602606126062260632606426065260662606726068260692607026071260722607326074260752607626077260782607926080260812608226083260842608526086260872608826089260902609126092260932609426095260962609726098260992610026101261022610326104261052610626107261082610926110261112611226113261142611526116261172611826119261202612126122261232612426125261262612726128261292613026131261322613326134261352613626137261382613926140261412614226143261442614526146261472614826149261502615126152261532615426155261562615726158261592616026161261622616326164261652616626167261682616926170261712617226173261742617526176261772617826179261802618126182261832618426185261862618726188261892619026191261922619326194261952619626197261982619926200262012620226203262042620526206262072620826209262102621126212262132621426215262162621726218262192622026221262222622326224262252622626227262282622926230262312623226233262342623526236262372623826239262402624126242262432624426245262462624726248262492625026251262522625326254262552625626257262582625926260262612626226263262642626526266262672626826269262702627126272262732627426275262762627726278262792628026281262822628326284262852628626287262882628926290262912629226293262942629526296262972629826299263002630126302263032630426305263062630726308263092631026311263122631326314263152631626317263182631926320263212632226323263242632526326263272632826329263302633126332263332633426335263362633726338263392634026341263422634326344263452634626347263482634926350263512635226353263542635526356263572635826359263602636126362263632636426365263662636726368263692637026371263722637326374263752637626377263782637926380263812638226383263842638526386263872638826389263902639126392263932639426395263962639726398263992640026401264022640326404264052640626407264082640926410264112641226413264142641526416264172641826419264202642126422264232642426425264262642726428264292643026431264322643326434264352643626437264382643926440264412644226443264442644526446264472644826449264502645126452264532645426455264562645726458264592646026461264622646326464264652646626467264682646926470264712647226473264742647526476264772647826479264802648126482264832648426485264862648726488264892649026491264922649326494264952649626497264982649926500265012650226503265042650526506265072650826509265102651126512265132651426515265162651726518265192652026521265222652326524265252652626527265282652926530265312653226533265342653526536265372653826539265402654126542265432654426545265462654726548265492655026551265522655326554265552655626557265582655926560265612656226563265642656526566265672656826569265702657126572265732657426575265762657726578265792658026581265822658326584265852658626587265882658926590265912659226593265942659526596265972659826599266002660126602266032660426605266062660726608266092661026611266122661326614266152661626617266182661926620266212662226623266242662526626266272662826629266302663126632266332663426635266362663726638266392664026641266422664326644266452664626647266482664926650266512665226653266542665526656266572665826659266602666126662266632666426665266662666726668266692667026671266722667326674266752667626677266782667926680266812668226683266842668526686266872668826689266902669126692266932669426695266962669726698266992670026701267022670326704267052670626707267082670926710267112671226713267142671526716267172671826719267202672126722267232672426725267262672726728267292673026731267322673326734267352673626737267382673926740267412674226743267442674526746267472674826749267502675126752267532675426755267562675726758267592676026761267622676326764267652676626767267682676926770267712677226773267742677526776267772677826779267802678126782267832678426785267862678726788267892679026791267922679326794267952679626797267982679926800268012680226803268042680526806268072680826809268102681126812268132681426815268162681726818268192682026821268222682326824268252682626827268282682926830268312683226833268342683526836268372683826839268402684126842268432684426845268462684726848268492685026851268522685326854268552685626857268582685926860268612686226863268642686526866268672686826869268702687126872268732687426875268762687726878268792688026881268822688326884268852688626887268882688926890268912689226893268942689526896268972689826899269002690126902269032690426905269062690726908269092691026911269122691326914269152691626917269182691926920269212692226923269242692526926269272692826929269302693126932269332693426935269362693726938269392694026941269422694326944269452694626947269482694926950269512695226953269542695526956269572695826959269602696126962269632696426965269662696726968269692697026971269722697326974269752697626977269782697926980269812698226983269842698526986
  1. diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
  2. index 3a3b30ac2a75..9e0745cafbd8 100644
  3. --- a/Documentation/sysrq.txt
  4. +++ b/Documentation/sysrq.txt
  5. @@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
  6. On other - If you know of the key combos for other architectures, please
  7. let me know so I can add them to this section.
  8. -On all - write a character to /proc/sysrq-trigger. e.g.:
  9. -
  10. +On all - write a character to /proc/sysrq-trigger, e.g.:
  11. echo t > /proc/sysrq-trigger
  12. +On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
  13. + echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
  14. + Send an ICMP echo request with this pattern plus the particular
  15. + SysRq command key. Example:
  16. + # ping -c1 -s57 -p0102030468
  17. + will trigger the SysRq-H (help) command.
  18. +
  19. +
  20. * What are the 'command' keys?
  21. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  22. 'b' - Will immediately reboot the system without syncing or unmounting
  23. diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt
  24. new file mode 100644
  25. index 000000000000..6f2aeabf7faa
  26. --- /dev/null
  27. +++ b/Documentation/trace/histograms.txt
  28. @@ -0,0 +1,186 @@
  29. + Using the Linux Kernel Latency Histograms
  30. +
  31. +
  32. +This document gives a short explanation how to enable, configure and use
  33. +latency histograms. Latency histograms are primarily relevant in the
  34. +context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
  35. +and are used in the quality management of the Linux real-time
  36. +capabilities.
  37. +
  38. +
  39. +* Purpose of latency histograms
  40. +
  41. +A latency histogram continuously accumulates the frequencies of latency
  42. +data. There are two types of histograms
  43. +- potential sources of latencies
  44. +- effective latencies
  45. +
  46. +
  47. +* Potential sources of latencies
  48. +
  49. +Potential sources of latencies are code segments where interrupts,
  50. +preemption or both are disabled (aka critical sections). To create
  51. +histograms of potential sources of latency, the kernel stores the time
  52. +stamp at the start of a critical section, determines the time elapsed
  53. +when the end of the section is reached, and increments the frequency
  54. +counter of that latency value - irrespective of whether any concurrently
  55. +running process is affected by latency or not.
  56. +- Configuration items (in the Kernel hacking/Tracers submenu)
  57. + CONFIG_INTERRUPT_OFF_LATENCY
  58. + CONFIG_PREEMPT_OFF_LATENCY
  59. +
  60. +
  61. +* Effective latencies
  62. +
  63. +Effective latencies are actually occuring during wakeup of a process. To
  64. +determine effective latencies, the kernel stores the time stamp when a
  65. +process is scheduled to be woken up, and determines the duration of the
  66. +wakeup time shortly before control is passed over to this process. Note
  67. +that the apparent latency in user space may be somewhat longer, since the
  68. +process may be interrupted after control is passed over to it but before
  69. +the execution in user space takes place. Simply measuring the interval
  70. +between enqueuing and wakeup may also not appropriate in cases when a
  71. +process is scheduled as a result of a timer expiration. The timer may have
  72. +missed its deadline, e.g. due to disabled interrupts, but this latency
  73. +would not be registered. Therefore, the offsets of missed timers are
  74. +recorded in a separate histogram. If both wakeup latency and missed timer
  75. +offsets are configured and enabled, a third histogram may be enabled that
  76. +records the overall latency as a sum of the timer latency, if any, and the
  77. +wakeup latency. This histogram is called "timerandwakeup".
  78. +- Configuration items (in the Kernel hacking/Tracers submenu)
  79. + CONFIG_WAKEUP_LATENCY
  80. + CONFIG_MISSED_TIMER_OFSETS
  81. +
  82. +
  83. +* Usage
  84. +
  85. +The interface to the administration of the latency histograms is located
  86. +in the debugfs file system. To mount it, either enter
  87. +
  88. +mount -t sysfs nodev /sys
  89. +mount -t debugfs nodev /sys/kernel/debug
  90. +
  91. +from shell command line level, or add
  92. +
  93. +nodev /sys sysfs defaults 0 0
  94. +nodev /sys/kernel/debug debugfs defaults 0 0
  95. +
  96. +to the file /etc/fstab. All latency histogram related files are then
  97. +available in the directory /sys/kernel/debug/tracing/latency_hist. A
  98. +particular histogram type is enabled by writing non-zero to the related
  99. +variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
  100. +Select "preemptirqsoff" for the histograms of potential sources of
  101. +latencies and "wakeup" for histograms of effective latencies etc. The
  102. +histogram data - one per CPU - are available in the files
  103. +
  104. +/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
  105. +/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
  106. +/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
  107. +/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
  108. +/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
  109. +/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
  110. +/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
  111. +
  112. +The histograms are reset by writing non-zero to the file "reset" in a
  113. +particular latency directory. To reset all latency data, use
  114. +
  115. +#!/bin/sh
  116. +
  117. +TRACINGDIR=/sys/kernel/debug/tracing
  118. +HISTDIR=$TRACINGDIR/latency_hist
  119. +
  120. +if test -d $HISTDIR
  121. +then
  122. + cd $HISTDIR
  123. + for i in `find . | grep /reset$`
  124. + do
  125. + echo 1 >$i
  126. + done
  127. +fi
  128. +
  129. +
  130. +* Data format
  131. +
  132. +Latency data are stored with a resolution of one microsecond. The
  133. +maximum latency is 10,240 microseconds. The data are only valid, if the
  134. +overflow register is empty. Every output line contains the latency in
  135. +microseconds in the first row and the number of samples in the second
  136. +row. To display only lines with a positive latency count, use, for
  137. +example,
  138. +
  139. +grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
  140. +
  141. +#Minimum latency: 0 microseconds.
  142. +#Average latency: 0 microseconds.
  143. +#Maximum latency: 25 microseconds.
  144. +#Total samples: 3104770694
  145. +#There are 0 samples greater or equal than 10240 microseconds
  146. +#usecs samples
  147. + 0 2984486876
  148. + 1 49843506
  149. + 2 58219047
  150. + 3 5348126
  151. + 4 2187960
  152. + 5 3388262
  153. + 6 959289
  154. + 7 208294
  155. + 8 40420
  156. + 9 4485
  157. + 10 14918
  158. + 11 18340
  159. + 12 25052
  160. + 13 19455
  161. + 14 5602
  162. + 15 969
  163. + 16 47
  164. + 17 18
  165. + 18 14
  166. + 19 1
  167. + 20 3
  168. + 21 2
  169. + 22 5
  170. + 23 2
  171. + 25 1
  172. +
  173. +
  174. +* Wakeup latency of a selected process
  175. +
  176. +To only collect wakeup latency data of a particular process, write the
  177. +PID of the requested process to
  178. +
  179. +/sys/kernel/debug/tracing/latency_hist/wakeup/pid
  180. +
  181. +PIDs are not considered, if this variable is set to 0.
  182. +
  183. +
  184. +* Details of the process with the highest wakeup latency so far
  185. +
  186. +Selected data of the process that suffered from the highest wakeup
  187. +latency that occurred in a particular CPU are available in the file
  188. +
  189. +/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
  190. +
  191. +In addition, other relevant system data at the time when the
  192. +latency occurred are given.
  193. +
  194. +The format of the data is (all in one line):
  195. +<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
  196. +<- <PID> <Priority> <Command> <Timestamp>
  197. +
  198. +The value of <Timeroffset> is only relevant in the combined timer
  199. +and wakeup latency recording. In the wakeup recording, it is
  200. +always 0, in the missed_timer_offsets recording, it is the same
  201. +as <Latency>.
  202. +
  203. +When retrospectively searching for the origin of a latency and
  204. +tracing was not enabled, it may be helpful to know the name and
  205. +some basic data of the task that (finally) was switching to the
  206. +late real-tlme task. In addition to the victim's data, also the
  207. +data of the possible culprit are therefore displayed after the
  208. +"<-" symbol.
  209. +
  210. +Finally, the timestamp of the time when the latency occurred
  211. +in <seconds>.<microseconds> after the most recent system boot
  212. +is provided.
  213. +
  214. +These data are also reset when the wakeup histogram is reset.
  215. diff --git a/MAINTAINERS b/MAINTAINERS
  216. index 63cefa62324c..be0ea1e5c4cc 100644
  217. --- a/MAINTAINERS
  218. +++ b/MAINTAINERS
  219. @@ -5196,6 +5196,23 @@ F: fs/fuse/
  220. F: include/uapi/linux/fuse.h
  221. F: Documentation/filesystems/fuse.txt
  222. +FUTEX SUBSYSTEM
  223. +M: Thomas Gleixner <tglx@linutronix.de>
  224. +M: Ingo Molnar <mingo@redhat.com>
  225. +R: Peter Zijlstra <peterz@infradead.org>
  226. +R: Darren Hart <dvhart@infradead.org>
  227. +L: linux-kernel@vger.kernel.org
  228. +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  229. +S: Maintained
  230. +F: kernel/futex.c
  231. +F: kernel/futex_compat.c
  232. +F: include/asm-generic/futex.h
  233. +F: include/linux/futex.h
  234. +F: include/uapi/linux/futex.h
  235. +F: tools/testing/selftests/futex/
  236. +F: tools/perf/bench/futex*
  237. +F: Documentation/*futex*
  238. +
  239. FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
  240. M: Rik Faith <faith@cs.unc.edu>
  241. L: linux-scsi@vger.kernel.org
  242. diff --git a/arch/Kconfig b/arch/Kconfig
  243. index 659bdd079277..099fc0f5155e 100644
  244. --- a/arch/Kconfig
  245. +++ b/arch/Kconfig
  246. @@ -9,6 +9,7 @@ config OPROFILE
  247. tristate "OProfile system profiling"
  248. depends on PROFILING
  249. depends on HAVE_OPROFILE
  250. + depends on !PREEMPT_RT_FULL
  251. select RING_BUFFER
  252. select RING_BUFFER_ALLOW_SWAP
  253. help
  254. @@ -52,6 +53,7 @@ config KPROBES
  255. config JUMP_LABEL
  256. bool "Optimize very unlikely/likely branches"
  257. depends on HAVE_ARCH_JUMP_LABEL
  258. + depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
  259. help
  260. This option enables a transparent branch optimization that
  261. makes certain almost-always-true or almost-always-false branch
  262. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
  263. index b5d529fdffab..5715844e83e3 100644
  264. --- a/arch/arm/Kconfig
  265. +++ b/arch/arm/Kconfig
  266. @@ -36,7 +36,7 @@ config ARM
  267. select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
  268. select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
  269. select HAVE_ARCH_HARDENED_USERCOPY
  270. - select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
  271. + select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
  272. select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
  273. select HAVE_ARCH_MMAP_RND_BITS if MMU
  274. select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
  275. @@ -75,6 +75,7 @@ config ARM
  276. select HAVE_PERF_EVENTS
  277. select HAVE_PERF_REGS
  278. select HAVE_PERF_USER_STACK_DUMP
  279. + select HAVE_PREEMPT_LAZY
  280. select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
  281. select HAVE_REGS_AND_STACK_ACCESS_API
  282. select HAVE_SYSCALL_TRACEPOINTS
  283. diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
  284. index e53638c8ed8a..6095a1649865 100644
  285. --- a/arch/arm/include/asm/irq.h
  286. +++ b/arch/arm/include/asm/irq.h
  287. @@ -22,6 +22,8 @@
  288. #endif
  289. #ifndef __ASSEMBLY__
  290. +#include <linux/cpumask.h>
  291. +
  292. struct irqaction;
  293. struct pt_regs;
  294. extern void migrate_irqs(void);
  295. diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
  296. index 12ebfcc1d539..c962084605bc 100644
  297. --- a/arch/arm/include/asm/switch_to.h
  298. +++ b/arch/arm/include/asm/switch_to.h
  299. @@ -3,6 +3,13 @@
  300. #include <linux/thread_info.h>
  301. +#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM
  302. +void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p);
  303. +#else
  304. +static inline void
  305. +switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
  306. +#endif
  307. +
  308. /*
  309. * For v7 SMP cores running a preemptible kernel we may be pre-empted
  310. * during a TLB maintenance operation, so execute an inner-shareable dsb
  311. @@ -25,6 +32,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
  312. #define switch_to(prev,next,last) \
  313. do { \
  314. __complete_pending_tlbi(); \
  315. + switch_kmaps(prev, next); \
  316. last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
  317. } while (0)
  318. diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
  319. index 776757d1604a..1f36a4eccc72 100644
  320. --- a/arch/arm/include/asm/thread_info.h
  321. +++ b/arch/arm/include/asm/thread_info.h
  322. @@ -49,6 +49,7 @@ struct cpu_context_save {
  323. struct thread_info {
  324. unsigned long flags; /* low level flags */
  325. int preempt_count; /* 0 => preemptable, <0 => bug */
  326. + int preempt_lazy_count; /* 0 => preemptable, <0 => bug */
  327. mm_segment_t addr_limit; /* address limit */
  328. struct task_struct *task; /* main task structure */
  329. __u32 cpu; /* cpu */
  330. @@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
  331. #define TIF_SYSCALL_TRACE 4 /* syscall trace active */
  332. #define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
  333. #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
  334. -#define TIF_SECCOMP 7 /* seccomp syscall filtering active */
  335. +#define TIF_SECCOMP 8 /* seccomp syscall filtering active */
  336. +#define TIF_NEED_RESCHED_LAZY 7
  337. #define TIF_NOHZ 12 /* in adaptive nohz mode */
  338. #define TIF_USING_IWMMXT 17
  339. @@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
  340. #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
  341. #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
  342. #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
  343. +#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
  344. #define _TIF_UPROBE (1 << TIF_UPROBE)
  345. #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
  346. #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
  347. @@ -167,7 +170,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
  348. * Change these and you break ASM code in entry-common.S
  349. */
  350. #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
  351. - _TIF_NOTIFY_RESUME | _TIF_UPROBE)
  352. + _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
  353. + _TIF_NEED_RESCHED_LAZY)
  354. #endif /* __KERNEL__ */
  355. #endif /* __ASM_ARM_THREAD_INFO_H */
  356. diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
  357. index 608008229c7d..3866da3f7bb7 100644
  358. --- a/arch/arm/kernel/asm-offsets.c
  359. +++ b/arch/arm/kernel/asm-offsets.c
  360. @@ -65,6 +65,7 @@ int main(void)
  361. BLANK();
  362. DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
  363. DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
  364. + DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
  365. DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
  366. DEFINE(TI_TASK, offsetof(struct thread_info, task));
  367. DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  368. diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
  369. index 9f157e7c51e7..468e224d76aa 100644
  370. --- a/arch/arm/kernel/entry-armv.S
  371. +++ b/arch/arm/kernel/entry-armv.S
  372. @@ -220,11 +220,18 @@ ENDPROC(__dabt_svc)
  373. #ifdef CONFIG_PREEMPT
  374. ldr r8, [tsk, #TI_PREEMPT] @ get preempt count
  375. - ldr r0, [tsk, #TI_FLAGS] @ get flags
  376. teq r8, #0 @ if preempt count != 0
  377. + bne 1f @ return from exeption
  378. + ldr r0, [tsk, #TI_FLAGS] @ get flags
  379. + tst r0, #_TIF_NEED_RESCHED @ if NEED_RESCHED is set
  380. + blne svc_preempt @ preempt!
  381. +
  382. + ldr r8, [tsk, #TI_PREEMPT_LAZY] @ get preempt lazy count
  383. + teq r8, #0 @ if preempt lazy count != 0
  384. movne r0, #0 @ force flags to 0
  385. - tst r0, #_TIF_NEED_RESCHED
  386. + tst r0, #_TIF_NEED_RESCHED_LAZY
  387. blne svc_preempt
  388. +1:
  389. #endif
  390. svc_exit r5, irq = 1 @ return from exception
  391. @@ -239,8 +246,14 @@ ENDPROC(__irq_svc)
  392. 1: bl preempt_schedule_irq @ irq en/disable is done inside
  393. ldr r0, [tsk, #TI_FLAGS] @ get new tasks TI_FLAGS
  394. tst r0, #_TIF_NEED_RESCHED
  395. + bne 1b
  396. + tst r0, #_TIF_NEED_RESCHED_LAZY
  397. reteq r8 @ go again
  398. - b 1b
  399. + ldr r0, [tsk, #TI_PREEMPT_LAZY] @ get preempt lazy count
  400. + teq r0, #0 @ if preempt lazy count != 0
  401. + beq 1b
  402. + ret r8 @ go again
  403. +
  404. #endif
  405. __und_fault:
  406. diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
  407. index 10c3283d6c19..8872937862cc 100644
  408. --- a/arch/arm/kernel/entry-common.S
  409. +++ b/arch/arm/kernel/entry-common.S
  410. @@ -36,7 +36,9 @@
  411. UNWIND(.cantunwind )
  412. disable_irq_notrace @ disable interrupts
  413. ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
  414. - tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
  415. + tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
  416. + bne fast_work_pending
  417. + tst r1, #_TIF_SECCOMP
  418. bne fast_work_pending
  419. /* perform architecture specific actions before user return */
  420. @@ -62,8 +64,11 @@ ENDPROC(ret_fast_syscall)
  421. str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
  422. disable_irq_notrace @ disable interrupts
  423. ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
  424. - tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
  425. + tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
  426. + bne do_slower_path
  427. + tst r1, #_TIF_SECCOMP
  428. beq no_work_pending
  429. +do_slower_path:
  430. UNWIND(.fnend )
  431. ENDPROC(ret_fast_syscall)
  432. diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
  433. index 69bda1a5707e..1f665acaa6a9 100644
  434. --- a/arch/arm/kernel/patch.c
  435. +++ b/arch/arm/kernel/patch.c
  436. @@ -15,7 +15,7 @@ struct patch {
  437. unsigned int insn;
  438. };
  439. -static DEFINE_SPINLOCK(patch_lock);
  440. +static DEFINE_RAW_SPINLOCK(patch_lock);
  441. static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
  442. __acquires(&patch_lock)
  443. @@ -32,7 +32,7 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
  444. return addr;
  445. if (flags)
  446. - spin_lock_irqsave(&patch_lock, *flags);
  447. + raw_spin_lock_irqsave(&patch_lock, *flags);
  448. else
  449. __acquire(&patch_lock);
  450. @@ -47,7 +47,7 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags)
  451. clear_fixmap(fixmap);
  452. if (flags)
  453. - spin_unlock_irqrestore(&patch_lock, *flags);
  454. + raw_spin_unlock_irqrestore(&patch_lock, *flags);
  455. else
  456. __release(&patch_lock);
  457. }
  458. diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
  459. index 91d2d5b01414..750550098b59 100644
  460. --- a/arch/arm/kernel/process.c
  461. +++ b/arch/arm/kernel/process.c
  462. @@ -322,6 +322,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  463. }
  464. #ifdef CONFIG_MMU
  465. +/*
  466. + * CONFIG_SPLIT_PTLOCK_CPUS results in a page->ptl lock. If the lock is not
  467. + * initialized by pgtable_page_ctor() then a coredump of the vector page will
  468. + * fail.
  469. + */
  470. +static int __init vectors_user_mapping_init_page(void)
  471. +{
  472. + struct page *page;
  473. + unsigned long addr = 0xffff0000;
  474. + pgd_t *pgd;
  475. + pud_t *pud;
  476. + pmd_t *pmd;
  477. +
  478. + pgd = pgd_offset_k(addr);
  479. + pud = pud_offset(pgd, addr);
  480. + pmd = pmd_offset(pud, addr);
  481. + page = pmd_page(*(pmd));
  482. +
  483. + pgtable_page_ctor(page);
  484. +
  485. + return 0;
  486. +}
  487. +late_initcall(vectors_user_mapping_init_page);
  488. +
  489. #ifdef CONFIG_KUSER_HELPERS
  490. /*
  491. * The vectors page is always readable from user space for the
  492. diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
  493. index 7b8f2141427b..96541e00b74a 100644
  494. --- a/arch/arm/kernel/signal.c
  495. +++ b/arch/arm/kernel/signal.c
  496. @@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
  497. */
  498. trace_hardirqs_off();
  499. do {
  500. - if (likely(thread_flags & _TIF_NEED_RESCHED)) {
  501. + if (likely(thread_flags & (_TIF_NEED_RESCHED |
  502. + _TIF_NEED_RESCHED_LAZY))) {
  503. schedule();
  504. } else {
  505. if (unlikely(!user_mode(regs)))
  506. diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
  507. index 7dd14e8395e6..4cd7e3d98035 100644
  508. --- a/arch/arm/kernel/smp.c
  509. +++ b/arch/arm/kernel/smp.c
  510. @@ -234,8 +234,6 @@ int __cpu_disable(void)
  511. flush_cache_louis();
  512. local_flush_tlb_all();
  513. - clear_tasks_mm_cpumask(cpu);
  514. -
  515. return 0;
  516. }
  517. @@ -251,6 +249,9 @@ void __cpu_die(unsigned int cpu)
  518. pr_err("CPU%u: cpu didn't die\n", cpu);
  519. return;
  520. }
  521. +
  522. + clear_tasks_mm_cpumask(cpu);
  523. +
  524. pr_notice("CPU%u: shutdown\n", cpu);
  525. /*
  526. diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
  527. index 0bee233fef9a..314cfb232a63 100644
  528. --- a/arch/arm/kernel/unwind.c
  529. +++ b/arch/arm/kernel/unwind.c
  530. @@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];
  531. static const struct unwind_idx *__origin_unwind_idx;
  532. extern const struct unwind_idx __stop_unwind_idx[];
  533. -static DEFINE_SPINLOCK(unwind_lock);
  534. +static DEFINE_RAW_SPINLOCK(unwind_lock);
  535. static LIST_HEAD(unwind_tables);
  536. /* Convert a prel31 symbol to an absolute address */
  537. @@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
  538. /* module unwind tables */
  539. struct unwind_table *table;
  540. - spin_lock_irqsave(&unwind_lock, flags);
  541. + raw_spin_lock_irqsave(&unwind_lock, flags);
  542. list_for_each_entry(table, &unwind_tables, list) {
  543. if (addr >= table->begin_addr &&
  544. addr < table->end_addr) {
  545. @@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
  546. break;
  547. }
  548. }
  549. - spin_unlock_irqrestore(&unwind_lock, flags);
  550. + raw_spin_unlock_irqrestore(&unwind_lock, flags);
  551. }
  552. pr_debug("%s: idx = %p\n", __func__, idx);
  553. @@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
  554. tab->begin_addr = text_addr;
  555. tab->end_addr = text_addr + text_size;
  556. - spin_lock_irqsave(&unwind_lock, flags);
  557. + raw_spin_lock_irqsave(&unwind_lock, flags);
  558. list_add_tail(&tab->list, &unwind_tables);
  559. - spin_unlock_irqrestore(&unwind_lock, flags);
  560. + raw_spin_unlock_irqrestore(&unwind_lock, flags);
  561. return tab;
  562. }
  563. @@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)
  564. if (!tab)
  565. return;
  566. - spin_lock_irqsave(&unwind_lock, flags);
  567. + raw_spin_lock_irqsave(&unwind_lock, flags);
  568. list_del(&tab->list);
  569. - spin_unlock_irqrestore(&unwind_lock, flags);
  570. + raw_spin_unlock_irqrestore(&unwind_lock, flags);
  571. kfree(tab);
  572. }
  573. diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
  574. index 19b5f5c1c0ff..82aa639e6737 100644
  575. --- a/arch/arm/kvm/arm.c
  576. +++ b/arch/arm/kvm/arm.c
  577. @@ -619,7 +619,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
  578. * involves poking the GIC, which must be done in a
  579. * non-preemptible context.
  580. */
  581. - preempt_disable();
  582. + migrate_disable();
  583. kvm_pmu_flush_hwstate(vcpu);
  584. kvm_timer_flush_hwstate(vcpu);
  585. kvm_vgic_flush_hwstate(vcpu);
  586. @@ -640,7 +640,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
  587. kvm_pmu_sync_hwstate(vcpu);
  588. kvm_timer_sync_hwstate(vcpu);
  589. kvm_vgic_sync_hwstate(vcpu);
  590. - preempt_enable();
  591. + migrate_enable();
  592. continue;
  593. }
  594. @@ -696,7 +696,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
  595. kvm_vgic_sync_hwstate(vcpu);
  596. - preempt_enable();
  597. + migrate_enable();
  598. ret = handle_exit(vcpu, run, ret);
  599. }
  600. diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
  601. index 98ffe1e62ad5..df9769ddece5 100644
  602. --- a/arch/arm/mach-exynos/platsmp.c
  603. +++ b/arch/arm/mach-exynos/platsmp.c
  604. @@ -229,7 +229,7 @@ static void __iomem *scu_base_addr(void)
  605. return (void __iomem *)(S5P_VA_SCU);
  606. }
  607. -static DEFINE_SPINLOCK(boot_lock);
  608. +static DEFINE_RAW_SPINLOCK(boot_lock);
  609. static void exynos_secondary_init(unsigned int cpu)
  610. {
  611. @@ -242,8 +242,8 @@ static void exynos_secondary_init(unsigned int cpu)
  612. /*
  613. * Synchronise with the boot thread.
  614. */
  615. - spin_lock(&boot_lock);
  616. - spin_unlock(&boot_lock);
  617. + raw_spin_lock(&boot_lock);
  618. + raw_spin_unlock(&boot_lock);
  619. }
  620. int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
  621. @@ -307,7 +307,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
  622. * Set synchronisation state between this boot processor
  623. * and the secondary one
  624. */
  625. - spin_lock(&boot_lock);
  626. + raw_spin_lock(&boot_lock);
  627. /*
  628. * The secondary processor is waiting to be released from
  629. @@ -334,7 +334,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
  630. if (timeout == 0) {
  631. printk(KERN_ERR "cpu1 power enable failed");
  632. - spin_unlock(&boot_lock);
  633. + raw_spin_unlock(&boot_lock);
  634. return -ETIMEDOUT;
  635. }
  636. }
  637. @@ -380,7 +380,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
  638. * calibrations, then wait for it to finish
  639. */
  640. fail:
  641. - spin_unlock(&boot_lock);
  642. + raw_spin_unlock(&boot_lock);
  643. return pen_release != -1 ? ret : 0;
  644. }
  645. diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c
  646. index 4b653a8cb75c..b03d5a922cb1 100644
  647. --- a/arch/arm/mach-hisi/platmcpm.c
  648. +++ b/arch/arm/mach-hisi/platmcpm.c
  649. @@ -61,7 +61,7 @@
  650. static void __iomem *sysctrl, *fabric;
  651. static int hip04_cpu_table[HIP04_MAX_CLUSTERS][HIP04_MAX_CPUS_PER_CLUSTER];
  652. -static DEFINE_SPINLOCK(boot_lock);
  653. +static DEFINE_RAW_SPINLOCK(boot_lock);
  654. static u32 fabric_phys_addr;
  655. /*
  656. * [0]: bootwrapper physical address
  657. @@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
  658. if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
  659. return -EINVAL;
  660. - spin_lock_irq(&boot_lock);
  661. + raw_spin_lock_irq(&boot_lock);
  662. if (hip04_cpu_table[cluster][cpu])
  663. goto out;
  664. @@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
  665. out:
  666. hip04_cpu_table[cluster][cpu]++;
  667. - spin_unlock_irq(&boot_lock);
  668. + raw_spin_unlock_irq(&boot_lock);
  669. return 0;
  670. }
  671. @@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l_cpu)
  672. cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
  673. cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
  674. - spin_lock(&boot_lock);
  675. + raw_spin_lock(&boot_lock);
  676. hip04_cpu_table[cluster][cpu]--;
  677. if (hip04_cpu_table[cluster][cpu] == 1) {
  678. /* A power_up request went ahead of us. */
  679. - spin_unlock(&boot_lock);
  680. + raw_spin_unlock(&boot_lock);
  681. return;
  682. } else if (hip04_cpu_table[cluster][cpu] > 1) {
  683. pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu);
  684. @@ -174,7 +174,7 @@ static void hip04_cpu_die(unsigned int l_cpu)
  685. }
  686. last_man = hip04_cluster_is_down(cluster);
  687. - spin_unlock(&boot_lock);
  688. + raw_spin_unlock(&boot_lock);
  689. if (last_man) {
  690. /* Since it's Cortex A15, disable L2 prefetching. */
  691. asm volatile(
  692. @@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
  693. cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
  694. count = TIMEOUT_MSEC / POLL_MSEC;
  695. - spin_lock_irq(&boot_lock);
  696. + raw_spin_lock_irq(&boot_lock);
  697. for (tries = 0; tries < count; tries++) {
  698. if (hip04_cpu_table[cluster][cpu])
  699. goto err;
  700. @@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
  701. data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
  702. if (data & CORE_WFI_STATUS(cpu))
  703. break;
  704. - spin_unlock_irq(&boot_lock);
  705. + raw_spin_unlock_irq(&boot_lock);
  706. /* Wait for clean L2 when the whole cluster is down. */
  707. msleep(POLL_MSEC);
  708. - spin_lock_irq(&boot_lock);
  709. + raw_spin_lock_irq(&boot_lock);
  710. }
  711. if (tries >= count)
  712. goto err;
  713. @@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
  714. goto err;
  715. if (hip04_cluster_is_down(cluster))
  716. hip04_set_snoop_filter(cluster, 0);
  717. - spin_unlock_irq(&boot_lock);
  718. + raw_spin_unlock_irq(&boot_lock);
  719. return 1;
  720. err:
  721. - spin_unlock_irq(&boot_lock);
  722. + raw_spin_unlock_irq(&boot_lock);
  723. return 0;
  724. }
  725. #endif
  726. diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
  727. index b4de3da6dffa..b52893319d75 100644
  728. --- a/arch/arm/mach-omap2/omap-smp.c
  729. +++ b/arch/arm/mach-omap2/omap-smp.c
  730. @@ -64,7 +64,7 @@ static const struct omap_smp_config omap5_cfg __initconst = {
  731. .startup_addr = omap5_secondary_startup,
  732. };
  733. -static DEFINE_SPINLOCK(boot_lock);
  734. +static DEFINE_RAW_SPINLOCK(boot_lock);
  735. void __iomem *omap4_get_scu_base(void)
  736. {
  737. @@ -131,8 +131,8 @@ static void omap4_secondary_init(unsigned int cpu)
  738. /*
  739. * Synchronise with the boot thread.
  740. */
  741. - spin_lock(&boot_lock);
  742. - spin_unlock(&boot_lock);
  743. + raw_spin_lock(&boot_lock);
  744. + raw_spin_unlock(&boot_lock);
  745. }
  746. static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
  747. @@ -146,7 +146,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
  748. * Set synchronisation state between this boot processor
  749. * and the secondary one
  750. */
  751. - spin_lock(&boot_lock);
  752. + raw_spin_lock(&boot_lock);
  753. /*
  754. * Update the AuxCoreBoot0 with boot state for secondary core.
  755. @@ -223,7 +223,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
  756. * Now the secondary core is starting up let it run its
  757. * calibrations, then wait for it to finish
  758. */
  759. - spin_unlock(&boot_lock);
  760. + raw_spin_unlock(&boot_lock);
  761. return 0;
  762. }
  763. diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
  764. index 0875b99add18..18b6d98d2581 100644
  765. --- a/arch/arm/mach-prima2/platsmp.c
  766. +++ b/arch/arm/mach-prima2/platsmp.c
  767. @@ -22,7 +22,7 @@
  768. static void __iomem *clk_base;
  769. -static DEFINE_SPINLOCK(boot_lock);
  770. +static DEFINE_RAW_SPINLOCK(boot_lock);
  771. static void sirfsoc_secondary_init(unsigned int cpu)
  772. {
  773. @@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsigned int cpu)
  774. /*
  775. * Synchronise with the boot thread.
  776. */
  777. - spin_lock(&boot_lock);
  778. - spin_unlock(&boot_lock);
  779. + raw_spin_lock(&boot_lock);
  780. + raw_spin_unlock(&boot_lock);
  781. }
  782. static const struct of_device_id clk_ids[] = {
  783. @@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
  784. /* make sure write buffer is drained */
  785. mb();
  786. - spin_lock(&boot_lock);
  787. + raw_spin_lock(&boot_lock);
  788. /*
  789. * The secondary processor is waiting to be released from
  790. @@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
  791. * now the secondary core is starting up let it run its
  792. * calibrations, then wait for it to finish
  793. */
  794. - spin_unlock(&boot_lock);
  795. + raw_spin_unlock(&boot_lock);
  796. return pen_release != -1 ? -ENOSYS : 0;
  797. }
  798. diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
  799. index 5494c9e0c909..e8ce157d3548 100644
  800. --- a/arch/arm/mach-qcom/platsmp.c
  801. +++ b/arch/arm/mach-qcom/platsmp.c
  802. @@ -46,7 +46,7 @@
  803. extern void secondary_startup_arm(void);
  804. -static DEFINE_SPINLOCK(boot_lock);
  805. +static DEFINE_RAW_SPINLOCK(boot_lock);
  806. #ifdef CONFIG_HOTPLUG_CPU
  807. static void qcom_cpu_die(unsigned int cpu)
  808. @@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned int cpu)
  809. /*
  810. * Synchronise with the boot thread.
  811. */
  812. - spin_lock(&boot_lock);
  813. - spin_unlock(&boot_lock);
  814. + raw_spin_lock(&boot_lock);
  815. + raw_spin_unlock(&boot_lock);
  816. }
  817. static int scss_release_secondary(unsigned int cpu)
  818. @@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
  819. * set synchronisation state between this boot processor
  820. * and the secondary one
  821. */
  822. - spin_lock(&boot_lock);
  823. + raw_spin_lock(&boot_lock);
  824. /*
  825. * Send the secondary CPU a soft interrupt, thereby causing
  826. @@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
  827. * now the secondary core is starting up let it run its
  828. * calibrations, then wait for it to finish
  829. */
  830. - spin_unlock(&boot_lock);
  831. + raw_spin_unlock(&boot_lock);
  832. return ret;
  833. }
  834. diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
  835. index 8d1e2d551786..7fa56cc78118 100644
  836. --- a/arch/arm/mach-spear/platsmp.c
  837. +++ b/arch/arm/mach-spear/platsmp.c
  838. @@ -32,7 +32,7 @@ static void write_pen_release(int val)
  839. sync_cache_w(&pen_release);
  840. }
  841. -static DEFINE_SPINLOCK(boot_lock);
  842. +static DEFINE_RAW_SPINLOCK(boot_lock);
  843. static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
  844. @@ -47,8 +47,8 @@ static void spear13xx_secondary_init(unsigned int cpu)
  845. /*
  846. * Synchronise with the boot thread.
  847. */
  848. - spin_lock(&boot_lock);
  849. - spin_unlock(&boot_lock);
  850. + raw_spin_lock(&boot_lock);
  851. + raw_spin_unlock(&boot_lock);
  852. }
  853. static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
  854. @@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
  855. * set synchronisation state between this boot processor
  856. * and the secondary one
  857. */
  858. - spin_lock(&boot_lock);
  859. + raw_spin_lock(&boot_lock);
  860. /*
  861. * The secondary processor is waiting to be released from
  862. @@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
  863. * now the secondary core is starting up let it run its
  864. * calibrations, then wait for it to finish
  865. */
  866. - spin_unlock(&boot_lock);
  867. + raw_spin_unlock(&boot_lock);
  868. return pen_release != -1 ? -ENOSYS : 0;
  869. }
  870. diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c
  871. index ea5a2277ee46..b988e081ac79 100644
  872. --- a/arch/arm/mach-sti/platsmp.c
  873. +++ b/arch/arm/mach-sti/platsmp.c
  874. @@ -35,7 +35,7 @@ static void write_pen_release(int val)
  875. sync_cache_w(&pen_release);
  876. }
  877. -static DEFINE_SPINLOCK(boot_lock);
  878. +static DEFINE_RAW_SPINLOCK(boot_lock);
  879. static void sti_secondary_init(unsigned int cpu)
  880. {
  881. @@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned int cpu)
  882. /*
  883. * Synchronise with the boot thread.
  884. */
  885. - spin_lock(&boot_lock);
  886. - spin_unlock(&boot_lock);
  887. + raw_spin_lock(&boot_lock);
  888. + raw_spin_unlock(&boot_lock);
  889. }
  890. static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
  891. @@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
  892. * set synchronisation state between this boot processor
  893. * and the secondary one
  894. */
  895. - spin_lock(&boot_lock);
  896. + raw_spin_lock(&boot_lock);
  897. /*
  898. * The secondary processor is waiting to be released from
  899. @@ -91,7 +91,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
  900. * now the secondary core is starting up let it run its
  901. * calibrations, then wait for it to finish
  902. */
  903. - spin_unlock(&boot_lock);
  904. + raw_spin_unlock(&boot_lock);
  905. return pen_release != -1 ? -ENOSYS : 0;
  906. }
  907. diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
  908. index 0122ad1a6027..926b1be48043 100644
  909. --- a/arch/arm/mm/fault.c
  910. +++ b/arch/arm/mm/fault.c
  911. @@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
  912. if (addr < TASK_SIZE)
  913. return do_page_fault(addr, fsr, regs);
  914. + if (interrupts_enabled(regs))
  915. + local_irq_enable();
  916. +
  917. if (user_mode(regs))
  918. goto bad_area;
  919. @@ -497,6 +500,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
  920. static int
  921. do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  922. {
  923. + if (interrupts_enabled(regs))
  924. + local_irq_enable();
  925. +
  926. do_bad_area(addr, fsr, regs);
  927. return 0;
  928. }
  929. diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
  930. index d02f8187b1cc..542692dbd40a 100644
  931. --- a/arch/arm/mm/highmem.c
  932. +++ b/arch/arm/mm/highmem.c
  933. @@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)
  934. return *ptep;
  935. }
  936. +static unsigned int fixmap_idx(int type)
  937. +{
  938. + return FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
  939. +}
  940. +
  941. void *kmap(struct page *page)
  942. {
  943. might_sleep();
  944. @@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap);
  945. void *kmap_atomic(struct page *page)
  946. {
  947. + pte_t pte = mk_pte(page, kmap_prot);
  948. unsigned int idx;
  949. unsigned long vaddr;
  950. void *kmap;
  951. int type;
  952. - preempt_disable();
  953. + preempt_disable_nort();
  954. pagefault_disable();
  955. if (!PageHighMem(page))
  956. return page_address(page);
  957. @@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page)
  958. type = kmap_atomic_idx_push();
  959. - idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
  960. + idx = fixmap_idx(type);
  961. vaddr = __fix_to_virt(idx);
  962. #ifdef CONFIG_DEBUG_HIGHMEM
  963. /*
  964. @@ -93,7 +99,10 @@ void *kmap_atomic(struct page *page)
  965. * in place, so the contained TLB flush ensures the TLB is updated
  966. * with the new mapping.
  967. */
  968. - set_fixmap_pte(idx, mk_pte(page, kmap_prot));
  969. +#ifdef CONFIG_PREEMPT_RT_FULL
  970. + current->kmap_pte[type] = pte;
  971. +#endif
  972. + set_fixmap_pte(idx, pte);
  973. return (void *)vaddr;
  974. }
  975. @@ -106,44 +115,75 @@ void __kunmap_atomic(void *kvaddr)
  976. if (kvaddr >= (void *)FIXADDR_START) {
  977. type = kmap_atomic_idx();
  978. - idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
  979. + idx = fixmap_idx(type);
  980. if (cache_is_vivt())
  981. __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
  982. +#ifdef CONFIG_PREEMPT_RT_FULL
  983. + current->kmap_pte[type] = __pte(0);
  984. +#endif
  985. #ifdef CONFIG_DEBUG_HIGHMEM
  986. BUG_ON(vaddr != __fix_to_virt(idx));
  987. - set_fixmap_pte(idx, __pte(0));
  988. #else
  989. (void) idx; /* to kill a warning */
  990. #endif
  991. + set_fixmap_pte(idx, __pte(0));
  992. kmap_atomic_idx_pop();
  993. } else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
  994. /* this address was obtained through kmap_high_get() */
  995. kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
  996. }
  997. pagefault_enable();
  998. - preempt_enable();
  999. + preempt_enable_nort();
  1000. }
  1001. EXPORT_SYMBOL(__kunmap_atomic);
  1002. void *kmap_atomic_pfn(unsigned long pfn)
  1003. {
  1004. + pte_t pte = pfn_pte(pfn, kmap_prot);
  1005. unsigned long vaddr;
  1006. int idx, type;
  1007. struct page *page = pfn_to_page(pfn);
  1008. - preempt_disable();
  1009. + preempt_disable_nort();
  1010. pagefault_disable();
  1011. if (!PageHighMem(page))
  1012. return page_address(page);
  1013. type = kmap_atomic_idx_push();
  1014. - idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
  1015. + idx = fixmap_idx(type);
  1016. vaddr = __fix_to_virt(idx);
  1017. #ifdef CONFIG_DEBUG_HIGHMEM
  1018. BUG_ON(!pte_none(get_fixmap_pte(vaddr)));
  1019. #endif
  1020. - set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot));
  1021. +#ifdef CONFIG_PREEMPT_RT_FULL
  1022. + current->kmap_pte[type] = pte;
  1023. +#endif
  1024. + set_fixmap_pte(idx, pte);
  1025. return (void *)vaddr;
  1026. }
  1027. +#if defined CONFIG_PREEMPT_RT_FULL
  1028. +void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
  1029. +{
  1030. + int i;
  1031. +
  1032. + /*
  1033. + * Clear @prev's kmap_atomic mappings
  1034. + */
  1035. + for (i = 0; i < prev_p->kmap_idx; i++) {
  1036. + int idx = fixmap_idx(i);
  1037. +
  1038. + set_fixmap_pte(idx, __pte(0));
  1039. + }
  1040. + /*
  1041. + * Restore @next_p's kmap_atomic mappings
  1042. + */
  1043. + for (i = 0; i < next_p->kmap_idx; i++) {
  1044. + int idx = fixmap_idx(i);
  1045. +
  1046. + if (!pte_none(next_p->kmap_pte[i]))
  1047. + set_fixmap_pte(idx, next_p->kmap_pte[i]);
  1048. + }
  1049. +}
  1050. +#endif
  1051. diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
  1052. index c2366510187a..6b60f582b738 100644
  1053. --- a/arch/arm/plat-versatile/platsmp.c
  1054. +++ b/arch/arm/plat-versatile/platsmp.c
  1055. @@ -32,7 +32,7 @@ static void write_pen_release(int val)
  1056. sync_cache_w(&pen_release);
  1057. }
  1058. -static DEFINE_SPINLOCK(boot_lock);
  1059. +static DEFINE_RAW_SPINLOCK(boot_lock);
  1060. void versatile_secondary_init(unsigned int cpu)
  1061. {
  1062. @@ -45,8 +45,8 @@ void versatile_secondary_init(unsigned int cpu)
  1063. /*
  1064. * Synchronise with the boot thread.
  1065. */
  1066. - spin_lock(&boot_lock);
  1067. - spin_unlock(&boot_lock);
  1068. + raw_spin_lock(&boot_lock);
  1069. + raw_spin_unlock(&boot_lock);
  1070. }
  1071. int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
  1072. @@ -57,7 +57,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
  1073. * Set synchronisation state between this boot processor
  1074. * and the secondary one
  1075. */
  1076. - spin_lock(&boot_lock);
  1077. + raw_spin_lock(&boot_lock);
  1078. /*
  1079. * This is really belt and braces; we hold unintended secondary
  1080. @@ -87,7 +87,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
  1081. * now the secondary core is starting up let it run its
  1082. * calibrations, then wait for it to finish
  1083. */
  1084. - spin_unlock(&boot_lock);
  1085. + raw_spin_unlock(&boot_lock);
  1086. return pen_release != -1 ? -ENOSYS : 0;
  1087. }
  1088. diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
  1089. index cf57a7799a0f..78d1b49fbed5 100644
  1090. --- a/arch/arm64/Kconfig
  1091. +++ b/arch/arm64/Kconfig
  1092. @@ -91,6 +91,7 @@ config ARM64
  1093. select HAVE_PERF_EVENTS
  1094. select HAVE_PERF_REGS
  1095. select HAVE_PERF_USER_STACK_DUMP
  1096. + select HAVE_PREEMPT_LAZY
  1097. select HAVE_REGS_AND_STACK_ACCESS_API
  1098. select HAVE_RCU_TABLE_FREE
  1099. select HAVE_SYSCALL_TRACEPOINTS
  1100. @@ -704,7 +705,7 @@ config XEN_DOM0
  1101. config XEN
  1102. bool "Xen guest support on ARM64"
  1103. - depends on ARM64 && OF
  1104. + depends on ARM64 && OF && !PREEMPT_RT_FULL
  1105. select SWIOTLB_XEN
  1106. select PARAVIRT
  1107. help
  1108. diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
  1109. index e9ea5a6bd449..6c500ad63c6a 100644
  1110. --- a/arch/arm64/include/asm/thread_info.h
  1111. +++ b/arch/arm64/include/asm/thread_info.h
  1112. @@ -49,6 +49,7 @@ struct thread_info {
  1113. mm_segment_t addr_limit; /* address limit */
  1114. struct task_struct *task; /* main task structure */
  1115. int preempt_count; /* 0 => preemptable, <0 => bug */
  1116. + int preempt_lazy_count; /* 0 => preemptable, <0 => bug */
  1117. int cpu; /* cpu */
  1118. };
  1119. @@ -112,6 +113,7 @@ static inline struct thread_info *current_thread_info(void)
  1120. #define TIF_NEED_RESCHED 1
  1121. #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
  1122. #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */
  1123. +#define TIF_NEED_RESCHED_LAZY 4
  1124. #define TIF_NOHZ 7
  1125. #define TIF_SYSCALL_TRACE 8
  1126. #define TIF_SYSCALL_AUDIT 9
  1127. @@ -127,6 +129,7 @@ static inline struct thread_info *current_thread_info(void)
  1128. #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
  1129. #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
  1130. #define _TIF_FOREIGN_FPSTATE (1 << TIF_FOREIGN_FPSTATE)
  1131. +#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
  1132. #define _TIF_NOHZ (1 << TIF_NOHZ)
  1133. #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
  1134. #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
  1135. @@ -135,7 +138,9 @@ static inline struct thread_info *current_thread_info(void)
  1136. #define _TIF_32BIT (1 << TIF_32BIT)
  1137. #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
  1138. - _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
  1139. + _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
  1140. + _TIF_NEED_RESCHED_LAZY)
  1141. +#define _TIF_NEED_RESCHED_MASK (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
  1142. #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
  1143. _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
  1144. diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
  1145. index c58ddf8c4062..a8f2f7c1fe12 100644
  1146. --- a/arch/arm64/kernel/asm-offsets.c
  1147. +++ b/arch/arm64/kernel/asm-offsets.c
  1148. @@ -38,6 +38,7 @@ int main(void)
  1149. BLANK();
  1150. DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
  1151. DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
  1152. + DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
  1153. DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
  1154. DEFINE(TI_TASK, offsetof(struct thread_info, task));
  1155. DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  1156. diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
  1157. index 79b0fe24d5b7..f3c959ade308 100644
  1158. --- a/arch/arm64/kernel/entry.S
  1159. +++ b/arch/arm64/kernel/entry.S
  1160. @@ -428,11 +428,16 @@ ENDPROC(el1_sync)
  1161. #ifdef CONFIG_PREEMPT
  1162. ldr w24, [tsk, #TI_PREEMPT] // get preempt count
  1163. - cbnz w24, 1f // preempt count != 0
  1164. + cbnz w24, 2f // preempt count != 0
  1165. ldr x0, [tsk, #TI_FLAGS] // get flags
  1166. - tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
  1167. - bl el1_preempt
  1168. + tbnz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
  1169. +
  1170. + ldr w24, [tsk, #TI_PREEMPT_LAZY] // get preempt lazy count
  1171. + cbnz w24, 2f // preempt lazy count != 0
  1172. + tbz x0, #TIF_NEED_RESCHED_LAZY, 2f // needs rescheduling?
  1173. 1:
  1174. + bl el1_preempt
  1175. +2:
  1176. #endif
  1177. #ifdef CONFIG_TRACE_IRQFLAGS
  1178. bl trace_hardirqs_on
  1179. @@ -446,6 +451,7 @@ ENDPROC(el1_irq)
  1180. 1: bl preempt_schedule_irq // irq en/disable is done inside
  1181. ldr x0, [tsk, #TI_FLAGS] // get new tasks TI_FLAGS
  1182. tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling?
  1183. + tbnz x0, #TIF_NEED_RESCHED_LAZY, 1b // needs rescheduling?
  1184. ret x24
  1185. #endif
  1186. diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
  1187. index 404dd67080b9..639dc6d12e72 100644
  1188. --- a/arch/arm64/kernel/signal.c
  1189. +++ b/arch/arm64/kernel/signal.c
  1190. @@ -409,7 +409,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
  1191. */
  1192. trace_hardirqs_off();
  1193. do {
  1194. - if (thread_flags & _TIF_NEED_RESCHED) {
  1195. + if (thread_flags & _TIF_NEED_RESCHED_MASK) {
  1196. schedule();
  1197. } else {
  1198. local_irq_enable();
  1199. diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
  1200. index 5e844f68e847..dc613cc10f54 100644
  1201. --- a/arch/mips/Kconfig
  1202. +++ b/arch/mips/Kconfig
  1203. @@ -2516,7 +2516,7 @@ config MIPS_ASID_BITS_VARIABLE
  1204. #
  1205. config HIGHMEM
  1206. bool "High Memory Support"
  1207. - depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA
  1208. + depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA && !PREEMPT_RT_FULL
  1209. config CPU_SUPPORTS_HIGHMEM
  1210. bool
  1211. diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
  1212. index 8f01f21e78f1..619485b777d2 100644
  1213. --- a/arch/powerpc/Kconfig
  1214. +++ b/arch/powerpc/Kconfig
  1215. @@ -52,10 +52,11 @@ config LOCKDEP_SUPPORT
  1216. config RWSEM_GENERIC_SPINLOCK
  1217. bool
  1218. + default y if PREEMPT_RT_FULL
  1219. config RWSEM_XCHGADD_ALGORITHM
  1220. bool
  1221. - default y
  1222. + default y if !PREEMPT_RT_FULL
  1223. config GENERIC_LOCKBREAK
  1224. bool
  1225. @@ -134,6 +135,7 @@ config PPC
  1226. select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
  1227. select GENERIC_STRNCPY_FROM_USER
  1228. select GENERIC_STRNLEN_USER
  1229. + select HAVE_PREEMPT_LAZY
  1230. select HAVE_MOD_ARCH_SPECIFIC
  1231. select MODULES_USE_ELF_RELA
  1232. select CLONE_BACKWARDS
  1233. @@ -321,7 +323,7 @@ menu "Kernel options"
  1234. config HIGHMEM
  1235. bool "High memory support"
  1236. - depends on PPC32
  1237. + depends on PPC32 && !PREEMPT_RT_FULL
  1238. source kernel/Kconfig.hz
  1239. source kernel/Kconfig.preempt
  1240. diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
  1241. index 87e4b2d8dcd4..981e501a4359 100644
  1242. --- a/arch/powerpc/include/asm/thread_info.h
  1243. +++ b/arch/powerpc/include/asm/thread_info.h
  1244. @@ -43,6 +43,8 @@ struct thread_info {
  1245. int cpu; /* cpu we're on */
  1246. int preempt_count; /* 0 => preemptable,
  1247. <0 => BUG */
  1248. + int preempt_lazy_count; /* 0 => preemptable,
  1249. + <0 => BUG */
  1250. unsigned long local_flags; /* private flags for thread */
  1251. #ifdef CONFIG_LIVEPATCH
  1252. unsigned long *livepatch_sp;
  1253. @@ -88,8 +90,7 @@ static inline struct thread_info *current_thread_info(void)
  1254. #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
  1255. #define TIF_SIGPENDING 1 /* signal pending */
  1256. #define TIF_NEED_RESCHED 2 /* rescheduling necessary */
  1257. -#define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
  1258. - TIF_NEED_RESCHED */
  1259. +#define TIF_NEED_RESCHED_LAZY 3 /* lazy rescheduling necessary */
  1260. #define TIF_32BIT 4 /* 32 bit binary */
  1261. #define TIF_RESTORE_TM 5 /* need to restore TM FP/VEC/VSX */
  1262. #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
  1263. @@ -107,6 +108,8 @@ static inline struct thread_info *current_thread_info(void)
  1264. #if defined(CONFIG_PPC64)
  1265. #define TIF_ELF2ABI 18 /* function descriptors must die! */
  1266. #endif
  1267. +#define TIF_POLLING_NRFLAG 19 /* true if poll_idle() is polling
  1268. + TIF_NEED_RESCHED */
  1269. /* as above, but as bit values */
  1270. #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
  1271. @@ -125,14 +128,16 @@ static inline struct thread_info *current_thread_info(void)
  1272. #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
  1273. #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
  1274. #define _TIF_NOHZ (1<<TIF_NOHZ)
  1275. +#define _TIF_NEED_RESCHED_LAZY (1<<TIF_NEED_RESCHED_LAZY)
  1276. #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
  1277. _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
  1278. _TIF_NOHZ)
  1279. #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
  1280. _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
  1281. - _TIF_RESTORE_TM)
  1282. + _TIF_RESTORE_TM | _TIF_NEED_RESCHED_LAZY)
  1283. #define _TIF_PERSYSCALL_MASK (_TIF_RESTOREALL|_TIF_NOERROR)
  1284. +#define _TIF_NEED_RESCHED_MASK (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
  1285. /* Bits in local_flags */
  1286. /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
  1287. diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
  1288. index c833d88c423d..96e9fbc3f684 100644
  1289. --- a/arch/powerpc/kernel/asm-offsets.c
  1290. +++ b/arch/powerpc/kernel/asm-offsets.c
  1291. @@ -156,6 +156,7 @@ int main(void)
  1292. DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
  1293. DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
  1294. DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
  1295. + DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
  1296. DEFINE(TI_TASK, offsetof(struct thread_info, task));
  1297. DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  1298. diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
  1299. index 3841d749a430..6dbaeff192b9 100644
  1300. --- a/arch/powerpc/kernel/entry_32.S
  1301. +++ b/arch/powerpc/kernel/entry_32.S
  1302. @@ -835,7 +835,14 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
  1303. cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
  1304. bne restore
  1305. andi. r8,r8,_TIF_NEED_RESCHED
  1306. + bne+ 1f
  1307. + lwz r0,TI_PREEMPT_LAZY(r9)
  1308. + cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
  1309. + bne restore
  1310. + lwz r0,TI_FLAGS(r9)
  1311. + andi. r0,r0,_TIF_NEED_RESCHED_LAZY
  1312. beq+ restore
  1313. +1:
  1314. lwz r3,_MSR(r1)
  1315. andi. r0,r3,MSR_EE /* interrupts off? */
  1316. beq restore /* don't schedule if so */
  1317. @@ -846,11 +853,11 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
  1318. */
  1319. bl trace_hardirqs_off
  1320. #endif
  1321. -1: bl preempt_schedule_irq
  1322. +2: bl preempt_schedule_irq
  1323. CURRENT_THREAD_INFO(r9, r1)
  1324. lwz r3,TI_FLAGS(r9)
  1325. - andi. r0,r3,_TIF_NEED_RESCHED
  1326. - bne- 1b
  1327. + andi. r0,r3,_TIF_NEED_RESCHED_MASK
  1328. + bne- 2b
  1329. #ifdef CONFIG_TRACE_IRQFLAGS
  1330. /* And now, to properly rebalance the above, we tell lockdep they
  1331. * are being turned back on, which will happen when we return
  1332. @@ -1171,7 +1178,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
  1333. #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
  1334. do_work: /* r10 contains MSR_KERNEL here */
  1335. - andi. r0,r9,_TIF_NEED_RESCHED
  1336. + andi. r0,r9,_TIF_NEED_RESCHED_MASK
  1337. beq do_user_signal
  1338. do_resched: /* r10 contains MSR_KERNEL here */
  1339. @@ -1192,7 +1199,7 @@ do_resched: /* r10 contains MSR_KERNEL here */
  1340. MTMSRD(r10) /* disable interrupts */
  1341. CURRENT_THREAD_INFO(r9, r1)
  1342. lwz r9,TI_FLAGS(r9)
  1343. - andi. r0,r9,_TIF_NEED_RESCHED
  1344. + andi. r0,r9,_TIF_NEED_RESCHED_MASK
  1345. bne- do_resched
  1346. andi. r0,r9,_TIF_USER_WORK_MASK
  1347. beq restore_user
  1348. diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
  1349. index 767ef6d68c9e..2cb4d5552319 100644
  1350. --- a/arch/powerpc/kernel/entry_64.S
  1351. +++ b/arch/powerpc/kernel/entry_64.S
  1352. @@ -656,7 +656,7 @@ _GLOBAL(ret_from_except_lite)
  1353. bl restore_math
  1354. b restore
  1355. #endif
  1356. -1: andi. r0,r4,_TIF_NEED_RESCHED
  1357. +1: andi. r0,r4,_TIF_NEED_RESCHED_MASK
  1358. beq 2f
  1359. bl restore_interrupts
  1360. SCHEDULE_USER
  1361. @@ -718,10 +718,18 @@ _GLOBAL(ret_from_except_lite)
  1362. #ifdef CONFIG_PREEMPT
  1363. /* Check if we need to preempt */
  1364. - andi. r0,r4,_TIF_NEED_RESCHED
  1365. - beq+ restore
  1366. - /* Check that preempt_count() == 0 and interrupts are enabled */
  1367. lwz r8,TI_PREEMPT(r9)
  1368. + cmpwi 0,r8,0 /* if non-zero, just restore regs and return */
  1369. + bne restore
  1370. + andi. r0,r4,_TIF_NEED_RESCHED
  1371. + bne+ check_count
  1372. +
  1373. + andi. r0,r4,_TIF_NEED_RESCHED_LAZY
  1374. + beq+ restore
  1375. + lwz r8,TI_PREEMPT_LAZY(r9)
  1376. +
  1377. + /* Check that preempt_count() == 0 and interrupts are enabled */
  1378. +check_count:
  1379. cmpwi cr1,r8,0
  1380. ld r0,SOFTE(r1)
  1381. cmpdi r0,0
  1382. @@ -738,7 +746,7 @@ _GLOBAL(ret_from_except_lite)
  1383. /* Re-test flags and eventually loop */
  1384. CURRENT_THREAD_INFO(r9, r1)
  1385. ld r4,TI_FLAGS(r9)
  1386. - andi. r0,r4,_TIF_NEED_RESCHED
  1387. + andi. r0,r4,_TIF_NEED_RESCHED_MASK
  1388. bne 1b
  1389. /*
  1390. diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
  1391. index 3c05c311e35e..f83f6ac1274d 100644
  1392. --- a/arch/powerpc/kernel/irq.c
  1393. +++ b/arch/powerpc/kernel/irq.c
  1394. @@ -638,6 +638,7 @@ void irq_ctx_init(void)
  1395. }
  1396. }
  1397. +#ifndef CONFIG_PREEMPT_RT_FULL
  1398. void do_softirq_own_stack(void)
  1399. {
  1400. struct thread_info *curtp, *irqtp;
  1401. @@ -655,6 +656,7 @@ void do_softirq_own_stack(void)
  1402. if (irqtp->flags)
  1403. set_bits(irqtp->flags, &curtp->flags);
  1404. }
  1405. +#endif
  1406. irq_hw_number_t virq_to_hw(unsigned int virq)
  1407. {
  1408. diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
  1409. index 030d72df5dd5..b471a709e100 100644
  1410. --- a/arch/powerpc/kernel/misc_32.S
  1411. +++ b/arch/powerpc/kernel/misc_32.S
  1412. @@ -41,6 +41,7 @@
  1413. * We store the saved ksp_limit in the unused part
  1414. * of the STACK_FRAME_OVERHEAD
  1415. */
  1416. +#ifndef CONFIG_PREEMPT_RT_FULL
  1417. _GLOBAL(call_do_softirq)
  1418. mflr r0
  1419. stw r0,4(r1)
  1420. @@ -57,6 +58,7 @@ _GLOBAL(call_do_softirq)
  1421. stw r10,THREAD+KSP_LIMIT(r2)
  1422. mtlr r0
  1423. blr
  1424. +#endif
  1425. /*
  1426. * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
  1427. diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
  1428. index 4cefe6888b18..cb2ee4be999a 100644
  1429. --- a/arch/powerpc/kernel/misc_64.S
  1430. +++ b/arch/powerpc/kernel/misc_64.S
  1431. @@ -31,6 +31,7 @@
  1432. .text
  1433. +#ifndef CONFIG_PREEMPT_RT_FULL
  1434. _GLOBAL(call_do_softirq)
  1435. mflr r0
  1436. std r0,16(r1)
  1437. @@ -41,6 +42,7 @@ _GLOBAL(call_do_softirq)
  1438. ld r0,16(r1)
  1439. mtlr r0
  1440. blr
  1441. +#endif
  1442. _GLOBAL(call_do_irq)
  1443. mflr r0
  1444. diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
  1445. index 029be26b5a17..9528089ea142 100644
  1446. --- a/arch/powerpc/kvm/Kconfig
  1447. +++ b/arch/powerpc/kvm/Kconfig
  1448. @@ -175,6 +175,7 @@ config KVM_E500MC
  1449. config KVM_MPIC
  1450. bool "KVM in-kernel MPIC emulation"
  1451. depends on KVM && E500
  1452. + depends on !PREEMPT_RT_FULL
  1453. select HAVE_KVM_IRQCHIP
  1454. select HAVE_KVM_IRQFD
  1455. select HAVE_KVM_IRQ_ROUTING
  1456. diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
  1457. index e48462447ff0..2670cee66064 100644
  1458. --- a/arch/powerpc/platforms/ps3/device-init.c
  1459. +++ b/arch/powerpc/platforms/ps3/device-init.c
  1460. @@ -752,7 +752,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
  1461. }
  1462. pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
  1463. - res = wait_event_interruptible(dev->done.wait,
  1464. + res = swait_event_interruptible(dev->done.wait,
  1465. dev->done.done || kthread_should_stop());
  1466. if (kthread_should_stop())
  1467. res = -EINTR;
  1468. diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
  1469. index 6c0378c0b8b5..abd58b4dff97 100644
  1470. --- a/arch/sh/kernel/irq.c
  1471. +++ b/arch/sh/kernel/irq.c
  1472. @@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu)
  1473. hardirq_ctx[cpu] = NULL;
  1474. }
  1475. +#ifndef CONFIG_PREEMPT_RT_FULL
  1476. void do_softirq_own_stack(void)
  1477. {
  1478. struct thread_info *curctx;
  1479. @@ -174,6 +175,7 @@ void do_softirq_own_stack(void)
  1480. "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
  1481. );
  1482. }
  1483. +#endif
  1484. #else
  1485. static inline void handle_one_irq(unsigned int irq)
  1486. {
  1487. diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
  1488. index 165ecdd24d22..b68a464a22be 100644
  1489. --- a/arch/sparc/Kconfig
  1490. +++ b/arch/sparc/Kconfig
  1491. @@ -194,12 +194,10 @@ config NR_CPUS
  1492. source kernel/Kconfig.hz
  1493. config RWSEM_GENERIC_SPINLOCK
  1494. - bool
  1495. - default y if SPARC32
  1496. + def_bool PREEMPT_RT_FULL
  1497. config RWSEM_XCHGADD_ALGORITHM
  1498. - bool
  1499. - default y if SPARC64
  1500. + def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
  1501. config GENERIC_HWEIGHT
  1502. bool
  1503. diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
  1504. index 34a7930b76ef..773740521008 100644
  1505. --- a/arch/sparc/kernel/irq_64.c
  1506. +++ b/arch/sparc/kernel/irq_64.c
  1507. @@ -854,6 +854,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
  1508. set_irq_regs(old_regs);
  1509. }
  1510. +#ifndef CONFIG_PREEMPT_RT_FULL
  1511. void do_softirq_own_stack(void)
  1512. {
  1513. void *orig_sp, *sp = softirq_stack[smp_processor_id()];
  1514. @@ -868,6 +869,7 @@ void do_softirq_own_stack(void)
  1515. __asm__ __volatile__("mov %0, %%sp"
  1516. : : "r" (orig_sp));
  1517. }
  1518. +#endif
  1519. #ifdef CONFIG_HOTPLUG_CPU
  1520. void fixup_irqs(void)
  1521. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
  1522. index bada636d1065..f8a995c90c01 100644
  1523. --- a/arch/x86/Kconfig
  1524. +++ b/arch/x86/Kconfig
  1525. @@ -17,6 +17,7 @@ config X86_64
  1526. ### Arch settings
  1527. config X86
  1528. def_bool y
  1529. + select HAVE_PREEMPT_LAZY
  1530. select ACPI_LEGACY_TABLES_LOOKUP if ACPI
  1531. select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
  1532. select ANON_INODES
  1533. @@ -232,8 +233,11 @@ config ARCH_MAY_HAVE_PC_FDC
  1534. def_bool y
  1535. depends on ISA_DMA_API
  1536. +config RWSEM_GENERIC_SPINLOCK
  1537. + def_bool PREEMPT_RT_FULL
  1538. +
  1539. config RWSEM_XCHGADD_ALGORITHM
  1540. - def_bool y
  1541. + def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
  1542. config GENERIC_CALIBRATE_DELAY
  1543. def_bool y
  1544. @@ -897,7 +901,7 @@ config IOMMU_HELPER
  1545. config MAXSMP
  1546. bool "Enable Maximum number of SMP Processors and NUMA Nodes"
  1547. depends on X86_64 && SMP && DEBUG_KERNEL
  1548. - select CPUMASK_OFFSTACK
  1549. + select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
  1550. ---help---
  1551. Enable maximum number of CPUS and NUMA Nodes for this architecture.
  1552. If unsure, say N.
  1553. diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
  1554. index aa8b0672f87a..2429414bfc71 100644
  1555. --- a/arch/x86/crypto/aesni-intel_glue.c
  1556. +++ b/arch/x86/crypto/aesni-intel_glue.c
  1557. @@ -372,14 +372,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc,
  1558. err = blkcipher_walk_virt(desc, &walk);
  1559. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1560. - kernel_fpu_begin();
  1561. while ((nbytes = walk.nbytes)) {
  1562. + kernel_fpu_begin();
  1563. aesni_ecb_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
  1564. - nbytes & AES_BLOCK_MASK);
  1565. + nbytes & AES_BLOCK_MASK);
  1566. + kernel_fpu_end();
  1567. nbytes &= AES_BLOCK_SIZE - 1;
  1568. err = blkcipher_walk_done(desc, &walk, nbytes);
  1569. }
  1570. - kernel_fpu_end();
  1571. return err;
  1572. }
  1573. @@ -396,14 +396,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc,
  1574. err = blkcipher_walk_virt(desc, &walk);
  1575. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1576. - kernel_fpu_begin();
  1577. while ((nbytes = walk.nbytes)) {
  1578. + kernel_fpu_begin();
  1579. aesni_ecb_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
  1580. nbytes & AES_BLOCK_MASK);
  1581. + kernel_fpu_end();
  1582. nbytes &= AES_BLOCK_SIZE - 1;
  1583. err = blkcipher_walk_done(desc, &walk, nbytes);
  1584. }
  1585. - kernel_fpu_end();
  1586. return err;
  1587. }
  1588. @@ -420,14 +420,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc,
  1589. err = blkcipher_walk_virt(desc, &walk);
  1590. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1591. - kernel_fpu_begin();
  1592. while ((nbytes = walk.nbytes)) {
  1593. + kernel_fpu_begin();
  1594. aesni_cbc_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
  1595. nbytes & AES_BLOCK_MASK, walk.iv);
  1596. + kernel_fpu_end();
  1597. nbytes &= AES_BLOCK_SIZE - 1;
  1598. err = blkcipher_walk_done(desc, &walk, nbytes);
  1599. }
  1600. - kernel_fpu_end();
  1601. return err;
  1602. }
  1603. @@ -444,14 +444,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc,
  1604. err = blkcipher_walk_virt(desc, &walk);
  1605. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1606. - kernel_fpu_begin();
  1607. while ((nbytes = walk.nbytes)) {
  1608. + kernel_fpu_begin();
  1609. aesni_cbc_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
  1610. nbytes & AES_BLOCK_MASK, walk.iv);
  1611. + kernel_fpu_end();
  1612. nbytes &= AES_BLOCK_SIZE - 1;
  1613. err = blkcipher_walk_done(desc, &walk, nbytes);
  1614. }
  1615. - kernel_fpu_end();
  1616. return err;
  1617. }
  1618. @@ -503,18 +503,20 @@ static int ctr_crypt(struct blkcipher_desc *desc,
  1619. err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
  1620. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1621. - kernel_fpu_begin();
  1622. while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
  1623. + kernel_fpu_begin();
  1624. aesni_ctr_enc_tfm(ctx, walk.dst.virt.addr, walk.src.virt.addr,
  1625. nbytes & AES_BLOCK_MASK, walk.iv);
  1626. + kernel_fpu_end();
  1627. nbytes &= AES_BLOCK_SIZE - 1;
  1628. err = blkcipher_walk_done(desc, &walk, nbytes);
  1629. }
  1630. if (walk.nbytes) {
  1631. + kernel_fpu_begin();
  1632. ctr_crypt_final(ctx, &walk);
  1633. + kernel_fpu_end();
  1634. err = blkcipher_walk_done(desc, &walk, 0);
  1635. }
  1636. - kernel_fpu_end();
  1637. return err;
  1638. }
  1639. diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
  1640. index 8648158f3916..d7699130ee36 100644
  1641. --- a/arch/x86/crypto/cast5_avx_glue.c
  1642. +++ b/arch/x86/crypto/cast5_avx_glue.c
  1643. @@ -59,7 +59,7 @@ static inline void cast5_fpu_end(bool fpu_enabled)
  1644. static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
  1645. bool enc)
  1646. {
  1647. - bool fpu_enabled = false;
  1648. + bool fpu_enabled;
  1649. struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
  1650. const unsigned int bsize = CAST5_BLOCK_SIZE;
  1651. unsigned int nbytes;
  1652. @@ -75,7 +75,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
  1653. u8 *wsrc = walk->src.virt.addr;
  1654. u8 *wdst = walk->dst.virt.addr;
  1655. - fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
  1656. + fpu_enabled = cast5_fpu_begin(false, nbytes);
  1657. /* Process multi-block batch */
  1658. if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
  1659. @@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
  1660. } while (nbytes >= bsize);
  1661. done:
  1662. + cast5_fpu_end(fpu_enabled);
  1663. err = blkcipher_walk_done(desc, walk, nbytes);
  1664. }
  1665. -
  1666. - cast5_fpu_end(fpu_enabled);
  1667. return err;
  1668. }
  1669. @@ -227,7 +226,7 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
  1670. static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  1671. struct scatterlist *src, unsigned int nbytes)
  1672. {
  1673. - bool fpu_enabled = false;
  1674. + bool fpu_enabled;
  1675. struct blkcipher_walk walk;
  1676. int err;
  1677. @@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  1678. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1679. while ((nbytes = walk.nbytes)) {
  1680. - fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
  1681. + fpu_enabled = cast5_fpu_begin(false, nbytes);
  1682. nbytes = __cbc_decrypt(desc, &walk);
  1683. + cast5_fpu_end(fpu_enabled);
  1684. err = blkcipher_walk_done(desc, &walk, nbytes);
  1685. }
  1686. -
  1687. - cast5_fpu_end(fpu_enabled);
  1688. return err;
  1689. }
  1690. @@ -311,7 +309,7 @@ static unsigned int __ctr_crypt(struct blkcipher_desc *desc,
  1691. static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  1692. struct scatterlist *src, unsigned int nbytes)
  1693. {
  1694. - bool fpu_enabled = false;
  1695. + bool fpu_enabled;
  1696. struct blkcipher_walk walk;
  1697. int err;
  1698. @@ -320,13 +318,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  1699. desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  1700. while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) {
  1701. - fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
  1702. + fpu_enabled = cast5_fpu_begin(false, nbytes);
  1703. nbytes = __ctr_crypt(desc, &walk);
  1704. + cast5_fpu_end(fpu_enabled);
  1705. err = blkcipher_walk_done(desc, &walk, nbytes);
  1706. }
  1707. - cast5_fpu_end(fpu_enabled);
  1708. -
  1709. if (walk.nbytes) {
  1710. ctr_crypt_final(desc, &walk);
  1711. err = blkcipher_walk_done(desc, &walk, 0);
  1712. diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
  1713. index 6a85598931b5..3a506ce7ed93 100644
  1714. --- a/arch/x86/crypto/glue_helper.c
  1715. +++ b/arch/x86/crypto/glue_helper.c
  1716. @@ -39,7 +39,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
  1717. void *ctx = crypto_blkcipher_ctx(desc->tfm);
  1718. const unsigned int bsize = 128 / 8;
  1719. unsigned int nbytes, i, func_bytes;
  1720. - bool fpu_enabled = false;
  1721. + bool fpu_enabled;
  1722. int err;
  1723. err = blkcipher_walk_virt(desc, walk);
  1724. @@ -49,7 +49,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
  1725. u8 *wdst = walk->dst.virt.addr;
  1726. fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
  1727. - desc, fpu_enabled, nbytes);
  1728. + desc, false, nbytes);
  1729. for (i = 0; i < gctx->num_funcs; i++) {
  1730. func_bytes = bsize * gctx->funcs[i].num_blocks;
  1731. @@ -71,10 +71,10 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
  1732. }
  1733. done:
  1734. + glue_fpu_end(fpu_enabled);
  1735. err = blkcipher_walk_done(desc, walk, nbytes);
  1736. }
  1737. - glue_fpu_end(fpu_enabled);
  1738. return err;
  1739. }
  1740. @@ -194,7 +194,7 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
  1741. struct scatterlist *src, unsigned int nbytes)
  1742. {
  1743. const unsigned int bsize = 128 / 8;
  1744. - bool fpu_enabled = false;
  1745. + bool fpu_enabled;
  1746. struct blkcipher_walk walk;
  1747. int err;
  1748. @@ -203,12 +203,12 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
  1749. while ((nbytes = walk.nbytes)) {
  1750. fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
  1751. - desc, fpu_enabled, nbytes);
  1752. + desc, false, nbytes);
  1753. nbytes = __glue_cbc_decrypt_128bit(gctx, desc, &walk);
  1754. + glue_fpu_end(fpu_enabled);
  1755. err = blkcipher_walk_done(desc, &walk, nbytes);
  1756. }
  1757. - glue_fpu_end(fpu_enabled);
  1758. return err;
  1759. }
  1760. EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit);
  1761. @@ -277,7 +277,7 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
  1762. struct scatterlist *src, unsigned int nbytes)
  1763. {
  1764. const unsigned int bsize = 128 / 8;
  1765. - bool fpu_enabled = false;
  1766. + bool fpu_enabled;
  1767. struct blkcipher_walk walk;
  1768. int err;
  1769. @@ -286,13 +286,12 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
  1770. while ((nbytes = walk.nbytes) >= bsize) {
  1771. fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
  1772. - desc, fpu_enabled, nbytes);
  1773. + desc, false, nbytes);
  1774. nbytes = __glue_ctr_crypt_128bit(gctx, desc, &walk);
  1775. + glue_fpu_end(fpu_enabled);
  1776. err = blkcipher_walk_done(desc, &walk, nbytes);
  1777. }
  1778. - glue_fpu_end(fpu_enabled);
  1779. -
  1780. if (walk.nbytes) {
  1781. glue_ctr_crypt_final_128bit(
  1782. gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk);
  1783. @@ -347,7 +346,7 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
  1784. void *tweak_ctx, void *crypt_ctx)
  1785. {
  1786. const unsigned int bsize = 128 / 8;
  1787. - bool fpu_enabled = false;
  1788. + bool fpu_enabled;
  1789. struct blkcipher_walk walk;
  1790. int err;
  1791. @@ -360,21 +359,21 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
  1792. /* set minimum length to bsize, for tweak_fn */
  1793. fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
  1794. - desc, fpu_enabled,
  1795. + desc, false,
  1796. nbytes < bsize ? bsize : nbytes);
  1797. -
  1798. /* calculate first value of T */
  1799. tweak_fn(tweak_ctx, walk.iv, walk.iv);
  1800. + glue_fpu_end(fpu_enabled);
  1801. while (nbytes) {
  1802. + fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
  1803. + desc, false, nbytes);
  1804. nbytes = __glue_xts_crypt_128bit(gctx, crypt_ctx, desc, &walk);
  1805. + glue_fpu_end(fpu_enabled);
  1806. err = blkcipher_walk_done(desc, &walk, nbytes);
  1807. nbytes = walk.nbytes;
  1808. }
  1809. -
  1810. - glue_fpu_end(fpu_enabled);
  1811. -
  1812. return err;
  1813. }
  1814. EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
  1815. diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
  1816. index bdd9cc59d20f..56d01a339ba4 100644
  1817. --- a/arch/x86/entry/common.c
  1818. +++ b/arch/x86/entry/common.c
  1819. @@ -129,7 +129,7 @@ static long syscall_trace_enter(struct pt_regs *regs)
  1820. #define EXIT_TO_USERMODE_LOOP_FLAGS \
  1821. (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
  1822. - _TIF_NEED_RESCHED | _TIF_USER_RETURN_NOTIFY)
  1823. + _TIF_NEED_RESCHED_MASK | _TIF_USER_RETURN_NOTIFY)
  1824. static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
  1825. {
  1826. @@ -145,9 +145,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
  1827. /* We have work to do. */
  1828. local_irq_enable();
  1829. - if (cached_flags & _TIF_NEED_RESCHED)
  1830. + if (cached_flags & _TIF_NEED_RESCHED_MASK)
  1831. schedule();
  1832. +#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
  1833. + if (unlikely(current->forced_info.si_signo)) {
  1834. + struct task_struct *t = current;
  1835. + force_sig_info(t->forced_info.si_signo, &t->forced_info, t);
  1836. + t->forced_info.si_signo = 0;
  1837. + }
  1838. +#endif
  1839. if (cached_flags & _TIF_UPROBE)
  1840. uprobe_notify_resume(regs);
  1841. diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
  1842. index edba8606b99a..4a3389535fc6 100644
  1843. --- a/arch/x86/entry/entry_32.S
  1844. +++ b/arch/x86/entry/entry_32.S
  1845. @@ -308,8 +308,25 @@ END(ret_from_exception)
  1846. ENTRY(resume_kernel)
  1847. DISABLE_INTERRUPTS(CLBR_ANY)
  1848. need_resched:
  1849. + # preempt count == 0 + NEED_RS set?
  1850. cmpl $0, PER_CPU_VAR(__preempt_count)
  1851. +#ifndef CONFIG_PREEMPT_LAZY
  1852. jnz restore_all
  1853. +#else
  1854. + jz test_int_off
  1855. +
  1856. + # atleast preempt count == 0 ?
  1857. + cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
  1858. + jne restore_all
  1859. +
  1860. + movl PER_CPU_VAR(current_task), %ebp
  1861. + cmpl $0,TASK_TI_preempt_lazy_count(%ebp) # non-zero preempt_lazy_count ?
  1862. + jnz restore_all
  1863. +
  1864. + testl $_TIF_NEED_RESCHED_LAZY, TASK_TI_flags(%ebp)
  1865. + jz restore_all
  1866. +test_int_off:
  1867. +#endif
  1868. testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
  1869. jz restore_all
  1870. call preempt_schedule_irq
  1871. diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
  1872. index ef766a358b37..28401f826ab1 100644
  1873. --- a/arch/x86/entry/entry_64.S
  1874. +++ b/arch/x86/entry/entry_64.S
  1875. @@ -546,7 +546,23 @@ GLOBAL(retint_user)
  1876. bt $9, EFLAGS(%rsp) /* were interrupts off? */
  1877. jnc 1f
  1878. 0: cmpl $0, PER_CPU_VAR(__preempt_count)
  1879. +#ifndef CONFIG_PREEMPT_LAZY
  1880. jnz 1f
  1881. +#else
  1882. + jz do_preempt_schedule_irq
  1883. +
  1884. + # atleast preempt count == 0 ?
  1885. + cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
  1886. + jnz 1f
  1887. +
  1888. + movq PER_CPU_VAR(current_task), %rcx
  1889. + cmpl $0, TASK_TI_preempt_lazy_count(%rcx)
  1890. + jnz 1f
  1891. +
  1892. + bt $TIF_NEED_RESCHED_LAZY,TASK_TI_flags(%rcx)
  1893. + jnc 1f
  1894. +do_preempt_schedule_irq:
  1895. +#endif
  1896. call preempt_schedule_irq
  1897. jmp 0b
  1898. 1:
  1899. @@ -894,6 +910,7 @@ EXPORT_SYMBOL(native_load_gs_index)
  1900. jmp 2b
  1901. .previous
  1902. +#ifndef CONFIG_PREEMPT_RT_FULL
  1903. /* Call softirq on interrupt stack. Interrupts are off. */
  1904. ENTRY(do_softirq_own_stack)
  1905. pushq %rbp
  1906. @@ -906,6 +923,7 @@ ENTRY(do_softirq_own_stack)
  1907. decl PER_CPU_VAR(irq_count)
  1908. ret
  1909. END(do_softirq_own_stack)
  1910. +#endif
  1911. #ifdef CONFIG_XEN
  1912. idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
  1913. diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
  1914. index 17f218645701..11bd1b7ee6eb 100644
  1915. --- a/arch/x86/include/asm/preempt.h
  1916. +++ b/arch/x86/include/asm/preempt.h
  1917. @@ -79,17 +79,46 @@ static __always_inline void __preempt_count_sub(int val)
  1918. * a decrement which hits zero means we have no preempt_count and should
  1919. * reschedule.
  1920. */
  1921. -static __always_inline bool __preempt_count_dec_and_test(void)
  1922. +static __always_inline bool ____preempt_count_dec_and_test(void)
  1923. {
  1924. GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), e);
  1925. }
  1926. +static __always_inline bool __preempt_count_dec_and_test(void)
  1927. +{
  1928. + if (____preempt_count_dec_and_test())
  1929. + return true;
  1930. +#ifdef CONFIG_PREEMPT_LAZY
  1931. + if (current_thread_info()->preempt_lazy_count)
  1932. + return false;
  1933. + return test_thread_flag(TIF_NEED_RESCHED_LAZY);
  1934. +#else
  1935. + return false;
  1936. +#endif
  1937. +}
  1938. +
  1939. /*
  1940. * Returns true when we need to resched and can (barring IRQ state).
  1941. */
  1942. static __always_inline bool should_resched(int preempt_offset)
  1943. {
  1944. +#ifdef CONFIG_PREEMPT_LAZY
  1945. + u32 tmp;
  1946. +
  1947. + tmp = raw_cpu_read_4(__preempt_count);
  1948. + if (tmp == preempt_offset)
  1949. + return true;
  1950. +
  1951. + /* preempt count == 0 ? */
  1952. + tmp &= ~PREEMPT_NEED_RESCHED;
  1953. + if (tmp)
  1954. + return false;
  1955. + if (current_thread_info()->preempt_lazy_count)
  1956. + return false;
  1957. + return test_thread_flag(TIF_NEED_RESCHED_LAZY);
  1958. +#else
  1959. return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset);
  1960. +#endif
  1961. }
  1962. #ifdef CONFIG_PREEMPT
  1963. diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
  1964. index 8af22be0fe61..d1328789b759 100644
  1965. --- a/arch/x86/include/asm/signal.h
  1966. +++ b/arch/x86/include/asm/signal.h
  1967. @@ -27,6 +27,19 @@ typedef struct {
  1968. #define SA_IA32_ABI 0x02000000u
  1969. #define SA_X32_ABI 0x01000000u
  1970. +/*
  1971. + * Because some traps use the IST stack, we must keep preemption
  1972. + * disabled while calling do_trap(), but do_trap() may call
  1973. + * force_sig_info() which will grab the signal spin_locks for the
  1974. + * task, which in PREEMPT_RT_FULL are mutexes. By defining
  1975. + * ARCH_RT_DELAYS_SIGNAL_SEND the force_sig_info() will set
  1976. + * TIF_NOTIFY_RESUME and set up the signal to be sent on exit of the
  1977. + * trap.
  1978. + */
  1979. +#if defined(CONFIG_PREEMPT_RT_FULL)
  1980. +#define ARCH_RT_DELAYS_SIGNAL_SEND
  1981. +#endif
  1982. +
  1983. #ifndef CONFIG_COMPAT
  1984. typedef sigset_t compat_sigset_t;
  1985. #endif
  1986. diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
  1987. index 58505f01962f..02fa39652cd6 100644
  1988. --- a/arch/x86/include/asm/stackprotector.h
  1989. +++ b/arch/x86/include/asm/stackprotector.h
  1990. @@ -59,7 +59,7 @@
  1991. */
  1992. static __always_inline void boot_init_stack_canary(void)
  1993. {
  1994. - u64 canary;
  1995. + u64 uninitialized_var(canary);
  1996. u64 tsc;
  1997. #ifdef CONFIG_X86_64
  1998. @@ -70,8 +70,15 @@ static __always_inline void boot_init_stack_canary(void)
  1999. * of randomness. The TSC only matters for very early init,
  2000. * there it already has some randomness on most systems. Later
  2001. * on during the bootup the random pool has true entropy too.
  2002. + *
  2003. + * For preempt-rt we need to weaken the randomness a bit, as
  2004. + * we can't call into the random generator from atomic context
  2005. + * due to locking constraints. We just leave canary
  2006. + * uninitialized and use the TSC based randomness on top of it.
  2007. */
  2008. +#ifndef CONFIG_PREEMPT_RT_FULL
  2009. get_random_bytes(&canary, sizeof(canary));
  2010. +#endif
  2011. tsc = rdtsc();
  2012. canary += tsc + (tsc << 32UL);
  2013. diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
  2014. index ad6f5eb07a95..5ceb3a1c2b1a 100644
  2015. --- a/arch/x86/include/asm/thread_info.h
  2016. +++ b/arch/x86/include/asm/thread_info.h
  2017. @@ -54,11 +54,14 @@ struct task_struct;
  2018. struct thread_info {
  2019. unsigned long flags; /* low level flags */
  2020. + int preempt_lazy_count; /* 0 => lazy preemptable
  2021. + <0 => BUG */
  2022. };
  2023. #define INIT_THREAD_INFO(tsk) \
  2024. { \
  2025. .flags = 0, \
  2026. + .preempt_lazy_count = 0, \
  2027. }
  2028. #define init_stack (init_thread_union.stack)
  2029. @@ -67,6 +70,10 @@ struct thread_info {
  2030. #include <asm/asm-offsets.h>
  2031. +#define GET_THREAD_INFO(reg) \
  2032. + _ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \
  2033. + _ASM_SUB $(THREAD_SIZE),reg ;
  2034. +
  2035. #endif
  2036. /*
  2037. @@ -85,6 +92,7 @@ struct thread_info {
  2038. #define TIF_SYSCALL_EMU 6 /* syscall emulation active */
  2039. #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
  2040. #define TIF_SECCOMP 8 /* secure computing */
  2041. +#define TIF_NEED_RESCHED_LAZY 9 /* lazy rescheduling necessary */
  2042. #define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
  2043. #define TIF_UPROBE 12 /* breakpointed or singlestepping */
  2044. #define TIF_NOTSC 16 /* TSC is not accessible in userland */
  2045. @@ -108,6 +116,7 @@ struct thread_info {
  2046. #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU)
  2047. #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
  2048. #define _TIF_SECCOMP (1 << TIF_SECCOMP)
  2049. +#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
  2050. #define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
  2051. #define _TIF_UPROBE (1 << TIF_UPROBE)
  2052. #define _TIF_NOTSC (1 << TIF_NOTSC)
  2053. @@ -143,6 +152,8 @@ struct thread_info {
  2054. #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
  2055. #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
  2056. +#define _TIF_NEED_RESCHED_MASK (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
  2057. +
  2058. #define STACK_WARN (THREAD_SIZE/8)
  2059. /*
  2060. diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
  2061. index 57ab86d94d64..35d25e27180f 100644
  2062. --- a/arch/x86/include/asm/uv/uv_bau.h
  2063. +++ b/arch/x86/include/asm/uv/uv_bau.h
  2064. @@ -624,9 +624,9 @@ struct bau_control {
  2065. cycles_t send_message;
  2066. cycles_t period_end;
  2067. cycles_t period_time;
  2068. - spinlock_t uvhub_lock;
  2069. - spinlock_t queue_lock;
  2070. - spinlock_t disable_lock;
  2071. + raw_spinlock_t uvhub_lock;
  2072. + raw_spinlock_t queue_lock;
  2073. + raw_spinlock_t disable_lock;
  2074. /* tunables */
  2075. int max_concurr;
  2076. int max_concurr_const;
  2077. @@ -815,15 +815,15 @@ static inline int atom_asr(short i, struct atomic_short *v)
  2078. * to be lowered below the current 'v'. atomic_add_unless can only stop
  2079. * on equal.
  2080. */
  2081. -static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u)
  2082. +static inline int atomic_inc_unless_ge(raw_spinlock_t *lock, atomic_t *v, int u)
  2083. {
  2084. - spin_lock(lock);
  2085. + raw_spin_lock(lock);
  2086. if (atomic_read(v) >= u) {
  2087. - spin_unlock(lock);
  2088. + raw_spin_unlock(lock);
  2089. return 0;
  2090. }
  2091. atomic_inc(v);
  2092. - spin_unlock(lock);
  2093. + raw_spin_unlock(lock);
  2094. return 1;
  2095. }
  2096. diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
  2097. index 931ced8ca345..167975ac8af7 100644
  2098. --- a/arch/x86/kernel/acpi/boot.c
  2099. +++ b/arch/x86/kernel/acpi/boot.c
  2100. @@ -87,7 +87,9 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
  2101. * ->ioapic_mutex
  2102. * ->ioapic_lock
  2103. */
  2104. +#ifdef CONFIG_X86_IO_APIC
  2105. static DEFINE_MUTEX(acpi_ioapic_lock);
  2106. +#endif
  2107. /* --------------------------------------------------------------------------
  2108. Boot-time Configuration
  2109. diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
  2110. index 7249f1500bcb..a79d5c224004 100644
  2111. --- a/arch/x86/kernel/apic/io_apic.c
  2112. +++ b/arch/x86/kernel/apic/io_apic.c
  2113. @@ -1712,7 +1712,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
  2114. static inline bool ioapic_irqd_mask(struct irq_data *data)
  2115. {
  2116. /* If we are moving the irq we need to mask it */
  2117. - if (unlikely(irqd_is_setaffinity_pending(data))) {
  2118. + if (unlikely(irqd_is_setaffinity_pending(data) &&
  2119. + !irqd_irq_inprogress(data))) {
  2120. mask_ioapic_irq(data);
  2121. return true;
  2122. }
  2123. diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
  2124. index c62e015b126c..0cc71257fca6 100644
  2125. --- a/arch/x86/kernel/asm-offsets.c
  2126. +++ b/arch/x86/kernel/asm-offsets.c
  2127. @@ -36,6 +36,7 @@ void common(void) {
  2128. BLANK();
  2129. OFFSET(TASK_TI_flags, task_struct, thread_info.flags);
  2130. + OFFSET(TASK_TI_preempt_lazy_count, task_struct, thread_info.preempt_lazy_count);
  2131. OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
  2132. BLANK();
  2133. @@ -91,4 +92,5 @@ void common(void) {
  2134. BLANK();
  2135. DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
  2136. + DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
  2137. }
  2138. diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
  2139. index 22cda29d654e..57c85e3af092 100644
  2140. --- a/arch/x86/kernel/cpu/mcheck/mce.c
  2141. +++ b/arch/x86/kernel/cpu/mcheck/mce.c
  2142. @@ -41,6 +41,8 @@
  2143. #include <linux/debugfs.h>
  2144. #include <linux/irq_work.h>
  2145. #include <linux/export.h>
  2146. +#include <linux/jiffies.h>
  2147. +#include <linux/swork.h>
  2148. #include <linux/jump_label.h>
  2149. #include <asm/processor.h>
  2150. @@ -1307,7 +1309,7 @@ void mce_log_therm_throt_event(__u64 status)
  2151. static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
  2152. static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
  2153. -static DEFINE_PER_CPU(struct timer_list, mce_timer);
  2154. +static DEFINE_PER_CPU(struct hrtimer, mce_timer);
  2155. static unsigned long mce_adjust_timer_default(unsigned long interval)
  2156. {
  2157. @@ -1316,32 +1318,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
  2158. static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
  2159. -static void __restart_timer(struct timer_list *t, unsigned long interval)
  2160. +static enum hrtimer_restart __restart_timer(struct hrtimer *timer, unsigned long interval)
  2161. {
  2162. - unsigned long when = jiffies + interval;
  2163. - unsigned long flags;
  2164. -
  2165. - local_irq_save(flags);
  2166. -
  2167. - if (timer_pending(t)) {
  2168. - if (time_before(when, t->expires))
  2169. - mod_timer(t, when);
  2170. - } else {
  2171. - t->expires = round_jiffies(when);
  2172. - add_timer_on(t, smp_processor_id());
  2173. - }
  2174. -
  2175. - local_irq_restore(flags);
  2176. + if (!interval)
  2177. + return HRTIMER_NORESTART;
  2178. + hrtimer_forward_now(timer, ns_to_ktime(jiffies_to_nsecs(interval)));
  2179. + return HRTIMER_RESTART;
  2180. }
  2181. -static void mce_timer_fn(unsigned long data)
  2182. +static enum hrtimer_restart mce_timer_fn(struct hrtimer *timer)
  2183. {
  2184. - struct timer_list *t = this_cpu_ptr(&mce_timer);
  2185. - int cpu = smp_processor_id();
  2186. unsigned long iv;
  2187. - WARN_ON(cpu != data);
  2188. -
  2189. iv = __this_cpu_read(mce_next_interval);
  2190. if (mce_available(this_cpu_ptr(&cpu_info))) {
  2191. @@ -1364,7 +1352,7 @@ static void mce_timer_fn(unsigned long data)
  2192. done:
  2193. __this_cpu_write(mce_next_interval, iv);
  2194. - __restart_timer(t, iv);
  2195. + return __restart_timer(timer, iv);
  2196. }
  2197. /*
  2198. @@ -1372,7 +1360,7 @@ static void mce_timer_fn(unsigned long data)
  2199. */
  2200. void mce_timer_kick(unsigned long interval)
  2201. {
  2202. - struct timer_list *t = this_cpu_ptr(&mce_timer);
  2203. + struct hrtimer *t = this_cpu_ptr(&mce_timer);
  2204. unsigned long iv = __this_cpu_read(mce_next_interval);
  2205. __restart_timer(t, interval);
  2206. @@ -1387,7 +1375,7 @@ static void mce_timer_delete_all(void)
  2207. int cpu;
  2208. for_each_online_cpu(cpu)
  2209. - del_timer_sync(&per_cpu(mce_timer, cpu));
  2210. + hrtimer_cancel(&per_cpu(mce_timer, cpu));
  2211. }
  2212. static void mce_do_trigger(struct work_struct *work)
  2213. @@ -1397,6 +1385,56 @@ static void mce_do_trigger(struct work_struct *work)
  2214. static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
  2215. +static void __mce_notify_work(struct swork_event *event)
  2216. +{
  2217. + /* Not more than two messages every minute */
  2218. + static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);
  2219. +
  2220. + /* wake processes polling /dev/mcelog */
  2221. + wake_up_interruptible(&mce_chrdev_wait);
  2222. +
  2223. + /*
  2224. + * There is no risk of missing notifications because
  2225. + * work_pending is always cleared before the function is
  2226. + * executed.
  2227. + */
  2228. + if (mce_helper[0] && !work_pending(&mce_trigger_work))
  2229. + schedule_work(&mce_trigger_work);
  2230. +
  2231. + if (__ratelimit(&ratelimit))
  2232. + pr_info(HW_ERR "Machine check events logged\n");
  2233. +}
  2234. +
  2235. +#ifdef CONFIG_PREEMPT_RT_FULL
  2236. +static bool notify_work_ready __read_mostly;
  2237. +static struct swork_event notify_work;
  2238. +
  2239. +static int mce_notify_work_init(void)
  2240. +{
  2241. + int err;
  2242. +
  2243. + err = swork_get();
  2244. + if (err)
  2245. + return err;
  2246. +
  2247. + INIT_SWORK(&notify_work, __mce_notify_work);
  2248. + notify_work_ready = true;
  2249. + return 0;
  2250. +}
  2251. +
  2252. +static void mce_notify_work(void)
  2253. +{
  2254. + if (notify_work_ready)
  2255. + swork_queue(&notify_work);
  2256. +}
  2257. +#else
  2258. +static void mce_notify_work(void)
  2259. +{
  2260. + __mce_notify_work(NULL);
  2261. +}
  2262. +static inline int mce_notify_work_init(void) { return 0; }
  2263. +#endif
  2264. +
  2265. /*
  2266. * Notify the user(s) about new machine check events.
  2267. * Can be called from interrupt context, but not from machine check/NMI
  2268. @@ -1404,19 +1442,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
  2269. */
  2270. int mce_notify_irq(void)
  2271. {
  2272. - /* Not more than two messages every minute */
  2273. - static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);
  2274. -
  2275. if (test_and_clear_bit(0, &mce_need_notify)) {
  2276. - /* wake processes polling /dev/mcelog */
  2277. - wake_up_interruptible(&mce_chrdev_wait);
  2278. -
  2279. - if (mce_helper[0])
  2280. - schedule_work(&mce_trigger_work);
  2281. -
  2282. - if (__ratelimit(&ratelimit))
  2283. - pr_info(HW_ERR "Machine check events logged\n");
  2284. -
  2285. + mce_notify_work();
  2286. return 1;
  2287. }
  2288. return 0;
  2289. @@ -1722,7 +1749,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)
  2290. }
  2291. }
  2292. -static void mce_start_timer(unsigned int cpu, struct timer_list *t)
  2293. +static void mce_start_timer(unsigned int cpu, struct hrtimer *t)
  2294. {
  2295. unsigned long iv = check_interval * HZ;
  2296. @@ -1731,16 +1758,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)
  2297. per_cpu(mce_next_interval, cpu) = iv;
  2298. - t->expires = round_jiffies(jiffies + iv);
  2299. - add_timer_on(t, cpu);
  2300. + hrtimer_start_range_ns(t, ns_to_ktime(jiffies_to_usecs(iv) * 1000ULL),
  2301. + 0, HRTIMER_MODE_REL_PINNED);
  2302. }
  2303. static void __mcheck_cpu_init_timer(void)
  2304. {
  2305. - struct timer_list *t = this_cpu_ptr(&mce_timer);
  2306. + struct hrtimer *t = this_cpu_ptr(&mce_timer);
  2307. unsigned int cpu = smp_processor_id();
  2308. - setup_pinned_timer(t, mce_timer_fn, cpu);
  2309. + hrtimer_init(t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  2310. + t->function = mce_timer_fn;
  2311. mce_start_timer(cpu, t);
  2312. }
  2313. @@ -2465,6 +2493,8 @@ static void mce_disable_cpu(void *h)
  2314. if (!mce_available(raw_cpu_ptr(&cpu_info)))
  2315. return;
  2316. + hrtimer_cancel(this_cpu_ptr(&mce_timer));
  2317. +
  2318. if (!(action & CPU_TASKS_FROZEN))
  2319. cmci_clear();
  2320. @@ -2487,6 +2517,7 @@ static void mce_reenable_cpu(void *h)
  2321. if (b->init)
  2322. wrmsrl(msr_ops.ctl(i), b->ctl);
  2323. }
  2324. + __mcheck_cpu_init_timer();
  2325. }
  2326. /* Get notified when a cpu comes on/off. Be hotplug friendly. */
  2327. @@ -2494,7 +2525,6 @@ static int
  2328. mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  2329. {
  2330. unsigned int cpu = (unsigned long)hcpu;
  2331. - struct timer_list *t = &per_cpu(mce_timer, cpu);
  2332. switch (action & ~CPU_TASKS_FROZEN) {
  2333. case CPU_ONLINE:
  2334. @@ -2514,11 +2544,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  2335. break;
  2336. case CPU_DOWN_PREPARE:
  2337. smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
  2338. - del_timer_sync(t);
  2339. break;
  2340. case CPU_DOWN_FAILED:
  2341. smp_call_function_single(cpu, mce_reenable_cpu, &action, 1);
  2342. - mce_start_timer(cpu, t);
  2343. break;
  2344. }
  2345. @@ -2557,6 +2585,10 @@ static __init int mcheck_init_device(void)
  2346. goto err_out;
  2347. }
  2348. + err = mce_notify_work_init();
  2349. + if (err)
  2350. + goto err_out;
  2351. +
  2352. if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
  2353. err = -ENOMEM;
  2354. goto err_out;
  2355. diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
  2356. index 1f38d9a4d9de..053bf3b2ef39 100644
  2357. --- a/arch/x86/kernel/irq_32.c
  2358. +++ b/arch/x86/kernel/irq_32.c
  2359. @@ -127,6 +127,7 @@ void irq_ctx_init(int cpu)
  2360. cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
  2361. }
  2362. +#ifndef CONFIG_PREEMPT_RT_FULL
  2363. void do_softirq_own_stack(void)
  2364. {
  2365. struct irq_stack *irqstk;
  2366. @@ -143,6 +144,7 @@ void do_softirq_own_stack(void)
  2367. call_on_stack(__do_softirq, isp);
  2368. }
  2369. +#endif
  2370. bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
  2371. {
  2372. diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
  2373. index bd7be8efdc4c..b3b0a7f7b1ca 100644
  2374. --- a/arch/x86/kernel/process_32.c
  2375. +++ b/arch/x86/kernel/process_32.c
  2376. @@ -35,6 +35,7 @@
  2377. #include <linux/uaccess.h>
  2378. #include <linux/io.h>
  2379. #include <linux/kdebug.h>
  2380. +#include <linux/highmem.h>
  2381. #include <asm/pgtable.h>
  2382. #include <asm/ldt.h>
  2383. @@ -195,6 +196,35 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  2384. }
  2385. EXPORT_SYMBOL_GPL(start_thread);
  2386. +#ifdef CONFIG_PREEMPT_RT_FULL
  2387. +static void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
  2388. +{
  2389. + int i;
  2390. +
  2391. + /*
  2392. + * Clear @prev's kmap_atomic mappings
  2393. + */
  2394. + for (i = 0; i < prev_p->kmap_idx; i++) {
  2395. + int idx = i + KM_TYPE_NR * smp_processor_id();
  2396. + pte_t *ptep = kmap_pte - idx;
  2397. +
  2398. + kpte_clear_flush(ptep, __fix_to_virt(FIX_KMAP_BEGIN + idx));
  2399. + }
  2400. + /*
  2401. + * Restore @next_p's kmap_atomic mappings
  2402. + */
  2403. + for (i = 0; i < next_p->kmap_idx; i++) {
  2404. + int idx = i + KM_TYPE_NR * smp_processor_id();
  2405. +
  2406. + if (!pte_none(next_p->kmap_pte[i]))
  2407. + set_pte(kmap_pte - idx, next_p->kmap_pte[i]);
  2408. + }
  2409. +}
  2410. +#else
  2411. +static inline void
  2412. +switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
  2413. +#endif
  2414. +
  2415. /*
  2416. * switch_to(x,y) should switch tasks from x to y.
  2417. @@ -271,6 +301,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  2418. task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
  2419. __switch_to_xtra(prev_p, next_p, tss);
  2420. + switch_kmaps(prev_p, next_p);
  2421. +
  2422. /*
  2423. * Leave lazy mode, flushing any hypercalls made here.
  2424. * This must be done before restoring TLS segments so
  2425. diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
  2426. index 3f05c044720b..fe68afd37162 100644
  2427. --- a/arch/x86/kvm/lapic.c
  2428. +++ b/arch/x86/kvm/lapic.c
  2429. @@ -1939,6 +1939,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
  2430. hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
  2431. HRTIMER_MODE_ABS_PINNED);
  2432. apic->lapic_timer.timer.function = apic_timer_fn;
  2433. + apic->lapic_timer.timer.irqsafe = 1;
  2434. /*
  2435. * APIC is created enabled. This will prevent kvm_lapic_set_base from
  2436. diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
  2437. index 81bba3c2137d..fcb84512e85d 100644
  2438. --- a/arch/x86/kvm/x86.c
  2439. +++ b/arch/x86/kvm/x86.c
  2440. @@ -5958,6 +5958,13 @@ int kvm_arch_init(void *opaque)
  2441. goto out;
  2442. }
  2443. +#ifdef CONFIG_PREEMPT_RT_FULL
  2444. + if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
  2445. + printk(KERN_ERR "RT requires X86_FEATURE_CONSTANT_TSC\n");
  2446. + return -EOPNOTSUPP;
  2447. + }
  2448. +#endif
  2449. +
  2450. r = kvm_mmu_module_init();
  2451. if (r)
  2452. goto out_free_percpu;
  2453. diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
  2454. index 6d18b70ed5a9..f752724c22e8 100644
  2455. --- a/arch/x86/mm/highmem_32.c
  2456. +++ b/arch/x86/mm/highmem_32.c
  2457. @@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap);
  2458. */
  2459. void *kmap_atomic_prot(struct page *page, pgprot_t prot)
  2460. {
  2461. + pte_t pte = mk_pte(page, prot);
  2462. unsigned long vaddr;
  2463. int idx, type;
  2464. - preempt_disable();
  2465. + preempt_disable_nort();
  2466. pagefault_disable();
  2467. if (!PageHighMem(page))
  2468. @@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
  2469. idx = type + KM_TYPE_NR*smp_processor_id();
  2470. vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  2471. BUG_ON(!pte_none(*(kmap_pte-idx)));
  2472. - set_pte(kmap_pte-idx, mk_pte(page, prot));
  2473. +#ifdef CONFIG_PREEMPT_RT_FULL
  2474. + current->kmap_pte[type] = pte;
  2475. +#endif
  2476. + set_pte(kmap_pte-idx, pte);
  2477. arch_flush_lazy_mmu_mode();
  2478. return (void *)vaddr;
  2479. @@ -88,6 +92,9 @@ void __kunmap_atomic(void *kvaddr)
  2480. * is a bad idea also, in case the page changes cacheability
  2481. * attributes or becomes a protected page in a hypervisor.
  2482. */
  2483. +#ifdef CONFIG_PREEMPT_RT_FULL
  2484. + current->kmap_pte[type] = __pte(0);
  2485. +#endif
  2486. kpte_clear_flush(kmap_pte-idx, vaddr);
  2487. kmap_atomic_idx_pop();
  2488. arch_flush_lazy_mmu_mode();
  2489. @@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr)
  2490. #endif
  2491. pagefault_enable();
  2492. - preempt_enable();
  2493. + preempt_enable_nort();
  2494. }
  2495. EXPORT_SYMBOL(__kunmap_atomic);
  2496. diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
  2497. index ada98b39b8ad..585f6829653b 100644
  2498. --- a/arch/x86/mm/iomap_32.c
  2499. +++ b/arch/x86/mm/iomap_32.c
  2500. @@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free);
  2501. void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
  2502. {
  2503. + pte_t pte = pfn_pte(pfn, prot);
  2504. unsigned long vaddr;
  2505. int idx, type;
  2506. @@ -65,7 +66,12 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
  2507. type = kmap_atomic_idx_push();
  2508. idx = type + KM_TYPE_NR * smp_processor_id();
  2509. vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  2510. - set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
  2511. + WARN_ON(!pte_none(*(kmap_pte - idx)));
  2512. +
  2513. +#ifdef CONFIG_PREEMPT_RT_FULL
  2514. + current->kmap_pte[type] = pte;
  2515. +#endif
  2516. + set_pte(kmap_pte - idx, pte);
  2517. arch_flush_lazy_mmu_mode();
  2518. return (void *)vaddr;
  2519. @@ -113,6 +119,9 @@ iounmap_atomic(void __iomem *kvaddr)
  2520. * is a bad idea also, in case the page changes cacheability
  2521. * attributes or becomes a protected page in a hypervisor.
  2522. */
  2523. +#ifdef CONFIG_PREEMPT_RT_FULL
  2524. + current->kmap_pte[type] = __pte(0);
  2525. +#endif
  2526. kpte_clear_flush(kmap_pte-idx, vaddr);
  2527. kmap_atomic_idx_pop();
  2528. }
  2529. diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
  2530. index e3353c97d086..01664968555c 100644
  2531. --- a/arch/x86/mm/pageattr.c
  2532. +++ b/arch/x86/mm/pageattr.c
  2533. @@ -214,7 +214,15 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
  2534. int in_flags, struct page **pages)
  2535. {
  2536. unsigned int i, level;
  2537. +#ifdef CONFIG_PREEMPT
  2538. + /*
  2539. + * Avoid wbinvd() because it causes latencies on all CPUs,
  2540. + * regardless of any CPU isolation that may be in effect.
  2541. + */
  2542. + unsigned long do_wbinvd = 0;
  2543. +#else
  2544. unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */
  2545. +#endif
  2546. BUG_ON(irqs_disabled());
  2547. diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
  2548. index 9e42842e924a..5398f97172f9 100644
  2549. --- a/arch/x86/platform/uv/tlb_uv.c
  2550. +++ b/arch/x86/platform/uv/tlb_uv.c
  2551. @@ -748,9 +748,9 @@ static void destination_plugged(struct bau_desc *bau_desc,
  2552. quiesce_local_uvhub(hmaster);
  2553. - spin_lock(&hmaster->queue_lock);
  2554. + raw_spin_lock(&hmaster->queue_lock);
  2555. reset_with_ipi(&bau_desc->distribution, bcp);
  2556. - spin_unlock(&hmaster->queue_lock);
  2557. + raw_spin_unlock(&hmaster->queue_lock);
  2558. end_uvhub_quiesce(hmaster);
  2559. @@ -770,9 +770,9 @@ static void destination_timeout(struct bau_desc *bau_desc,
  2560. quiesce_local_uvhub(hmaster);
  2561. - spin_lock(&hmaster->queue_lock);
  2562. + raw_spin_lock(&hmaster->queue_lock);
  2563. reset_with_ipi(&bau_desc->distribution, bcp);
  2564. - spin_unlock(&hmaster->queue_lock);
  2565. + raw_spin_unlock(&hmaster->queue_lock);
  2566. end_uvhub_quiesce(hmaster);
  2567. @@ -793,7 +793,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
  2568. cycles_t tm1;
  2569. hmaster = bcp->uvhub_master;
  2570. - spin_lock(&hmaster->disable_lock);
  2571. + raw_spin_lock(&hmaster->disable_lock);
  2572. if (!bcp->baudisabled) {
  2573. stat->s_bau_disabled++;
  2574. tm1 = get_cycles();
  2575. @@ -806,7 +806,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
  2576. }
  2577. }
  2578. }
  2579. - spin_unlock(&hmaster->disable_lock);
  2580. + raw_spin_unlock(&hmaster->disable_lock);
  2581. }
  2582. static void count_max_concurr(int stat, struct bau_control *bcp,
  2583. @@ -869,7 +869,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2,
  2584. */
  2585. static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
  2586. {
  2587. - spinlock_t *lock = &hmaster->uvhub_lock;
  2588. + raw_spinlock_t *lock = &hmaster->uvhub_lock;
  2589. atomic_t *v;
  2590. v = &hmaster->active_descriptor_count;
  2591. @@ -1002,7 +1002,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
  2592. struct bau_control *hmaster;
  2593. hmaster = bcp->uvhub_master;
  2594. - spin_lock(&hmaster->disable_lock);
  2595. + raw_spin_lock(&hmaster->disable_lock);
  2596. if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
  2597. stat->s_bau_reenabled++;
  2598. for_each_present_cpu(tcpu) {
  2599. @@ -1014,10 +1014,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
  2600. tbcp->period_giveups = 0;
  2601. }
  2602. }
  2603. - spin_unlock(&hmaster->disable_lock);
  2604. + raw_spin_unlock(&hmaster->disable_lock);
  2605. return 0;
  2606. }
  2607. - spin_unlock(&hmaster->disable_lock);
  2608. + raw_spin_unlock(&hmaster->disable_lock);
  2609. return -1;
  2610. }
  2611. @@ -1940,9 +1940,9 @@ static void __init init_per_cpu_tunables(void)
  2612. bcp->cong_reps = congested_reps;
  2613. bcp->disabled_period = sec_2_cycles(disabled_period);
  2614. bcp->giveup_limit = giveup_limit;
  2615. - spin_lock_init(&bcp->queue_lock);
  2616. - spin_lock_init(&bcp->uvhub_lock);
  2617. - spin_lock_init(&bcp->disable_lock);
  2618. + raw_spin_lock_init(&bcp->queue_lock);
  2619. + raw_spin_lock_init(&bcp->uvhub_lock);
  2620. + raw_spin_lock_init(&bcp->disable_lock);
  2621. }
  2622. }
  2623. diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
  2624. index b333fc45f9ec..8b85916e6986 100644
  2625. --- a/arch/x86/platform/uv/uv_time.c
  2626. +++ b/arch/x86/platform/uv/uv_time.c
  2627. @@ -57,7 +57,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
  2628. /* There is one of these allocated per node */
  2629. struct uv_rtc_timer_head {
  2630. - spinlock_t lock;
  2631. + raw_spinlock_t lock;
  2632. /* next cpu waiting for timer, local node relative: */
  2633. int next_cpu;
  2634. /* number of cpus on this node: */
  2635. @@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers(void)
  2636. uv_rtc_deallocate_timers();
  2637. return -ENOMEM;
  2638. }
  2639. - spin_lock_init(&head->lock);
  2640. + raw_spin_lock_init(&head->lock);
  2641. head->ncpus = uv_blade_nr_possible_cpus(bid);
  2642. head->next_cpu = -1;
  2643. blade_info[bid] = head;
  2644. @@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
  2645. unsigned long flags;
  2646. int next_cpu;
  2647. - spin_lock_irqsave(&head->lock, flags);
  2648. + raw_spin_lock_irqsave(&head->lock, flags);
  2649. next_cpu = head->next_cpu;
  2650. *t = expires;
  2651. @@ -243,12 +243,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
  2652. if (uv_setup_intr(cpu, expires)) {
  2653. *t = ULLONG_MAX;
  2654. uv_rtc_find_next_timer(head, pnode);
  2655. - spin_unlock_irqrestore(&head->lock, flags);
  2656. + raw_spin_unlock_irqrestore(&head->lock, flags);
  2657. return -ETIME;
  2658. }
  2659. }
  2660. - spin_unlock_irqrestore(&head->lock, flags);
  2661. + raw_spin_unlock_irqrestore(&head->lock, flags);
  2662. return 0;
  2663. }
  2664. @@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
  2665. unsigned long flags;
  2666. int rc = 0;
  2667. - spin_lock_irqsave(&head->lock, flags);
  2668. + raw_spin_lock_irqsave(&head->lock, flags);
  2669. if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force)
  2670. rc = 1;
  2671. @@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
  2672. uv_rtc_find_next_timer(head, pnode);
  2673. }
  2674. - spin_unlock_irqrestore(&head->lock, flags);
  2675. + raw_spin_unlock_irqrestore(&head->lock, flags);
  2676. return rc;
  2677. }
  2678. @@ -299,13 +299,18 @@ static int uv_rtc_unset_timer(int cpu, int force)
  2679. static cycle_t uv_read_rtc(struct clocksource *cs)
  2680. {
  2681. unsigned long offset;
  2682. + cycle_t cycles;
  2683. + preempt_disable();
  2684. if (uv_get_min_hub_revision_id() == 1)
  2685. offset = 0;
  2686. else
  2687. offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;
  2688. - return (cycle_t)uv_read_local_mmr(UVH_RTC | offset);
  2689. + cycles = (cycle_t)uv_read_local_mmr(UVH_RTC | offset);
  2690. + preempt_enable();
  2691. +
  2692. + return cycles;
  2693. }
  2694. /*
  2695. diff --git a/block/blk-core.c b/block/blk-core.c
  2696. index d1f2801ce836..6f945bb0fa1a 100644
  2697. --- a/block/blk-core.c
  2698. +++ b/block/blk-core.c
  2699. @@ -125,6 +125,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
  2700. INIT_LIST_HEAD(&rq->queuelist);
  2701. INIT_LIST_HEAD(&rq->timeout_list);
  2702. +#ifdef CONFIG_PREEMPT_RT_FULL
  2703. + INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
  2704. +#endif
  2705. rq->cpu = -1;
  2706. rq->q = q;
  2707. rq->__sector = (sector_t) -1;
  2708. @@ -233,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
  2709. **/
  2710. void blk_start_queue(struct request_queue *q)
  2711. {
  2712. - WARN_ON(!irqs_disabled());
  2713. + WARN_ON_NONRT(!irqs_disabled());
  2714. queue_flag_clear(QUEUE_FLAG_STOPPED, q);
  2715. __blk_run_queue(q);
  2716. @@ -659,7 +662,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
  2717. if (nowait)
  2718. return -EBUSY;
  2719. - ret = wait_event_interruptible(q->mq_freeze_wq,
  2720. + ret = swait_event_interruptible(q->mq_freeze_wq,
  2721. !atomic_read(&q->mq_freeze_depth) ||
  2722. blk_queue_dying(q));
  2723. if (blk_queue_dying(q))
  2724. @@ -679,7 +682,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
  2725. struct request_queue *q =
  2726. container_of(ref, struct request_queue, q_usage_counter);
  2727. - wake_up_all(&q->mq_freeze_wq);
  2728. + swake_up_all(&q->mq_freeze_wq);
  2729. }
  2730. static void blk_rq_timed_out_timer(unsigned long data)
  2731. @@ -748,7 +751,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
  2732. q->bypass_depth = 1;
  2733. __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
  2734. - init_waitqueue_head(&q->mq_freeze_wq);
  2735. + init_swait_queue_head(&q->mq_freeze_wq);
  2736. /*
  2737. * Init percpu_ref in atomic mode so that it's faster to shutdown.
  2738. @@ -3200,7 +3203,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
  2739. blk_run_queue_async(q);
  2740. else
  2741. __blk_run_queue(q);
  2742. - spin_unlock(q->queue_lock);
  2743. + spin_unlock_irq(q->queue_lock);
  2744. }
  2745. static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
  2746. @@ -3248,7 +3251,6 @@ EXPORT_SYMBOL(blk_check_plugged);
  2747. void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
  2748. {
  2749. struct request_queue *q;
  2750. - unsigned long flags;
  2751. struct request *rq;
  2752. LIST_HEAD(list);
  2753. unsigned int depth;
  2754. @@ -3268,11 +3270,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
  2755. q = NULL;
  2756. depth = 0;
  2757. - /*
  2758. - * Save and disable interrupts here, to avoid doing it for every
  2759. - * queue lock we have to take.
  2760. - */
  2761. - local_irq_save(flags);
  2762. while (!list_empty(&list)) {
  2763. rq = list_entry_rq(list.next);
  2764. list_del_init(&rq->queuelist);
  2765. @@ -3285,7 +3282,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
  2766. queue_unplugged(q, depth, from_schedule);
  2767. q = rq->q;
  2768. depth = 0;
  2769. - spin_lock(q->queue_lock);
  2770. + spin_lock_irq(q->queue_lock);
  2771. }
  2772. /*
  2773. @@ -3312,8 +3309,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
  2774. */
  2775. if (q)
  2776. queue_unplugged(q, depth, from_schedule);
  2777. -
  2778. - local_irq_restore(flags);
  2779. }
  2780. void blk_finish_plug(struct blk_plug *plug)
  2781. diff --git a/block/blk-ioc.c b/block/blk-ioc.c
  2782. index 381cb50a673c..dc8785233d94 100644
  2783. --- a/block/blk-ioc.c
  2784. +++ b/block/blk-ioc.c
  2785. @@ -7,6 +7,7 @@
  2786. #include <linux/bio.h>
  2787. #include <linux/blkdev.h>
  2788. #include <linux/slab.h>
  2789. +#include <linux/delay.h>
  2790. #include "blk.h"
  2791. @@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work)
  2792. spin_unlock(q->queue_lock);
  2793. } else {
  2794. spin_unlock_irqrestore(&ioc->lock, flags);
  2795. - cpu_relax();
  2796. + cpu_chill();
  2797. spin_lock_irqsave_nested(&ioc->lock, flags, 1);
  2798. }
  2799. }
  2800. @@ -187,7 +188,7 @@ void put_io_context_active(struct io_context *ioc)
  2801. spin_unlock(icq->q->queue_lock);
  2802. } else {
  2803. spin_unlock_irqrestore(&ioc->lock, flags);
  2804. - cpu_relax();
  2805. + cpu_chill();
  2806. goto retry;
  2807. }
  2808. }
  2809. diff --git a/block/blk-mq.c b/block/blk-mq.c
  2810. index 7b597ec4e9c5..48c9652a701c 100644
  2811. --- a/block/blk-mq.c
  2812. +++ b/block/blk-mq.c
  2813. @@ -72,7 +72,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
  2814. static void blk_mq_freeze_queue_wait(struct request_queue *q)
  2815. {
  2816. - wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
  2817. + swait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
  2818. }
  2819. /*
  2820. @@ -110,7 +110,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
  2821. WARN_ON_ONCE(freeze_depth < 0);
  2822. if (!freeze_depth) {
  2823. percpu_ref_reinit(&q->q_usage_counter);
  2824. - wake_up_all(&q->mq_freeze_wq);
  2825. + swake_up_all(&q->mq_freeze_wq);
  2826. }
  2827. }
  2828. EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
  2829. @@ -129,7 +129,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
  2830. * dying, we need to ensure that processes currently waiting on
  2831. * the queue are notified as well.
  2832. */
  2833. - wake_up_all(&q->mq_freeze_wq);
  2834. + swake_up_all(&q->mq_freeze_wq);
  2835. }
  2836. bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
  2837. @@ -177,6 +177,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
  2838. rq->resid_len = 0;
  2839. rq->sense = NULL;
  2840. +#ifdef CONFIG_PREEMPT_RT_FULL
  2841. + INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
  2842. +#endif
  2843. INIT_LIST_HEAD(&rq->timeout_list);
  2844. rq->timeout = 0;
  2845. @@ -345,6 +348,17 @@ void blk_mq_end_request(struct request *rq, int error)
  2846. }
  2847. EXPORT_SYMBOL(blk_mq_end_request);
  2848. +#ifdef CONFIG_PREEMPT_RT_FULL
  2849. +
  2850. +void __blk_mq_complete_request_remote_work(struct work_struct *work)
  2851. +{
  2852. + struct request *rq = container_of(work, struct request, work);
  2853. +
  2854. + rq->q->softirq_done_fn(rq);
  2855. +}
  2856. +
  2857. +#else
  2858. +
  2859. static void __blk_mq_complete_request_remote(void *data)
  2860. {
  2861. struct request *rq = data;
  2862. @@ -352,6 +366,8 @@ static void __blk_mq_complete_request_remote(void *data)
  2863. rq->q->softirq_done_fn(rq);
  2864. }
  2865. +#endif
  2866. +
  2867. static void blk_mq_ipi_complete_request(struct request *rq)
  2868. {
  2869. struct blk_mq_ctx *ctx = rq->mq_ctx;
  2870. @@ -363,19 +379,23 @@ static void blk_mq_ipi_complete_request(struct request *rq)
  2871. return;
  2872. }
  2873. - cpu = get_cpu();
  2874. + cpu = get_cpu_light();
  2875. if (!test_bit(QUEUE_FLAG_SAME_FORCE, &rq->q->queue_flags))
  2876. shared = cpus_share_cache(cpu, ctx->cpu);
  2877. if (cpu != ctx->cpu && !shared && cpu_online(ctx->cpu)) {
  2878. +#ifdef CONFIG_PREEMPT_RT_FULL
  2879. + schedule_work_on(ctx->cpu, &rq->work);
  2880. +#else
  2881. rq->csd.func = __blk_mq_complete_request_remote;
  2882. rq->csd.info = rq;
  2883. rq->csd.flags = 0;
  2884. smp_call_function_single_async(ctx->cpu, &rq->csd);
  2885. +#endif
  2886. } else {
  2887. rq->q->softirq_done_fn(rq);
  2888. }
  2889. - put_cpu();
  2890. + put_cpu_light();
  2891. }
  2892. static void __blk_mq_complete_request(struct request *rq)
  2893. @@ -906,14 +926,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
  2894. return;
  2895. if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
  2896. - int cpu = get_cpu();
  2897. + int cpu = get_cpu_light();
  2898. if (cpumask_test_cpu(cpu, hctx->cpumask)) {
  2899. __blk_mq_run_hw_queue(hctx);
  2900. - put_cpu();
  2901. + put_cpu_light();
  2902. return;
  2903. }
  2904. - put_cpu();
  2905. + put_cpu_light();
  2906. }
  2907. kblockd_schedule_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work);
  2908. diff --git a/block/blk-mq.h b/block/blk-mq.h
  2909. index e5d25249028c..1e846b842eab 100644
  2910. --- a/block/blk-mq.h
  2911. +++ b/block/blk-mq.h
  2912. @@ -72,12 +72,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
  2913. */
  2914. static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
  2915. {
  2916. - return __blk_mq_get_ctx(q, get_cpu());
  2917. + return __blk_mq_get_ctx(q, get_cpu_light());
  2918. }
  2919. static inline void blk_mq_put_ctx(struct blk_mq_ctx *ctx)
  2920. {
  2921. - put_cpu();
  2922. + put_cpu_light();
  2923. }
  2924. struct blk_mq_alloc_data {
  2925. diff --git a/block/blk-softirq.c b/block/blk-softirq.c
  2926. index 06cf9807f49a..c40342643ca0 100644
  2927. --- a/block/blk-softirq.c
  2928. +++ b/block/blk-softirq.c
  2929. @@ -51,6 +51,7 @@ static void trigger_softirq(void *data)
  2930. raise_softirq_irqoff(BLOCK_SOFTIRQ);
  2931. local_irq_restore(flags);
  2932. + preempt_check_resched_rt();
  2933. }
  2934. /*
  2935. @@ -89,6 +90,7 @@ static int blk_softirq_cpu_dead(unsigned int cpu)
  2936. this_cpu_ptr(&blk_cpu_done));
  2937. raise_softirq_irqoff(BLOCK_SOFTIRQ);
  2938. local_irq_enable();
  2939. + preempt_check_resched_rt();
  2940. return 0;
  2941. }
  2942. @@ -141,6 +143,7 @@ void __blk_complete_request(struct request *req)
  2943. goto do_local;
  2944. local_irq_restore(flags);
  2945. + preempt_check_resched_rt();
  2946. }
  2947. /**
  2948. diff --git a/block/bounce.c b/block/bounce.c
  2949. index 1cb5dd3a5da1..2f1ec8a67cbe 100644
  2950. --- a/block/bounce.c
  2951. +++ b/block/bounce.c
  2952. @@ -55,11 +55,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom)
  2953. unsigned long flags;
  2954. unsigned char *vto;
  2955. - local_irq_save(flags);
  2956. + local_irq_save_nort(flags);
  2957. vto = kmap_atomic(to->bv_page);
  2958. memcpy(vto + to->bv_offset, vfrom, to->bv_len);
  2959. kunmap_atomic(vto);
  2960. - local_irq_restore(flags);
  2961. + local_irq_restore_nort(flags);
  2962. }
  2963. #else /* CONFIG_HIGHMEM */
  2964. diff --git a/crypto/algapi.c b/crypto/algapi.c
  2965. index 1fad2a6b3bbb..ecb7315426a9 100644
  2966. --- a/crypto/algapi.c
  2967. +++ b/crypto/algapi.c
  2968. @@ -719,13 +719,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
  2969. int crypto_register_notifier(struct notifier_block *nb)
  2970. {
  2971. - return blocking_notifier_chain_register(&crypto_chain, nb);
  2972. + return srcu_notifier_chain_register(&crypto_chain, nb);
  2973. }
  2974. EXPORT_SYMBOL_GPL(crypto_register_notifier);
  2975. int crypto_unregister_notifier(struct notifier_block *nb)
  2976. {
  2977. - return blocking_notifier_chain_unregister(&crypto_chain, nb);
  2978. + return srcu_notifier_chain_unregister(&crypto_chain, nb);
  2979. }
  2980. EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
  2981. diff --git a/crypto/api.c b/crypto/api.c
  2982. index bbc147cb5dec..bc1a848f02ec 100644
  2983. --- a/crypto/api.c
  2984. +++ b/crypto/api.c
  2985. @@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(crypto_alg_list);
  2986. DECLARE_RWSEM(crypto_alg_sem);
  2987. EXPORT_SYMBOL_GPL(crypto_alg_sem);
  2988. -BLOCKING_NOTIFIER_HEAD(crypto_chain);
  2989. +SRCU_NOTIFIER_HEAD(crypto_chain);
  2990. EXPORT_SYMBOL_GPL(crypto_chain);
  2991. static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
  2992. @@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long val, void *v)
  2993. {
  2994. int ok;
  2995. - ok = blocking_notifier_call_chain(&crypto_chain, val, v);
  2996. + ok = srcu_notifier_call_chain(&crypto_chain, val, v);
  2997. if (ok == NOTIFY_DONE) {
  2998. request_module("cryptomgr");
  2999. - ok = blocking_notifier_call_chain(&crypto_chain, val, v);
  3000. + ok = srcu_notifier_call_chain(&crypto_chain, val, v);
  3001. }
  3002. return ok;
  3003. diff --git a/crypto/internal.h b/crypto/internal.h
  3004. index 7eefcdb00227..0ecc7f5a2f40 100644
  3005. --- a/crypto/internal.h
  3006. +++ b/crypto/internal.h
  3007. @@ -47,7 +47,7 @@ struct crypto_larval {
  3008. extern struct list_head crypto_alg_list;
  3009. extern struct rw_semaphore crypto_alg_sem;
  3010. -extern struct blocking_notifier_head crypto_chain;
  3011. +extern struct srcu_notifier_head crypto_chain;
  3012. #ifdef CONFIG_PROC_FS
  3013. void __init crypto_init_proc(void);
  3014. @@ -146,7 +146,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg)
  3015. static inline void crypto_notify(unsigned long val, void *v)
  3016. {
  3017. - blocking_notifier_call_chain(&crypto_chain, val, v);
  3018. + srcu_notifier_call_chain(&crypto_chain, val, v);
  3019. }
  3020. #endif /* _CRYPTO_INTERNAL_H */
  3021. diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
  3022. index 750fa824d42c..441edf51484a 100644
  3023. --- a/drivers/acpi/acpica/acglobal.h
  3024. +++ b/drivers/acpi/acpica/acglobal.h
  3025. @@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending);
  3026. * interrupt level
  3027. */
  3028. ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */
  3029. -ACPI_GLOBAL(acpi_spinlock, acpi_gbl_hardware_lock); /* For ACPI H/W except GPE registers */
  3030. +ACPI_GLOBAL(acpi_raw_spinlock, acpi_gbl_hardware_lock); /* For ACPI H/W except GPE registers */
  3031. ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
  3032. /* Mutex for _OSI support */
  3033. diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
  3034. index 3b7fb99362b6..696bf8e62afb 100644
  3035. --- a/drivers/acpi/acpica/hwregs.c
  3036. +++ b/drivers/acpi/acpica/hwregs.c
  3037. @@ -363,14 +363,14 @@ acpi_status acpi_hw_clear_acpi_status(void)
  3038. ACPI_BITMASK_ALL_FIXED_STATUS,
  3039. ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
  3040. - lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
  3041. + raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
  3042. /* Clear the fixed events in PM1 A/B */
  3043. status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
  3044. ACPI_BITMASK_ALL_FIXED_STATUS);
  3045. - acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
  3046. + raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
  3047. if (ACPI_FAILURE(status)) {
  3048. goto exit;
  3049. diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
  3050. index 98c26ff39409..6e236f2ea791 100644
  3051. --- a/drivers/acpi/acpica/hwxface.c
  3052. +++ b/drivers/acpi/acpica/hwxface.c
  3053. @@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
  3054. return_ACPI_STATUS(AE_BAD_PARAMETER);
  3055. }
  3056. - lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
  3057. + raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
  3058. /*
  3059. * At this point, we know that the parent register is one of the
  3060. @@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
  3061. unlock_and_exit:
  3062. - acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
  3063. + raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
  3064. return_ACPI_STATUS(status);
  3065. }
  3066. diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
  3067. index 15073375bd00..357e7ca5a587 100644
  3068. --- a/drivers/acpi/acpica/utmutex.c
  3069. +++ b/drivers/acpi/acpica/utmutex.c
  3070. @@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(void)
  3071. return_ACPI_STATUS (status);
  3072. }
  3073. - status = acpi_os_create_lock (&acpi_gbl_hardware_lock);
  3074. + status = acpi_os_create_raw_lock (&acpi_gbl_hardware_lock);
  3075. if (ACPI_FAILURE (status)) {
  3076. return_ACPI_STATUS (status);
  3077. }
  3078. @@ -145,7 +145,7 @@ void acpi_ut_mutex_terminate(void)
  3079. /* Delete the spinlocks */
  3080. acpi_os_delete_lock(acpi_gbl_gpe_lock);
  3081. - acpi_os_delete_lock(acpi_gbl_hardware_lock);
  3082. + acpi_os_delete_raw_lock(acpi_gbl_hardware_lock);
  3083. acpi_os_delete_lock(acpi_gbl_reference_count_lock);
  3084. /* Delete the reader/writer lock */
  3085. diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
  3086. index 051b6158d1b7..7ad293bef6ed 100644
  3087. --- a/drivers/ata/libata-sff.c
  3088. +++ b/drivers/ata/libata-sff.c
  3089. @@ -678,9 +678,9 @@ unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
  3090. unsigned long flags;
  3091. unsigned int consumed;
  3092. - local_irq_save(flags);
  3093. + local_irq_save_nort(flags);
  3094. consumed = ata_sff_data_xfer32(dev, buf, buflen, rw);
  3095. - local_irq_restore(flags);
  3096. + local_irq_restore_nort(flags);
  3097. return consumed;
  3098. }
  3099. @@ -719,7 +719,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
  3100. unsigned long flags;
  3101. /* FIXME: use a bounce buffer */
  3102. - local_irq_save(flags);
  3103. + local_irq_save_nort(flags);
  3104. buf = kmap_atomic(page);
  3105. /* do the actual data transfer */
  3106. @@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
  3107. do_write);
  3108. kunmap_atomic(buf);
  3109. - local_irq_restore(flags);
  3110. + local_irq_restore_nort(flags);
  3111. } else {
  3112. buf = page_address(page);
  3113. ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
  3114. @@ -864,7 +864,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
  3115. unsigned long flags;
  3116. /* FIXME: use bounce buffer */
  3117. - local_irq_save(flags);
  3118. + local_irq_save_nort(flags);
  3119. buf = kmap_atomic(page);
  3120. /* do the actual data transfer */
  3121. @@ -872,7 +872,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
  3122. count, rw);
  3123. kunmap_atomic(buf);
  3124. - local_irq_restore(flags);
  3125. + local_irq_restore_nort(flags);
  3126. } else {
  3127. buf = page_address(page);
  3128. consumed = ap->ops->sff_data_xfer(dev, buf + offset,
  3129. diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
  3130. index 4b5cd3a7b2b6..fa8329ad79fd 100644
  3131. --- a/drivers/block/zram/zcomp.c
  3132. +++ b/drivers/block/zram/zcomp.c
  3133. @@ -118,12 +118,19 @@ ssize_t zcomp_available_show(const char *comp, char *buf)
  3134. struct zcomp_strm *zcomp_stream_get(struct zcomp *comp)
  3135. {
  3136. - return *get_cpu_ptr(comp->stream);
  3137. + struct zcomp_strm *zstrm;
  3138. +
  3139. + zstrm = *this_cpu_ptr(comp->stream);
  3140. + spin_lock(&zstrm->zcomp_lock);
  3141. + return zstrm;
  3142. }
  3143. void zcomp_stream_put(struct zcomp *comp)
  3144. {
  3145. - put_cpu_ptr(comp->stream);
  3146. + struct zcomp_strm *zstrm;
  3147. +
  3148. + zstrm = *this_cpu_ptr(comp->stream);
  3149. + spin_unlock(&zstrm->zcomp_lock);
  3150. }
  3151. int zcomp_compress(struct zcomp_strm *zstrm,
  3152. @@ -174,6 +181,7 @@ static int __zcomp_cpu_notifier(struct zcomp *comp,
  3153. pr_err("Can't allocate a compression stream\n");
  3154. return NOTIFY_BAD;
  3155. }
  3156. + spin_lock_init(&zstrm->zcomp_lock);
  3157. *per_cpu_ptr(comp->stream, cpu) = zstrm;
  3158. break;
  3159. case CPU_DEAD:
  3160. diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h
  3161. index 478cac2ed465..f7a6efdc3285 100644
  3162. --- a/drivers/block/zram/zcomp.h
  3163. +++ b/drivers/block/zram/zcomp.h
  3164. @@ -14,6 +14,7 @@ struct zcomp_strm {
  3165. /* compression/decompression buffer */
  3166. void *buffer;
  3167. struct crypto_comp *tfm;
  3168. + spinlock_t zcomp_lock;
  3169. };
  3170. /* dynamic per-device compression frontend */
  3171. diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
  3172. index c9914d653968..2038d138f286 100644
  3173. --- a/drivers/block/zram/zram_drv.c
  3174. +++ b/drivers/block/zram/zram_drv.c
  3175. @@ -528,6 +528,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
  3176. goto out_error;
  3177. }
  3178. + zram_meta_init_table_locks(meta, disksize);
  3179. +
  3180. return meta;
  3181. out_error:
  3182. @@ -575,28 +577,28 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
  3183. struct zram_meta *meta = zram->meta;
  3184. unsigned long handle;
  3185. unsigned int size;
  3186. + struct zcomp_strm *zstrm;
  3187. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3188. + zram_lock_table(&meta->table[index]);
  3189. handle = meta->table[index].handle;
  3190. size = zram_get_obj_size(meta, index);
  3191. if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) {
  3192. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3193. + zram_unlock_table(&meta->table[index]);
  3194. memset(mem, 0, PAGE_SIZE);
  3195. return 0;
  3196. }
  3197. + zstrm = zcomp_stream_get(zram->comp);
  3198. cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO);
  3199. if (size == PAGE_SIZE) {
  3200. memcpy(mem, cmem, PAGE_SIZE);
  3201. } else {
  3202. - struct zcomp_strm *zstrm = zcomp_stream_get(zram->comp);
  3203. -
  3204. ret = zcomp_decompress(zstrm, cmem, size, mem);
  3205. - zcomp_stream_put(zram->comp);
  3206. }
  3207. zs_unmap_object(meta->mem_pool, handle);
  3208. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3209. + zcomp_stream_put(zram->comp);
  3210. + zram_unlock_table(&meta->table[index]);
  3211. /* Should NEVER happen. Return bio error if it does. */
  3212. if (unlikely(ret)) {
  3213. @@ -616,14 +618,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
  3214. struct zram_meta *meta = zram->meta;
  3215. page = bvec->bv_page;
  3216. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3217. + zram_lock_table(&meta->table[index]);
  3218. if (unlikely(!meta->table[index].handle) ||
  3219. zram_test_flag(meta, index, ZRAM_ZERO)) {
  3220. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3221. + zram_unlock_table(&meta->table[index]);
  3222. handle_zero_page(bvec);
  3223. return 0;
  3224. }
  3225. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3226. + zram_unlock_table(&meta->table[index]);
  3227. if (is_partial_io(bvec))
  3228. /* Use a temporary buffer to decompress the page */
  3229. @@ -700,10 +702,10 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
  3230. if (user_mem)
  3231. kunmap_atomic(user_mem);
  3232. /* Free memory associated with this sector now. */
  3233. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3234. + zram_lock_table(&meta->table[index]);
  3235. zram_free_page(zram, index);
  3236. zram_set_flag(meta, index, ZRAM_ZERO);
  3237. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3238. + zram_unlock_table(&meta->table[index]);
  3239. atomic64_inc(&zram->stats.zero_pages);
  3240. ret = 0;
  3241. @@ -794,12 +796,12 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
  3242. * Free memory associated with this sector
  3243. * before overwriting unused sectors.
  3244. */
  3245. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3246. + zram_lock_table(&meta->table[index]);
  3247. zram_free_page(zram, index);
  3248. meta->table[index].handle = handle;
  3249. zram_set_obj_size(meta, index, clen);
  3250. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3251. + zram_unlock_table(&meta->table[index]);
  3252. /* Update stats */
  3253. atomic64_add(clen, &zram->stats.compr_data_size);
  3254. @@ -842,9 +844,9 @@ static void zram_bio_discard(struct zram *zram, u32 index,
  3255. }
  3256. while (n >= PAGE_SIZE) {
  3257. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3258. + zram_lock_table(&meta->table[index]);
  3259. zram_free_page(zram, index);
  3260. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3261. + zram_unlock_table(&meta->table[index]);
  3262. atomic64_inc(&zram->stats.notify_free);
  3263. index++;
  3264. n -= PAGE_SIZE;
  3265. @@ -973,9 +975,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
  3266. zram = bdev->bd_disk->private_data;
  3267. meta = zram->meta;
  3268. - bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
  3269. + zram_lock_table(&meta->table[index]);
  3270. zram_free_page(zram, index);
  3271. - bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
  3272. + zram_unlock_table(&meta->table[index]);
  3273. atomic64_inc(&zram->stats.notify_free);
  3274. }
  3275. diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
  3276. index 74fcf10da374..fd4020c99b9e 100644
  3277. --- a/drivers/block/zram/zram_drv.h
  3278. +++ b/drivers/block/zram/zram_drv.h
  3279. @@ -73,6 +73,9 @@ enum zram_pageflags {
  3280. struct zram_table_entry {
  3281. unsigned long handle;
  3282. unsigned long value;
  3283. +#ifdef CONFIG_PREEMPT_RT_BASE
  3284. + spinlock_t lock;
  3285. +#endif
  3286. };
  3287. struct zram_stats {
  3288. @@ -120,4 +123,42 @@ struct zram {
  3289. */
  3290. bool claim; /* Protected by bdev->bd_mutex */
  3291. };
  3292. +
  3293. +#ifndef CONFIG_PREEMPT_RT_BASE
  3294. +static inline void zram_lock_table(struct zram_table_entry *table)
  3295. +{
  3296. + bit_spin_lock(ZRAM_ACCESS, &table->value);
  3297. +}
  3298. +
  3299. +static inline void zram_unlock_table(struct zram_table_entry *table)
  3300. +{
  3301. + bit_spin_unlock(ZRAM_ACCESS, &table->value);
  3302. +}
  3303. +
  3304. +static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize) { }
  3305. +#else /* CONFIG_PREEMPT_RT_BASE */
  3306. +static inline void zram_lock_table(struct zram_table_entry *table)
  3307. +{
  3308. + spin_lock(&table->lock);
  3309. + __set_bit(ZRAM_ACCESS, &table->value);
  3310. +}
  3311. +
  3312. +static inline void zram_unlock_table(struct zram_table_entry *table)
  3313. +{
  3314. + __clear_bit(ZRAM_ACCESS, &table->value);
  3315. + spin_unlock(&table->lock);
  3316. +}
  3317. +
  3318. +static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize)
  3319. +{
  3320. + size_t num_pages = disksize >> PAGE_SHIFT;
  3321. + size_t index;
  3322. +
  3323. + for (index = 0; index < num_pages; index++) {
  3324. + spinlock_t *lock = &meta->table[index].lock;
  3325. + spin_lock_init(lock);
  3326. + }
  3327. +}
  3328. +#endif /* CONFIG_PREEMPT_RT_BASE */
  3329. +
  3330. #endif
  3331. diff --git a/drivers/char/random.c b/drivers/char/random.c
  3332. index 08d1dd58c0d2..25ee319dc8e3 100644
  3333. --- a/drivers/char/random.c
  3334. +++ b/drivers/char/random.c
  3335. @@ -262,6 +262,7 @@
  3336. #include <linux/syscalls.h>
  3337. #include <linux/completion.h>
  3338. #include <linux/uuid.h>
  3339. +#include <linux/locallock.h>
  3340. #include <crypto/chacha20.h>
  3341. #include <asm/processor.h>
  3342. @@ -1028,8 +1029,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
  3343. } sample;
  3344. long delta, delta2, delta3;
  3345. - preempt_disable();
  3346. -
  3347. sample.jiffies = jiffies;
  3348. sample.cycles = random_get_entropy();
  3349. sample.num = num;
  3350. @@ -1070,7 +1069,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
  3351. */
  3352. credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
  3353. }
  3354. - preempt_enable();
  3355. }
  3356. void add_input_randomness(unsigned int type, unsigned int code,
  3357. @@ -1123,28 +1121,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
  3358. return *(ptr + f->reg_idx++);
  3359. }
  3360. -void add_interrupt_randomness(int irq, int irq_flags)
  3361. +void add_interrupt_randomness(int irq, int irq_flags, __u64 ip)
  3362. {
  3363. struct entropy_store *r;
  3364. struct fast_pool *fast_pool = this_cpu_ptr(&irq_randomness);
  3365. - struct pt_regs *regs = get_irq_regs();
  3366. unsigned long now = jiffies;
  3367. cycles_t cycles = random_get_entropy();
  3368. __u32 c_high, j_high;
  3369. - __u64 ip;
  3370. unsigned long seed;
  3371. int credit = 0;
  3372. if (cycles == 0)
  3373. - cycles = get_reg(fast_pool, regs);
  3374. + cycles = get_reg(fast_pool, NULL);
  3375. c_high = (sizeof(cycles) > 4) ? cycles >> 32 : 0;
  3376. j_high = (sizeof(now) > 4) ? now >> 32 : 0;
  3377. fast_pool->pool[0] ^= cycles ^ j_high ^ irq;
  3378. fast_pool->pool[1] ^= now ^ c_high;
  3379. - ip = regs ? instruction_pointer(regs) : _RET_IP_;
  3380. + if (!ip)
  3381. + ip = _RET_IP_;
  3382. fast_pool->pool[2] ^= ip;
  3383. fast_pool->pool[3] ^= (sizeof(ip) > 4) ? ip >> 32 :
  3384. - get_reg(fast_pool, regs);
  3385. + get_reg(fast_pool, NULL);
  3386. fast_mix(fast_pool);
  3387. add_interrupt_bench(cycles);
  3388. @@ -2056,6 +2053,7 @@ struct batched_entropy {
  3389. * goal of being quite fast and not depleting entropy.
  3390. */
  3391. static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_long);
  3392. +static DEFINE_LOCAL_IRQ_LOCK(batched_entropy_long_lock);
  3393. unsigned long get_random_long(void)
  3394. {
  3395. unsigned long ret;
  3396. @@ -2064,13 +2062,13 @@ unsigned long get_random_long(void)
  3397. if (arch_get_random_long(&ret))
  3398. return ret;
  3399. - batch = &get_cpu_var(batched_entropy_long);
  3400. + batch = &get_locked_var(batched_entropy_long_lock, batched_entropy_long);
  3401. if (batch->position % ARRAY_SIZE(batch->entropy_long) == 0) {
  3402. extract_crng((u8 *)batch->entropy_long);
  3403. batch->position = 0;
  3404. }
  3405. ret = batch->entropy_long[batch->position++];
  3406. - put_cpu_var(batched_entropy_long);
  3407. + put_locked_var(batched_entropy_long_lock, batched_entropy_long);
  3408. return ret;
  3409. }
  3410. EXPORT_SYMBOL(get_random_long);
  3411. @@ -2082,6 +2080,8 @@ unsigned int get_random_int(void)
  3412. }
  3413. #else
  3414. static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_int);
  3415. +static DEFINE_LOCAL_IRQ_LOCK(batched_entropy_int_lock);
  3416. +
  3417. unsigned int get_random_int(void)
  3418. {
  3419. unsigned int ret;
  3420. @@ -2090,13 +2090,13 @@ unsigned int get_random_int(void)
  3421. if (arch_get_random_int(&ret))
  3422. return ret;
  3423. - batch = &get_cpu_var(batched_entropy_int);
  3424. + batch = &get_locked_var(batched_entropy_int_lock, batched_entropy_int);
  3425. if (batch->position % ARRAY_SIZE(batch->entropy_int) == 0) {
  3426. extract_crng((u8 *)batch->entropy_int);
  3427. batch->position = 0;
  3428. }
  3429. ret = batch->entropy_int[batch->position++];
  3430. - put_cpu_var(batched_entropy_int);
  3431. + put_locked_var(batched_entropy_int_lock, batched_entropy_int);
  3432. return ret;
  3433. }
  3434. #endif
  3435. diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
  3436. index 4da2af9694a2..5b6f57f500b8 100644
  3437. --- a/drivers/clocksource/tcb_clksrc.c
  3438. +++ b/drivers/clocksource/tcb_clksrc.c
  3439. @@ -23,8 +23,7 @@
  3440. * this 32 bit free-running counter. the second channel is not used.
  3441. *
  3442. * - The third channel may be used to provide a 16-bit clockevent
  3443. - * source, used in either periodic or oneshot mode. This runs
  3444. - * at 32 KiHZ, and can handle delays of up to two seconds.
  3445. + * source, used in either periodic or oneshot mode.
  3446. *
  3447. * A boot clocksource and clockevent source are also currently needed,
  3448. * unless the relevant platforms (ARM/AT91, AVR32/AT32) are changed so
  3449. @@ -74,6 +73,8 @@ static struct clocksource clksrc = {
  3450. struct tc_clkevt_device {
  3451. struct clock_event_device clkevt;
  3452. struct clk *clk;
  3453. + bool clk_enabled;
  3454. + u32 freq;
  3455. void __iomem *regs;
  3456. };
  3457. @@ -82,15 +83,26 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt)
  3458. return container_of(clkevt, struct tc_clkevt_device, clkevt);
  3459. }
  3460. -/* For now, we always use the 32K clock ... this optimizes for NO_HZ,
  3461. - * because using one of the divided clocks would usually mean the
  3462. - * tick rate can never be less than several dozen Hz (vs 0.5 Hz).
  3463. - *
  3464. - * A divided clock could be good for high resolution timers, since
  3465. - * 30.5 usec resolution can seem "low".
  3466. - */
  3467. static u32 timer_clock;
  3468. +static void tc_clk_disable(struct clock_event_device *d)
  3469. +{
  3470. + struct tc_clkevt_device *tcd = to_tc_clkevt(d);
  3471. +
  3472. + clk_disable(tcd->clk);
  3473. + tcd->clk_enabled = false;
  3474. +}
  3475. +
  3476. +static void tc_clk_enable(struct clock_event_device *d)
  3477. +{
  3478. + struct tc_clkevt_device *tcd = to_tc_clkevt(d);
  3479. +
  3480. + if (tcd->clk_enabled)
  3481. + return;
  3482. + clk_enable(tcd->clk);
  3483. + tcd->clk_enabled = true;
  3484. +}
  3485. +
  3486. static int tc_shutdown(struct clock_event_device *d)
  3487. {
  3488. struct tc_clkevt_device *tcd = to_tc_clkevt(d);
  3489. @@ -98,8 +110,14 @@ static int tc_shutdown(struct clock_event_device *d)
  3490. __raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
  3491. __raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
  3492. + return 0;
  3493. +}
  3494. +
  3495. +static int tc_shutdown_clk_off(struct clock_event_device *d)
  3496. +{
  3497. + tc_shutdown(d);
  3498. if (!clockevent_state_detached(d))
  3499. - clk_disable(tcd->clk);
  3500. + tc_clk_disable(d);
  3501. return 0;
  3502. }
  3503. @@ -112,9 +130,9 @@ static int tc_set_oneshot(struct clock_event_device *d)
  3504. if (clockevent_state_oneshot(d) || clockevent_state_periodic(d))
  3505. tc_shutdown(d);
  3506. - clk_enable(tcd->clk);
  3507. + tc_clk_enable(d);
  3508. - /* slow clock, count up to RC, then irq and stop */
  3509. + /* count up to RC, then irq and stop */
  3510. __raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
  3511. ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR));
  3512. __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
  3513. @@ -134,12 +152,12 @@ static int tc_set_periodic(struct clock_event_device *d)
  3514. /* By not making the gentime core emulate periodic mode on top
  3515. * of oneshot, we get lower overhead and improved accuracy.
  3516. */
  3517. - clk_enable(tcd->clk);
  3518. + tc_clk_enable(d);
  3519. - /* slow clock, count up to RC, then irq and restart */
  3520. + /* count up to RC, then irq and restart */
  3521. __raw_writel(timer_clock | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO,
  3522. regs + ATMEL_TC_REG(2, CMR));
  3523. - __raw_writel((32768 + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
  3524. + __raw_writel((tcd->freq + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
  3525. /* Enable clock and interrupts on RC compare */
  3526. __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
  3527. @@ -166,9 +184,13 @@ static struct tc_clkevt_device clkevt = {
  3528. .features = CLOCK_EVT_FEAT_PERIODIC |
  3529. CLOCK_EVT_FEAT_ONESHOT,
  3530. /* Should be lower than at91rm9200's system timer */
  3531. +#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
  3532. .rating = 125,
  3533. +#else
  3534. + .rating = 200,
  3535. +#endif
  3536. .set_next_event = tc_next_event,
  3537. - .set_state_shutdown = tc_shutdown,
  3538. + .set_state_shutdown = tc_shutdown_clk_off,
  3539. .set_state_periodic = tc_set_periodic,
  3540. .set_state_oneshot = tc_set_oneshot,
  3541. },
  3542. @@ -188,8 +210,9 @@ static irqreturn_t ch2_irq(int irq, void *handle)
  3543. return IRQ_NONE;
  3544. }
  3545. -static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
  3546. +static int __init setup_clkevents(struct atmel_tc *tc, int divisor_idx)
  3547. {
  3548. + unsigned divisor = atmel_tc_divisors[divisor_idx];
  3549. int ret;
  3550. struct clk *t2_clk = tc->clk[2];
  3551. int irq = tc->irq[2];
  3552. @@ -210,7 +233,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
  3553. clkevt.regs = tc->regs;
  3554. clkevt.clk = t2_clk;
  3555. - timer_clock = clk32k_divisor_idx;
  3556. + timer_clock = divisor_idx;
  3557. + if (!divisor)
  3558. + clkevt.freq = 32768;
  3559. + else
  3560. + clkevt.freq = clk_get_rate(t2_clk) / divisor;
  3561. clkevt.clkevt.cpumask = cpumask_of(0);
  3562. @@ -221,7 +248,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
  3563. return ret;
  3564. }
  3565. - clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
  3566. + clockevents_config_and_register(&clkevt.clkevt, clkevt.freq, 1, 0xffff);
  3567. return ret;
  3568. }
  3569. @@ -358,7 +385,11 @@ static int __init tcb_clksrc_init(void)
  3570. goto err_disable_t1;
  3571. /* channel 2: periodic and oneshot timer support */
  3572. +#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
  3573. ret = setup_clkevents(tc, clk32k_divisor_idx);
  3574. +#else
  3575. + ret = setup_clkevents(tc, best_divisor_idx);
  3576. +#endif
  3577. if (ret)
  3578. goto err_unregister_clksrc;
  3579. diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
  3580. index 6555821bbdae..93288849b2bd 100644
  3581. --- a/drivers/clocksource/timer-atmel-pit.c
  3582. +++ b/drivers/clocksource/timer-atmel-pit.c
  3583. @@ -46,6 +46,7 @@ struct pit_data {
  3584. u32 cycle;
  3585. u32 cnt;
  3586. unsigned int irq;
  3587. + bool irq_requested;
  3588. struct clk *mck;
  3589. };
  3590. @@ -96,15 +97,29 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
  3591. /* disable irq, leaving the clocksource active */
  3592. pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
  3593. + if (data->irq_requested) {
  3594. + free_irq(data->irq, data);
  3595. + data->irq_requested = false;
  3596. + }
  3597. return 0;
  3598. }
  3599. +static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id);
  3600. /*
  3601. * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16)
  3602. */
  3603. static int pit_clkevt_set_periodic(struct clock_event_device *dev)
  3604. {
  3605. struct pit_data *data = clkevt_to_pit_data(dev);
  3606. + int ret;
  3607. +
  3608. + ret = request_irq(data->irq, at91sam926x_pit_interrupt,
  3609. + IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
  3610. + "at91_tick", data);
  3611. + if (ret)
  3612. + panic(pr_fmt("Unable to setup IRQ\n"));
  3613. +
  3614. + data->irq_requested = true;
  3615. /* update clocksource counter */
  3616. data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
  3617. @@ -230,15 +245,6 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
  3618. return ret;
  3619. }
  3620. - /* Set up irq handler */
  3621. - ret = request_irq(data->irq, at91sam926x_pit_interrupt,
  3622. - IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
  3623. - "at91_tick", data);
  3624. - if (ret) {
  3625. - pr_err("Unable to setup IRQ\n");
  3626. - return ret;
  3627. - }
  3628. -
  3629. /* Set up and register clockevents */
  3630. data->clkevt.name = "pit";
  3631. data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
  3632. diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
  3633. index e90ab5b63a90..9e124087c55f 100644
  3634. --- a/drivers/clocksource/timer-atmel-st.c
  3635. +++ b/drivers/clocksource/timer-atmel-st.c
  3636. @@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_irq(void)
  3637. last_crtr = read_CRTR();
  3638. }
  3639. +static int atmel_st_irq;
  3640. +
  3641. static int clkevt32k_shutdown(struct clock_event_device *evt)
  3642. {
  3643. clkdev32k_disable_and_flush_irq();
  3644. irqmask = 0;
  3645. regmap_write(regmap_st, AT91_ST_IER, irqmask);
  3646. + free_irq(atmel_st_irq, regmap_st);
  3647. return 0;
  3648. }
  3649. static int clkevt32k_set_oneshot(struct clock_event_device *dev)
  3650. {
  3651. + int ret;
  3652. +
  3653. clkdev32k_disable_and_flush_irq();
  3654. + ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
  3655. + IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
  3656. + "at91_tick", regmap_st);
  3657. + if (ret)
  3658. + panic(pr_fmt("Unable to setup IRQ\n"));
  3659. +
  3660. /*
  3661. * ALM for oneshot irqs, set by next_event()
  3662. * before 32 seconds have passed.
  3663. @@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
  3664. static int clkevt32k_set_periodic(struct clock_event_device *dev)
  3665. {
  3666. + int ret;
  3667. +
  3668. clkdev32k_disable_and_flush_irq();
  3669. + ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
  3670. + IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
  3671. + "at91_tick", regmap_st);
  3672. + if (ret)
  3673. + panic(pr_fmt("Unable to setup IRQ\n"));
  3674. +
  3675. /* PIT for periodic irqs; fixed rate of 1/HZ */
  3676. irqmask = AT91_ST_PITS;
  3677. regmap_write(regmap_st, AT91_ST_PIMR, timer_latch);
  3678. @@ -198,7 +217,7 @@ static int __init atmel_st_timer_init(struct device_node *node)
  3679. {
  3680. struct clk *sclk;
  3681. unsigned int sclk_rate, val;
  3682. - int irq, ret;
  3683. + int ret;
  3684. regmap_st = syscon_node_to_regmap(node);
  3685. if (IS_ERR(regmap_st)) {
  3686. @@ -212,21 +231,12 @@ static int __init atmel_st_timer_init(struct device_node *node)
  3687. regmap_read(regmap_st, AT91_ST_SR, &val);
  3688. /* Get the interrupts property */
  3689. - irq = irq_of_parse_and_map(node, 0);
  3690. - if (!irq) {
  3691. + atmel_st_irq = irq_of_parse_and_map(node, 0);
  3692. + if (!atmel_st_irq) {
  3693. pr_err("Unable to get IRQ from DT\n");
  3694. return -EINVAL;
  3695. }
  3696. - /* Make IRQs happen for the system timer */
  3697. - ret = request_irq(irq, at91rm9200_timer_interrupt,
  3698. - IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
  3699. - "at91_tick", regmap_st);
  3700. - if (ret) {
  3701. - pr_err("Unable to setup IRQ\n");
  3702. - return ret;
  3703. - }
  3704. -
  3705. sclk = of_clk_get(node, 0);
  3706. if (IS_ERR(sclk)) {
  3707. pr_err("Unable to get slow clock\n");
  3708. diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
  3709. index a782ce87715c..19d265948526 100644
  3710. --- a/drivers/connector/cn_proc.c
  3711. +++ b/drivers/connector/cn_proc.c
  3712. @@ -32,6 +32,7 @@
  3713. #include <linux/pid_namespace.h>
  3714. #include <linux/cn_proc.h>
  3715. +#include <linux/locallock.h>
  3716. /*
  3717. * Size of a cn_msg followed by a proc_event structure. Since the
  3718. @@ -54,10 +55,11 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
  3719. /* proc_event_counts is used as the sequence number of the netlink message */
  3720. static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
  3721. +static DEFINE_LOCAL_IRQ_LOCK(send_msg_lock);
  3722. static inline void send_msg(struct cn_msg *msg)
  3723. {
  3724. - preempt_disable();
  3725. + local_lock(send_msg_lock);
  3726. msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
  3727. ((struct proc_event *)msg->data)->cpu = smp_processor_id();
  3728. @@ -70,7 +72,7 @@ static inline void send_msg(struct cn_msg *msg)
  3729. */
  3730. cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
  3731. - preempt_enable();
  3732. + local_unlock(send_msg_lock);
  3733. }
  3734. void proc_fork_connector(struct task_struct *task)
  3735. diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
  3736. index adbd1de1cea5..1fac5074f2cf 100644
  3737. --- a/drivers/cpufreq/Kconfig.x86
  3738. +++ b/drivers/cpufreq/Kconfig.x86
  3739. @@ -124,7 +124,7 @@ config X86_POWERNOW_K7_ACPI
  3740. config X86_POWERNOW_K8
  3741. tristate "AMD Opteron/Athlon64 PowerNow!"
  3742. - depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ
  3743. + depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ && !PREEMPT_RT_BASE
  3744. help
  3745. This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
  3746. Support for K10 and newer processors is now in acpi-cpufreq.
  3747. diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
  3748. index 2117f172d7a2..96c15501b0c8 100644
  3749. --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
  3750. +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
  3751. @@ -1489,7 +1489,9 @@ execbuf_submit(struct i915_execbuffer_params *params,
  3752. if (ret)
  3753. return ret;
  3754. +#ifndef CONFIG_PREEMPT_RT_BASE
  3755. trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags);
  3756. +#endif
  3757. i915_gem_execbuffer_move_to_active(vmas, params->request);
  3758. diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
  3759. index 755d78832a66..97fb03dc4971 100644
  3760. --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
  3761. +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
  3762. @@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
  3763. if (!mutex_is_locked(mutex))
  3764. return false;
  3765. -#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
  3766. +#if (defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)) && !defined(CONFIG_PREEMPT_RT_BASE)
  3767. return mutex->owner == task;
  3768. #else
  3769. /* Since UP may be pre-empted, we cannot assume that we own the lock */
  3770. diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
  3771. index 02908e37c228..05c0480576e1 100644
  3772. --- a/drivers/gpu/drm/i915/i915_irq.c
  3773. +++ b/drivers/gpu/drm/i915/i915_irq.c
  3774. @@ -812,6 +812,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
  3775. spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
  3776. /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
  3777. + preempt_disable_rt();
  3778. /* Get optional system timestamp before query. */
  3779. if (stime)
  3780. @@ -863,6 +864,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
  3781. *etime = ktime_get();
  3782. /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
  3783. + preempt_enable_rt();
  3784. spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  3785. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
  3786. index 5dc6082639db..c32458fb3be2 100644
  3787. --- a/drivers/gpu/drm/i915/intel_display.c
  3788. +++ b/drivers/gpu/drm/i915/intel_display.c
  3789. @@ -12131,7 +12131,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe)
  3790. struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  3791. struct intel_flip_work *work;
  3792. - WARN_ON(!in_interrupt());
  3793. + WARN_ON_NONRT(!in_interrupt());
  3794. if (crtc == NULL)
  3795. return;
  3796. diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
  3797. index dbed12c484c9..5c540b78e8b5 100644
  3798. --- a/drivers/gpu/drm/i915/intel_sprite.c
  3799. +++ b/drivers/gpu/drm/i915/intel_sprite.c
  3800. @@ -35,6 +35,7 @@
  3801. #include <drm/drm_rect.h>
  3802. #include <drm/drm_atomic.h>
  3803. #include <drm/drm_plane_helper.h>
  3804. +#include <linux/locallock.h>
  3805. #include "intel_drv.h"
  3806. #include "intel_frontbuffer.h"
  3807. #include <drm/i915_drm.h>
  3808. @@ -65,6 +66,8 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
  3809. 1000 * adjusted_mode->crtc_htotal);
  3810. }
  3811. +static DEFINE_LOCAL_IRQ_LOCK(pipe_update_lock);
  3812. +
  3813. /**
  3814. * intel_pipe_update_start() - start update of a set of display registers
  3815. * @crtc: the crtc of which the registers are going to be updated
  3816. @@ -95,7 +98,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
  3817. min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100);
  3818. max = vblank_start - 1;
  3819. - local_irq_disable();
  3820. + local_lock_irq(pipe_update_lock);
  3821. if (min <= 0 || max <= 0)
  3822. return;
  3823. @@ -125,11 +128,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
  3824. break;
  3825. }
  3826. - local_irq_enable();
  3827. + local_unlock_irq(pipe_update_lock);
  3828. timeout = schedule_timeout(timeout);
  3829. - local_irq_disable();
  3830. + local_lock_irq(pipe_update_lock);
  3831. }
  3832. finish_wait(wq, &wait);
  3833. @@ -181,7 +184,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
  3834. crtc->base.state->event = NULL;
  3835. }
  3836. - local_irq_enable();
  3837. + local_unlock_irq(pipe_update_lock);
  3838. if (crtc->debug.start_vbl_count &&
  3839. crtc->debug.start_vbl_count != end_vbl_count) {
  3840. diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
  3841. index 192b2d3a79cb..d5372a207326 100644
  3842. --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
  3843. +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
  3844. @@ -23,7 +23,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
  3845. if (!mutex_is_locked(mutex))
  3846. return false;
  3847. -#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
  3848. +#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)) && !defined(CONFIG_PREEMPT_RT_BASE)
  3849. return mutex->owner == task;
  3850. #else
  3851. /* Since UP may be pre-empted, we cannot assume that we own the lock */
  3852. diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
  3853. index cdb8cb568c15..b6d7fd964cbc 100644
  3854. --- a/drivers/gpu/drm/radeon/radeon_display.c
  3855. +++ b/drivers/gpu/drm/radeon/radeon_display.c
  3856. @@ -1845,6 +1845,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
  3857. struct radeon_device *rdev = dev->dev_private;
  3858. /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
  3859. + preempt_disable_rt();
  3860. /* Get optional system timestamp before query. */
  3861. if (stime)
  3862. @@ -1937,6 +1938,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
  3863. *etime = ktime_get();
  3864. /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
  3865. + preempt_enable_rt();
  3866. /* Decode into vertical and horizontal scanout position. */
  3867. *vpos = position & 0x1fff;
  3868. diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
  3869. index 0276d2ef06ee..8868045eabde 100644
  3870. --- a/drivers/hv/vmbus_drv.c
  3871. +++ b/drivers/hv/vmbus_drv.c
  3872. @@ -761,6 +761,8 @@ static void vmbus_isr(void)
  3873. void *page_addr;
  3874. struct hv_message *msg;
  3875. union hv_synic_event_flags *event;
  3876. + struct pt_regs *regs = get_irq_regs();
  3877. + u64 ip = regs ? instruction_pointer(regs) : 0;
  3878. bool handled = false;
  3879. page_addr = hv_context.synic_event_page[cpu];
  3880. @@ -808,7 +810,7 @@ static void vmbus_isr(void)
  3881. tasklet_schedule(hv_context.msg_dpc[cpu]);
  3882. }
  3883. - add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
  3884. + add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, ip);
  3885. }
  3886. diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
  3887. index 36f76e28a0bf..394f142f90c7 100644
  3888. --- a/drivers/ide/alim15x3.c
  3889. +++ b/drivers/ide/alim15x3.c
  3890. @@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
  3891. isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
  3892. - local_irq_save(flags);
  3893. + local_irq_save_nort(flags);
  3894. if (m5229_revision < 0xC2) {
  3895. /*
  3896. @@ -325,7 +325,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
  3897. }
  3898. pci_dev_put(north);
  3899. pci_dev_put(isa_dev);
  3900. - local_irq_restore(flags);
  3901. + local_irq_restore_nort(flags);
  3902. return 0;
  3903. }
  3904. diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
  3905. index 0ceae5cbd89a..c212e85d7f3e 100644
  3906. --- a/drivers/ide/hpt366.c
  3907. +++ b/drivers/ide/hpt366.c
  3908. @@ -1236,7 +1236,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
  3909. dma_old = inb(base + 2);
  3910. - local_irq_save(flags);
  3911. + local_irq_save_nort(flags);
  3912. dma_new = dma_old;
  3913. pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma);
  3914. @@ -1247,7 +1247,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
  3915. if (dma_new != dma_old)
  3916. outb(dma_new, base + 2);
  3917. - local_irq_restore(flags);
  3918. + local_irq_restore_nort(flags);
  3919. printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
  3920. hwif->name, base, base + 7);
  3921. diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
  3922. index 19763977568c..4169433faab5 100644
  3923. --- a/drivers/ide/ide-io-std.c
  3924. +++ b/drivers/ide/ide-io-std.c
  3925. @@ -175,7 +175,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
  3926. unsigned long uninitialized_var(flags);
  3927. if ((io_32bit & 2) && !mmio) {
  3928. - local_irq_save(flags);
  3929. + local_irq_save_nort(flags);
  3930. ata_vlb_sync(io_ports->nsect_addr);
  3931. }
  3932. @@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
  3933. insl(data_addr, buf, words);
  3934. if ((io_32bit & 2) && !mmio)
  3935. - local_irq_restore(flags);
  3936. + local_irq_restore_nort(flags);
  3937. if (((len + 1) & 3) < 2)
  3938. return;
  3939. @@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
  3940. unsigned long uninitialized_var(flags);
  3941. if ((io_32bit & 2) && !mmio) {
  3942. - local_irq_save(flags);
  3943. + local_irq_save_nort(flags);
  3944. ata_vlb_sync(io_ports->nsect_addr);
  3945. }
  3946. @@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
  3947. outsl(data_addr, buf, words);
  3948. if ((io_32bit & 2) && !mmio)
  3949. - local_irq_restore(flags);
  3950. + local_irq_restore_nort(flags);
  3951. if (((len + 1) & 3) < 2)
  3952. return;
  3953. diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
  3954. index 669ea1e45795..e12e43e62245 100644
  3955. --- a/drivers/ide/ide-io.c
  3956. +++ b/drivers/ide/ide-io.c
  3957. @@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long data)
  3958. /* disable_irq_nosync ?? */
  3959. disable_irq(hwif->irq);
  3960. /* local CPU only, as if we were handling an interrupt */
  3961. - local_irq_disable();
  3962. + local_irq_disable_nort();
  3963. if (hwif->polling) {
  3964. startstop = handler(drive);
  3965. } else if (drive_is_ready(drive)) {
  3966. diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
  3967. index 376f2dc410c5..f014dd1b73dc 100644
  3968. --- a/drivers/ide/ide-iops.c
  3969. +++ b/drivers/ide/ide-iops.c
  3970. @@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
  3971. if ((stat & ATA_BUSY) == 0)
  3972. break;
  3973. - local_irq_restore(flags);
  3974. + local_irq_restore_nort(flags);
  3975. *rstat = stat;
  3976. return -EBUSY;
  3977. }
  3978. }
  3979. - local_irq_restore(flags);
  3980. + local_irq_restore_nort(flags);
  3981. }
  3982. /*
  3983. * Allow status to settle, then read it again.
  3984. diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
  3985. index 0b63facd1d87..4ceba37afc0c 100644
  3986. --- a/drivers/ide/ide-probe.c
  3987. +++ b/drivers/ide/ide-probe.c
  3988. @@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
  3989. int bswap = 1;
  3990. /* local CPU only; some systems need this */
  3991. - local_irq_save(flags);
  3992. + local_irq_save_nort(flags);
  3993. /* read 512 bytes of id info */
  3994. hwif->tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
  3995. - local_irq_restore(flags);
  3996. + local_irq_restore_nort(flags);
  3997. drive->dev_flags |= IDE_DFLAG_ID_READ;
  3998. #ifdef DEBUG
  3999. diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
  4000. index a716693417a3..be0568c722d6 100644
  4001. --- a/drivers/ide/ide-taskfile.c
  4002. +++ b/drivers/ide/ide-taskfile.c
  4003. @@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
  4004. page_is_high = PageHighMem(page);
  4005. if (page_is_high)
  4006. - local_irq_save(flags);
  4007. + local_irq_save_nort(flags);
  4008. buf = kmap_atomic(page) + offset;
  4009. @@ -271,7 +271,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
  4010. kunmap_atomic(buf);
  4011. if (page_is_high)
  4012. - local_irq_restore(flags);
  4013. + local_irq_restore_nort(flags);
  4014. len -= nr_bytes;
  4015. }
  4016. @@ -414,7 +414,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
  4017. }
  4018. if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
  4019. - local_irq_disable();
  4020. + local_irq_disable_nort();
  4021. ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
  4022. diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
  4023. index fddff403d5d2..cca1bb4fbfe3 100644
  4024. --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
  4025. +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
  4026. @@ -902,7 +902,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
  4027. ipoib_dbg_mcast(priv, "restarting multicast task\n");
  4028. - local_irq_save(flags);
  4029. + local_irq_save_nort(flags);
  4030. netif_addr_lock(dev);
  4031. spin_lock(&priv->lock);
  4032. @@ -984,7 +984,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
  4033. spin_unlock(&priv->lock);
  4034. netif_addr_unlock(dev);
  4035. - local_irq_restore(flags);
  4036. + local_irq_restore_nort(flags);
  4037. /*
  4038. * make sure the in-flight joins have finished before we attempt
  4039. diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
  4040. index 4a2a9e370be7..e970d9afd179 100644
  4041. --- a/drivers/input/gameport/gameport.c
  4042. +++ b/drivers/input/gameport/gameport.c
  4043. @@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
  4044. tx = ~0;
  4045. for (i = 0; i < 50; i++) {
  4046. - local_irq_save(flags);
  4047. + local_irq_save_nort(flags);
  4048. t1 = ktime_get_ns();
  4049. for (t = 0; t < 50; t++)
  4050. gameport_read(gameport);
  4051. t2 = ktime_get_ns();
  4052. t3 = ktime_get_ns();
  4053. - local_irq_restore(flags);
  4054. + local_irq_restore_nort(flags);
  4055. udelay(i * 10);
  4056. t = (t2 - t1) - (t3 - t2);
  4057. if (t < tx)
  4058. @@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
  4059. tx = 1 << 30;
  4060. for(i = 0; i < 50; i++) {
  4061. - local_irq_save(flags);
  4062. + local_irq_save_nort(flags);
  4063. GET_TIME(t1);
  4064. for (t = 0; t < 50; t++) gameport_read(gameport);
  4065. GET_TIME(t2);
  4066. GET_TIME(t3);
  4067. - local_irq_restore(flags);
  4068. + local_irq_restore_nort(flags);
  4069. udelay(i * 10);
  4070. if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
  4071. }
  4072. @@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
  4073. tx = 1 << 30;
  4074. for(i = 0; i < 50; i++) {
  4075. - local_irq_save(flags);
  4076. + local_irq_save_nort(flags);
  4077. t1 = rdtsc();
  4078. for (t = 0; t < 50; t++) gameport_read(gameport);
  4079. t2 = rdtsc();
  4080. - local_irq_restore(flags);
  4081. + local_irq_restore_nort(flags);
  4082. udelay(i * 10);
  4083. if (t2 - t1 < tx) tx = t2 - t1;
  4084. }
  4085. diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
  4086. index 11a13b5be73a..baaed0ac274b 100644
  4087. --- a/drivers/iommu/amd_iommu.c
  4088. +++ b/drivers/iommu/amd_iommu.c
  4089. @@ -1923,10 +1923,10 @@ static int __attach_device(struct iommu_dev_data *dev_data,
  4090. int ret;
  4091. /*
  4092. - * Must be called with IRQs disabled. Warn here to detect early
  4093. - * when its not.
  4094. + * Must be called with IRQs disabled on a non RT kernel. Warn here to
  4095. + * detect early when its not.
  4096. */
  4097. - WARN_ON(!irqs_disabled());
  4098. + WARN_ON_NONRT(!irqs_disabled());
  4099. /* lock domain */
  4100. spin_lock(&domain->lock);
  4101. @@ -2094,10 +2094,10 @@ static void __detach_device(struct iommu_dev_data *dev_data)
  4102. struct protection_domain *domain;
  4103. /*
  4104. - * Must be called with IRQs disabled. Warn here to detect early
  4105. - * when its not.
  4106. + * Must be called with IRQs disabled on a non RT kernel. Warn here to
  4107. + * detect early when its not.
  4108. */
  4109. - WARN_ON(!irqs_disabled());
  4110. + WARN_ON_NONRT(!irqs_disabled());
  4111. if (WARN_ON(!dev_data->domain))
  4112. return;
  4113. diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
  4114. index 87fcbf71b85a..674c82b61f36 100644
  4115. --- a/drivers/iommu/intel-iommu.c
  4116. +++ b/drivers/iommu/intel-iommu.c
  4117. @@ -479,7 +479,7 @@ struct deferred_flush_data {
  4118. struct deferred_flush_table *tables;
  4119. };
  4120. -DEFINE_PER_CPU(struct deferred_flush_data, deferred_flush);
  4121. +static DEFINE_PER_CPU(struct deferred_flush_data, deferred_flush);
  4122. /* bitmap for indexing intel_iommus */
  4123. static int g_num_of_iommus;
  4124. @@ -3719,10 +3719,8 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
  4125. struct intel_iommu *iommu;
  4126. struct deferred_flush_entry *entry;
  4127. struct deferred_flush_data *flush_data;
  4128. - unsigned int cpuid;
  4129. - cpuid = get_cpu();
  4130. - flush_data = per_cpu_ptr(&deferred_flush, cpuid);
  4131. + flush_data = raw_cpu_ptr(&deferred_flush);
  4132. /* Flush all CPUs' entries to avoid deferring too much. If
  4133. * this becomes a bottleneck, can just flush us, and rely on
  4134. @@ -3755,8 +3753,6 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
  4135. }
  4136. flush_data->size++;
  4137. spin_unlock_irqrestore(&flush_data->lock, flags);
  4138. -
  4139. - put_cpu();
  4140. }
  4141. static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
  4142. diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
  4143. index e23001bfcfee..359d5d169ec0 100644
  4144. --- a/drivers/iommu/iova.c
  4145. +++ b/drivers/iommu/iova.c
  4146. @@ -22,6 +22,7 @@
  4147. #include <linux/slab.h>
  4148. #include <linux/smp.h>
  4149. #include <linux/bitops.h>
  4150. +#include <linux/cpu.h>
  4151. static bool iova_rcache_insert(struct iova_domain *iovad,
  4152. unsigned long pfn,
  4153. @@ -420,10 +421,8 @@ alloc_iova_fast(struct iova_domain *iovad, unsigned long size,
  4154. /* Try replenishing IOVAs by flushing rcache. */
  4155. flushed_rcache = true;
  4156. - preempt_disable();
  4157. for_each_online_cpu(cpu)
  4158. free_cpu_cached_iovas(cpu, iovad);
  4159. - preempt_enable();
  4160. goto retry;
  4161. }
  4162. @@ -751,7 +750,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
  4163. bool can_insert = false;
  4164. unsigned long flags;
  4165. - cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
  4166. + cpu_rcache = raw_cpu_ptr(rcache->cpu_rcaches);
  4167. spin_lock_irqsave(&cpu_rcache->lock, flags);
  4168. if (!iova_magazine_full(cpu_rcache->loaded)) {
  4169. @@ -781,7 +780,6 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
  4170. iova_magazine_push(cpu_rcache->loaded, iova_pfn);
  4171. spin_unlock_irqrestore(&cpu_rcache->lock, flags);
  4172. - put_cpu_ptr(rcache->cpu_rcaches);
  4173. if (mag_to_free) {
  4174. iova_magazine_free_pfns(mag_to_free, iovad);
  4175. @@ -815,7 +813,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
  4176. bool has_pfn = false;
  4177. unsigned long flags;
  4178. - cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
  4179. + cpu_rcache = raw_cpu_ptr(rcache->cpu_rcaches);
  4180. spin_lock_irqsave(&cpu_rcache->lock, flags);
  4181. if (!iova_magazine_empty(cpu_rcache->loaded)) {
  4182. @@ -837,7 +835,6 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
  4183. iova_pfn = iova_magazine_pop(cpu_rcache->loaded, limit_pfn);
  4184. spin_unlock_irqrestore(&cpu_rcache->lock, flags);
  4185. - put_cpu_ptr(rcache->cpu_rcaches);
  4186. return iova_pfn;
  4187. }
  4188. diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
  4189. index 3f9ddb9fafa7..09da5b6b44a1 100644
  4190. --- a/drivers/leds/trigger/Kconfig
  4191. +++ b/drivers/leds/trigger/Kconfig
  4192. @@ -69,7 +69,7 @@ config LEDS_TRIGGER_BACKLIGHT
  4193. config LEDS_TRIGGER_CPU
  4194. bool "LED CPU Trigger"
  4195. - depends on LEDS_TRIGGERS
  4196. + depends on LEDS_TRIGGERS && !PREEMPT_RT_BASE
  4197. help
  4198. This allows LEDs to be controlled by active CPUs. This shows
  4199. the active CPUs across an array of LEDs so you can see which
  4200. diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
  4201. index 4d200883c505..98b64ed5cb81 100644
  4202. --- a/drivers/md/bcache/Kconfig
  4203. +++ b/drivers/md/bcache/Kconfig
  4204. @@ -1,6 +1,7 @@
  4205. config BCACHE
  4206. tristate "Block device as cache"
  4207. + depends on !PREEMPT_RT_FULL
  4208. ---help---
  4209. Allows a block device to be used as cache for other devices; uses
  4210. a btree for indexing and the layout is optimized for SSDs.
  4211. diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
  4212. index ba7c4c685db3..834ec328f217 100644
  4213. --- a/drivers/md/dm-rq.c
  4214. +++ b/drivers/md/dm-rq.c
  4215. @@ -842,7 +842,7 @@ static void dm_old_request_fn(struct request_queue *q)
  4216. /* Establish tio->ti before queuing work (map_tio_request) */
  4217. tio->ti = ti;
  4218. kthread_queue_work(&md->kworker, &tio->work);
  4219. - BUG_ON(!irqs_disabled());
  4220. + BUG_ON_NONRT(!irqs_disabled());
  4221. }
  4222. }
  4223. diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
  4224. index f34ad2be66a1..123469f7b560 100644
  4225. --- a/drivers/md/raid5.c
  4226. +++ b/drivers/md/raid5.c
  4227. @@ -1928,8 +1928,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
  4228. struct raid5_percpu *percpu;
  4229. unsigned long cpu;
  4230. - cpu = get_cpu();
  4231. + cpu = get_cpu_light();
  4232. percpu = per_cpu_ptr(conf->percpu, cpu);
  4233. + spin_lock(&percpu->lock);
  4234. if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
  4235. ops_run_biofill(sh);
  4236. overlap_clear++;
  4237. @@ -1985,7 +1986,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
  4238. if (test_and_clear_bit(R5_Overlap, &dev->flags))
  4239. wake_up(&sh->raid_conf->wait_for_overlap);
  4240. }
  4241. - put_cpu();
  4242. + spin_unlock(&percpu->lock);
  4243. + put_cpu_light();
  4244. }
  4245. static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
  4246. @@ -6393,6 +6395,7 @@ static int raid456_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)
  4247. __func__, cpu);
  4248. return -ENOMEM;
  4249. }
  4250. + spin_lock_init(&per_cpu_ptr(conf->percpu, cpu)->lock);
  4251. return 0;
  4252. }
  4253. @@ -6403,7 +6406,6 @@ static int raid5_alloc_percpu(struct r5conf *conf)
  4254. conf->percpu = alloc_percpu(struct raid5_percpu);
  4255. if (!conf->percpu)
  4256. return -ENOMEM;
  4257. -
  4258. err = cpuhp_state_add_instance(CPUHP_MD_RAID5_PREPARE, &conf->node);
  4259. if (!err) {
  4260. conf->scribble_disks = max(conf->raid_disks,
  4261. diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
  4262. index 57ec49f0839e..0739604990b7 100644
  4263. --- a/drivers/md/raid5.h
  4264. +++ b/drivers/md/raid5.h
  4265. @@ -504,6 +504,7 @@ struct r5conf {
  4266. int recovery_disabled;
  4267. /* per cpu variables */
  4268. struct raid5_percpu {
  4269. + spinlock_t lock; /* Protection for -RT */
  4270. struct page *spare_page; /* Used when checking P/Q in raid6 */
  4271. struct flex_array *scribble; /* space for constructing buffer
  4272. * lists and performing address
  4273. diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
  4274. index 64971baf11fa..215e91e36198 100644
  4275. --- a/drivers/misc/Kconfig
  4276. +++ b/drivers/misc/Kconfig
  4277. @@ -54,6 +54,7 @@ config AD525X_DPOT_SPI
  4278. config ATMEL_TCLIB
  4279. bool "Atmel AT32/AT91 Timer/Counter Library"
  4280. depends on (AVR32 || ARCH_AT91)
  4281. + default y if PREEMPT_RT_FULL
  4282. help
  4283. Select this if you want a library to allocate the Timer/Counter
  4284. blocks found on many Atmel processors. This facilitates using
  4285. @@ -69,8 +70,7 @@ config ATMEL_TCB_CLKSRC
  4286. are combined to make a single 32-bit timer.
  4287. When GENERIC_CLOCKEVENTS is defined, the third timer channel
  4288. - may be used as a clock event device supporting oneshot mode
  4289. - (delays of up to two seconds) based on the 32 KiHz clock.
  4290. + may be used as a clock event device supporting oneshot mode.
  4291. config ATMEL_TCB_CLKSRC_BLOCK
  4292. int
  4293. @@ -84,6 +84,15 @@ config ATMEL_TCB_CLKSRC_BLOCK
  4294. TC can be used for other purposes, such as PWM generation and
  4295. interval timing.
  4296. +config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
  4297. + bool "TC Block use 32 KiHz clock"
  4298. + depends on ATMEL_TCB_CLKSRC
  4299. + default y if !PREEMPT_RT_FULL
  4300. + help
  4301. + Select this to use 32 KiHz base clock rate as TC block clock
  4302. + source for clock events.
  4303. +
  4304. +
  4305. config DUMMY_IRQ
  4306. tristate "Dummy IRQ handler"
  4307. default n
  4308. diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
  4309. index df990bb8c873..1a162709a85e 100644
  4310. --- a/drivers/mmc/host/mmci.c
  4311. +++ b/drivers/mmc/host/mmci.c
  4312. @@ -1147,15 +1147,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
  4313. struct sg_mapping_iter *sg_miter = &host->sg_miter;
  4314. struct variant_data *variant = host->variant;
  4315. void __iomem *base = host->base;
  4316. - unsigned long flags;
  4317. u32 status;
  4318. status = readl(base + MMCISTATUS);
  4319. dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status);
  4320. - local_irq_save(flags);
  4321. -
  4322. do {
  4323. unsigned int remain, len;
  4324. char *buffer;
  4325. @@ -1195,8 +1192,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
  4326. sg_miter_stop(sg_miter);
  4327. - local_irq_restore(flags);
  4328. -
  4329. /*
  4330. * If we have less than the fifo 'half-full' threshold to transfer,
  4331. * trigger a PIO interrupt as soon as any data is available.
  4332. diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
  4333. index 9133e7926da5..63afb921ed40 100644
  4334. --- a/drivers/net/ethernet/3com/3c59x.c
  4335. +++ b/drivers/net/ethernet/3com/3c59x.c
  4336. @@ -842,9 +842,9 @@ static void poll_vortex(struct net_device *dev)
  4337. {
  4338. struct vortex_private *vp = netdev_priv(dev);
  4339. unsigned long flags;
  4340. - local_irq_save(flags);
  4341. + local_irq_save_nort(flags);
  4342. (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
  4343. - local_irq_restore(flags);
  4344. + local_irq_restore_nort(flags);
  4345. }
  4346. #endif
  4347. @@ -1910,12 +1910,12 @@ static void vortex_tx_timeout(struct net_device *dev)
  4348. * Block interrupts because vortex_interrupt does a bare spin_lock()
  4349. */
  4350. unsigned long flags;
  4351. - local_irq_save(flags);
  4352. + local_irq_save_nort(flags);
  4353. if (vp->full_bus_master_tx)
  4354. boomerang_interrupt(dev->irq, dev);
  4355. else
  4356. vortex_interrupt(dev->irq, dev);
  4357. - local_irq_restore(flags);
  4358. + local_irq_restore_nort(flags);
  4359. }
  4360. }
  4361. diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
  4362. index da4c2d8a4173..1420dfb56bac 100644
  4363. --- a/drivers/net/ethernet/realtek/8139too.c
  4364. +++ b/drivers/net/ethernet/realtek/8139too.c
  4365. @@ -2233,7 +2233,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
  4366. struct rtl8139_private *tp = netdev_priv(dev);
  4367. const int irq = tp->pci_dev->irq;
  4368. - disable_irq(irq);
  4369. + disable_irq_nosync(irq);
  4370. rtl8139_interrupt(irq, dev);
  4371. enable_irq(irq);
  4372. }
  4373. diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
  4374. index bca6935a94db..d7a35ee34d03 100644
  4375. --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
  4376. +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
  4377. @@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
  4378. while (!ctx->done.done && msecs--)
  4379. udelay(1000);
  4380. } else {
  4381. - wait_event_interruptible(ctx->done.wait,
  4382. + swait_event_interruptible(ctx->done.wait,
  4383. ctx->done.done);
  4384. }
  4385. break;
  4386. diff --git a/drivers/pci/access.c b/drivers/pci/access.c
  4387. index d11cdbb8fba3..223bbb9acb03 100644
  4388. --- a/drivers/pci/access.c
  4389. +++ b/drivers/pci/access.c
  4390. @@ -672,7 +672,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev)
  4391. WARN_ON(!dev->block_cfg_access);
  4392. dev->block_cfg_access = 0;
  4393. - wake_up_all(&pci_cfg_wait);
  4394. + wake_up_all_locked(&pci_cfg_wait);
  4395. raw_spin_unlock_irqrestore(&pci_lock, flags);
  4396. }
  4397. EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
  4398. diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
  4399. index bedce3453dd3..faf038978650 100644
  4400. --- a/drivers/pinctrl/qcom/pinctrl-msm.c
  4401. +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
  4402. @@ -61,7 +61,7 @@ struct msm_pinctrl {
  4403. struct notifier_block restart_nb;
  4404. int irq;
  4405. - spinlock_t lock;
  4406. + raw_spinlock_t lock;
  4407. DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO);
  4408. DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO);
  4409. @@ -153,14 +153,14 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev,
  4410. if (WARN_ON(i == g->nfuncs))
  4411. return -EINVAL;
  4412. - spin_lock_irqsave(&pctrl->lock, flags);
  4413. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4414. val = readl(pctrl->regs + g->ctl_reg);
  4415. val &= ~mask;
  4416. val |= i << g->mux_bit;
  4417. writel(val, pctrl->regs + g->ctl_reg);
  4418. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4419. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4420. return 0;
  4421. }
  4422. @@ -323,14 +323,14 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
  4423. break;
  4424. case PIN_CONFIG_OUTPUT:
  4425. /* set output value */
  4426. - spin_lock_irqsave(&pctrl->lock, flags);
  4427. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4428. val = readl(pctrl->regs + g->io_reg);
  4429. if (arg)
  4430. val |= BIT(g->out_bit);
  4431. else
  4432. val &= ~BIT(g->out_bit);
  4433. writel(val, pctrl->regs + g->io_reg);
  4434. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4435. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4436. /* enable output */
  4437. arg = 1;
  4438. @@ -351,12 +351,12 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
  4439. return -EINVAL;
  4440. }
  4441. - spin_lock_irqsave(&pctrl->lock, flags);
  4442. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4443. val = readl(pctrl->regs + g->ctl_reg);
  4444. val &= ~(mask << bit);
  4445. val |= arg << bit;
  4446. writel(val, pctrl->regs + g->ctl_reg);
  4447. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4448. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4449. }
  4450. return 0;
  4451. @@ -384,13 +384,13 @@ static int msm_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
  4452. g = &pctrl->soc->groups[offset];
  4453. - spin_lock_irqsave(&pctrl->lock, flags);
  4454. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4455. val = readl(pctrl->regs + g->ctl_reg);
  4456. val &= ~BIT(g->oe_bit);
  4457. writel(val, pctrl->regs + g->ctl_reg);
  4458. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4459. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4460. return 0;
  4461. }
  4462. @@ -404,7 +404,7 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in
  4463. g = &pctrl->soc->groups[offset];
  4464. - spin_lock_irqsave(&pctrl->lock, flags);
  4465. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4466. val = readl(pctrl->regs + g->io_reg);
  4467. if (value)
  4468. @@ -417,7 +417,7 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in
  4469. val |= BIT(g->oe_bit);
  4470. writel(val, pctrl->regs + g->ctl_reg);
  4471. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4472. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4473. return 0;
  4474. }
  4475. @@ -443,7 +443,7 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
  4476. g = &pctrl->soc->groups[offset];
  4477. - spin_lock_irqsave(&pctrl->lock, flags);
  4478. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4479. val = readl(pctrl->regs + g->io_reg);
  4480. if (value)
  4481. @@ -452,7 +452,7 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
  4482. val &= ~BIT(g->out_bit);
  4483. writel(val, pctrl->regs + g->io_reg);
  4484. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4485. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4486. }
  4487. #ifdef CONFIG_DEBUG_FS
  4488. @@ -571,7 +571,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)
  4489. g = &pctrl->soc->groups[d->hwirq];
  4490. - spin_lock_irqsave(&pctrl->lock, flags);
  4491. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4492. val = readl(pctrl->regs + g->intr_cfg_reg);
  4493. val &= ~BIT(g->intr_enable_bit);
  4494. @@ -579,7 +579,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)
  4495. clear_bit(d->hwirq, pctrl->enabled_irqs);
  4496. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4497. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4498. }
  4499. static void msm_gpio_irq_unmask(struct irq_data *d)
  4500. @@ -592,7 +592,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
  4501. g = &pctrl->soc->groups[d->hwirq];
  4502. - spin_lock_irqsave(&pctrl->lock, flags);
  4503. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4504. val = readl(pctrl->regs + g->intr_cfg_reg);
  4505. val |= BIT(g->intr_enable_bit);
  4506. @@ -600,7 +600,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
  4507. set_bit(d->hwirq, pctrl->enabled_irqs);
  4508. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4509. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4510. }
  4511. static void msm_gpio_irq_ack(struct irq_data *d)
  4512. @@ -613,7 +613,7 @@ static void msm_gpio_irq_ack(struct irq_data *d)
  4513. g = &pctrl->soc->groups[d->hwirq];
  4514. - spin_lock_irqsave(&pctrl->lock, flags);
  4515. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4516. val = readl(pctrl->regs + g->intr_status_reg);
  4517. if (g->intr_ack_high)
  4518. @@ -625,7 +625,7 @@ static void msm_gpio_irq_ack(struct irq_data *d)
  4519. if (test_bit(d->hwirq, pctrl->dual_edge_irqs))
  4520. msm_gpio_update_dual_edge_pos(pctrl, g, d);
  4521. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4522. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4523. }
  4524. static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
  4525. @@ -638,7 +638,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
  4526. g = &pctrl->soc->groups[d->hwirq];
  4527. - spin_lock_irqsave(&pctrl->lock, flags);
  4528. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4529. /*
  4530. * For hw without possibility of detecting both edges
  4531. @@ -712,7 +712,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
  4532. if (test_bit(d->hwirq, pctrl->dual_edge_irqs))
  4533. msm_gpio_update_dual_edge_pos(pctrl, g, d);
  4534. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4535. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4536. if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
  4537. irq_set_handler_locked(d, handle_level_irq);
  4538. @@ -728,11 +728,11 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
  4539. struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
  4540. unsigned long flags;
  4541. - spin_lock_irqsave(&pctrl->lock, flags);
  4542. + raw_spin_lock_irqsave(&pctrl->lock, flags);
  4543. irq_set_irq_wake(pctrl->irq, on);
  4544. - spin_unlock_irqrestore(&pctrl->lock, flags);
  4545. + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
  4546. return 0;
  4547. }
  4548. @@ -878,7 +878,7 @@ int msm_pinctrl_probe(struct platform_device *pdev,
  4549. pctrl->soc = soc_data;
  4550. pctrl->chip = msm_gpio_template;
  4551. - spin_lock_init(&pctrl->lock);
  4552. + raw_spin_lock_init(&pctrl->lock);
  4553. res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  4554. pctrl->regs = devm_ioremap_resource(&pdev->dev, res);
  4555. diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
  4556. index 9bd41a35a78a..8e2d436c2e3f 100644
  4557. --- a/drivers/scsi/fcoe/fcoe.c
  4558. +++ b/drivers/scsi/fcoe/fcoe.c
  4559. @@ -1455,11 +1455,11 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
  4560. static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
  4561. {
  4562. struct fcoe_percpu_s *fps;
  4563. - int rc;
  4564. + int rc, cpu = get_cpu_light();
  4565. - fps = &get_cpu_var(fcoe_percpu);
  4566. + fps = &per_cpu(fcoe_percpu, cpu);
  4567. rc = fcoe_get_paged_crc_eof(skb, tlen, fps);
  4568. - put_cpu_var(fcoe_percpu);
  4569. + put_cpu_light();
  4570. return rc;
  4571. }
  4572. @@ -1646,11 +1646,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
  4573. return 0;
  4574. }
  4575. - stats = per_cpu_ptr(lport->stats, get_cpu());
  4576. + stats = per_cpu_ptr(lport->stats, get_cpu_light());
  4577. stats->InvalidCRCCount++;
  4578. if (stats->InvalidCRCCount < 5)
  4579. printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
  4580. - put_cpu();
  4581. + put_cpu_light();
  4582. return -EINVAL;
  4583. }
  4584. @@ -1693,7 +1693,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)
  4585. */
  4586. hp = (struct fcoe_hdr *) skb_network_header(skb);
  4587. - stats = per_cpu_ptr(lport->stats, get_cpu());
  4588. + stats = per_cpu_ptr(lport->stats, get_cpu_light());
  4589. if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
  4590. if (stats->ErrorFrames < 5)
  4591. printk(KERN_WARNING "fcoe: FCoE version "
  4592. @@ -1725,13 +1725,13 @@ static void fcoe_recv_frame(struct sk_buff *skb)
  4593. goto drop;
  4594. if (!fcoe_filter_frames(lport, fp)) {
  4595. - put_cpu();
  4596. + put_cpu_light();
  4597. fc_exch_recv(lport, fp);
  4598. return;
  4599. }
  4600. drop:
  4601. stats->ErrorFrames++;
  4602. - put_cpu();
  4603. + put_cpu_light();
  4604. kfree_skb(skb);
  4605. }
  4606. diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
  4607. index dcf36537a767..1a1f2e46452c 100644
  4608. --- a/drivers/scsi/fcoe/fcoe_ctlr.c
  4609. +++ b/drivers/scsi/fcoe/fcoe_ctlr.c
  4610. @@ -834,7 +834,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
  4611. INIT_LIST_HEAD(&del_list);
  4612. - stats = per_cpu_ptr(fip->lp->stats, get_cpu());
  4613. + stats = per_cpu_ptr(fip->lp->stats, get_cpu_light());
  4614. list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
  4615. deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
  4616. @@ -870,7 +870,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
  4617. sel_time = fcf->time;
  4618. }
  4619. }
  4620. - put_cpu();
  4621. + put_cpu_light();
  4622. list_for_each_entry_safe(fcf, next, &del_list, list) {
  4623. /* Removes fcf from current list */
  4624. diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
  4625. index 16ca31ad5ec0..c3987347e762 100644
  4626. --- a/drivers/scsi/libfc/fc_exch.c
  4627. +++ b/drivers/scsi/libfc/fc_exch.c
  4628. @@ -814,10 +814,10 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
  4629. }
  4630. memset(ep, 0, sizeof(*ep));
  4631. - cpu = get_cpu();
  4632. + cpu = get_cpu_light();
  4633. pool = per_cpu_ptr(mp->pool, cpu);
  4634. spin_lock_bh(&pool->lock);
  4635. - put_cpu();
  4636. + put_cpu_light();
  4637. /* peek cache of free slot */
  4638. if (pool->left != FC_XID_UNKNOWN) {
  4639. diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
  4640. index 87f5e694dbed..23c0a50fb6aa 100644
  4641. --- a/drivers/scsi/libsas/sas_ata.c
  4642. +++ b/drivers/scsi/libsas/sas_ata.c
  4643. @@ -190,7 +190,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
  4644. /* TODO: audit callers to ensure they are ready for qc_issue to
  4645. * unconditionally re-enable interrupts
  4646. */
  4647. - local_irq_save(flags);
  4648. + local_irq_save_nort(flags);
  4649. spin_unlock(ap->lock);
  4650. /* If the device fell off, no sense in issuing commands */
  4651. @@ -252,7 +252,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
  4652. out:
  4653. spin_lock(ap->lock);
  4654. - local_irq_restore(flags);
  4655. + local_irq_restore_nort(flags);
  4656. return ret;
  4657. }
  4658. diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
  4659. index edc48f3b8230..ee5c6f9dfb6f 100644
  4660. --- a/drivers/scsi/qla2xxx/qla_inline.h
  4661. +++ b/drivers/scsi/qla2xxx/qla_inline.h
  4662. @@ -59,12 +59,12 @@ qla2x00_poll(struct rsp_que *rsp)
  4663. {
  4664. unsigned long flags;
  4665. struct qla_hw_data *ha = rsp->hw;
  4666. - local_irq_save(flags);
  4667. + local_irq_save_nort(flags);
  4668. if (IS_P3P_TYPE(ha))
  4669. qla82xx_poll(0, rsp);
  4670. else
  4671. ha->isp_ops->intr_handler(0, rsp);
  4672. - local_irq_restore(flags);
  4673. + local_irq_restore_nort(flags);
  4674. }
  4675. static inline uint8_t *
  4676. diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
  4677. index 068c4e47fac9..a2090f640397 100644
  4678. --- a/drivers/scsi/qla2xxx/qla_isr.c
  4679. +++ b/drivers/scsi/qla2xxx/qla_isr.c
  4680. @@ -3125,7 +3125,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
  4681. * kref_put().
  4682. */
  4683. kref_get(&qentry->irq_notify.kref);
  4684. +#ifdef CONFIG_PREEMPT_RT_BASE
  4685. + swork_queue(&qentry->irq_notify.swork);
  4686. +#else
  4687. schedule_work(&qentry->irq_notify.work);
  4688. +#endif
  4689. }
  4690. /*
  4691. diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
  4692. index 95f4c1bcdb4c..0be934799bff 100644
  4693. --- a/drivers/thermal/x86_pkg_temp_thermal.c
  4694. +++ b/drivers/thermal/x86_pkg_temp_thermal.c
  4695. @@ -29,6 +29,7 @@
  4696. #include <linux/pm.h>
  4697. #include <linux/thermal.h>
  4698. #include <linux/debugfs.h>
  4699. +#include <linux/swork.h>
  4700. #include <asm/cpu_device_id.h>
  4701. #include <asm/mce.h>
  4702. @@ -353,7 +354,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
  4703. }
  4704. }
  4705. -static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
  4706. +static void platform_thermal_notify_work(struct swork_event *event)
  4707. {
  4708. unsigned long flags;
  4709. int cpu = smp_processor_id();
  4710. @@ -370,7 +371,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
  4711. pkg_work_scheduled[phy_id]) {
  4712. disable_pkg_thres_interrupt();
  4713. spin_unlock_irqrestore(&pkg_work_lock, flags);
  4714. - return -EINVAL;
  4715. + return;
  4716. }
  4717. pkg_work_scheduled[phy_id] = 1;
  4718. spin_unlock_irqrestore(&pkg_work_lock, flags);
  4719. @@ -379,9 +380,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
  4720. schedule_delayed_work_on(cpu,
  4721. &per_cpu(pkg_temp_thermal_threshold_work, cpu),
  4722. msecs_to_jiffies(notify_delay_ms));
  4723. +}
  4724. +
  4725. +#ifdef CONFIG_PREEMPT_RT_FULL
  4726. +static struct swork_event notify_work;
  4727. +
  4728. +static int thermal_notify_work_init(void)
  4729. +{
  4730. + int err;
  4731. +
  4732. + err = swork_get();
  4733. + if (err)
  4734. + return err;
  4735. +
  4736. + INIT_SWORK(&notify_work, platform_thermal_notify_work);
  4737. return 0;
  4738. }
  4739. +static void thermal_notify_work_cleanup(void)
  4740. +{
  4741. + swork_put();
  4742. +}
  4743. +
  4744. +static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
  4745. +{
  4746. + swork_queue(&notify_work);
  4747. + return 0;
  4748. +}
  4749. +
  4750. +#else /* !CONFIG_PREEMPT_RT_FULL */
  4751. +
  4752. +static int thermal_notify_work_init(void) { return 0; }
  4753. +
  4754. +static void thermal_notify_work_cleanup(void) { }
  4755. +
  4756. +static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
  4757. +{
  4758. + platform_thermal_notify_work(NULL);
  4759. +
  4760. + return 0;
  4761. +}
  4762. +#endif /* CONFIG_PREEMPT_RT_FULL */
  4763. +
  4764. static int find_siblings_cpu(int cpu)
  4765. {
  4766. int i;
  4767. @@ -585,6 +625,9 @@ static int __init pkg_temp_thermal_init(void)
  4768. if (!x86_match_cpu(pkg_temp_thermal_ids))
  4769. return -ENODEV;
  4770. + if (!thermal_notify_work_init())
  4771. + return -ENODEV;
  4772. +
  4773. spin_lock_init(&pkg_work_lock);
  4774. platform_thermal_package_notify =
  4775. pkg_temp_thermal_platform_thermal_notify;
  4776. @@ -609,7 +652,7 @@ static int __init pkg_temp_thermal_init(void)
  4777. kfree(pkg_work_scheduled);
  4778. platform_thermal_package_notify = NULL;
  4779. platform_thermal_package_rate_control = NULL;
  4780. -
  4781. + thermal_notify_work_cleanup();
  4782. return -ENODEV;
  4783. }
  4784. @@ -634,6 +677,7 @@ static void __exit pkg_temp_thermal_exit(void)
  4785. mutex_unlock(&phy_dev_list_mutex);
  4786. platform_thermal_package_notify = NULL;
  4787. platform_thermal_package_rate_control = NULL;
  4788. + thermal_notify_work_cleanup();
  4789. for_each_online_cpu(i)
  4790. cancel_delayed_work_sync(
  4791. &per_cpu(pkg_temp_thermal_threshold_work, i));
  4792. diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
  4793. index e8819aa20415..dd7f9bf45d6c 100644
  4794. --- a/drivers/tty/serial/8250/8250_core.c
  4795. +++ b/drivers/tty/serial/8250/8250_core.c
  4796. @@ -58,7 +58,16 @@ static struct uart_driver serial8250_reg;
  4797. static unsigned int skip_txen_test; /* force skip of txen test at init time */
  4798. -#define PASS_LIMIT 512
  4799. +/*
  4800. + * On -rt we can have a more delays, and legitimately
  4801. + * so - so don't drop work spuriously and spam the
  4802. + * syslog:
  4803. + */
  4804. +#ifdef CONFIG_PREEMPT_RT_FULL
  4805. +# define PASS_LIMIT 1000000
  4806. +#else
  4807. +# define PASS_LIMIT 512
  4808. +#endif
  4809. #include <asm/serial.h>
  4810. /*
  4811. diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
  4812. index 080d5a59d0a7..eecc4f111473 100644
  4813. --- a/drivers/tty/serial/8250/8250_port.c
  4814. +++ b/drivers/tty/serial/8250/8250_port.c
  4815. @@ -35,6 +35,7 @@
  4816. #include <linux/nmi.h>
  4817. #include <linux/mutex.h>
  4818. #include <linux/slab.h>
  4819. +#include <linux/kdb.h>
  4820. #include <linux/uaccess.h>
  4821. #include <linux/pm_runtime.h>
  4822. #include <linux/timer.h>
  4823. @@ -3144,9 +3145,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
  4824. serial8250_rpm_get(up);
  4825. - if (port->sysrq)
  4826. + if (port->sysrq || oops_in_progress)
  4827. locked = 0;
  4828. - else if (oops_in_progress)
  4829. + else if (in_kdb_printk())
  4830. locked = spin_trylock_irqsave(&port->lock, flags);
  4831. else
  4832. spin_lock_irqsave(&port->lock, flags);
  4833. diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
  4834. index e2c33b9528d8..53af53c43e8c 100644
  4835. --- a/drivers/tty/serial/amba-pl011.c
  4836. +++ b/drivers/tty/serial/amba-pl011.c
  4837. @@ -2194,13 +2194,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
  4838. clk_enable(uap->clk);
  4839. - local_irq_save(flags);
  4840. + /*
  4841. + * local_irq_save(flags);
  4842. + *
  4843. + * This local_irq_save() is nonsense. If we come in via sysrq
  4844. + * handling then interrupts are already disabled. Aside of
  4845. + * that the port.sysrq check is racy on SMP regardless.
  4846. + */
  4847. if (uap->port.sysrq)
  4848. locked = 0;
  4849. else if (oops_in_progress)
  4850. - locked = spin_trylock(&uap->port.lock);
  4851. + locked = spin_trylock_irqsave(&uap->port.lock, flags);
  4852. else
  4853. - spin_lock(&uap->port.lock);
  4854. + spin_lock_irqsave(&uap->port.lock, flags);
  4855. /*
  4856. * First save the CR then disable the interrupts
  4857. @@ -2224,8 +2230,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
  4858. pl011_write(old_cr, uap, REG_CR);
  4859. if (locked)
  4860. - spin_unlock(&uap->port.lock);
  4861. - local_irq_restore(flags);
  4862. + spin_unlock_irqrestore(&uap->port.lock, flags);
  4863. clk_disable(uap->clk);
  4864. }
  4865. diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
  4866. index 44e5b5bf713b..400140d1dfff 100644
  4867. --- a/drivers/tty/serial/omap-serial.c
  4868. +++ b/drivers/tty/serial/omap-serial.c
  4869. @@ -1257,13 +1257,10 @@ serial_omap_console_write(struct console *co, const char *s,
  4870. pm_runtime_get_sync(up->dev);
  4871. - local_irq_save(flags);
  4872. - if (up->port.sysrq)
  4873. - locked = 0;
  4874. - else if (oops_in_progress)
  4875. - locked = spin_trylock(&up->port.lock);
  4876. + if (up->port.sysrq || oops_in_progress)
  4877. + locked = spin_trylock_irqsave(&up->port.lock, flags);
  4878. else
  4879. - spin_lock(&up->port.lock);
  4880. + spin_lock_irqsave(&up->port.lock, flags);
  4881. /*
  4882. * First save the IER then disable the interrupts
  4883. @@ -1292,8 +1289,7 @@ serial_omap_console_write(struct console *co, const char *s,
  4884. pm_runtime_mark_last_busy(up->dev);
  4885. pm_runtime_put_autosuspend(up->dev);
  4886. if (locked)
  4887. - spin_unlock(&up->port.lock);
  4888. - local_irq_restore(flags);
  4889. + spin_unlock_irqrestore(&up->port.lock, flags);
  4890. }
  4891. static int __init
  4892. diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
  4893. index 3b9735abf2e0..73ba3239869e 100644
  4894. --- a/drivers/usb/core/hcd.c
  4895. +++ b/drivers/usb/core/hcd.c
  4896. @@ -1764,9 +1764,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
  4897. * and no one may trigger the above deadlock situation when
  4898. * running complete() in tasklet.
  4899. */
  4900. - local_irq_save(flags);
  4901. + local_irq_save_nort(flags);
  4902. urb->complete(urb);
  4903. - local_irq_restore(flags);
  4904. + local_irq_restore_nort(flags);
  4905. usb_anchor_resume_wakeups(anchor);
  4906. atomic_dec(&urb->use_count);
  4907. diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
  4908. index 89081b834615..90b231b7ad0a 100644
  4909. --- a/drivers/usb/gadget/function/f_fs.c
  4910. +++ b/drivers/usb/gadget/function/f_fs.c
  4911. @@ -1593,7 +1593,7 @@ static void ffs_data_put(struct ffs_data *ffs)
  4912. pr_info("%s(): freeing\n", __func__);
  4913. ffs_data_clear(ffs);
  4914. BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
  4915. - waitqueue_active(&ffs->ep0req_completion.wait));
  4916. + swait_active(&ffs->ep0req_completion.wait));
  4917. kfree(ffs->dev_name);
  4918. kfree(ffs);
  4919. }
  4920. diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
  4921. index 1468d8f085a3..6aae3ae25c18 100644
  4922. --- a/drivers/usb/gadget/legacy/inode.c
  4923. +++ b/drivers/usb/gadget/legacy/inode.c
  4924. @@ -346,7 +346,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
  4925. spin_unlock_irq (&epdata->dev->lock);
  4926. if (likely (value == 0)) {
  4927. - value = wait_event_interruptible (done.wait, done.done);
  4928. + value = swait_event_interruptible (done.wait, done.done);
  4929. if (value != 0) {
  4930. spin_lock_irq (&epdata->dev->lock);
  4931. if (likely (epdata->ep != NULL)) {
  4932. @@ -355,7 +355,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
  4933. usb_ep_dequeue (epdata->ep, epdata->req);
  4934. spin_unlock_irq (&epdata->dev->lock);
  4935. - wait_event (done.wait, done.done);
  4936. + swait_event (done.wait, done.done);
  4937. if (epdata->status == -ECONNRESET)
  4938. epdata->status = -EINTR;
  4939. } else {
  4940. diff --git a/fs/aio.c b/fs/aio.c
  4941. index 428484f2f841..2b02e2eb2158 100644
  4942. --- a/fs/aio.c
  4943. +++ b/fs/aio.c
  4944. @@ -40,6 +40,7 @@
  4945. #include <linux/ramfs.h>
  4946. #include <linux/percpu-refcount.h>
  4947. #include <linux/mount.h>
  4948. +#include <linux/swork.h>
  4949. #include <asm/kmap_types.h>
  4950. #include <asm/uaccess.h>
  4951. @@ -115,7 +116,7 @@ struct kioctx {
  4952. struct page **ring_pages;
  4953. long nr_pages;
  4954. - struct work_struct free_work;
  4955. + struct swork_event free_work;
  4956. /*
  4957. * signals when all in-flight requests are done
  4958. @@ -258,6 +259,7 @@ static int __init aio_setup(void)
  4959. .mount = aio_mount,
  4960. .kill_sb = kill_anon_super,
  4961. };
  4962. + BUG_ON(swork_get());
  4963. aio_mnt = kern_mount(&aio_fs);
  4964. if (IS_ERR(aio_mnt))
  4965. panic("Failed to create aio fs mount.");
  4966. @@ -581,9 +583,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
  4967. return cancel(&kiocb->common);
  4968. }
  4969. -static void free_ioctx(struct work_struct *work)
  4970. +static void free_ioctx(struct swork_event *sev)
  4971. {
  4972. - struct kioctx *ctx = container_of(work, struct kioctx, free_work);
  4973. + struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
  4974. pr_debug("freeing %p\n", ctx);
  4975. @@ -602,8 +604,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
  4976. if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
  4977. complete(&ctx->rq_wait->comp);
  4978. - INIT_WORK(&ctx->free_work, free_ioctx);
  4979. - schedule_work(&ctx->free_work);
  4980. + INIT_SWORK(&ctx->free_work, free_ioctx);
  4981. + swork_queue(&ctx->free_work);
  4982. }
  4983. /*
  4984. @@ -611,9 +613,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
  4985. * and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
  4986. * now it's safe to cancel any that need to be.
  4987. */
  4988. -static void free_ioctx_users(struct percpu_ref *ref)
  4989. +static void free_ioctx_users_work(struct swork_event *sev)
  4990. {
  4991. - struct kioctx *ctx = container_of(ref, struct kioctx, users);
  4992. + struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
  4993. struct aio_kiocb *req;
  4994. spin_lock_irq(&ctx->ctx_lock);
  4995. @@ -632,6 +634,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
  4996. percpu_ref_put(&ctx->reqs);
  4997. }
  4998. +static void free_ioctx_users(struct percpu_ref *ref)
  4999. +{
  5000. + struct kioctx *ctx = container_of(ref, struct kioctx, users);
  5001. +
  5002. + INIT_SWORK(&ctx->free_work, free_ioctx_users_work);
  5003. + swork_queue(&ctx->free_work);
  5004. +}
  5005. +
  5006. static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
  5007. {
  5008. unsigned i, new_nr;
  5009. diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
  5010. index a1fba4285277..3796769b4cd1 100644
  5011. --- a/fs/autofs4/autofs_i.h
  5012. +++ b/fs/autofs4/autofs_i.h
  5013. @@ -31,6 +31,7 @@
  5014. #include <linux/sched.h>
  5015. #include <linux/mount.h>
  5016. #include <linux/namei.h>
  5017. +#include <linux/delay.h>
  5018. #include <asm/current.h>
  5019. #include <linux/uaccess.h>
  5020. diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
  5021. index d8e6d421c27f..2e689ab1306b 100644
  5022. --- a/fs/autofs4/expire.c
  5023. +++ b/fs/autofs4/expire.c
  5024. @@ -148,7 +148,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
  5025. parent = p->d_parent;
  5026. if (!spin_trylock(&parent->d_lock)) {
  5027. spin_unlock(&p->d_lock);
  5028. - cpu_relax();
  5029. + cpu_chill();
  5030. goto relock;
  5031. }
  5032. spin_unlock(&p->d_lock);
  5033. diff --git a/fs/buffer.c b/fs/buffer.c
  5034. index b205a629001d..5646afc022ba 100644
  5035. --- a/fs/buffer.c
  5036. +++ b/fs/buffer.c
  5037. @@ -301,8 +301,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5038. * decide that the page is now completely done.
  5039. */
  5040. first = page_buffers(page);
  5041. - local_irq_save(flags);
  5042. - bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
  5043. + flags = bh_uptodate_lock_irqsave(first);
  5044. clear_buffer_async_read(bh);
  5045. unlock_buffer(bh);
  5046. tmp = bh;
  5047. @@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5048. }
  5049. tmp = tmp->b_this_page;
  5050. } while (tmp != bh);
  5051. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5052. - local_irq_restore(flags);
  5053. + bh_uptodate_unlock_irqrestore(first, flags);
  5054. /*
  5055. * If none of the buffers had errors and they are all
  5056. @@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5057. return;
  5058. still_busy:
  5059. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5060. - local_irq_restore(flags);
  5061. - return;
  5062. + bh_uptodate_unlock_irqrestore(first, flags);
  5063. }
  5064. /*
  5065. @@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
  5066. }
  5067. first = page_buffers(page);
  5068. - local_irq_save(flags);
  5069. - bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
  5070. + flags = bh_uptodate_lock_irqsave(first);
  5071. clear_buffer_async_write(bh);
  5072. unlock_buffer(bh);
  5073. @@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
  5074. }
  5075. tmp = tmp->b_this_page;
  5076. }
  5077. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5078. - local_irq_restore(flags);
  5079. + bh_uptodate_unlock_irqrestore(first, flags);
  5080. end_page_writeback(page);
  5081. return;
  5082. still_busy:
  5083. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5084. - local_irq_restore(flags);
  5085. - return;
  5086. + bh_uptodate_unlock_irqrestore(first, flags);
  5087. }
  5088. EXPORT_SYMBOL(end_buffer_async_write);
  5089. @@ -3383,6 +3375,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
  5090. struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
  5091. if (ret) {
  5092. INIT_LIST_HEAD(&ret->b_assoc_buffers);
  5093. + buffer_head_init_locks(ret);
  5094. preempt_disable();
  5095. __this_cpu_inc(bh_accounting.nr);
  5096. recalc_bh_state();
  5097. diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
  5098. index a27fc8791551..791aecb7c1ac 100644
  5099. --- a/fs/cifs/readdir.c
  5100. +++ b/fs/cifs/readdir.c
  5101. @@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
  5102. struct inode *inode;
  5103. struct super_block *sb = parent->d_sb;
  5104. struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
  5105. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5106. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5107. cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
  5108. diff --git a/fs/dcache.c b/fs/dcache.c
  5109. index 4485a48f4091..691039a6a872 100644
  5110. --- a/fs/dcache.c
  5111. +++ b/fs/dcache.c
  5112. @@ -19,6 +19,7 @@
  5113. #include <linux/mm.h>
  5114. #include <linux/fs.h>
  5115. #include <linux/fsnotify.h>
  5116. +#include <linux/delay.h>
  5117. #include <linux/slab.h>
  5118. #include <linux/init.h>
  5119. #include <linux/hash.h>
  5120. @@ -750,6 +751,8 @@ static inline bool fast_dput(struct dentry *dentry)
  5121. */
  5122. void dput(struct dentry *dentry)
  5123. {
  5124. + struct dentry *parent;
  5125. +
  5126. if (unlikely(!dentry))
  5127. return;
  5128. @@ -788,9 +791,18 @@ void dput(struct dentry *dentry)
  5129. return;
  5130. kill_it:
  5131. - dentry = dentry_kill(dentry);
  5132. - if (dentry) {
  5133. - cond_resched();
  5134. + parent = dentry_kill(dentry);
  5135. + if (parent) {
  5136. + int r;
  5137. +
  5138. + if (parent == dentry) {
  5139. + /* the task with the highest priority won't schedule */
  5140. + r = cond_resched();
  5141. + if (!r)
  5142. + cpu_chill();
  5143. + } else {
  5144. + dentry = parent;
  5145. + }
  5146. goto repeat;
  5147. }
  5148. }
  5149. @@ -2324,7 +2336,7 @@ void d_delete(struct dentry * dentry)
  5150. if (dentry->d_lockref.count == 1) {
  5151. if (!spin_trylock(&inode->i_lock)) {
  5152. spin_unlock(&dentry->d_lock);
  5153. - cpu_relax();
  5154. + cpu_chill();
  5155. goto again;
  5156. }
  5157. dentry->d_flags &= ~DCACHE_CANT_MOUNT;
  5158. @@ -2384,21 +2396,24 @@ static inline void end_dir_add(struct inode *dir, unsigned n)
  5159. static void d_wait_lookup(struct dentry *dentry)
  5160. {
  5161. - if (d_in_lookup(dentry)) {
  5162. - DECLARE_WAITQUEUE(wait, current);
  5163. - add_wait_queue(dentry->d_wait, &wait);
  5164. - do {
  5165. - set_current_state(TASK_UNINTERRUPTIBLE);
  5166. - spin_unlock(&dentry->d_lock);
  5167. - schedule();
  5168. - spin_lock(&dentry->d_lock);
  5169. - } while (d_in_lookup(dentry));
  5170. - }
  5171. + struct swait_queue __wait;
  5172. +
  5173. + if (!d_in_lookup(dentry))
  5174. + return;
  5175. +
  5176. + INIT_LIST_HEAD(&__wait.task_list);
  5177. + do {
  5178. + prepare_to_swait(dentry->d_wait, &__wait, TASK_UNINTERRUPTIBLE);
  5179. + spin_unlock(&dentry->d_lock);
  5180. + schedule();
  5181. + spin_lock(&dentry->d_lock);
  5182. + } while (d_in_lookup(dentry));
  5183. + finish_swait(dentry->d_wait, &__wait);
  5184. }
  5185. struct dentry *d_alloc_parallel(struct dentry *parent,
  5186. const struct qstr *name,
  5187. - wait_queue_head_t *wq)
  5188. + struct swait_queue_head *wq)
  5189. {
  5190. unsigned int hash = name->hash;
  5191. struct hlist_bl_head *b = in_lookup_hash(parent, hash);
  5192. @@ -2507,7 +2522,7 @@ void __d_lookup_done(struct dentry *dentry)
  5193. hlist_bl_lock(b);
  5194. dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
  5195. __hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
  5196. - wake_up_all(dentry->d_wait);
  5197. + swake_up_all(dentry->d_wait);
  5198. dentry->d_wait = NULL;
  5199. hlist_bl_unlock(b);
  5200. INIT_HLIST_NODE(&dentry->d_u.d_alias);
  5201. @@ -3604,6 +3619,11 @@ EXPORT_SYMBOL(d_genocide);
  5202. void __init vfs_caches_init_early(void)
  5203. {
  5204. + int i;
  5205. +
  5206. + for (i = 0; i < ARRAY_SIZE(in_lookup_hashtable); i++)
  5207. + INIT_HLIST_BL_HEAD(&in_lookup_hashtable[i]);
  5208. +
  5209. dcache_init_early();
  5210. inode_init_early();
  5211. }
  5212. diff --git a/fs/eventpoll.c b/fs/eventpoll.c
  5213. index 10db91218933..42af0a06f657 100644
  5214. --- a/fs/eventpoll.c
  5215. +++ b/fs/eventpoll.c
  5216. @@ -510,12 +510,12 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests)
  5217. */
  5218. static void ep_poll_safewake(wait_queue_head_t *wq)
  5219. {
  5220. - int this_cpu = get_cpu();
  5221. + int this_cpu = get_cpu_light();
  5222. ep_call_nested(&poll_safewake_ncalls, EP_MAX_NESTS,
  5223. ep_poll_wakeup_proc, NULL, wq, (void *) (long) this_cpu);
  5224. - put_cpu();
  5225. + put_cpu_light();
  5226. }
  5227. static void ep_remove_wait_queue(struct eppoll_entry *pwq)
  5228. diff --git a/fs/exec.c b/fs/exec.c
  5229. index 67e86571685a..fe14cdd84016 100644
  5230. --- a/fs/exec.c
  5231. +++ b/fs/exec.c
  5232. @@ -1017,12 +1017,14 @@ static int exec_mmap(struct mm_struct *mm)
  5233. }
  5234. }
  5235. task_lock(tsk);
  5236. + preempt_disable_rt();
  5237. active_mm = tsk->active_mm;
  5238. tsk->mm = mm;
  5239. tsk->active_mm = mm;
  5240. activate_mm(active_mm, mm);
  5241. tsk->mm->vmacache_seqnum = 0;
  5242. vmacache_flush(tsk);
  5243. + preempt_enable_rt();
  5244. task_unlock(tsk);
  5245. if (old_mm) {
  5246. up_read(&old_mm->mmap_sem);
  5247. diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
  5248. index 642c57b8de7b..8494b9308333 100644
  5249. --- a/fs/fuse/dir.c
  5250. +++ b/fs/fuse/dir.c
  5251. @@ -1191,7 +1191,7 @@ static int fuse_direntplus_link(struct file *file,
  5252. struct inode *dir = d_inode(parent);
  5253. struct fuse_conn *fc;
  5254. struct inode *inode;
  5255. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5256. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5257. if (!o->nodeid) {
  5258. /*
  5259. diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
  5260. index 684996c8a3a4..6e18a06aaabe 100644
  5261. --- a/fs/jbd2/checkpoint.c
  5262. +++ b/fs/jbd2/checkpoint.c
  5263. @@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
  5264. nblocks = jbd2_space_needed(journal);
  5265. while (jbd2_log_space_left(journal) < nblocks) {
  5266. write_unlock(&journal->j_state_lock);
  5267. + if (current->plug)
  5268. + io_schedule();
  5269. mutex_lock(&journal->j_checkpoint_mutex);
  5270. /*
  5271. diff --git a/fs/locks.c b/fs/locks.c
  5272. index 22c5b4aa4961..269c6a44449a 100644
  5273. --- a/fs/locks.c
  5274. +++ b/fs/locks.c
  5275. @@ -935,7 +935,7 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)
  5276. return -ENOMEM;
  5277. }
  5278. - percpu_down_read_preempt_disable(&file_rwsem);
  5279. + percpu_down_read(&file_rwsem);
  5280. spin_lock(&ctx->flc_lock);
  5281. if (request->fl_flags & FL_ACCESS)
  5282. goto find_conflict;
  5283. @@ -976,7 +976,7 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)
  5284. out:
  5285. spin_unlock(&ctx->flc_lock);
  5286. - percpu_up_read_preempt_enable(&file_rwsem);
  5287. + percpu_up_read(&file_rwsem);
  5288. if (new_fl)
  5289. locks_free_lock(new_fl);
  5290. locks_dispose_list(&dispose);
  5291. @@ -1013,7 +1013,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,
  5292. new_fl2 = locks_alloc_lock();
  5293. }
  5294. - percpu_down_read_preempt_disable(&file_rwsem);
  5295. + percpu_down_read(&file_rwsem);
  5296. spin_lock(&ctx->flc_lock);
  5297. /*
  5298. * New lock request. Walk all POSIX locks and look for conflicts. If
  5299. @@ -1185,7 +1185,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,
  5300. }
  5301. out:
  5302. spin_unlock(&ctx->flc_lock);
  5303. - percpu_up_read_preempt_enable(&file_rwsem);
  5304. + percpu_up_read(&file_rwsem);
  5305. /*
  5306. * Free any unused locks.
  5307. */
  5308. @@ -1460,7 +1460,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
  5309. return error;
  5310. }
  5311. - percpu_down_read_preempt_disable(&file_rwsem);
  5312. + percpu_down_read(&file_rwsem);
  5313. spin_lock(&ctx->flc_lock);
  5314. time_out_leases(inode, &dispose);
  5315. @@ -1512,13 +1512,13 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
  5316. locks_insert_block(fl, new_fl);
  5317. trace_break_lease_block(inode, new_fl);
  5318. spin_unlock(&ctx->flc_lock);
  5319. - percpu_up_read_preempt_enable(&file_rwsem);
  5320. + percpu_up_read(&file_rwsem);
  5321. locks_dispose_list(&dispose);
  5322. error = wait_event_interruptible_timeout(new_fl->fl_wait,
  5323. !new_fl->fl_next, break_time);
  5324. - percpu_down_read_preempt_disable(&file_rwsem);
  5325. + percpu_down_read(&file_rwsem);
  5326. spin_lock(&ctx->flc_lock);
  5327. trace_break_lease_unblock(inode, new_fl);
  5328. locks_delete_block(new_fl);
  5329. @@ -1535,7 +1535,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
  5330. }
  5331. out:
  5332. spin_unlock(&ctx->flc_lock);
  5333. - percpu_up_read_preempt_enable(&file_rwsem);
  5334. + percpu_up_read(&file_rwsem);
  5335. locks_dispose_list(&dispose);
  5336. locks_free_lock(new_fl);
  5337. return error;
  5338. @@ -1609,7 +1609,7 @@ int fcntl_getlease(struct file *filp)
  5339. ctx = smp_load_acquire(&inode->i_flctx);
  5340. if (ctx && !list_empty_careful(&ctx->flc_lease)) {
  5341. - percpu_down_read_preempt_disable(&file_rwsem);
  5342. + percpu_down_read(&file_rwsem);
  5343. spin_lock(&ctx->flc_lock);
  5344. time_out_leases(inode, &dispose);
  5345. list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
  5346. @@ -1619,7 +1619,7 @@ int fcntl_getlease(struct file *filp)
  5347. break;
  5348. }
  5349. spin_unlock(&ctx->flc_lock);
  5350. - percpu_up_read_preempt_enable(&file_rwsem);
  5351. + percpu_up_read(&file_rwsem);
  5352. locks_dispose_list(&dispose);
  5353. }
  5354. @@ -1694,7 +1694,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
  5355. return -EINVAL;
  5356. }
  5357. - percpu_down_read_preempt_disable(&file_rwsem);
  5358. + percpu_down_read(&file_rwsem);
  5359. spin_lock(&ctx->flc_lock);
  5360. time_out_leases(inode, &dispose);
  5361. error = check_conflicting_open(dentry, arg, lease->fl_flags);
  5362. @@ -1765,7 +1765,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
  5363. lease->fl_lmops->lm_setup(lease, priv);
  5364. out:
  5365. spin_unlock(&ctx->flc_lock);
  5366. - percpu_up_read_preempt_enable(&file_rwsem);
  5367. + percpu_up_read(&file_rwsem);
  5368. locks_dispose_list(&dispose);
  5369. if (is_deleg)
  5370. inode_unlock(inode);
  5371. @@ -1788,7 +1788,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
  5372. return error;
  5373. }
  5374. - percpu_down_read_preempt_disable(&file_rwsem);
  5375. + percpu_down_read(&file_rwsem);
  5376. spin_lock(&ctx->flc_lock);
  5377. list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
  5378. if (fl->fl_file == filp &&
  5379. @@ -1801,7 +1801,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
  5380. if (victim)
  5381. error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
  5382. spin_unlock(&ctx->flc_lock);
  5383. - percpu_up_read_preempt_enable(&file_rwsem);
  5384. + percpu_up_read(&file_rwsem);
  5385. locks_dispose_list(&dispose);
  5386. return error;
  5387. }
  5388. @@ -2532,13 +2532,13 @@ locks_remove_lease(struct file *filp, struct file_lock_context *ctx)
  5389. if (list_empty(&ctx->flc_lease))
  5390. return;
  5391. - percpu_down_read_preempt_disable(&file_rwsem);
  5392. + percpu_down_read(&file_rwsem);
  5393. spin_lock(&ctx->flc_lock);
  5394. list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list)
  5395. if (filp == fl->fl_file)
  5396. lease_modify(fl, F_UNLCK, &dispose);
  5397. spin_unlock(&ctx->flc_lock);
  5398. - percpu_up_read_preempt_enable(&file_rwsem);
  5399. + percpu_up_read(&file_rwsem);
  5400. locks_dispose_list(&dispose);
  5401. }
  5402. diff --git a/fs/namei.c b/fs/namei.c
  5403. index d5e5140c1045..150fbdd8e04c 100644
  5404. --- a/fs/namei.c
  5405. +++ b/fs/namei.c
  5406. @@ -1626,7 +1626,7 @@ static struct dentry *lookup_slow(const struct qstr *name,
  5407. {
  5408. struct dentry *dentry = ERR_PTR(-ENOENT), *old;
  5409. struct inode *inode = dir->d_inode;
  5410. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5411. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5412. inode_lock_shared(inode);
  5413. /* Don't go there if it's already dead */
  5414. @@ -3083,7 +3083,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
  5415. struct dentry *dentry;
  5416. int error, create_error = 0;
  5417. umode_t mode = op->mode;
  5418. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5419. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5420. if (unlikely(IS_DEADDIR(dir_inode)))
  5421. return -ENOENT;
  5422. diff --git a/fs/namespace.c b/fs/namespace.c
  5423. index 5e35057f07ac..843d274ba167 100644
  5424. --- a/fs/namespace.c
  5425. +++ b/fs/namespace.c
  5426. @@ -14,6 +14,7 @@
  5427. #include <linux/mnt_namespace.h>
  5428. #include <linux/user_namespace.h>
  5429. #include <linux/namei.h>
  5430. +#include <linux/delay.h>
  5431. #include <linux/security.h>
  5432. #include <linux/idr.h>
  5433. #include <linux/init.h> /* init_rootfs */
  5434. @@ -356,8 +357,11 @@ int __mnt_want_write(struct vfsmount *m)
  5435. * incremented count after it has set MNT_WRITE_HOLD.
  5436. */
  5437. smp_mb();
  5438. - while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD)
  5439. - cpu_relax();
  5440. + while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) {
  5441. + preempt_enable();
  5442. + cpu_chill();
  5443. + preempt_disable();
  5444. + }
  5445. /*
  5446. * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
  5447. * be set to match its requirements. So we must not load that until
  5448. diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
  5449. index dff600ae0d74..d726d2e09353 100644
  5450. --- a/fs/nfs/delegation.c
  5451. +++ b/fs/nfs/delegation.c
  5452. @@ -150,11 +150,11 @@ static int nfs_delegation_claim_opens(struct inode *inode,
  5453. sp = state->owner;
  5454. /* Block nfs4_proc_unlck */
  5455. mutex_lock(&sp->so_delegreturn_mutex);
  5456. - seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
  5457. + seq = read_seqbegin(&sp->so_reclaim_seqlock);
  5458. err = nfs4_open_delegation_recall(ctx, state, stateid, type);
  5459. if (!err)
  5460. err = nfs_delegation_claim_locks(ctx, state, stateid);
  5461. - if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
  5462. + if (!err && read_seqretry(&sp->so_reclaim_seqlock, seq))
  5463. err = -EAGAIN;
  5464. mutex_unlock(&sp->so_delegreturn_mutex);
  5465. put_nfs_open_context(ctx);
  5466. diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
  5467. index 53e02b8bd9bd..a66e7d77cfbb 100644
  5468. --- a/fs/nfs/dir.c
  5469. +++ b/fs/nfs/dir.c
  5470. @@ -485,7 +485,7 @@ static
  5471. void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
  5472. {
  5473. struct qstr filename = QSTR_INIT(entry->name, entry->len);
  5474. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5475. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5476. struct dentry *dentry;
  5477. struct dentry *alias;
  5478. struct inode *dir = d_inode(parent);
  5479. @@ -1487,7 +1487,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
  5480. struct file *file, unsigned open_flags,
  5481. umode_t mode, int *opened)
  5482. {
  5483. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5484. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5485. struct nfs_open_context *ctx;
  5486. struct dentry *res;
  5487. struct iattr attr = { .ia_valid = ATTR_OPEN };
  5488. @@ -1802,7 +1802,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
  5489. trace_nfs_rmdir_enter(dir, dentry);
  5490. if (d_really_is_positive(dentry)) {
  5491. +#ifdef CONFIG_PREEMPT_RT_BASE
  5492. + down(&NFS_I(d_inode(dentry))->rmdir_sem);
  5493. +#else
  5494. down_write(&NFS_I(d_inode(dentry))->rmdir_sem);
  5495. +#endif
  5496. error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
  5497. /* Ensure the VFS deletes this inode */
  5498. switch (error) {
  5499. @@ -1812,7 +1816,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
  5500. case -ENOENT:
  5501. nfs_dentry_handle_enoent(dentry);
  5502. }
  5503. +#ifdef CONFIG_PREEMPT_RT_BASE
  5504. + up(&NFS_I(d_inode(dentry))->rmdir_sem);
  5505. +#else
  5506. up_write(&NFS_I(d_inode(dentry))->rmdir_sem);
  5507. +#endif
  5508. } else
  5509. error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
  5510. trace_nfs_rmdir_exit(dir, dentry, error);
  5511. diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
  5512. index bf4ec5ecc97e..36cd5fc9192c 100644
  5513. --- a/fs/nfs/inode.c
  5514. +++ b/fs/nfs/inode.c
  5515. @@ -1957,7 +1957,11 @@ static void init_once(void *foo)
  5516. nfsi->nrequests = 0;
  5517. nfsi->commit_info.ncommit = 0;
  5518. atomic_set(&nfsi->commit_info.rpcs_out, 0);
  5519. +#ifdef CONFIG_PREEMPT_RT_BASE
  5520. + sema_init(&nfsi->rmdir_sem, 1);
  5521. +#else
  5522. init_rwsem(&nfsi->rmdir_sem);
  5523. +#endif
  5524. nfs4_init_once(nfsi);
  5525. }
  5526. diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
  5527. index 1452177c822d..f43b01d54c59 100644
  5528. --- a/fs/nfs/nfs4_fs.h
  5529. +++ b/fs/nfs/nfs4_fs.h
  5530. @@ -111,7 +111,7 @@ struct nfs4_state_owner {
  5531. unsigned long so_flags;
  5532. struct list_head so_states;
  5533. struct nfs_seqid_counter so_seqid;
  5534. - seqcount_t so_reclaim_seqcount;
  5535. + seqlock_t so_reclaim_seqlock;
  5536. struct mutex so_delegreturn_mutex;
  5537. };
  5538. diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
  5539. index fc9b04941739..7c9bc1c7efe7 100644
  5540. --- a/fs/nfs/nfs4proc.c
  5541. +++ b/fs/nfs/nfs4proc.c
  5542. @@ -2697,7 +2697,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
  5543. unsigned int seq;
  5544. int ret;
  5545. - seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
  5546. + seq = raw_seqcount_begin(&sp->so_reclaim_seqlock.seqcount);
  5547. ret = _nfs4_proc_open(opendata);
  5548. if (ret != 0)
  5549. @@ -2735,7 +2735,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
  5550. if (d_inode(dentry) == state->inode) {
  5551. nfs_inode_attach_open_context(ctx);
  5552. - if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
  5553. + if (read_seqretry(&sp->so_reclaim_seqlock, seq))
  5554. nfs4_schedule_stateid_recovery(server, state);
  5555. }
  5556. out:
  5557. diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
  5558. index 0959c9661662..dabd834d7686 100644
  5559. --- a/fs/nfs/nfs4state.c
  5560. +++ b/fs/nfs/nfs4state.c
  5561. @@ -488,7 +488,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
  5562. nfs4_init_seqid_counter(&sp->so_seqid);
  5563. atomic_set(&sp->so_count, 1);
  5564. INIT_LIST_HEAD(&sp->so_lru);
  5565. - seqcount_init(&sp->so_reclaim_seqcount);
  5566. + seqlock_init(&sp->so_reclaim_seqlock);
  5567. mutex_init(&sp->so_delegreturn_mutex);
  5568. return sp;
  5569. }
  5570. @@ -1497,8 +1497,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
  5571. * recovering after a network partition or a reboot from a
  5572. * server that doesn't support a grace period.
  5573. */
  5574. +#ifdef CONFIG_PREEMPT_RT_FULL
  5575. + write_seqlock(&sp->so_reclaim_seqlock);
  5576. +#else
  5577. + write_seqcount_begin(&sp->so_reclaim_seqlock.seqcount);
  5578. +#endif
  5579. spin_lock(&sp->so_lock);
  5580. - raw_write_seqcount_begin(&sp->so_reclaim_seqcount);
  5581. restart:
  5582. list_for_each_entry(state, &sp->so_states, open_states) {
  5583. if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
  5584. @@ -1567,14 +1571,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
  5585. spin_lock(&sp->so_lock);
  5586. goto restart;
  5587. }
  5588. - raw_write_seqcount_end(&sp->so_reclaim_seqcount);
  5589. spin_unlock(&sp->so_lock);
  5590. +#ifdef CONFIG_PREEMPT_RT_FULL
  5591. + write_sequnlock(&sp->so_reclaim_seqlock);
  5592. +#else
  5593. + write_seqcount_end(&sp->so_reclaim_seqlock.seqcount);
  5594. +#endif
  5595. return 0;
  5596. out_err:
  5597. nfs4_put_open_state(state);
  5598. - spin_lock(&sp->so_lock);
  5599. - raw_write_seqcount_end(&sp->so_reclaim_seqcount);
  5600. - spin_unlock(&sp->so_lock);
  5601. +#ifdef CONFIG_PREEMPT_RT_FULL
  5602. + write_sequnlock(&sp->so_reclaim_seqlock);
  5603. +#else
  5604. + write_seqcount_end(&sp->so_reclaim_seqlock.seqcount);
  5605. +#endif
  5606. return status;
  5607. }
  5608. diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
  5609. index 191aa577dd1f..58990c8f52e0 100644
  5610. --- a/fs/nfs/unlink.c
  5611. +++ b/fs/nfs/unlink.c
  5612. @@ -12,7 +12,7 @@
  5613. #include <linux/sunrpc/clnt.h>
  5614. #include <linux/nfs_fs.h>
  5615. #include <linux/sched.h>
  5616. -#include <linux/wait.h>
  5617. +#include <linux/swait.h>
  5618. #include <linux/namei.h>
  5619. #include <linux/fsnotify.h>
  5620. @@ -51,6 +51,29 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
  5621. rpc_restart_call_prepare(task);
  5622. }
  5623. +#ifdef CONFIG_PREEMPT_RT_BASE
  5624. +static void nfs_down_anon(struct semaphore *sema)
  5625. +{
  5626. + down(sema);
  5627. +}
  5628. +
  5629. +static void nfs_up_anon(struct semaphore *sema)
  5630. +{
  5631. + up(sema);
  5632. +}
  5633. +
  5634. +#else
  5635. +static void nfs_down_anon(struct rw_semaphore *rwsem)
  5636. +{
  5637. + down_read_non_owner(rwsem);
  5638. +}
  5639. +
  5640. +static void nfs_up_anon(struct rw_semaphore *rwsem)
  5641. +{
  5642. + up_read_non_owner(rwsem);
  5643. +}
  5644. +#endif
  5645. +
  5646. /**
  5647. * nfs_async_unlink_release - Release the sillydelete data.
  5648. * @task: rpc_task of the sillydelete
  5649. @@ -64,7 +87,7 @@ static void nfs_async_unlink_release(void *calldata)
  5650. struct dentry *dentry = data->dentry;
  5651. struct super_block *sb = dentry->d_sb;
  5652. - up_read_non_owner(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
  5653. + nfs_up_anon(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
  5654. d_lookup_done(dentry);
  5655. nfs_free_unlinkdata(data);
  5656. dput(dentry);
  5657. @@ -117,10 +140,10 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
  5658. struct inode *dir = d_inode(dentry->d_parent);
  5659. struct dentry *alias;
  5660. - down_read_non_owner(&NFS_I(dir)->rmdir_sem);
  5661. + nfs_down_anon(&NFS_I(dir)->rmdir_sem);
  5662. alias = d_alloc_parallel(dentry->d_parent, &data->args.name, &data->wq);
  5663. if (IS_ERR(alias)) {
  5664. - up_read_non_owner(&NFS_I(dir)->rmdir_sem);
  5665. + nfs_up_anon(&NFS_I(dir)->rmdir_sem);
  5666. return 0;
  5667. }
  5668. if (!d_in_lookup(alias)) {
  5669. @@ -142,7 +165,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
  5670. ret = 0;
  5671. spin_unlock(&alias->d_lock);
  5672. dput(alias);
  5673. - up_read_non_owner(&NFS_I(dir)->rmdir_sem);
  5674. + nfs_up_anon(&NFS_I(dir)->rmdir_sem);
  5675. /*
  5676. * If we'd displaced old cached devname, free it. At that
  5677. * point dentry is definitely not a root, so we won't need
  5678. @@ -182,7 +205,7 @@ nfs_async_unlink(struct dentry *dentry, const struct qstr *name)
  5679. goto out_free_name;
  5680. }
  5681. data->res.dir_attr = &data->dir_attr;
  5682. - init_waitqueue_head(&data->wq);
  5683. + init_swait_queue_head(&data->wq);
  5684. status = -EBUSY;
  5685. spin_lock(&dentry->d_lock);
  5686. diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
  5687. index fe251f187ff8..e89da4fb14c2 100644
  5688. --- a/fs/ntfs/aops.c
  5689. +++ b/fs/ntfs/aops.c
  5690. @@ -92,13 +92,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5691. ofs = 0;
  5692. if (file_ofs < init_size)
  5693. ofs = init_size - file_ofs;
  5694. - local_irq_save(flags);
  5695. + local_irq_save_nort(flags);
  5696. kaddr = kmap_atomic(page);
  5697. memset(kaddr + bh_offset(bh) + ofs, 0,
  5698. bh->b_size - ofs);
  5699. flush_dcache_page(page);
  5700. kunmap_atomic(kaddr);
  5701. - local_irq_restore(flags);
  5702. + local_irq_restore_nort(flags);
  5703. }
  5704. } else {
  5705. clear_buffer_uptodate(bh);
  5706. @@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5707. "0x%llx.", (unsigned long long)bh->b_blocknr);
  5708. }
  5709. first = page_buffers(page);
  5710. - local_irq_save(flags);
  5711. - bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
  5712. + flags = bh_uptodate_lock_irqsave(first);
  5713. clear_buffer_async_read(bh);
  5714. unlock_buffer(bh);
  5715. tmp = bh;
  5716. @@ -123,8 +122,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5717. }
  5718. tmp = tmp->b_this_page;
  5719. } while (tmp != bh);
  5720. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5721. - local_irq_restore(flags);
  5722. + bh_uptodate_unlock_irqrestore(first, flags);
  5723. /*
  5724. * If none of the buffers had errors then we can set the page uptodate,
  5725. * but we first have to perform the post read mst fixups, if the
  5726. @@ -145,13 +143,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5727. recs = PAGE_SIZE / rec_size;
  5728. /* Should have been verified before we got here... */
  5729. BUG_ON(!recs);
  5730. - local_irq_save(flags);
  5731. + local_irq_save_nort(flags);
  5732. kaddr = kmap_atomic(page);
  5733. for (i = 0; i < recs; i++)
  5734. post_read_mst_fixup((NTFS_RECORD*)(kaddr +
  5735. i * rec_size), rec_size);
  5736. kunmap_atomic(kaddr);
  5737. - local_irq_restore(flags);
  5738. + local_irq_restore_nort(flags);
  5739. flush_dcache_page(page);
  5740. if (likely(page_uptodate && !PageError(page)))
  5741. SetPageUptodate(page);
  5742. @@ -159,9 +157,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
  5743. unlock_page(page);
  5744. return;
  5745. still_busy:
  5746. - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
  5747. - local_irq_restore(flags);
  5748. - return;
  5749. + bh_uptodate_unlock_irqrestore(first, flags);
  5750. }
  5751. /**
  5752. diff --git a/fs/proc/base.c b/fs/proc/base.c
  5753. index ca651ac00660..41d9dc789285 100644
  5754. --- a/fs/proc/base.c
  5755. +++ b/fs/proc/base.c
  5756. @@ -1834,7 +1834,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
  5757. child = d_hash_and_lookup(dir, &qname);
  5758. if (!child) {
  5759. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5760. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5761. child = d_alloc_parallel(dir, &qname, &wq);
  5762. if (IS_ERR(child))
  5763. goto end_instantiate;
  5764. diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
  5765. index d4e37acd4821..000cea46434a 100644
  5766. --- a/fs/proc/proc_sysctl.c
  5767. +++ b/fs/proc/proc_sysctl.c
  5768. @@ -632,7 +632,7 @@ static bool proc_sys_fill_cache(struct file *file,
  5769. child = d_lookup(dir, &qname);
  5770. if (!child) {
  5771. - DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
  5772. + DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
  5773. child = d_alloc_parallel(dir, &qname, &wq);
  5774. if (IS_ERR(child))
  5775. return false;
  5776. diff --git a/fs/timerfd.c b/fs/timerfd.c
  5777. index ab8dd1538381..5580853f57dd 100644
  5778. --- a/fs/timerfd.c
  5779. +++ b/fs/timerfd.c
  5780. @@ -471,7 +471,10 @@ static int do_timerfd_settime(int ufd, int flags,
  5781. break;
  5782. }
  5783. spin_unlock_irq(&ctx->wqh.lock);
  5784. - cpu_relax();
  5785. + if (isalarm(ctx))
  5786. + hrtimer_wait_for_timer(&ctx->t.alarm.timer);
  5787. + else
  5788. + hrtimer_wait_for_timer(&ctx->t.tmr);
  5789. }
  5790. /*
  5791. diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
  5792. index e861a24f06f2..b5c97d3059c7 100644
  5793. --- a/include/acpi/platform/aclinux.h
  5794. +++ b/include/acpi/platform/aclinux.h
  5795. @@ -133,6 +133,7 @@
  5796. #define acpi_cache_t struct kmem_cache
  5797. #define acpi_spinlock spinlock_t *
  5798. +#define acpi_raw_spinlock raw_spinlock_t *
  5799. #define acpi_cpu_flags unsigned long
  5800. /* Use native linux version of acpi_os_allocate_zeroed */
  5801. @@ -151,6 +152,20 @@
  5802. #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_thread_id
  5803. #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
  5804. +#define acpi_os_create_raw_lock(__handle) \
  5805. +({ \
  5806. + raw_spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
  5807. + \
  5808. + if (lock) { \
  5809. + *(__handle) = lock; \
  5810. + raw_spin_lock_init(*(__handle)); \
  5811. + } \
  5812. + lock ? AE_OK : AE_NO_MEMORY; \
  5813. + })
  5814. +
  5815. +#define acpi_os_delete_raw_lock(__handle) kfree(__handle)
  5816. +
  5817. +
  5818. /*
  5819. * OSL interfaces used by debugger/disassembler
  5820. */
  5821. diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
  5822. index 6f96247226a4..fa53a21263c2 100644
  5823. --- a/include/asm-generic/bug.h
  5824. +++ b/include/asm-generic/bug.h
  5825. @@ -215,6 +215,20 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
  5826. # define WARN_ON_SMP(x) ({0;})
  5827. #endif
  5828. +#ifdef CONFIG_PREEMPT_RT_BASE
  5829. +# define BUG_ON_RT(c) BUG_ON(c)
  5830. +# define BUG_ON_NONRT(c) do { } while (0)
  5831. +# define WARN_ON_RT(condition) WARN_ON(condition)
  5832. +# define WARN_ON_NONRT(condition) do { } while (0)
  5833. +# define WARN_ON_ONCE_NONRT(condition) do { } while (0)
  5834. +#else
  5835. +# define BUG_ON_RT(c) do { } while (0)
  5836. +# define BUG_ON_NONRT(c) BUG_ON(c)
  5837. +# define WARN_ON_RT(condition) do { } while (0)
  5838. +# define WARN_ON_NONRT(condition) WARN_ON(condition)
  5839. +# define WARN_ON_ONCE_NONRT(condition) WARN_ON_ONCE(condition)
  5840. +#endif
  5841. +
  5842. #endif /* __ASSEMBLY__ */
  5843. #endif
  5844. diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
  5845. index 535ab2e13d2e..cfc246899473 100644
  5846. --- a/include/linux/blk-mq.h
  5847. +++ b/include/linux/blk-mq.h
  5848. @@ -209,7 +209,7 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
  5849. return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
  5850. }
  5851. -
  5852. +void __blk_mq_complete_request_remote_work(struct work_struct *work);
  5853. int blk_mq_request_started(struct request *rq);
  5854. void blk_mq_start_request(struct request *rq);
  5855. void blk_mq_end_request(struct request *rq, int error);
  5856. diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
  5857. index f6a816129856..ec7a4676f8a8 100644
  5858. --- a/include/linux/blkdev.h
  5859. +++ b/include/linux/blkdev.h
  5860. @@ -89,6 +89,7 @@ struct request {
  5861. struct list_head queuelist;
  5862. union {
  5863. struct call_single_data csd;
  5864. + struct work_struct work;
  5865. u64 fifo_time;
  5866. };
  5867. @@ -467,7 +468,7 @@ struct request_queue {
  5868. struct throtl_data *td;
  5869. #endif
  5870. struct rcu_head rcu_head;
  5871. - wait_queue_head_t mq_freeze_wq;
  5872. + struct swait_queue_head mq_freeze_wq;
  5873. struct percpu_ref q_usage_counter;
  5874. struct list_head all_q_node;
  5875. diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
  5876. index 8fdcb783197d..d07dbeec7bc1 100644
  5877. --- a/include/linux/bottom_half.h
  5878. +++ b/include/linux/bottom_half.h
  5879. @@ -3,6 +3,39 @@
  5880. #include <linux/preempt.h>
  5881. +#ifdef CONFIG_PREEMPT_RT_FULL
  5882. +
  5883. +extern void __local_bh_disable(void);
  5884. +extern void _local_bh_enable(void);
  5885. +extern void __local_bh_enable(void);
  5886. +
  5887. +static inline void local_bh_disable(void)
  5888. +{
  5889. + __local_bh_disable();
  5890. +}
  5891. +
  5892. +static inline void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
  5893. +{
  5894. + __local_bh_disable();
  5895. +}
  5896. +
  5897. +static inline void local_bh_enable(void)
  5898. +{
  5899. + __local_bh_enable();
  5900. +}
  5901. +
  5902. +static inline void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
  5903. +{
  5904. + __local_bh_enable();
  5905. +}
  5906. +
  5907. +static inline void local_bh_enable_ip(unsigned long ip)
  5908. +{
  5909. + __local_bh_enable();
  5910. +}
  5911. +
  5912. +#else
  5913. +
  5914. #ifdef CONFIG_TRACE_IRQFLAGS
  5915. extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
  5916. #else
  5917. @@ -30,5 +63,6 @@ static inline void local_bh_enable(void)
  5918. {
  5919. __local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
  5920. }
  5921. +#endif
  5922. #endif /* _LINUX_BH_H */
  5923. diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
  5924. index ebbacd14d450..be5e87f6360a 100644
  5925. --- a/include/linux/buffer_head.h
  5926. +++ b/include/linux/buffer_head.h
  5927. @@ -75,8 +75,50 @@ struct buffer_head {
  5928. struct address_space *b_assoc_map; /* mapping this buffer is
  5929. associated with */
  5930. atomic_t b_count; /* users using this buffer_head */
  5931. +#ifdef CONFIG_PREEMPT_RT_BASE
  5932. + spinlock_t b_uptodate_lock;
  5933. +#if IS_ENABLED(CONFIG_JBD2)
  5934. + spinlock_t b_state_lock;
  5935. + spinlock_t b_journal_head_lock;
  5936. +#endif
  5937. +#endif
  5938. };
  5939. +static inline unsigned long bh_uptodate_lock_irqsave(struct buffer_head *bh)
  5940. +{
  5941. + unsigned long flags;
  5942. +
  5943. +#ifndef CONFIG_PREEMPT_RT_BASE
  5944. + local_irq_save(flags);
  5945. + bit_spin_lock(BH_Uptodate_Lock, &bh->b_state);
  5946. +#else
  5947. + spin_lock_irqsave(&bh->b_uptodate_lock, flags);
  5948. +#endif
  5949. + return flags;
  5950. +}
  5951. +
  5952. +static inline void
  5953. +bh_uptodate_unlock_irqrestore(struct buffer_head *bh, unsigned long flags)
  5954. +{
  5955. +#ifndef CONFIG_PREEMPT_RT_BASE
  5956. + bit_spin_unlock(BH_Uptodate_Lock, &bh->b_state);
  5957. + local_irq_restore(flags);
  5958. +#else
  5959. + spin_unlock_irqrestore(&bh->b_uptodate_lock, flags);
  5960. +#endif
  5961. +}
  5962. +
  5963. +static inline void buffer_head_init_locks(struct buffer_head *bh)
  5964. +{
  5965. +#ifdef CONFIG_PREEMPT_RT_BASE
  5966. + spin_lock_init(&bh->b_uptodate_lock);
  5967. +#if IS_ENABLED(CONFIG_JBD2)
  5968. + spin_lock_init(&bh->b_state_lock);
  5969. + spin_lock_init(&bh->b_journal_head_lock);
  5970. +#endif
  5971. +#endif
  5972. +}
  5973. +
  5974. /*
  5975. * macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
  5976. * and buffer_foo() functions.
  5977. diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
  5978. index 5b17de62c962..56027cc01a56 100644
  5979. --- a/include/linux/cgroup-defs.h
  5980. +++ b/include/linux/cgroup-defs.h
  5981. @@ -16,6 +16,7 @@
  5982. #include <linux/percpu-refcount.h>
  5983. #include <linux/percpu-rwsem.h>
  5984. #include <linux/workqueue.h>
  5985. +#include <linux/swork.h>
  5986. #ifdef CONFIG_CGROUPS
  5987. @@ -137,6 +138,7 @@ struct cgroup_subsys_state {
  5988. /* percpu_ref killing and RCU release */
  5989. struct rcu_head rcu_head;
  5990. struct work_struct destroy_work;
  5991. + struct swork_event destroy_swork;
  5992. };
  5993. /*
  5994. diff --git a/include/linux/completion.h b/include/linux/completion.h
  5995. index 5d5aaae3af43..3bca1590e29f 100644
  5996. --- a/include/linux/completion.h
  5997. +++ b/include/linux/completion.h
  5998. @@ -7,8 +7,7 @@
  5999. * Atomic wait-for-completion handler data structures.
  6000. * See kernel/sched/completion.c for details.
  6001. */
  6002. -
  6003. -#include <linux/wait.h>
  6004. +#include <linux/swait.h>
  6005. /*
  6006. * struct completion - structure used to maintain state for a "completion"
  6007. @@ -24,11 +23,11 @@
  6008. */
  6009. struct completion {
  6010. unsigned int done;
  6011. - wait_queue_head_t wait;
  6012. + struct swait_queue_head wait;
  6013. };
  6014. #define COMPLETION_INITIALIZER(work) \
  6015. - { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
  6016. + { 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
  6017. #define COMPLETION_INITIALIZER_ONSTACK(work) \
  6018. ({ init_completion(&work); work; })
  6019. @@ -73,7 +72,7 @@ struct completion {
  6020. static inline void init_completion(struct completion *x)
  6021. {
  6022. x->done = 0;
  6023. - init_waitqueue_head(&x->wait);
  6024. + init_swait_queue_head(&x->wait);
  6025. }
  6026. /**
  6027. diff --git a/include/linux/cpu.h b/include/linux/cpu.h
  6028. index e571128ad99a..5e52d28c20c1 100644
  6029. --- a/include/linux/cpu.h
  6030. +++ b/include/linux/cpu.h
  6031. @@ -182,6 +182,8 @@ extern void get_online_cpus(void);
  6032. extern void put_online_cpus(void);
  6033. extern void cpu_hotplug_disable(void);
  6034. extern void cpu_hotplug_enable(void);
  6035. +extern void pin_current_cpu(void);
  6036. +extern void unpin_current_cpu(void);
  6037. #define hotcpu_notifier(fn, pri) cpu_notifier(fn, pri)
  6038. #define __hotcpu_notifier(fn, pri) __cpu_notifier(fn, pri)
  6039. #define register_hotcpu_notifier(nb) register_cpu_notifier(nb)
  6040. @@ -199,6 +201,8 @@ static inline void cpu_hotplug_done(void) {}
  6041. #define put_online_cpus() do { } while (0)
  6042. #define cpu_hotplug_disable() do { } while (0)
  6043. #define cpu_hotplug_enable() do { } while (0)
  6044. +static inline void pin_current_cpu(void) { }
  6045. +static inline void unpin_current_cpu(void) { }
  6046. #define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
  6047. #define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
  6048. /* These aren't inline functions due to a GCC bug. */
  6049. diff --git a/include/linux/dcache.h b/include/linux/dcache.h
  6050. index 5beed7b30561..61cab7ef458e 100644
  6051. --- a/include/linux/dcache.h
  6052. +++ b/include/linux/dcache.h
  6053. @@ -11,6 +11,7 @@
  6054. #include <linux/rcupdate.h>
  6055. #include <linux/lockref.h>
  6056. #include <linux/stringhash.h>
  6057. +#include <linux/wait.h>
  6058. struct path;
  6059. struct vfsmount;
  6060. @@ -100,7 +101,7 @@ struct dentry {
  6061. union {
  6062. struct list_head d_lru; /* LRU list */
  6063. - wait_queue_head_t *d_wait; /* in-lookup ones only */
  6064. + struct swait_queue_head *d_wait; /* in-lookup ones only */
  6065. };
  6066. struct list_head d_child; /* child of parent list */
  6067. struct list_head d_subdirs; /* our children */
  6068. @@ -230,7 +231,7 @@ extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op
  6069. extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
  6070. extern struct dentry * d_alloc_pseudo(struct super_block *, const struct qstr *);
  6071. extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,
  6072. - wait_queue_head_t *);
  6073. + struct swait_queue_head *);
  6074. extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
  6075. extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);
  6076. extern struct dentry * d_exact_alias(struct dentry *, struct inode *);
  6077. diff --git a/include/linux/delay.h b/include/linux/delay.h
  6078. index a6ecb34cf547..37caab306336 100644
  6079. --- a/include/linux/delay.h
  6080. +++ b/include/linux/delay.h
  6081. @@ -52,4 +52,10 @@ static inline void ssleep(unsigned int seconds)
  6082. msleep(seconds * 1000);
  6083. }
  6084. +#ifdef CONFIG_PREEMPT_RT_FULL
  6085. +extern void cpu_chill(void);
  6086. +#else
  6087. +# define cpu_chill() cpu_relax()
  6088. +#endif
  6089. +
  6090. #endif /* defined(_LINUX_DELAY_H) */
  6091. diff --git a/include/linux/highmem.h b/include/linux/highmem.h
  6092. index bb3f3297062a..a117a33ef72c 100644
  6093. --- a/include/linux/highmem.h
  6094. +++ b/include/linux/highmem.h
  6095. @@ -7,6 +7,7 @@
  6096. #include <linux/mm.h>
  6097. #include <linux/uaccess.h>
  6098. #include <linux/hardirq.h>
  6099. +#include <linux/sched.h>
  6100. #include <asm/cacheflush.h>
  6101. @@ -65,7 +66,7 @@ static inline void kunmap(struct page *page)
  6102. static inline void *kmap_atomic(struct page *page)
  6103. {
  6104. - preempt_disable();
  6105. + preempt_disable_nort();
  6106. pagefault_disable();
  6107. return page_address(page);
  6108. }
  6109. @@ -74,7 +75,7 @@ static inline void *kmap_atomic(struct page *page)
  6110. static inline void __kunmap_atomic(void *addr)
  6111. {
  6112. pagefault_enable();
  6113. - preempt_enable();
  6114. + preempt_enable_nort();
  6115. }
  6116. #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
  6117. @@ -86,32 +87,51 @@ static inline void __kunmap_atomic(void *addr)
  6118. #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
  6119. +#ifndef CONFIG_PREEMPT_RT_FULL
  6120. DECLARE_PER_CPU(int, __kmap_atomic_idx);
  6121. +#endif
  6122. static inline int kmap_atomic_idx_push(void)
  6123. {
  6124. +#ifndef CONFIG_PREEMPT_RT_FULL
  6125. int idx = __this_cpu_inc_return(__kmap_atomic_idx) - 1;
  6126. -#ifdef CONFIG_DEBUG_HIGHMEM
  6127. +# ifdef CONFIG_DEBUG_HIGHMEM
  6128. WARN_ON_ONCE(in_irq() && !irqs_disabled());
  6129. BUG_ON(idx >= KM_TYPE_NR);
  6130. -#endif
  6131. +# endif
  6132. return idx;
  6133. +#else
  6134. + current->kmap_idx++;
  6135. + BUG_ON(current->kmap_idx > KM_TYPE_NR);
  6136. + return current->kmap_idx - 1;
  6137. +#endif
  6138. }
  6139. static inline int kmap_atomic_idx(void)
  6140. {
  6141. +#ifndef CONFIG_PREEMPT_RT_FULL
  6142. return __this_cpu_read(__kmap_atomic_idx) - 1;
  6143. +#else
  6144. + return current->kmap_idx - 1;
  6145. +#endif
  6146. }
  6147. static inline void kmap_atomic_idx_pop(void)
  6148. {
  6149. -#ifdef CONFIG_DEBUG_HIGHMEM
  6150. +#ifndef CONFIG_PREEMPT_RT_FULL
  6151. +# ifdef CONFIG_DEBUG_HIGHMEM
  6152. int idx = __this_cpu_dec_return(__kmap_atomic_idx);
  6153. BUG_ON(idx < 0);
  6154. -#else
  6155. +# else
  6156. __this_cpu_dec(__kmap_atomic_idx);
  6157. +# endif
  6158. +#else
  6159. + current->kmap_idx--;
  6160. +# ifdef CONFIG_DEBUG_HIGHMEM
  6161. + BUG_ON(current->kmap_idx < 0);
  6162. +# endif
  6163. #endif
  6164. }
  6165. diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
  6166. index 5e00f80b1535..a34e10b55cde 100644
  6167. --- a/include/linux/hrtimer.h
  6168. +++ b/include/linux/hrtimer.h
  6169. @@ -87,6 +87,9 @@ enum hrtimer_restart {
  6170. * @function: timer expiry callback function
  6171. * @base: pointer to the timer base (per cpu and per clock)
  6172. * @state: state information (See bit values above)
  6173. + * @cb_entry: list entry to defer timers from hardirq context
  6174. + * @irqsafe: timer can run in hardirq context
  6175. + * @praecox: timer expiry time if expired at the time of programming
  6176. * @is_rel: Set if the timer was armed relative
  6177. * @start_pid: timer statistics field to store the pid of the task which
  6178. * started the timer
  6179. @@ -103,6 +106,11 @@ struct hrtimer {
  6180. enum hrtimer_restart (*function)(struct hrtimer *);
  6181. struct hrtimer_clock_base *base;
  6182. u8 state;
  6183. + struct list_head cb_entry;
  6184. + int irqsafe;
  6185. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  6186. + ktime_t praecox;
  6187. +#endif
  6188. u8 is_rel;
  6189. #ifdef CONFIG_TIMER_STATS
  6190. int start_pid;
  6191. @@ -123,11 +131,7 @@ struct hrtimer_sleeper {
  6192. struct task_struct *task;
  6193. };
  6194. -#ifdef CONFIG_64BIT
  6195. # define HRTIMER_CLOCK_BASE_ALIGN 64
  6196. -#else
  6197. -# define HRTIMER_CLOCK_BASE_ALIGN 32
  6198. -#endif
  6199. /**
  6200. * struct hrtimer_clock_base - the timer base for a specific clock
  6201. @@ -136,6 +140,7 @@ struct hrtimer_sleeper {
  6202. * timer to a base on another cpu.
  6203. * @clockid: clock id for per_cpu support
  6204. * @active: red black tree root node for the active timers
  6205. + * @expired: list head for deferred timers.
  6206. * @get_time: function to retrieve the current time of the clock
  6207. * @offset: offset of this clock to the monotonic base
  6208. */
  6209. @@ -144,6 +149,7 @@ struct hrtimer_clock_base {
  6210. int index;
  6211. clockid_t clockid;
  6212. struct timerqueue_head active;
  6213. + struct list_head expired;
  6214. ktime_t (*get_time)(void);
  6215. ktime_t offset;
  6216. } __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN)));
  6217. @@ -187,6 +193,7 @@ struct hrtimer_cpu_base {
  6218. raw_spinlock_t lock;
  6219. seqcount_t seq;
  6220. struct hrtimer *running;
  6221. + struct hrtimer *running_soft;
  6222. unsigned int cpu;
  6223. unsigned int active_bases;
  6224. unsigned int clock_was_set_seq;
  6225. @@ -203,6 +210,9 @@ struct hrtimer_cpu_base {
  6226. unsigned int nr_hangs;
  6227. unsigned int max_hang_time;
  6228. #endif
  6229. +#ifdef CONFIG_PREEMPT_RT_BASE
  6230. + wait_queue_head_t wait;
  6231. +#endif
  6232. struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
  6233. } ____cacheline_aligned;
  6234. @@ -412,6 +422,13 @@ static inline void hrtimer_restart(struct hrtimer *timer)
  6235. hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
  6236. }
  6237. +/* Softirq preemption could deadlock timer removal */
  6238. +#ifdef CONFIG_PREEMPT_RT_BASE
  6239. + extern void hrtimer_wait_for_timer(const struct hrtimer *timer);
  6240. +#else
  6241. +# define hrtimer_wait_for_timer(timer) do { cpu_relax(); } while (0)
  6242. +#endif
  6243. +
  6244. /* Query timers: */
  6245. extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
  6246. @@ -436,9 +453,15 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
  6247. * Helper function to check, whether the timer is running the callback
  6248. * function
  6249. */
  6250. -static inline int hrtimer_callback_running(struct hrtimer *timer)
  6251. +static inline int hrtimer_callback_running(const struct hrtimer *timer)
  6252. {
  6253. - return timer->base->cpu_base->running == timer;
  6254. + if (timer->base->cpu_base->running == timer)
  6255. + return 1;
  6256. +#ifdef CONFIG_PREEMPT_RT_BASE
  6257. + if (timer->base->cpu_base->running_soft == timer)
  6258. + return 1;
  6259. +#endif
  6260. + return 0;
  6261. }
  6262. /* Forward a hrtimer so it expires after now: */
  6263. diff --git a/include/linux/idr.h b/include/linux/idr.h
  6264. index 083d61e92706..5899796f50cb 100644
  6265. --- a/include/linux/idr.h
  6266. +++ b/include/linux/idr.h
  6267. @@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp);
  6268. * Each idr_preload() should be matched with an invocation of this
  6269. * function. See idr_preload() for details.
  6270. */
  6271. +#ifdef CONFIG_PREEMPT_RT_FULL
  6272. +void idr_preload_end(void);
  6273. +#else
  6274. static inline void idr_preload_end(void)
  6275. {
  6276. preempt_enable();
  6277. }
  6278. +#endif
  6279. /**
  6280. * idr_find - return pointer for given id
  6281. diff --git a/include/linux/init_task.h b/include/linux/init_task.h
  6282. index 325f649d77ff..a56e263f5005 100644
  6283. --- a/include/linux/init_task.h
  6284. +++ b/include/linux/init_task.h
  6285. @@ -150,6 +150,12 @@ extern struct task_group root_task_group;
  6286. # define INIT_PERF_EVENTS(tsk)
  6287. #endif
  6288. +#ifdef CONFIG_PREEMPT_RT_BASE
  6289. +# define INIT_TIMER_LIST .posix_timer_list = NULL,
  6290. +#else
  6291. +# define INIT_TIMER_LIST
  6292. +#endif
  6293. +
  6294. #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
  6295. # define INIT_VTIME(tsk) \
  6296. .vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount), \
  6297. @@ -164,6 +170,7 @@ extern struct task_group root_task_group;
  6298. #ifdef CONFIG_RT_MUTEXES
  6299. # define INIT_RT_MUTEXES(tsk) \
  6300. .pi_waiters = RB_ROOT, \
  6301. + .pi_top_task = NULL, \
  6302. .pi_waiters_leftmost = NULL,
  6303. #else
  6304. # define INIT_RT_MUTEXES(tsk)
  6305. @@ -250,6 +257,7 @@ extern struct task_group root_task_group;
  6306. .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
  6307. .pi_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock), \
  6308. .timer_slack_ns = 50000, /* 50 usec default slack */ \
  6309. + INIT_TIMER_LIST \
  6310. .pids = { \
  6311. [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \
  6312. [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \
  6313. diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
  6314. index 72f0721f75e7..480972ae47d3 100644
  6315. --- a/include/linux/interrupt.h
  6316. +++ b/include/linux/interrupt.h
  6317. @@ -14,6 +14,7 @@
  6318. #include <linux/hrtimer.h>
  6319. #include <linux/kref.h>
  6320. #include <linux/workqueue.h>
  6321. +#include <linux/swork.h>
  6322. #include <linux/atomic.h>
  6323. #include <asm/ptrace.h>
  6324. @@ -61,6 +62,7 @@
  6325. * interrupt handler after suspending interrupts. For system
  6326. * wakeup devices users need to implement wakeup detection in
  6327. * their interrupt handlers.
  6328. + * IRQF_NO_SOFTIRQ_CALL - Do not process softirqs in the irq thread context (RT)
  6329. */
  6330. #define IRQF_SHARED 0x00000080
  6331. #define IRQF_PROBE_SHARED 0x00000100
  6332. @@ -74,6 +76,7 @@
  6333. #define IRQF_NO_THREAD 0x00010000
  6334. #define IRQF_EARLY_RESUME 0x00020000
  6335. #define IRQF_COND_SUSPEND 0x00040000
  6336. +#define IRQF_NO_SOFTIRQ_CALL 0x00080000
  6337. #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
  6338. @@ -196,7 +199,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
  6339. #ifdef CONFIG_LOCKDEP
  6340. # define local_irq_enable_in_hardirq() do { } while (0)
  6341. #else
  6342. -# define local_irq_enable_in_hardirq() local_irq_enable()
  6343. +# define local_irq_enable_in_hardirq() local_irq_enable_nort()
  6344. #endif
  6345. extern void disable_irq_nosync(unsigned int irq);
  6346. @@ -216,6 +219,7 @@ extern void resume_device_irqs(void);
  6347. * struct irq_affinity_notify - context for notification of IRQ affinity changes
  6348. * @irq: Interrupt to which notification applies
  6349. * @kref: Reference count, for internal use
  6350. + * @swork: Swork item, for internal use
  6351. * @work: Work item, for internal use
  6352. * @notify: Function to be called on change. This will be
  6353. * called in process context.
  6354. @@ -227,7 +231,11 @@ extern void resume_device_irqs(void);
  6355. struct irq_affinity_notify {
  6356. unsigned int irq;
  6357. struct kref kref;
  6358. +#ifdef CONFIG_PREEMPT_RT_BASE
  6359. + struct swork_event swork;
  6360. +#else
  6361. struct work_struct work;
  6362. +#endif
  6363. void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
  6364. void (*release)(struct kref *ref);
  6365. };
  6366. @@ -406,9 +414,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
  6367. bool state);
  6368. #ifdef CONFIG_IRQ_FORCED_THREADING
  6369. +# ifndef CONFIG_PREEMPT_RT_BASE
  6370. extern bool force_irqthreads;
  6371. +# else
  6372. +# define force_irqthreads (true)
  6373. +# endif
  6374. #else
  6375. -#define force_irqthreads (0)
  6376. +#define force_irqthreads (false)
  6377. #endif
  6378. #ifndef __ARCH_SET_SOFTIRQ_PENDING
  6379. @@ -465,9 +477,10 @@ struct softirq_action
  6380. void (*action)(struct softirq_action *);
  6381. };
  6382. +#ifndef CONFIG_PREEMPT_RT_FULL
  6383. asmlinkage void do_softirq(void);
  6384. asmlinkage void __do_softirq(void);
  6385. -
  6386. +static inline void thread_do_softirq(void) { do_softirq(); }
  6387. #ifdef __ARCH_HAS_DO_SOFTIRQ
  6388. void do_softirq_own_stack(void);
  6389. #else
  6390. @@ -476,13 +489,25 @@ static inline void do_softirq_own_stack(void)
  6391. __do_softirq();
  6392. }
  6393. #endif
  6394. +#else
  6395. +extern void thread_do_softirq(void);
  6396. +#endif
  6397. extern void open_softirq(int nr, void (*action)(struct softirq_action *));
  6398. extern void softirq_init(void);
  6399. extern void __raise_softirq_irqoff(unsigned int nr);
  6400. +#ifdef CONFIG_PREEMPT_RT_FULL
  6401. +extern void __raise_softirq_irqoff_ksoft(unsigned int nr);
  6402. +#else
  6403. +static inline void __raise_softirq_irqoff_ksoft(unsigned int nr)
  6404. +{
  6405. + __raise_softirq_irqoff(nr);
  6406. +}
  6407. +#endif
  6408. extern void raise_softirq_irqoff(unsigned int nr);
  6409. extern void raise_softirq(unsigned int nr);
  6410. +extern void softirq_check_pending_idle(void);
  6411. DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
  6412. @@ -504,8 +529,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void)
  6413. to be executed on some cpu at least once after this.
  6414. * If the tasklet is already scheduled, but its execution is still not
  6415. started, it will be executed only once.
  6416. - * If this tasklet is already running on another CPU (or schedule is called
  6417. - from tasklet itself), it is rescheduled for later.
  6418. + * If this tasklet is already running on another CPU, it is rescheduled
  6419. + for later.
  6420. + * Schedule must not be called from the tasklet itself (a lockup occurs)
  6421. * Tasklet is strictly serialized wrt itself, but not
  6422. wrt another tasklets. If client needs some intertask synchronization,
  6423. he makes it with spinlocks.
  6424. @@ -530,27 +556,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
  6425. enum
  6426. {
  6427. TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */
  6428. - TASKLET_STATE_RUN /* Tasklet is running (SMP only) */
  6429. + TASKLET_STATE_RUN, /* Tasklet is running (SMP only) */
  6430. + TASKLET_STATE_PENDING /* Tasklet is pending */
  6431. };
  6432. -#ifdef CONFIG_SMP
  6433. +#define TASKLET_STATEF_SCHED (1 << TASKLET_STATE_SCHED)
  6434. +#define TASKLET_STATEF_RUN (1 << TASKLET_STATE_RUN)
  6435. +#define TASKLET_STATEF_PENDING (1 << TASKLET_STATE_PENDING)
  6436. +
  6437. +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
  6438. static inline int tasklet_trylock(struct tasklet_struct *t)
  6439. {
  6440. return !test_and_set_bit(TASKLET_STATE_RUN, &(t)->state);
  6441. }
  6442. +static inline int tasklet_tryunlock(struct tasklet_struct *t)
  6443. +{
  6444. + return cmpxchg(&t->state, TASKLET_STATEF_RUN, 0) == TASKLET_STATEF_RUN;
  6445. +}
  6446. +
  6447. static inline void tasklet_unlock(struct tasklet_struct *t)
  6448. {
  6449. smp_mb__before_atomic();
  6450. clear_bit(TASKLET_STATE_RUN, &(t)->state);
  6451. }
  6452. -static inline void tasklet_unlock_wait(struct tasklet_struct *t)
  6453. -{
  6454. - while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { barrier(); }
  6455. -}
  6456. +extern void tasklet_unlock_wait(struct tasklet_struct *t);
  6457. +
  6458. #else
  6459. #define tasklet_trylock(t) 1
  6460. +#define tasklet_tryunlock(t) 1
  6461. #define tasklet_unlock_wait(t) do { } while (0)
  6462. #define tasklet_unlock(t) do { } while (0)
  6463. #endif
  6464. @@ -599,12 +634,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
  6465. smp_mb();
  6466. }
  6467. -static inline void tasklet_enable(struct tasklet_struct *t)
  6468. -{
  6469. - smp_mb__before_atomic();
  6470. - atomic_dec(&t->count);
  6471. -}
  6472. -
  6473. +extern void tasklet_enable(struct tasklet_struct *t);
  6474. extern void tasklet_kill(struct tasklet_struct *t);
  6475. extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu);
  6476. extern void tasklet_init(struct tasklet_struct *t,
  6477. @@ -635,6 +665,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
  6478. tasklet_kill(&ttimer->tasklet);
  6479. }
  6480. +#ifdef CONFIG_PREEMPT_RT_FULL
  6481. +extern void softirq_early_init(void);
  6482. +#else
  6483. +static inline void softirq_early_init(void) { }
  6484. +#endif
  6485. +
  6486. /*
  6487. * Autoprobing for irqs:
  6488. *
  6489. diff --git a/include/linux/irq.h b/include/linux/irq.h
  6490. index 39e3254e5769..8ebac94fbb9f 100644
  6491. --- a/include/linux/irq.h
  6492. +++ b/include/linux/irq.h
  6493. @@ -72,6 +72,7 @@ enum irqchip_irq_state;
  6494. * IRQ_IS_POLLED - Always polled by another interrupt. Exclude
  6495. * it from the spurious interrupt detection
  6496. * mechanism and from core side polling.
  6497. + * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT)
  6498. * IRQ_DISABLE_UNLAZY - Disable lazy irq disable
  6499. */
  6500. enum {
  6501. @@ -99,13 +100,14 @@ enum {
  6502. IRQ_PER_CPU_DEVID = (1 << 17),
  6503. IRQ_IS_POLLED = (1 << 18),
  6504. IRQ_DISABLE_UNLAZY = (1 << 19),
  6505. + IRQ_NO_SOFTIRQ_CALL = (1 << 20),
  6506. };
  6507. #define IRQF_MODIFY_MASK \
  6508. (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
  6509. IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
  6510. IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
  6511. - IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
  6512. + IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
  6513. #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
  6514. diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
  6515. index 47b9ebd4a74f..2543aab05daa 100644
  6516. --- a/include/linux/irq_work.h
  6517. +++ b/include/linux/irq_work.h
  6518. @@ -16,6 +16,7 @@
  6519. #define IRQ_WORK_BUSY 2UL
  6520. #define IRQ_WORK_FLAGS 3UL
  6521. #define IRQ_WORK_LAZY 4UL /* Doesn't want IPI, wait for tick */
  6522. +#define IRQ_WORK_HARD_IRQ 8UL /* Run hard IRQ context, even on RT */
  6523. struct irq_work {
  6524. unsigned long flags;
  6525. @@ -51,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; }
  6526. static inline void irq_work_run(void) { }
  6527. #endif
  6528. +#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
  6529. +void irq_work_tick_soft(void);
  6530. +#else
  6531. +static inline void irq_work_tick_soft(void) { }
  6532. +#endif
  6533. +
  6534. #endif /* _LINUX_IRQ_WORK_H */
  6535. diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
  6536. index c9be57931b58..eeeb540971ae 100644
  6537. --- a/include/linux/irqdesc.h
  6538. +++ b/include/linux/irqdesc.h
  6539. @@ -66,6 +66,7 @@ struct irq_desc {
  6540. unsigned int irqs_unhandled;
  6541. atomic_t threads_handled;
  6542. int threads_handled_last;
  6543. + u64 random_ip;
  6544. raw_spinlock_t lock;
  6545. struct cpumask *percpu_enabled;
  6546. const struct cpumask *percpu_affinity;
  6547. diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
  6548. index 5dd1272d1ab2..9b77034f7c5e 100644
  6549. --- a/include/linux/irqflags.h
  6550. +++ b/include/linux/irqflags.h
  6551. @@ -25,8 +25,6 @@
  6552. # define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
  6553. # define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
  6554. # define trace_hardirq_exit() do { current->hardirq_context--; } while (0)
  6555. -# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
  6556. -# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
  6557. # define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1,
  6558. #else
  6559. # define trace_hardirqs_on() do { } while (0)
  6560. @@ -39,9 +37,15 @@
  6561. # define trace_softirqs_enabled(p) 0
  6562. # define trace_hardirq_enter() do { } while (0)
  6563. # define trace_hardirq_exit() do { } while (0)
  6564. +# define INIT_TRACE_IRQFLAGS
  6565. +#endif
  6566. +
  6567. +#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PREEMPT_RT_FULL)
  6568. +# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
  6569. +# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
  6570. +#else
  6571. # define lockdep_softirq_enter() do { } while (0)
  6572. # define lockdep_softirq_exit() do { } while (0)
  6573. -# define INIT_TRACE_IRQFLAGS
  6574. #endif
  6575. #if defined(CONFIG_IRQSOFF_TRACER) || \
  6576. @@ -148,4 +152,23 @@
  6577. #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags)
  6578. +/*
  6579. + * local_irq* variants depending on RT/!RT
  6580. + */
  6581. +#ifdef CONFIG_PREEMPT_RT_FULL
  6582. +# define local_irq_disable_nort() do { } while (0)
  6583. +# define local_irq_enable_nort() do { } while (0)
  6584. +# define local_irq_save_nort(flags) local_save_flags(flags)
  6585. +# define local_irq_restore_nort(flags) (void)(flags)
  6586. +# define local_irq_disable_rt() local_irq_disable()
  6587. +# define local_irq_enable_rt() local_irq_enable()
  6588. +#else
  6589. +# define local_irq_disable_nort() local_irq_disable()
  6590. +# define local_irq_enable_nort() local_irq_enable()
  6591. +# define local_irq_save_nort(flags) local_irq_save(flags)
  6592. +# define local_irq_restore_nort(flags) local_irq_restore(flags)
  6593. +# define local_irq_disable_rt() do { } while (0)
  6594. +# define local_irq_enable_rt() do { } while (0)
  6595. +#endif
  6596. +
  6597. #endif
  6598. diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
  6599. index dfaa1f4dcb0c..d57dd06544a1 100644
  6600. --- a/include/linux/jbd2.h
  6601. +++ b/include/linux/jbd2.h
  6602. @@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh)
  6603. static inline void jbd_lock_bh_state(struct buffer_head *bh)
  6604. {
  6605. +#ifndef CONFIG_PREEMPT_RT_BASE
  6606. bit_spin_lock(BH_State, &bh->b_state);
  6607. +#else
  6608. + spin_lock(&bh->b_state_lock);
  6609. +#endif
  6610. }
  6611. static inline int jbd_trylock_bh_state(struct buffer_head *bh)
  6612. {
  6613. +#ifndef CONFIG_PREEMPT_RT_BASE
  6614. return bit_spin_trylock(BH_State, &bh->b_state);
  6615. +#else
  6616. + return spin_trylock(&bh->b_state_lock);
  6617. +#endif
  6618. }
  6619. static inline int jbd_is_locked_bh_state(struct buffer_head *bh)
  6620. {
  6621. +#ifndef CONFIG_PREEMPT_RT_BASE
  6622. return bit_spin_is_locked(BH_State, &bh->b_state);
  6623. +#else
  6624. + return spin_is_locked(&bh->b_state_lock);
  6625. +#endif
  6626. }
  6627. static inline void jbd_unlock_bh_state(struct buffer_head *bh)
  6628. {
  6629. +#ifndef CONFIG_PREEMPT_RT_BASE
  6630. bit_spin_unlock(BH_State, &bh->b_state);
  6631. +#else
  6632. + spin_unlock(&bh->b_state_lock);
  6633. +#endif
  6634. }
  6635. static inline void jbd_lock_bh_journal_head(struct buffer_head *bh)
  6636. {
  6637. +#ifndef CONFIG_PREEMPT_RT_BASE
  6638. bit_spin_lock(BH_JournalHead, &bh->b_state);
  6639. +#else
  6640. + spin_lock(&bh->b_journal_head_lock);
  6641. +#endif
  6642. }
  6643. static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
  6644. {
  6645. +#ifndef CONFIG_PREEMPT_RT_BASE
  6646. bit_spin_unlock(BH_JournalHead, &bh->b_state);
  6647. +#else
  6648. + spin_unlock(&bh->b_journal_head_lock);
  6649. +#endif
  6650. }
  6651. #define J_ASSERT(assert) BUG_ON(!(assert))
  6652. diff --git a/include/linux/kdb.h b/include/linux/kdb.h
  6653. index 410decacff8f..0861bebfc188 100644
  6654. --- a/include/linux/kdb.h
  6655. +++ b/include/linux/kdb.h
  6656. @@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(enum kdb_msgsrc src, const char *fmt,
  6657. extern __printf(1, 2) int kdb_printf(const char *, ...);
  6658. typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
  6659. +#define in_kdb_printk() (kdb_trap_printk)
  6660. extern void kdb_init(int level);
  6661. /* Access to kdb specific polling devices */
  6662. @@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kdb_func_t, char *, char *,
  6663. extern int kdb_unregister(char *);
  6664. #else /* ! CONFIG_KGDB_KDB */
  6665. static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }
  6666. +#define in_kdb_printk() (0)
  6667. static inline void kdb_init(int level) {}
  6668. static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
  6669. char *help, short minlen) { return 0; }
  6670. diff --git a/include/linux/kernel.h b/include/linux/kernel.h
  6671. index bc6ed52a39b9..7894d55e4998 100644
  6672. --- a/include/linux/kernel.h
  6673. +++ b/include/linux/kernel.h
  6674. @@ -194,6 +194,9 @@ extern int _cond_resched(void);
  6675. */
  6676. # define might_sleep() \
  6677. do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
  6678. +
  6679. +# define might_sleep_no_state_check() \
  6680. + do { ___might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
  6681. # define sched_annotate_sleep() (current->task_state_change = 0)
  6682. #else
  6683. static inline void ___might_sleep(const char *file, int line,
  6684. @@ -201,6 +204,7 @@ extern int _cond_resched(void);
  6685. static inline void __might_sleep(const char *file, int line,
  6686. int preempt_offset) { }
  6687. # define might_sleep() do { might_resched(); } while (0)
  6688. +# define might_sleep_no_state_check() do { might_resched(); } while (0)
  6689. # define sched_annotate_sleep() do { } while (0)
  6690. #endif
  6691. @@ -488,6 +492,7 @@ extern enum system_states {
  6692. SYSTEM_HALT,
  6693. SYSTEM_POWER_OFF,
  6694. SYSTEM_RESTART,
  6695. + SYSTEM_SUSPEND,
  6696. } system_state;
  6697. #define TAINT_PROPRIETARY_MODULE 0
  6698. diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
  6699. index cb483305e1f5..4e5062316bb6 100644
  6700. --- a/include/linux/list_bl.h
  6701. +++ b/include/linux/list_bl.h
  6702. @@ -2,6 +2,7 @@
  6703. #define _LINUX_LIST_BL_H
  6704. #include <linux/list.h>
  6705. +#include <linux/spinlock.h>
  6706. #include <linux/bit_spinlock.h>
  6707. /*
  6708. @@ -32,13 +33,24 @@
  6709. struct hlist_bl_head {
  6710. struct hlist_bl_node *first;
  6711. +#ifdef CONFIG_PREEMPT_RT_BASE
  6712. + raw_spinlock_t lock;
  6713. +#endif
  6714. };
  6715. struct hlist_bl_node {
  6716. struct hlist_bl_node *next, **pprev;
  6717. };
  6718. -#define INIT_HLIST_BL_HEAD(ptr) \
  6719. - ((ptr)->first = NULL)
  6720. +
  6721. +#ifdef CONFIG_PREEMPT_RT_BASE
  6722. +#define INIT_HLIST_BL_HEAD(h) \
  6723. +do { \
  6724. + (h)->first = NULL; \
  6725. + raw_spin_lock_init(&(h)->lock); \
  6726. +} while (0)
  6727. +#else
  6728. +#define INIT_HLIST_BL_HEAD(h) (h)->first = NULL
  6729. +#endif
  6730. static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
  6731. {
  6732. @@ -118,12 +130,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n)
  6733. static inline void hlist_bl_lock(struct hlist_bl_head *b)
  6734. {
  6735. +#ifndef CONFIG_PREEMPT_RT_BASE
  6736. bit_spin_lock(0, (unsigned long *)b);
  6737. +#else
  6738. + raw_spin_lock(&b->lock);
  6739. +#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
  6740. + __set_bit(0, (unsigned long *)b);
  6741. +#endif
  6742. +#endif
  6743. }
  6744. static inline void hlist_bl_unlock(struct hlist_bl_head *b)
  6745. {
  6746. +#ifndef CONFIG_PREEMPT_RT_BASE
  6747. __bit_spin_unlock(0, (unsigned long *)b);
  6748. +#else
  6749. +#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
  6750. + __clear_bit(0, (unsigned long *)b);
  6751. +#endif
  6752. + raw_spin_unlock(&b->lock);
  6753. +#endif
  6754. }
  6755. static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
  6756. diff --git a/include/linux/locallock.h b/include/linux/locallock.h
  6757. new file mode 100644
  6758. index 000000000000..845c77f1a5ca
  6759. --- /dev/null
  6760. +++ b/include/linux/locallock.h
  6761. @@ -0,0 +1,278 @@
  6762. +#ifndef _LINUX_LOCALLOCK_H
  6763. +#define _LINUX_LOCALLOCK_H
  6764. +
  6765. +#include <linux/percpu.h>
  6766. +#include <linux/spinlock.h>
  6767. +
  6768. +#ifdef CONFIG_PREEMPT_RT_BASE
  6769. +
  6770. +#ifdef CONFIG_DEBUG_SPINLOCK
  6771. +# define LL_WARN(cond) WARN_ON(cond)
  6772. +#else
  6773. +# define LL_WARN(cond) do { } while (0)
  6774. +#endif
  6775. +
  6776. +/*
  6777. + * per cpu lock based substitute for local_irq_*()
  6778. + */
  6779. +struct local_irq_lock {
  6780. + spinlock_t lock;
  6781. + struct task_struct *owner;
  6782. + int nestcnt;
  6783. + unsigned long flags;
  6784. +};
  6785. +
  6786. +#define DEFINE_LOCAL_IRQ_LOCK(lvar) \
  6787. + DEFINE_PER_CPU(struct local_irq_lock, lvar) = { \
  6788. + .lock = __SPIN_LOCK_UNLOCKED((lvar).lock) }
  6789. +
  6790. +#define DECLARE_LOCAL_IRQ_LOCK(lvar) \
  6791. + DECLARE_PER_CPU(struct local_irq_lock, lvar)
  6792. +
  6793. +#define local_irq_lock_init(lvar) \
  6794. + do { \
  6795. + int __cpu; \
  6796. + for_each_possible_cpu(__cpu) \
  6797. + spin_lock_init(&per_cpu(lvar, __cpu).lock); \
  6798. + } while (0)
  6799. +
  6800. +/*
  6801. + * spin_lock|trylock|unlock_local flavour that does not migrate disable
  6802. + * used for __local_lock|trylock|unlock where get_local_var/put_local_var
  6803. + * already takes care of the migrate_disable/enable
  6804. + * for CONFIG_PREEMPT_BASE map to the normal spin_* calls.
  6805. + */
  6806. +#ifdef CONFIG_PREEMPT_RT_FULL
  6807. +# define spin_lock_local(lock) rt_spin_lock__no_mg(lock)
  6808. +# define spin_trylock_local(lock) rt_spin_trylock__no_mg(lock)
  6809. +# define spin_unlock_local(lock) rt_spin_unlock__no_mg(lock)
  6810. +#else
  6811. +# define spin_lock_local(lock) spin_lock(lock)
  6812. +# define spin_trylock_local(lock) spin_trylock(lock)
  6813. +# define spin_unlock_local(lock) spin_unlock(lock)
  6814. +#endif
  6815. +
  6816. +static inline void __local_lock(struct local_irq_lock *lv)
  6817. +{
  6818. + if (lv->owner != current) {
  6819. + spin_lock_local(&lv->lock);
  6820. + LL_WARN(lv->owner);
  6821. + LL_WARN(lv->nestcnt);
  6822. + lv->owner = current;
  6823. + }
  6824. + lv->nestcnt++;
  6825. +}
  6826. +
  6827. +#define local_lock(lvar) \
  6828. + do { __local_lock(&get_local_var(lvar)); } while (0)
  6829. +
  6830. +#define local_lock_on(lvar, cpu) \
  6831. + do { __local_lock(&per_cpu(lvar, cpu)); } while (0)
  6832. +
  6833. +static inline int __local_trylock(struct local_irq_lock *lv)
  6834. +{
  6835. + if (lv->owner != current && spin_trylock_local(&lv->lock)) {
  6836. + LL_WARN(lv->owner);
  6837. + LL_WARN(lv->nestcnt);
  6838. + lv->owner = current;
  6839. + lv->nestcnt = 1;
  6840. + return 1;
  6841. + }
  6842. + return 0;
  6843. +}
  6844. +
  6845. +#define local_trylock(lvar) \
  6846. + ({ \
  6847. + int __locked; \
  6848. + __locked = __local_trylock(&get_local_var(lvar)); \
  6849. + if (!__locked) \
  6850. + put_local_var(lvar); \
  6851. + __locked; \
  6852. + })
  6853. +
  6854. +static inline void __local_unlock(struct local_irq_lock *lv)
  6855. +{
  6856. + LL_WARN(lv->nestcnt == 0);
  6857. + LL_WARN(lv->owner != current);
  6858. + if (--lv->nestcnt)
  6859. + return;
  6860. +
  6861. + lv->owner = NULL;
  6862. + spin_unlock_local(&lv->lock);
  6863. +}
  6864. +
  6865. +#define local_unlock(lvar) \
  6866. + do { \
  6867. + __local_unlock(this_cpu_ptr(&lvar)); \
  6868. + put_local_var(lvar); \
  6869. + } while (0)
  6870. +
  6871. +#define local_unlock_on(lvar, cpu) \
  6872. + do { __local_unlock(&per_cpu(lvar, cpu)); } while (0)
  6873. +
  6874. +static inline void __local_lock_irq(struct local_irq_lock *lv)
  6875. +{
  6876. + spin_lock_irqsave(&lv->lock, lv->flags);
  6877. + LL_WARN(lv->owner);
  6878. + LL_WARN(lv->nestcnt);
  6879. + lv->owner = current;
  6880. + lv->nestcnt = 1;
  6881. +}
  6882. +
  6883. +#define local_lock_irq(lvar) \
  6884. + do { __local_lock_irq(&get_local_var(lvar)); } while (0)
  6885. +
  6886. +#define local_lock_irq_on(lvar, cpu) \
  6887. + do { __local_lock_irq(&per_cpu(lvar, cpu)); } while (0)
  6888. +
  6889. +static inline void __local_unlock_irq(struct local_irq_lock *lv)
  6890. +{
  6891. + LL_WARN(!lv->nestcnt);
  6892. + LL_WARN(lv->owner != current);
  6893. + lv->owner = NULL;
  6894. + lv->nestcnt = 0;
  6895. + spin_unlock_irq(&lv->lock);
  6896. +}
  6897. +
  6898. +#define local_unlock_irq(lvar) \
  6899. + do { \
  6900. + __local_unlock_irq(this_cpu_ptr(&lvar)); \
  6901. + put_local_var(lvar); \
  6902. + } while (0)
  6903. +
  6904. +#define local_unlock_irq_on(lvar, cpu) \
  6905. + do { \
  6906. + __local_unlock_irq(&per_cpu(lvar, cpu)); \
  6907. + } while (0)
  6908. +
  6909. +static inline int __local_lock_irqsave(struct local_irq_lock *lv)
  6910. +{
  6911. + if (lv->owner != current) {
  6912. + __local_lock_irq(lv);
  6913. + return 0;
  6914. + } else {
  6915. + lv->nestcnt++;
  6916. + return 1;
  6917. + }
  6918. +}
  6919. +
  6920. +#define local_lock_irqsave(lvar, _flags) \
  6921. + do { \
  6922. + if (__local_lock_irqsave(&get_local_var(lvar))) \
  6923. + put_local_var(lvar); \
  6924. + _flags = __this_cpu_read(lvar.flags); \
  6925. + } while (0)
  6926. +
  6927. +#define local_lock_irqsave_on(lvar, _flags, cpu) \
  6928. + do { \
  6929. + __local_lock_irqsave(&per_cpu(lvar, cpu)); \
  6930. + _flags = per_cpu(lvar, cpu).flags; \
  6931. + } while (0)
  6932. +
  6933. +static inline int __local_unlock_irqrestore(struct local_irq_lock *lv,
  6934. + unsigned long flags)
  6935. +{
  6936. + LL_WARN(!lv->nestcnt);
  6937. + LL_WARN(lv->owner != current);
  6938. + if (--lv->nestcnt)
  6939. + return 0;
  6940. +
  6941. + lv->owner = NULL;
  6942. + spin_unlock_irqrestore(&lv->lock, lv->flags);
  6943. + return 1;
  6944. +}
  6945. +
  6946. +#define local_unlock_irqrestore(lvar, flags) \
  6947. + do { \
  6948. + if (__local_unlock_irqrestore(this_cpu_ptr(&lvar), flags)) \
  6949. + put_local_var(lvar); \
  6950. + } while (0)
  6951. +
  6952. +#define local_unlock_irqrestore_on(lvar, flags, cpu) \
  6953. + do { \
  6954. + __local_unlock_irqrestore(&per_cpu(lvar, cpu), flags); \
  6955. + } while (0)
  6956. +
  6957. +#define local_spin_trylock_irq(lvar, lock) \
  6958. + ({ \
  6959. + int __locked; \
  6960. + local_lock_irq(lvar); \
  6961. + __locked = spin_trylock(lock); \
  6962. + if (!__locked) \
  6963. + local_unlock_irq(lvar); \
  6964. + __locked; \
  6965. + })
  6966. +
  6967. +#define local_spin_lock_irq(lvar, lock) \
  6968. + do { \
  6969. + local_lock_irq(lvar); \
  6970. + spin_lock(lock); \
  6971. + } while (0)
  6972. +
  6973. +#define local_spin_unlock_irq(lvar, lock) \
  6974. + do { \
  6975. + spin_unlock(lock); \
  6976. + local_unlock_irq(lvar); \
  6977. + } while (0)
  6978. +
  6979. +#define local_spin_lock_irqsave(lvar, lock, flags) \
  6980. + do { \
  6981. + local_lock_irqsave(lvar, flags); \
  6982. + spin_lock(lock); \
  6983. + } while (0)
  6984. +
  6985. +#define local_spin_unlock_irqrestore(lvar, lock, flags) \
  6986. + do { \
  6987. + spin_unlock(lock); \
  6988. + local_unlock_irqrestore(lvar, flags); \
  6989. + } while (0)
  6990. +
  6991. +#define get_locked_var(lvar, var) \
  6992. + (*({ \
  6993. + local_lock(lvar); \
  6994. + this_cpu_ptr(&var); \
  6995. + }))
  6996. +
  6997. +#define put_locked_var(lvar, var) local_unlock(lvar);
  6998. +
  6999. +#define local_lock_cpu(lvar) \
  7000. + ({ \
  7001. + local_lock(lvar); \
  7002. + smp_processor_id(); \
  7003. + })
  7004. +
  7005. +#define local_unlock_cpu(lvar) local_unlock(lvar)
  7006. +
  7007. +#else /* PREEMPT_RT_BASE */
  7008. +
  7009. +#define DEFINE_LOCAL_IRQ_LOCK(lvar) __typeof__(const int) lvar
  7010. +#define DECLARE_LOCAL_IRQ_LOCK(lvar) extern __typeof__(const int) lvar
  7011. +
  7012. +static inline void local_irq_lock_init(int lvar) { }
  7013. +
  7014. +#define local_lock(lvar) preempt_disable()
  7015. +#define local_unlock(lvar) preempt_enable()
  7016. +#define local_lock_irq(lvar) local_irq_disable()
  7017. +#define local_lock_irq_on(lvar, cpu) local_irq_disable()
  7018. +#define local_unlock_irq(lvar) local_irq_enable()
  7019. +#define local_unlock_irq_on(lvar, cpu) local_irq_enable()
  7020. +#define local_lock_irqsave(lvar, flags) local_irq_save(flags)
  7021. +#define local_unlock_irqrestore(lvar, flags) local_irq_restore(flags)
  7022. +
  7023. +#define local_spin_trylock_irq(lvar, lock) spin_trylock_irq(lock)
  7024. +#define local_spin_lock_irq(lvar, lock) spin_lock_irq(lock)
  7025. +#define local_spin_unlock_irq(lvar, lock) spin_unlock_irq(lock)
  7026. +#define local_spin_lock_irqsave(lvar, lock, flags) \
  7027. + spin_lock_irqsave(lock, flags)
  7028. +#define local_spin_unlock_irqrestore(lvar, lock, flags) \
  7029. + spin_unlock_irqrestore(lock, flags)
  7030. +
  7031. +#define get_locked_var(lvar, var) get_cpu_var(var)
  7032. +#define put_locked_var(lvar, var) put_cpu_var(var)
  7033. +
  7034. +#define local_lock_cpu(lvar) get_cpu()
  7035. +#define local_unlock_cpu(lvar) put_cpu()
  7036. +
  7037. +#endif
  7038. +
  7039. +#endif
  7040. diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
  7041. index 08d947fc4c59..705fb564a605 100644
  7042. --- a/include/linux/mm_types.h
  7043. +++ b/include/linux/mm_types.h
  7044. @@ -11,6 +11,7 @@
  7045. #include <linux/completion.h>
  7046. #include <linux/cpumask.h>
  7047. #include <linux/uprobes.h>
  7048. +#include <linux/rcupdate.h>
  7049. #include <linux/page-flags-layout.h>
  7050. #include <linux/workqueue.h>
  7051. #include <asm/page.h>
  7052. @@ -509,6 +510,9 @@ struct mm_struct {
  7053. bool tlb_flush_pending;
  7054. #endif
  7055. struct uprobes_state uprobes_state;
  7056. +#ifdef CONFIG_PREEMPT_RT_BASE
  7057. + struct rcu_head delayed_drop;
  7058. +#endif
  7059. #ifdef CONFIG_X86_INTEL_MPX
  7060. /* address of the bounds directory */
  7061. void __user *bd_addr;
  7062. diff --git a/include/linux/module.h b/include/linux/module.h
  7063. index 0c3207d26ac0..5944baaa3f28 100644
  7064. --- a/include/linux/module.h
  7065. +++ b/include/linux/module.h
  7066. @@ -496,6 +496,7 @@ static inline int module_is_live(struct module *mod)
  7067. struct module *__module_text_address(unsigned long addr);
  7068. struct module *__module_address(unsigned long addr);
  7069. bool is_module_address(unsigned long addr);
  7070. +bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr);
  7071. bool is_module_percpu_address(unsigned long addr);
  7072. bool is_module_text_address(unsigned long addr);
  7073. @@ -663,6 +664,11 @@ static inline bool is_module_percpu_address(unsigned long addr)
  7074. return false;
  7075. }
  7076. +static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
  7077. +{
  7078. + return false;
  7079. +}
  7080. +
  7081. static inline bool is_module_text_address(unsigned long addr)
  7082. {
  7083. return false;
  7084. diff --git a/include/linux/mutex.h b/include/linux/mutex.h
  7085. index 2cb7531e7d7a..b3fdfc820216 100644
  7086. --- a/include/linux/mutex.h
  7087. +++ b/include/linux/mutex.h
  7088. @@ -19,6 +19,17 @@
  7089. #include <asm/processor.h>
  7090. #include <linux/osq_lock.h>
  7091. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  7092. +# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
  7093. + , .dep_map = { .name = #lockname }
  7094. +#else
  7095. +# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
  7096. +#endif
  7097. +
  7098. +#ifdef CONFIG_PREEMPT_RT_FULL
  7099. +# include <linux/mutex_rt.h>
  7100. +#else
  7101. +
  7102. /*
  7103. * Simple, straightforward mutexes with strict semantics:
  7104. *
  7105. @@ -99,13 +110,6 @@ do { \
  7106. static inline void mutex_destroy(struct mutex *lock) {}
  7107. #endif
  7108. -#ifdef CONFIG_DEBUG_LOCK_ALLOC
  7109. -# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
  7110. - , .dep_map = { .name = #lockname }
  7111. -#else
  7112. -# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
  7113. -#endif
  7114. -
  7115. #define __MUTEX_INITIALIZER(lockname) \
  7116. { .count = ATOMIC_INIT(1) \
  7117. , .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
  7118. @@ -173,6 +177,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
  7119. extern int mutex_trylock(struct mutex *lock);
  7120. extern void mutex_unlock(struct mutex *lock);
  7121. +#endif /* !PREEMPT_RT_FULL */
  7122. +
  7123. extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
  7124. #endif /* __LINUX_MUTEX_H */
  7125. diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
  7126. new file mode 100644
  7127. index 000000000000..e0284edec655
  7128. --- /dev/null
  7129. +++ b/include/linux/mutex_rt.h
  7130. @@ -0,0 +1,89 @@
  7131. +#ifndef __LINUX_MUTEX_RT_H
  7132. +#define __LINUX_MUTEX_RT_H
  7133. +
  7134. +#ifndef __LINUX_MUTEX_H
  7135. +#error "Please include mutex.h"
  7136. +#endif
  7137. +
  7138. +#include <linux/rtmutex.h>
  7139. +
  7140. +/* FIXME: Just for __lockfunc */
  7141. +#include <linux/spinlock.h>
  7142. +
  7143. +struct mutex {
  7144. + struct rt_mutex lock;
  7145. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  7146. + struct lockdep_map dep_map;
  7147. +#endif
  7148. +};
  7149. +
  7150. +#define __MUTEX_INITIALIZER(mutexname) \
  7151. + { \
  7152. + .lock = __RT_MUTEX_INITIALIZER(mutexname.lock) \
  7153. + __DEP_MAP_MUTEX_INITIALIZER(mutexname) \
  7154. + }
  7155. +
  7156. +#define DEFINE_MUTEX(mutexname) \
  7157. + struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)
  7158. +
  7159. +extern void __mutex_do_init(struct mutex *lock, const char *name, struct lock_class_key *key);
  7160. +extern void __lockfunc _mutex_lock(struct mutex *lock);
  7161. +extern int __lockfunc _mutex_lock_interruptible(struct mutex *lock);
  7162. +extern int __lockfunc _mutex_lock_killable(struct mutex *lock);
  7163. +extern void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass);
  7164. +extern void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);
  7165. +extern int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass);
  7166. +extern int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass);
  7167. +extern int __lockfunc _mutex_trylock(struct mutex *lock);
  7168. +extern void __lockfunc _mutex_unlock(struct mutex *lock);
  7169. +
  7170. +#define mutex_is_locked(l) rt_mutex_is_locked(&(l)->lock)
  7171. +#define mutex_lock(l) _mutex_lock(l)
  7172. +#define mutex_lock_interruptible(l) _mutex_lock_interruptible(l)
  7173. +#define mutex_lock_killable(l) _mutex_lock_killable(l)
  7174. +#define mutex_trylock(l) _mutex_trylock(l)
  7175. +#define mutex_unlock(l) _mutex_unlock(l)
  7176. +
  7177. +#ifdef CONFIG_DEBUG_MUTEXES
  7178. +#define mutex_destroy(l) rt_mutex_destroy(&(l)->lock)
  7179. +#else
  7180. +static inline void mutex_destroy(struct mutex *lock) {}
  7181. +#endif
  7182. +
  7183. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  7184. +# define mutex_lock_nested(l, s) _mutex_lock_nested(l, s)
  7185. +# define mutex_lock_interruptible_nested(l, s) \
  7186. + _mutex_lock_interruptible_nested(l, s)
  7187. +# define mutex_lock_killable_nested(l, s) \
  7188. + _mutex_lock_killable_nested(l, s)
  7189. +
  7190. +# define mutex_lock_nest_lock(lock, nest_lock) \
  7191. +do { \
  7192. + typecheck(struct lockdep_map *, &(nest_lock)->dep_map); \
  7193. + _mutex_lock_nest_lock(lock, &(nest_lock)->dep_map); \
  7194. +} while (0)
  7195. +
  7196. +#else
  7197. +# define mutex_lock_nested(l, s) _mutex_lock(l)
  7198. +# define mutex_lock_interruptible_nested(l, s) \
  7199. + _mutex_lock_interruptible(l)
  7200. +# define mutex_lock_killable_nested(l, s) \
  7201. + _mutex_lock_killable(l)
  7202. +# define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)
  7203. +#endif
  7204. +
  7205. +# define mutex_init(mutex) \
  7206. +do { \
  7207. + static struct lock_class_key __key; \
  7208. + \
  7209. + rt_mutex_init(&(mutex)->lock); \
  7210. + __mutex_do_init((mutex), #mutex, &__key); \
  7211. +} while (0)
  7212. +
  7213. +# define __mutex_init(mutex, name, key) \
  7214. +do { \
  7215. + rt_mutex_init(&(mutex)->lock); \
  7216. + __mutex_do_init((mutex), name, key); \
  7217. +} while (0)
  7218. +
  7219. +#endif
  7220. diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
  7221. index bb9b102c15cd..a5b12b8ad196 100644
  7222. --- a/include/linux/netdevice.h
  7223. +++ b/include/linux/netdevice.h
  7224. @@ -396,7 +396,19 @@ typedef enum rx_handler_result rx_handler_result_t;
  7225. typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
  7226. void __napi_schedule(struct napi_struct *n);
  7227. +
  7228. +/*
  7229. + * When PREEMPT_RT_FULL is defined, all device interrupt handlers
  7230. + * run as threads, and they can also be preempted (without PREEMPT_RT
  7231. + * interrupt threads can not be preempted). Which means that calling
  7232. + * __napi_schedule_irqoff() from an interrupt handler can be preempted
  7233. + * and can corrupt the napi->poll_list.
  7234. + */
  7235. +#ifdef CONFIG_PREEMPT_RT_FULL
  7236. +#define __napi_schedule_irqoff(n) __napi_schedule(n)
  7237. +#else
  7238. void __napi_schedule_irqoff(struct napi_struct *n);
  7239. +#endif
  7240. static inline bool napi_disable_pending(struct napi_struct *n)
  7241. {
  7242. @@ -2463,14 +2475,53 @@ void netdev_freemem(struct net_device *dev);
  7243. void synchronize_net(void);
  7244. int init_dummy_netdev(struct net_device *dev);
  7245. -DECLARE_PER_CPU(int, xmit_recursion);
  7246. #define XMIT_RECURSION_LIMIT 10
  7247. +#ifdef CONFIG_PREEMPT_RT_FULL
  7248. +static inline int dev_recursion_level(void)
  7249. +{
  7250. + return current->xmit_recursion;
  7251. +}
  7252. +
  7253. +static inline int xmit_rec_read(void)
  7254. +{
  7255. + return current->xmit_recursion;
  7256. +}
  7257. +
  7258. +static inline void xmit_rec_inc(void)
  7259. +{
  7260. + current->xmit_recursion++;
  7261. +}
  7262. +
  7263. +static inline void xmit_rec_dec(void)
  7264. +{
  7265. + current->xmit_recursion--;
  7266. +}
  7267. +
  7268. +#else
  7269. +
  7270. +DECLARE_PER_CPU(int, xmit_recursion);
  7271. static inline int dev_recursion_level(void)
  7272. {
  7273. return this_cpu_read(xmit_recursion);
  7274. }
  7275. +static inline int xmit_rec_read(void)
  7276. +{
  7277. + return __this_cpu_read(xmit_recursion);
  7278. +}
  7279. +
  7280. +static inline void xmit_rec_inc(void)
  7281. +{
  7282. + __this_cpu_inc(xmit_recursion);
  7283. +}
  7284. +
  7285. +static inline void xmit_rec_dec(void)
  7286. +{
  7287. + __this_cpu_dec(xmit_recursion);
  7288. +}
  7289. +#endif
  7290. +
  7291. struct net_device *dev_get_by_index(struct net *net, int ifindex);
  7292. struct net_device *__dev_get_by_index(struct net *net, int ifindex);
  7293. struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
  7294. @@ -2855,6 +2906,7 @@ struct softnet_data {
  7295. unsigned int dropped;
  7296. struct sk_buff_head input_pkt_queue;
  7297. struct napi_struct backlog;
  7298. + struct sk_buff_head tofree_queue;
  7299. };
  7300. diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
  7301. index 2ad1a2b289b5..b4d10155af54 100644
  7302. --- a/include/linux/netfilter/x_tables.h
  7303. +++ b/include/linux/netfilter/x_tables.h
  7304. @@ -4,6 +4,7 @@
  7305. #include <linux/netdevice.h>
  7306. #include <linux/static_key.h>
  7307. +#include <linux/locallock.h>
  7308. #include <uapi/linux/netfilter/x_tables.h>
  7309. /* Test a struct->invflags and a boolean for inequality */
  7310. @@ -300,6 +301,8 @@ void xt_free_table_info(struct xt_table_info *info);
  7311. */
  7312. DECLARE_PER_CPU(seqcount_t, xt_recseq);
  7313. +DECLARE_LOCAL_IRQ_LOCK(xt_write_lock);
  7314. +
  7315. /* xt_tee_enabled - true if x_tables needs to handle reentrancy
  7316. *
  7317. * Enabled if current ip(6)tables ruleset has at least one -j TEE rule.
  7318. @@ -320,6 +323,9 @@ static inline unsigned int xt_write_recseq_begin(void)
  7319. {
  7320. unsigned int addend;
  7321. + /* RT protection */
  7322. + local_lock(xt_write_lock);
  7323. +
  7324. /*
  7325. * Low order bit of sequence is set if we already
  7326. * called xt_write_recseq_begin().
  7327. @@ -350,6 +356,7 @@ static inline void xt_write_recseq_end(unsigned int addend)
  7328. /* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
  7329. smp_wmb();
  7330. __this_cpu_add(xt_recseq.sequence, addend);
  7331. + local_unlock(xt_write_lock);
  7332. }
  7333. /*
  7334. diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
  7335. index 810124b33327..d54ca43d571f 100644
  7336. --- a/include/linux/nfs_fs.h
  7337. +++ b/include/linux/nfs_fs.h
  7338. @@ -165,7 +165,11 @@ struct nfs_inode {
  7339. /* Readers: in-flight sillydelete RPC calls */
  7340. /* Writers: rmdir */
  7341. +#ifdef CONFIG_PREEMPT_RT_BASE
  7342. + struct semaphore rmdir_sem;
  7343. +#else
  7344. struct rw_semaphore rmdir_sem;
  7345. +#endif
  7346. #if IS_ENABLED(CONFIG_NFS_V4)
  7347. struct nfs4_cached_acl *nfs4_acl;
  7348. diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
  7349. index beb1e10f446e..ebaf2e7bfe29 100644
  7350. --- a/include/linux/nfs_xdr.h
  7351. +++ b/include/linux/nfs_xdr.h
  7352. @@ -1490,7 +1490,7 @@ struct nfs_unlinkdata {
  7353. struct nfs_removeargs args;
  7354. struct nfs_removeres res;
  7355. struct dentry *dentry;
  7356. - wait_queue_head_t wq;
  7357. + struct swait_queue_head wq;
  7358. struct rpc_cred *cred;
  7359. struct nfs_fattr dir_attr;
  7360. long timeout;
  7361. diff --git a/include/linux/notifier.h b/include/linux/notifier.h
  7362. index 4149868de4e6..babe5b9bcb91 100644
  7363. --- a/include/linux/notifier.h
  7364. +++ b/include/linux/notifier.h
  7365. @@ -6,7 +6,7 @@
  7366. *
  7367. * Alan Cox <Alan.Cox@linux.org>
  7368. */
  7369. -
  7370. +
  7371. #ifndef _LINUX_NOTIFIER_H
  7372. #define _LINUX_NOTIFIER_H
  7373. #include <linux/errno.h>
  7374. @@ -42,9 +42,7 @@
  7375. * in srcu_notifier_call_chain(): no cache bounces and no memory barriers.
  7376. * As compensation, srcu_notifier_chain_unregister() is rather expensive.
  7377. * SRCU notifier chains should be used when the chain will be called very
  7378. - * often but notifier_blocks will seldom be removed. Also, SRCU notifier
  7379. - * chains are slightly more difficult to use because they require special
  7380. - * runtime initialization.
  7381. + * often but notifier_blocks will seldom be removed.
  7382. */
  7383. struct notifier_block;
  7384. @@ -90,7 +88,7 @@ struct srcu_notifier_head {
  7385. (name)->head = NULL; \
  7386. } while (0)
  7387. -/* srcu_notifier_heads must be initialized and cleaned up dynamically */
  7388. +/* srcu_notifier_heads must be cleaned up dynamically */
  7389. extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
  7390. #define srcu_cleanup_notifier_head(name) \
  7391. cleanup_srcu_struct(&(name)->srcu);
  7392. @@ -103,7 +101,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
  7393. .head = NULL }
  7394. #define RAW_NOTIFIER_INIT(name) { \
  7395. .head = NULL }
  7396. -/* srcu_notifier_heads cannot be initialized statically */
  7397. +
  7398. +#define SRCU_NOTIFIER_INIT(name, pcpu) \
  7399. + { \
  7400. + .mutex = __MUTEX_INITIALIZER(name.mutex), \
  7401. + .head = NULL, \
  7402. + .srcu = __SRCU_STRUCT_INIT(name.srcu, pcpu), \
  7403. + }
  7404. #define ATOMIC_NOTIFIER_HEAD(name) \
  7405. struct atomic_notifier_head name = \
  7406. @@ -115,6 +119,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
  7407. struct raw_notifier_head name = \
  7408. RAW_NOTIFIER_INIT(name)
  7409. +#define _SRCU_NOTIFIER_HEAD(name, mod) \
  7410. + static DEFINE_PER_CPU(struct srcu_struct_array, \
  7411. + name##_head_srcu_array); \
  7412. + mod struct srcu_notifier_head name = \
  7413. + SRCU_NOTIFIER_INIT(name, name##_head_srcu_array)
  7414. +
  7415. +#define SRCU_NOTIFIER_HEAD(name) \
  7416. + _SRCU_NOTIFIER_HEAD(name, )
  7417. +
  7418. +#define SRCU_NOTIFIER_HEAD_STATIC(name) \
  7419. + _SRCU_NOTIFIER_HEAD(name, static)
  7420. +
  7421. #ifdef __KERNEL__
  7422. extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
  7423. @@ -184,12 +200,12 @@ static inline int notifier_to_errno(int ret)
  7424. /*
  7425. * Declared notifiers so far. I can imagine quite a few more chains
  7426. - * over time (eg laptop power reset chains, reboot chain (to clean
  7427. + * over time (eg laptop power reset chains, reboot chain (to clean
  7428. * device units up), device [un]mount chain, module load/unload chain,
  7429. - * low memory chain, screenblank chain (for plug in modular screenblankers)
  7430. + * low memory chain, screenblank chain (for plug in modular screenblankers)
  7431. * VC switch chains (for loadable kernel svgalib VC switch helpers) etc...
  7432. */
  7433. -
  7434. +
  7435. /* CPU notfiers are defined in include/linux/cpu.h. */
  7436. /* netdevice notifiers are defined in include/linux/netdevice.h */
  7437. diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h
  7438. index 5b2e6159b744..ea940f451606 100644
  7439. --- a/include/linux/percpu-rwsem.h
  7440. +++ b/include/linux/percpu-rwsem.h
  7441. @@ -4,7 +4,7 @@
  7442. #include <linux/atomic.h>
  7443. #include <linux/rwsem.h>
  7444. #include <linux/percpu.h>
  7445. -#include <linux/wait.h>
  7446. +#include <linux/swait.h>
  7447. #include <linux/rcu_sync.h>
  7448. #include <linux/lockdep.h>
  7449. @@ -12,7 +12,7 @@ struct percpu_rw_semaphore {
  7450. struct rcu_sync rss;
  7451. unsigned int __percpu *read_count;
  7452. struct rw_semaphore rw_sem;
  7453. - wait_queue_head_t writer;
  7454. + struct swait_queue_head writer;
  7455. int readers_block;
  7456. };
  7457. @@ -22,13 +22,13 @@ static struct percpu_rw_semaphore name = { \
  7458. .rss = __RCU_SYNC_INITIALIZER(name.rss, RCU_SCHED_SYNC), \
  7459. .read_count = &__percpu_rwsem_rc_##name, \
  7460. .rw_sem = __RWSEM_INITIALIZER(name.rw_sem), \
  7461. - .writer = __WAIT_QUEUE_HEAD_INITIALIZER(name.writer), \
  7462. + .writer = __SWAIT_QUEUE_HEAD_INITIALIZER(name.writer), \
  7463. }
  7464. extern int __percpu_down_read(struct percpu_rw_semaphore *, int);
  7465. extern void __percpu_up_read(struct percpu_rw_semaphore *);
  7466. -static inline void percpu_down_read_preempt_disable(struct percpu_rw_semaphore *sem)
  7467. +static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
  7468. {
  7469. might_sleep();
  7470. @@ -46,16 +46,10 @@ static inline void percpu_down_read_preempt_disable(struct percpu_rw_semaphore *
  7471. __this_cpu_inc(*sem->read_count);
  7472. if (unlikely(!rcu_sync_is_idle(&sem->rss)))
  7473. __percpu_down_read(sem, false); /* Unconditional memory barrier */
  7474. - barrier();
  7475. /*
  7476. - * The barrier() prevents the compiler from
  7477. + * The preempt_enable() prevents the compiler from
  7478. * bleeding the critical section out.
  7479. */
  7480. -}
  7481. -
  7482. -static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
  7483. -{
  7484. - percpu_down_read_preempt_disable(sem);
  7485. preempt_enable();
  7486. }
  7487. @@ -82,13 +76,9 @@ static inline int percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
  7488. return ret;
  7489. }
  7490. -static inline void percpu_up_read_preempt_enable(struct percpu_rw_semaphore *sem)
  7491. +static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
  7492. {
  7493. - /*
  7494. - * The barrier() prevents the compiler from
  7495. - * bleeding the critical section out.
  7496. - */
  7497. - barrier();
  7498. + preempt_disable();
  7499. /*
  7500. * Same as in percpu_down_read().
  7501. */
  7502. @@ -101,12 +91,6 @@ static inline void percpu_up_read_preempt_enable(struct percpu_rw_semaphore *sem
  7503. rwsem_release(&sem->rw_sem.dep_map, 1, _RET_IP_);
  7504. }
  7505. -static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
  7506. -{
  7507. - preempt_disable();
  7508. - percpu_up_read_preempt_enable(sem);
  7509. -}
  7510. -
  7511. extern void percpu_down_write(struct percpu_rw_semaphore *);
  7512. extern void percpu_up_write(struct percpu_rw_semaphore *);
  7513. diff --git a/include/linux/percpu.h b/include/linux/percpu.h
  7514. index 56939d3f6e53..b988bf40ad3e 100644
  7515. --- a/include/linux/percpu.h
  7516. +++ b/include/linux/percpu.h
  7517. @@ -18,6 +18,35 @@
  7518. #define PERCPU_MODULE_RESERVE 0
  7519. #endif
  7520. +#ifdef CONFIG_PREEMPT_RT_FULL
  7521. +
  7522. +#define get_local_var(var) (*({ \
  7523. + migrate_disable(); \
  7524. + this_cpu_ptr(&var); }))
  7525. +
  7526. +#define put_local_var(var) do { \
  7527. + (void)&(var); \
  7528. + migrate_enable(); \
  7529. +} while (0)
  7530. +
  7531. +# define get_local_ptr(var) ({ \
  7532. + migrate_disable(); \
  7533. + this_cpu_ptr(var); })
  7534. +
  7535. +# define put_local_ptr(var) do { \
  7536. + (void)(var); \
  7537. + migrate_enable(); \
  7538. +} while (0)
  7539. +
  7540. +#else
  7541. +
  7542. +#define get_local_var(var) get_cpu_var(var)
  7543. +#define put_local_var(var) put_cpu_var(var)
  7544. +#define get_local_ptr(var) get_cpu_ptr(var)
  7545. +#define put_local_ptr(var) put_cpu_ptr(var)
  7546. +
  7547. +#endif
  7548. +
  7549. /* minimum unit size, also is the maximum supported allocation size */
  7550. #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
  7551. @@ -110,6 +139,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
  7552. #endif
  7553. extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
  7554. +extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
  7555. extern bool is_kernel_percpu_address(unsigned long addr);
  7556. #if !defined(CONFIG_SMP) || !defined(CONFIG_HAVE_SETUP_PER_CPU_AREA)
  7557. diff --git a/include/linux/pid.h b/include/linux/pid.h
  7558. index 23705a53abba..2cc64b779f03 100644
  7559. --- a/include/linux/pid.h
  7560. +++ b/include/linux/pid.h
  7561. @@ -2,6 +2,7 @@
  7562. #define _LINUX_PID_H
  7563. #include <linux/rcupdate.h>
  7564. +#include <linux/atomic.h>
  7565. enum pid_type
  7566. {
  7567. diff --git a/include/linux/preempt.h b/include/linux/preempt.h
  7568. index 75e4e30677f1..1cfb1cb72354 100644
  7569. --- a/include/linux/preempt.h
  7570. +++ b/include/linux/preempt.h
  7571. @@ -50,7 +50,11 @@
  7572. #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
  7573. #define NMI_OFFSET (1UL << NMI_SHIFT)
  7574. -#define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET)
  7575. +#ifndef CONFIG_PREEMPT_RT_FULL
  7576. +# define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET)
  7577. +#else
  7578. +# define SOFTIRQ_DISABLE_OFFSET (0)
  7579. +#endif
  7580. /* We use the MSB mostly because its available */
  7581. #define PREEMPT_NEED_RESCHED 0x80000000
  7582. @@ -59,9 +63,15 @@
  7583. #include <asm/preempt.h>
  7584. #define hardirq_count() (preempt_count() & HARDIRQ_MASK)
  7585. -#define softirq_count() (preempt_count() & SOFTIRQ_MASK)
  7586. #define irq_count() (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
  7587. | NMI_MASK))
  7588. +#ifndef CONFIG_PREEMPT_RT_FULL
  7589. +# define softirq_count() (preempt_count() & SOFTIRQ_MASK)
  7590. +# define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
  7591. +#else
  7592. +# define softirq_count() (0UL)
  7593. +extern int in_serving_softirq(void);
  7594. +#endif
  7595. /*
  7596. * Are we doing bottom half or hardware interrupt processing?
  7597. @@ -72,7 +82,6 @@
  7598. #define in_irq() (hardirq_count())
  7599. #define in_softirq() (softirq_count())
  7600. #define in_interrupt() (irq_count())
  7601. -#define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
  7602. /*
  7603. * Are we in NMI context?
  7604. @@ -91,7 +100,11 @@
  7605. /*
  7606. * The preempt_count offset after spin_lock()
  7607. */
  7608. +#if !defined(CONFIG_PREEMPT_RT_FULL)
  7609. #define PREEMPT_LOCK_OFFSET PREEMPT_DISABLE_OFFSET
  7610. +#else
  7611. +#define PREEMPT_LOCK_OFFSET 0
  7612. +#endif
  7613. /*
  7614. * The preempt_count offset needed for things like:
  7615. @@ -140,6 +153,20 @@ extern void preempt_count_sub(int val);
  7616. #define preempt_count_inc() preempt_count_add(1)
  7617. #define preempt_count_dec() preempt_count_sub(1)
  7618. +#ifdef CONFIG_PREEMPT_LAZY
  7619. +#define add_preempt_lazy_count(val) do { preempt_lazy_count() += (val); } while (0)
  7620. +#define sub_preempt_lazy_count(val) do { preempt_lazy_count() -= (val); } while (0)
  7621. +#define inc_preempt_lazy_count() add_preempt_lazy_count(1)
  7622. +#define dec_preempt_lazy_count() sub_preempt_lazy_count(1)
  7623. +#define preempt_lazy_count() (current_thread_info()->preempt_lazy_count)
  7624. +#else
  7625. +#define add_preempt_lazy_count(val) do { } while (0)
  7626. +#define sub_preempt_lazy_count(val) do { } while (0)
  7627. +#define inc_preempt_lazy_count() do { } while (0)
  7628. +#define dec_preempt_lazy_count() do { } while (0)
  7629. +#define preempt_lazy_count() (0)
  7630. +#endif
  7631. +
  7632. #ifdef CONFIG_PREEMPT_COUNT
  7633. #define preempt_disable() \
  7634. @@ -148,13 +175,25 @@ do { \
  7635. barrier(); \
  7636. } while (0)
  7637. +#define preempt_lazy_disable() \
  7638. +do { \
  7639. + inc_preempt_lazy_count(); \
  7640. + barrier(); \
  7641. +} while (0)
  7642. +
  7643. #define sched_preempt_enable_no_resched() \
  7644. do { \
  7645. barrier(); \
  7646. preempt_count_dec(); \
  7647. } while (0)
  7648. -#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
  7649. +#ifdef CONFIG_PREEMPT_RT_BASE
  7650. +# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
  7651. +# define preempt_check_resched_rt() preempt_check_resched()
  7652. +#else
  7653. +# define preempt_enable_no_resched() preempt_enable()
  7654. +# define preempt_check_resched_rt() barrier();
  7655. +#endif
  7656. #define preemptible() (preempt_count() == 0 && !irqs_disabled())
  7657. @@ -179,6 +218,13 @@ do { \
  7658. __preempt_schedule(); \
  7659. } while (0)
  7660. +#define preempt_lazy_enable() \
  7661. +do { \
  7662. + dec_preempt_lazy_count(); \
  7663. + barrier(); \
  7664. + preempt_check_resched(); \
  7665. +} while (0)
  7666. +
  7667. #else /* !CONFIG_PREEMPT */
  7668. #define preempt_enable() \
  7669. do { \
  7670. @@ -224,6 +270,7 @@ do { \
  7671. #define preempt_disable_notrace() barrier()
  7672. #define preempt_enable_no_resched_notrace() barrier()
  7673. #define preempt_enable_notrace() barrier()
  7674. +#define preempt_check_resched_rt() barrier()
  7675. #define preemptible() 0
  7676. #endif /* CONFIG_PREEMPT_COUNT */
  7677. @@ -244,10 +291,31 @@ do { \
  7678. } while (0)
  7679. #define preempt_fold_need_resched() \
  7680. do { \
  7681. - if (tif_need_resched()) \
  7682. + if (tif_need_resched_now()) \
  7683. set_preempt_need_resched(); \
  7684. } while (0)
  7685. +#ifdef CONFIG_PREEMPT_RT_FULL
  7686. +# define preempt_disable_rt() preempt_disable()
  7687. +# define preempt_enable_rt() preempt_enable()
  7688. +# define preempt_disable_nort() barrier()
  7689. +# define preempt_enable_nort() barrier()
  7690. +# ifdef CONFIG_SMP
  7691. + extern void migrate_disable(void);
  7692. + extern void migrate_enable(void);
  7693. +# else /* CONFIG_SMP */
  7694. +# define migrate_disable() barrier()
  7695. +# define migrate_enable() barrier()
  7696. +# endif /* CONFIG_SMP */
  7697. +#else
  7698. +# define preempt_disable_rt() barrier()
  7699. +# define preempt_enable_rt() barrier()
  7700. +# define preempt_disable_nort() preempt_disable()
  7701. +# define preempt_enable_nort() preempt_enable()
  7702. +# define migrate_disable() preempt_disable()
  7703. +# define migrate_enable() preempt_enable()
  7704. +#endif
  7705. +
  7706. #ifdef CONFIG_PREEMPT_NOTIFIERS
  7707. struct preempt_notifier;
  7708. diff --git a/include/linux/printk.h b/include/linux/printk.h
  7709. index eac1af8502bb..37e647af0b0b 100644
  7710. --- a/include/linux/printk.h
  7711. +++ b/include/linux/printk.h
  7712. @@ -126,9 +126,11 @@ struct va_format {
  7713. #ifdef CONFIG_EARLY_PRINTK
  7714. extern asmlinkage __printf(1, 2)
  7715. void early_printk(const char *fmt, ...);
  7716. +extern void printk_kill(void);
  7717. #else
  7718. static inline __printf(1, 2) __cold
  7719. void early_printk(const char *s, ...) { }
  7720. +static inline void printk_kill(void) { }
  7721. #endif
  7722. #ifdef CONFIG_PRINTK_NMI
  7723. diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
  7724. index af3581b8a451..277295039c8f 100644
  7725. --- a/include/linux/radix-tree.h
  7726. +++ b/include/linux/radix-tree.h
  7727. @@ -292,6 +292,8 @@ unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
  7728. int radix_tree_preload(gfp_t gfp_mask);
  7729. int radix_tree_maybe_preload(gfp_t gfp_mask);
  7730. int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order);
  7731. +void radix_tree_preload_end(void);
  7732. +
  7733. void radix_tree_init(void);
  7734. void *radix_tree_tag_set(struct radix_tree_root *root,
  7735. unsigned long index, unsigned int tag);
  7736. @@ -314,11 +316,6 @@ unsigned long radix_tree_range_tag_if_tagged(struct radix_tree_root *root,
  7737. int radix_tree_tagged(struct radix_tree_root *root, unsigned int tag);
  7738. unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
  7739. -static inline void radix_tree_preload_end(void)
  7740. -{
  7741. - preempt_enable();
  7742. -}
  7743. -
  7744. /**
  7745. * struct radix_tree_iter - radix tree iterator state
  7746. *
  7747. diff --git a/include/linux/random.h b/include/linux/random.h
  7748. index 16ab429735a7..9d0fecb5b6c2 100644
  7749. --- a/include/linux/random.h
  7750. +++ b/include/linux/random.h
  7751. @@ -31,7 +31,7 @@ static inline void add_latent_entropy(void) {}
  7752. extern void add_input_randomness(unsigned int type, unsigned int code,
  7753. unsigned int value) __latent_entropy;
  7754. -extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
  7755. +extern void add_interrupt_randomness(int irq, int irq_flags, __u64 ip) __latent_entropy;
  7756. extern void get_random_bytes(void *buf, int nbytes);
  7757. extern int add_random_ready_callback(struct random_ready_callback *rdy);
  7758. diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
  7759. index e585018498d5..25c64474fc27 100644
  7760. --- a/include/linux/rbtree.h
  7761. +++ b/include/linux/rbtree.h
  7762. @@ -31,7 +31,7 @@
  7763. #include <linux/kernel.h>
  7764. #include <linux/stddef.h>
  7765. -#include <linux/rcupdate.h>
  7766. +#include <linux/rcu_assign_pointer.h>
  7767. struct rb_node {
  7768. unsigned long __rb_parent_color;
  7769. diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
  7770. index d076183e49be..36bfb4dd57ae 100644
  7771. --- a/include/linux/rbtree_augmented.h
  7772. +++ b/include/linux/rbtree_augmented.h
  7773. @@ -26,6 +26,7 @@
  7774. #include <linux/compiler.h>
  7775. #include <linux/rbtree.h>
  7776. +#include <linux/rcupdate.h>
  7777. /*
  7778. * Please note - only struct rb_augment_callbacks and the prototypes for
  7779. diff --git a/include/linux/rcu_assign_pointer.h b/include/linux/rcu_assign_pointer.h
  7780. new file mode 100644
  7781. index 000000000000..7066962a4379
  7782. --- /dev/null
  7783. +++ b/include/linux/rcu_assign_pointer.h
  7784. @@ -0,0 +1,54 @@
  7785. +#ifndef __LINUX_RCU_ASSIGN_POINTER_H__
  7786. +#define __LINUX_RCU_ASSIGN_POINTER_H__
  7787. +#include <linux/compiler.h>
  7788. +#include <asm/barrier.h>
  7789. +
  7790. +/**
  7791. + * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
  7792. + * @v: The value to statically initialize with.
  7793. + */
  7794. +#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
  7795. +
  7796. +/**
  7797. + * rcu_assign_pointer() - assign to RCU-protected pointer
  7798. + * @p: pointer to assign to
  7799. + * @v: value to assign (publish)
  7800. + *
  7801. + * Assigns the specified value to the specified RCU-protected
  7802. + * pointer, ensuring that any concurrent RCU readers will see
  7803. + * any prior initialization.
  7804. + *
  7805. + * Inserts memory barriers on architectures that require them
  7806. + * (which is most of them), and also prevents the compiler from
  7807. + * reordering the code that initializes the structure after the pointer
  7808. + * assignment. More importantly, this call documents which pointers
  7809. + * will be dereferenced by RCU read-side code.
  7810. + *
  7811. + * In some special cases, you may use RCU_INIT_POINTER() instead
  7812. + * of rcu_assign_pointer(). RCU_INIT_POINTER() is a bit faster due
  7813. + * to the fact that it does not constrain either the CPU or the compiler.
  7814. + * That said, using RCU_INIT_POINTER() when you should have used
  7815. + * rcu_assign_pointer() is a very bad thing that results in
  7816. + * impossible-to-diagnose memory corruption. So please be careful.
  7817. + * See the RCU_INIT_POINTER() comment header for details.
  7818. + *
  7819. + * Note that rcu_assign_pointer() evaluates each of its arguments only
  7820. + * once, appearances notwithstanding. One of the "extra" evaluations
  7821. + * is in typeof() and the other visible only to sparse (__CHECKER__),
  7822. + * neither of which actually execute the argument. As with most cpp
  7823. + * macros, this execute-arguments-only-once property is important, so
  7824. + * please be careful when making changes to rcu_assign_pointer() and the
  7825. + * other macros that it invokes.
  7826. + */
  7827. +#define rcu_assign_pointer(p, v) \
  7828. +({ \
  7829. + uintptr_t _r_a_p__v = (uintptr_t)(v); \
  7830. + \
  7831. + if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL) \
  7832. + WRITE_ONCE((p), (typeof(p))(_r_a_p__v)); \
  7833. + else \
  7834. + smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
  7835. + _r_a_p__v; \
  7836. +})
  7837. +
  7838. +#endif
  7839. diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
  7840. index 01f71e1d2e94..30cc001d0d5a 100644
  7841. --- a/include/linux/rcupdate.h
  7842. +++ b/include/linux/rcupdate.h
  7843. @@ -46,6 +46,7 @@
  7844. #include <linux/compiler.h>
  7845. #include <linux/ktime.h>
  7846. #include <linux/irqflags.h>
  7847. +#include <linux/rcu_assign_pointer.h>
  7848. #include <asm/barrier.h>
  7849. @@ -178,6 +179,9 @@ void call_rcu(struct rcu_head *head,
  7850. #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  7851. +#ifdef CONFIG_PREEMPT_RT_FULL
  7852. +#define call_rcu_bh call_rcu
  7853. +#else
  7854. /**
  7855. * call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
  7856. * @head: structure to be used for queueing the RCU updates.
  7857. @@ -201,6 +205,7 @@ void call_rcu(struct rcu_head *head,
  7858. */
  7859. void call_rcu_bh(struct rcu_head *head,
  7860. rcu_callback_t func);
  7861. +#endif
  7862. /**
  7863. * call_rcu_sched() - Queue an RCU for invocation after sched grace period.
  7864. @@ -301,6 +306,11 @@ void synchronize_rcu(void);
  7865. * types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
  7866. */
  7867. #define rcu_preempt_depth() (current->rcu_read_lock_nesting)
  7868. +#ifndef CONFIG_PREEMPT_RT_FULL
  7869. +#define sched_rcu_preempt_depth() rcu_preempt_depth()
  7870. +#else
  7871. +static inline int sched_rcu_preempt_depth(void) { return 0; }
  7872. +#endif
  7873. #else /* #ifdef CONFIG_PREEMPT_RCU */
  7874. @@ -326,6 +336,8 @@ static inline int rcu_preempt_depth(void)
  7875. return 0;
  7876. }
  7877. +#define sched_rcu_preempt_depth() rcu_preempt_depth()
  7878. +
  7879. #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  7880. /* Internal to kernel */
  7881. @@ -505,7 +517,14 @@ extern struct lockdep_map rcu_callback_map;
  7882. int debug_lockdep_rcu_enabled(void);
  7883. int rcu_read_lock_held(void);
  7884. +#ifdef CONFIG_PREEMPT_RT_FULL
  7885. +static inline int rcu_read_lock_bh_held(void)
  7886. +{
  7887. + return rcu_read_lock_held();
  7888. +}
  7889. +#else
  7890. int rcu_read_lock_bh_held(void);
  7891. +#endif
  7892. /**
  7893. * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
  7894. @@ -626,54 +645,6 @@ static inline void rcu_preempt_sleep_check(void)
  7895. })
  7896. /**
  7897. - * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
  7898. - * @v: The value to statically initialize with.
  7899. - */
  7900. -#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
  7901. -
  7902. -/**
  7903. - * rcu_assign_pointer() - assign to RCU-protected pointer
  7904. - * @p: pointer to assign to
  7905. - * @v: value to assign (publish)
  7906. - *
  7907. - * Assigns the specified value to the specified RCU-protected
  7908. - * pointer, ensuring that any concurrent RCU readers will see
  7909. - * any prior initialization.
  7910. - *
  7911. - * Inserts memory barriers on architectures that require them
  7912. - * (which is most of them), and also prevents the compiler from
  7913. - * reordering the code that initializes the structure after the pointer
  7914. - * assignment. More importantly, this call documents which pointers
  7915. - * will be dereferenced by RCU read-side code.
  7916. - *
  7917. - * In some special cases, you may use RCU_INIT_POINTER() instead
  7918. - * of rcu_assign_pointer(). RCU_INIT_POINTER() is a bit faster due
  7919. - * to the fact that it does not constrain either the CPU or the compiler.
  7920. - * That said, using RCU_INIT_POINTER() when you should have used
  7921. - * rcu_assign_pointer() is a very bad thing that results in
  7922. - * impossible-to-diagnose memory corruption. So please be careful.
  7923. - * See the RCU_INIT_POINTER() comment header for details.
  7924. - *
  7925. - * Note that rcu_assign_pointer() evaluates each of its arguments only
  7926. - * once, appearances notwithstanding. One of the "extra" evaluations
  7927. - * is in typeof() and the other visible only to sparse (__CHECKER__),
  7928. - * neither of which actually execute the argument. As with most cpp
  7929. - * macros, this execute-arguments-only-once property is important, so
  7930. - * please be careful when making changes to rcu_assign_pointer() and the
  7931. - * other macros that it invokes.
  7932. - */
  7933. -#define rcu_assign_pointer(p, v) \
  7934. -({ \
  7935. - uintptr_t _r_a_p__v = (uintptr_t)(v); \
  7936. - \
  7937. - if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL) \
  7938. - WRITE_ONCE((p), (typeof(p))(_r_a_p__v)); \
  7939. - else \
  7940. - smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
  7941. - _r_a_p__v; \
  7942. -})
  7943. -
  7944. -/**
  7945. * rcu_access_pointer() - fetch RCU pointer with no dereferencing
  7946. * @p: The pointer to read
  7947. *
  7948. @@ -951,10 +922,14 @@ static inline void rcu_read_unlock(void)
  7949. static inline void rcu_read_lock_bh(void)
  7950. {
  7951. local_bh_disable();
  7952. +#ifdef CONFIG_PREEMPT_RT_FULL
  7953. + rcu_read_lock();
  7954. +#else
  7955. __acquire(RCU_BH);
  7956. rcu_lock_acquire(&rcu_bh_lock_map);
  7957. RCU_LOCKDEP_WARN(!rcu_is_watching(),
  7958. "rcu_read_lock_bh() used illegally while idle");
  7959. +#endif
  7960. }
  7961. /*
  7962. @@ -964,10 +939,14 @@ static inline void rcu_read_lock_bh(void)
  7963. */
  7964. static inline void rcu_read_unlock_bh(void)
  7965. {
  7966. +#ifdef CONFIG_PREEMPT_RT_FULL
  7967. + rcu_read_unlock();
  7968. +#else
  7969. RCU_LOCKDEP_WARN(!rcu_is_watching(),
  7970. "rcu_read_unlock_bh() used illegally while idle");
  7971. rcu_lock_release(&rcu_bh_lock_map);
  7972. __release(RCU_BH);
  7973. +#endif
  7974. local_bh_enable();
  7975. }
  7976. diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
  7977. index 63a4e4cf40a5..08ab12df2863 100644
  7978. --- a/include/linux/rcutree.h
  7979. +++ b/include/linux/rcutree.h
  7980. @@ -44,7 +44,11 @@ static inline void rcu_virt_note_context_switch(int cpu)
  7981. rcu_note_context_switch();
  7982. }
  7983. +#ifdef CONFIG_PREEMPT_RT_FULL
  7984. +# define synchronize_rcu_bh synchronize_rcu
  7985. +#else
  7986. void synchronize_rcu_bh(void);
  7987. +#endif
  7988. void synchronize_sched_expedited(void);
  7989. void synchronize_rcu_expedited(void);
  7990. @@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_expedited(void)
  7991. }
  7992. void rcu_barrier(void);
  7993. +#ifdef CONFIG_PREEMPT_RT_FULL
  7994. +# define rcu_barrier_bh rcu_barrier
  7995. +#else
  7996. void rcu_barrier_bh(void);
  7997. +#endif
  7998. void rcu_barrier_sched(void);
  7999. unsigned long get_state_synchronize_rcu(void);
  8000. void cond_synchronize_rcu(unsigned long oldstate);
  8001. @@ -82,17 +90,14 @@ void cond_synchronize_sched(unsigned long oldstate);
  8002. extern unsigned long rcutorture_testseq;
  8003. extern unsigned long rcutorture_vernum;
  8004. unsigned long rcu_batches_started(void);
  8005. -unsigned long rcu_batches_started_bh(void);
  8006. unsigned long rcu_batches_started_sched(void);
  8007. unsigned long rcu_batches_completed(void);
  8008. -unsigned long rcu_batches_completed_bh(void);
  8009. unsigned long rcu_batches_completed_sched(void);
  8010. unsigned long rcu_exp_batches_completed(void);
  8011. unsigned long rcu_exp_batches_completed_sched(void);
  8012. void show_rcu_gp_kthreads(void);
  8013. void rcu_force_quiescent_state(void);
  8014. -void rcu_bh_force_quiescent_state(void);
  8015. void rcu_sched_force_quiescent_state(void);
  8016. void rcu_idle_enter(void);
  8017. @@ -109,6 +114,16 @@ extern int rcu_scheduler_active __read_mostly;
  8018. bool rcu_is_watching(void);
  8019. +#ifndef CONFIG_PREEMPT_RT_FULL
  8020. +void rcu_bh_force_quiescent_state(void);
  8021. +unsigned long rcu_batches_started_bh(void);
  8022. +unsigned long rcu_batches_completed_bh(void);
  8023. +#else
  8024. +# define rcu_bh_force_quiescent_state rcu_force_quiescent_state
  8025. +# define rcu_batches_completed_bh rcu_batches_completed
  8026. +# define rcu_batches_started_bh rcu_batches_completed
  8027. +#endif
  8028. +
  8029. void rcu_all_qs(void);
  8030. /* RCUtree hotplug events */
  8031. diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
  8032. index 1abba5ce2a2f..294a8b4875f1 100644
  8033. --- a/include/linux/rtmutex.h
  8034. +++ b/include/linux/rtmutex.h
  8035. @@ -13,11 +13,15 @@
  8036. #define __LINUX_RT_MUTEX_H
  8037. #include <linux/linkage.h>
  8038. +#include <linux/spinlock_types_raw.h>
  8039. #include <linux/rbtree.h>
  8040. -#include <linux/spinlock_types.h>
  8041. extern int max_lock_depth; /* for sysctl */
  8042. +#ifdef CONFIG_DEBUG_MUTEXES
  8043. +#include <linux/debug_locks.h>
  8044. +#endif
  8045. +
  8046. /**
  8047. * The rt_mutex structure
  8048. *
  8049. @@ -31,8 +35,8 @@ struct rt_mutex {
  8050. struct rb_root waiters;
  8051. struct rb_node *waiters_leftmost;
  8052. struct task_struct *owner;
  8053. -#ifdef CONFIG_DEBUG_RT_MUTEXES
  8054. int save_state;
  8055. +#ifdef CONFIG_DEBUG_RT_MUTEXES
  8056. const char *name, *file;
  8057. int line;
  8058. void *magic;
  8059. @@ -55,22 +59,33 @@ struct hrtimer_sleeper;
  8060. # define rt_mutex_debug_check_no_locks_held(task) do { } while (0)
  8061. #endif
  8062. +# define rt_mutex_init(mutex) \
  8063. + do { \
  8064. + raw_spin_lock_init(&(mutex)->wait_lock); \
  8065. + __rt_mutex_init(mutex, #mutex); \
  8066. + } while (0)
  8067. +
  8068. #ifdef CONFIG_DEBUG_RT_MUTEXES
  8069. # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname) \
  8070. , .name = #mutexname, .file = __FILE__, .line = __LINE__
  8071. -# define rt_mutex_init(mutex) __rt_mutex_init(mutex, __func__)
  8072. extern void rt_mutex_debug_task_free(struct task_struct *tsk);
  8073. #else
  8074. # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname)
  8075. -# define rt_mutex_init(mutex) __rt_mutex_init(mutex, NULL)
  8076. # define rt_mutex_debug_task_free(t) do { } while (0)
  8077. #endif
  8078. -#define __RT_MUTEX_INITIALIZER(mutexname) \
  8079. - { .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
  8080. +#define __RT_MUTEX_INITIALIZER_PLAIN(mutexname) \
  8081. + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
  8082. , .waiters = RB_ROOT \
  8083. , .owner = NULL \
  8084. - __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
  8085. + __DEBUG_RT_MUTEX_INITIALIZER(mutexname)
  8086. +
  8087. +#define __RT_MUTEX_INITIALIZER(mutexname) \
  8088. + { __RT_MUTEX_INITIALIZER_PLAIN(mutexname) }
  8089. +
  8090. +#define __RT_MUTEX_INITIALIZER_SAVE_STATE(mutexname) \
  8091. + { __RT_MUTEX_INITIALIZER_PLAIN(mutexname) \
  8092. + , .save_state = 1 }
  8093. #define DEFINE_RT_MUTEX(mutexname) \
  8094. struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)
  8095. @@ -90,7 +105,9 @@ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name);
  8096. extern void rt_mutex_destroy(struct rt_mutex *lock);
  8097. extern void rt_mutex_lock(struct rt_mutex *lock);
  8098. +extern int rt_mutex_lock_state(struct rt_mutex *lock, int state);
  8099. extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
  8100. +extern int rt_mutex_lock_killable(struct rt_mutex *lock);
  8101. extern int rt_mutex_timed_lock(struct rt_mutex *lock,
  8102. struct hrtimer_sleeper *timeout);
  8103. diff --git a/include/linux/rwlock_rt.h b/include/linux/rwlock_rt.h
  8104. new file mode 100644
  8105. index 000000000000..49ed2d45d3be
  8106. --- /dev/null
  8107. +++ b/include/linux/rwlock_rt.h
  8108. @@ -0,0 +1,99 @@
  8109. +#ifndef __LINUX_RWLOCK_RT_H
  8110. +#define __LINUX_RWLOCK_RT_H
  8111. +
  8112. +#ifndef __LINUX_SPINLOCK_H
  8113. +#error Do not include directly. Use spinlock.h
  8114. +#endif
  8115. +
  8116. +#define rwlock_init(rwl) \
  8117. +do { \
  8118. + static struct lock_class_key __key; \
  8119. + \
  8120. + rt_mutex_init(&(rwl)->lock); \
  8121. + __rt_rwlock_init(rwl, #rwl, &__key); \
  8122. +} while (0)
  8123. +
  8124. +extern void __lockfunc rt_write_lock(rwlock_t *rwlock);
  8125. +extern void __lockfunc rt_read_lock(rwlock_t *rwlock);
  8126. +extern int __lockfunc rt_write_trylock(rwlock_t *rwlock);
  8127. +extern int __lockfunc rt_write_trylock_irqsave(rwlock_t *trylock, unsigned long *flags);
  8128. +extern int __lockfunc rt_read_trylock(rwlock_t *rwlock);
  8129. +extern void __lockfunc rt_write_unlock(rwlock_t *rwlock);
  8130. +extern void __lockfunc rt_read_unlock(rwlock_t *rwlock);
  8131. +extern unsigned long __lockfunc rt_write_lock_irqsave(rwlock_t *rwlock);
  8132. +extern unsigned long __lockfunc rt_read_lock_irqsave(rwlock_t *rwlock);
  8133. +extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key);
  8134. +
  8135. +#define read_trylock(lock) __cond_lock(lock, rt_read_trylock(lock))
  8136. +#define write_trylock(lock) __cond_lock(lock, rt_write_trylock(lock))
  8137. +
  8138. +#define write_trylock_irqsave(lock, flags) \
  8139. + __cond_lock(lock, rt_write_trylock_irqsave(lock, &flags))
  8140. +
  8141. +#define read_lock_irqsave(lock, flags) \
  8142. + do { \
  8143. + typecheck(unsigned long, flags); \
  8144. + flags = rt_read_lock_irqsave(lock); \
  8145. + } while (0)
  8146. +
  8147. +#define write_lock_irqsave(lock, flags) \
  8148. + do { \
  8149. + typecheck(unsigned long, flags); \
  8150. + flags = rt_write_lock_irqsave(lock); \
  8151. + } while (0)
  8152. +
  8153. +#define read_lock(lock) rt_read_lock(lock)
  8154. +
  8155. +#define read_lock_bh(lock) \
  8156. + do { \
  8157. + local_bh_disable(); \
  8158. + rt_read_lock(lock); \
  8159. + } while (0)
  8160. +
  8161. +#define read_lock_irq(lock) read_lock(lock)
  8162. +
  8163. +#define write_lock(lock) rt_write_lock(lock)
  8164. +
  8165. +#define write_lock_bh(lock) \
  8166. + do { \
  8167. + local_bh_disable(); \
  8168. + rt_write_lock(lock); \
  8169. + } while (0)
  8170. +
  8171. +#define write_lock_irq(lock) write_lock(lock)
  8172. +
  8173. +#define read_unlock(lock) rt_read_unlock(lock)
  8174. +
  8175. +#define read_unlock_bh(lock) \
  8176. + do { \
  8177. + rt_read_unlock(lock); \
  8178. + local_bh_enable(); \
  8179. + } while (0)
  8180. +
  8181. +#define read_unlock_irq(lock) read_unlock(lock)
  8182. +
  8183. +#define write_unlock(lock) rt_write_unlock(lock)
  8184. +
  8185. +#define write_unlock_bh(lock) \
  8186. + do { \
  8187. + rt_write_unlock(lock); \
  8188. + local_bh_enable(); \
  8189. + } while (0)
  8190. +
  8191. +#define write_unlock_irq(lock) write_unlock(lock)
  8192. +
  8193. +#define read_unlock_irqrestore(lock, flags) \
  8194. + do { \
  8195. + typecheck(unsigned long, flags); \
  8196. + (void) flags; \
  8197. + rt_read_unlock(lock); \
  8198. + } while (0)
  8199. +
  8200. +#define write_unlock_irqrestore(lock, flags) \
  8201. + do { \
  8202. + typecheck(unsigned long, flags); \
  8203. + (void) flags; \
  8204. + rt_write_unlock(lock); \
  8205. + } while (0)
  8206. +
  8207. +#endif
  8208. diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h
  8209. index cc0072e93e36..5317cd957292 100644
  8210. --- a/include/linux/rwlock_types.h
  8211. +++ b/include/linux/rwlock_types.h
  8212. @@ -1,6 +1,10 @@
  8213. #ifndef __LINUX_RWLOCK_TYPES_H
  8214. #define __LINUX_RWLOCK_TYPES_H
  8215. +#if !defined(__LINUX_SPINLOCK_TYPES_H)
  8216. +# error "Do not include directly, include spinlock_types.h"
  8217. +#endif
  8218. +
  8219. /*
  8220. * include/linux/rwlock_types.h - generic rwlock type definitions
  8221. * and initializers
  8222. diff --git a/include/linux/rwlock_types_rt.h b/include/linux/rwlock_types_rt.h
  8223. new file mode 100644
  8224. index 000000000000..51b28d775fe1
  8225. --- /dev/null
  8226. +++ b/include/linux/rwlock_types_rt.h
  8227. @@ -0,0 +1,33 @@
  8228. +#ifndef __LINUX_RWLOCK_TYPES_RT_H
  8229. +#define __LINUX_RWLOCK_TYPES_RT_H
  8230. +
  8231. +#ifndef __LINUX_SPINLOCK_TYPES_H
  8232. +#error "Do not include directly. Include spinlock_types.h instead"
  8233. +#endif
  8234. +
  8235. +/*
  8236. + * rwlocks - rtmutex which allows single reader recursion
  8237. + */
  8238. +typedef struct {
  8239. + struct rt_mutex lock;
  8240. + int read_depth;
  8241. + unsigned int break_lock;
  8242. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  8243. + struct lockdep_map dep_map;
  8244. +#endif
  8245. +} rwlock_t;
  8246. +
  8247. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  8248. +# define RW_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
  8249. +#else
  8250. +# define RW_DEP_MAP_INIT(lockname)
  8251. +#endif
  8252. +
  8253. +#define __RW_LOCK_UNLOCKED(name) \
  8254. + { .lock = __RT_MUTEX_INITIALIZER_SAVE_STATE(name.lock), \
  8255. + RW_DEP_MAP_INIT(name) }
  8256. +
  8257. +#define DEFINE_RWLOCK(name) \
  8258. + rwlock_t name = __RW_LOCK_UNLOCKED(name)
  8259. +
  8260. +#endif
  8261. diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
  8262. index dd1d14250340..aa2ac1f65c2d 100644
  8263. --- a/include/linux/rwsem.h
  8264. +++ b/include/linux/rwsem.h
  8265. @@ -19,6 +19,10 @@
  8266. #include <linux/osq_lock.h>
  8267. #endif
  8268. +#ifdef CONFIG_PREEMPT_RT_FULL
  8269. +#include <linux/rwsem_rt.h>
  8270. +#else /* PREEMPT_RT_FULL */
  8271. +
  8272. struct rw_semaphore;
  8273. #ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
  8274. @@ -106,6 +110,13 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem)
  8275. return !list_empty(&sem->wait_list);
  8276. }
  8277. +#endif /* !PREEMPT_RT_FULL */
  8278. +
  8279. +/*
  8280. + * The functions below are the same for all rwsem implementations including
  8281. + * the RT specific variant.
  8282. + */
  8283. +
  8284. /*
  8285. * lock for reading
  8286. */
  8287. diff --git a/include/linux/rwsem_rt.h b/include/linux/rwsem_rt.h
  8288. new file mode 100644
  8289. index 000000000000..2ffbf093ae92
  8290. --- /dev/null
  8291. +++ b/include/linux/rwsem_rt.h
  8292. @@ -0,0 +1,67 @@
  8293. +#ifndef _LINUX_RWSEM_RT_H
  8294. +#define _LINUX_RWSEM_RT_H
  8295. +
  8296. +#ifndef _LINUX_RWSEM_H
  8297. +#error "Include rwsem.h"
  8298. +#endif
  8299. +
  8300. +#include <linux/rtmutex.h>
  8301. +#include <linux/swait.h>
  8302. +
  8303. +#define READER_BIAS (1U << 31)
  8304. +#define WRITER_BIAS (1U << 30)
  8305. +
  8306. +struct rw_semaphore {
  8307. + atomic_t readers;
  8308. + struct rt_mutex rtmutex;
  8309. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  8310. + struct lockdep_map dep_map;
  8311. +#endif
  8312. +};
  8313. +
  8314. +#define __RWSEM_INITIALIZER(name) \
  8315. +{ \
  8316. + .readers = ATOMIC_INIT(READER_BIAS), \
  8317. + .rtmutex = __RT_MUTEX_INITIALIZER(name.rtmutex), \
  8318. + RW_DEP_MAP_INIT(name) \
  8319. +}
  8320. +
  8321. +#define DECLARE_RWSEM(lockname) \
  8322. + struct rw_semaphore lockname = __RWSEM_INITIALIZER(lockname)
  8323. +
  8324. +extern void __rwsem_init(struct rw_semaphore *rwsem, const char *name,
  8325. + struct lock_class_key *key);
  8326. +
  8327. +#define __init_rwsem(sem, name, key) \
  8328. +do { \
  8329. + rt_mutex_init(&(sem)->rtmutex); \
  8330. + __rwsem_init((sem), (name), (key)); \
  8331. +} while (0)
  8332. +
  8333. +#define init_rwsem(sem) \
  8334. +do { \
  8335. + static struct lock_class_key __key; \
  8336. + \
  8337. + __init_rwsem((sem), #sem, &__key); \
  8338. +} while (0)
  8339. +
  8340. +static inline int rwsem_is_locked(struct rw_semaphore *sem)
  8341. +{
  8342. + return atomic_read(&sem->readers) != READER_BIAS;
  8343. +}
  8344. +
  8345. +static inline int rwsem_is_contended(struct rw_semaphore *sem)
  8346. +{
  8347. + return atomic_read(&sem->readers) > 0;
  8348. +}
  8349. +
  8350. +extern void __down_read(struct rw_semaphore *sem);
  8351. +extern int __down_read_trylock(struct rw_semaphore *sem);
  8352. +extern void __down_write(struct rw_semaphore *sem);
  8353. +extern int __must_check __down_write_killable(struct rw_semaphore *sem);
  8354. +extern int __down_write_trylock(struct rw_semaphore *sem);
  8355. +extern void __up_read(struct rw_semaphore *sem);
  8356. +extern void __up_write(struct rw_semaphore *sem);
  8357. +extern void __downgrade_write(struct rw_semaphore *sem);
  8358. +
  8359. +#endif
  8360. diff --git a/include/linux/sched.h b/include/linux/sched.h
  8361. index f425eb3318ab..4d779486ad6b 100644
  8362. --- a/include/linux/sched.h
  8363. +++ b/include/linux/sched.h
  8364. @@ -26,6 +26,7 @@ struct sched_param {
  8365. #include <linux/nodemask.h>
  8366. #include <linux/mm_types.h>
  8367. #include <linux/preempt.h>
  8368. +#include <asm/kmap_types.h>
  8369. #include <asm/page.h>
  8370. #include <asm/ptrace.h>
  8371. @@ -236,17 +237,13 @@ extern char ___assert_task_state[1 - 2*!!(
  8372. /* Convenience macros for the sake of wake_up */
  8373. #define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)
  8374. -#define TASK_ALL (TASK_NORMAL | __TASK_STOPPED | __TASK_TRACED)
  8375. /* get_task_state() */
  8376. #define TASK_REPORT (TASK_RUNNING | TASK_INTERRUPTIBLE | \
  8377. TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \
  8378. __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)
  8379. -#define task_is_traced(task) ((task->state & __TASK_TRACED) != 0)
  8380. #define task_is_stopped(task) ((task->state & __TASK_STOPPED) != 0)
  8381. -#define task_is_stopped_or_traced(task) \
  8382. - ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
  8383. #define task_contributes_to_load(task) \
  8384. ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
  8385. (task->flags & PF_FROZEN) == 0 && \
  8386. @@ -312,6 +309,11 @@ extern char ___assert_task_state[1 - 2*!!(
  8387. #endif
  8388. +#define __set_current_state_no_track(state_value) \
  8389. + do { current->state = (state_value); } while (0)
  8390. +#define set_current_state_no_track(state_value) \
  8391. + set_mb(current->state, (state_value))
  8392. +
  8393. /* Task command name length */
  8394. #define TASK_COMM_LEN 16
  8395. @@ -1013,8 +1015,18 @@ struct wake_q_head {
  8396. struct wake_q_head name = { WAKE_Q_TAIL, &name.first }
  8397. extern void wake_q_add(struct wake_q_head *head,
  8398. - struct task_struct *task);
  8399. -extern void wake_up_q(struct wake_q_head *head);
  8400. + struct task_struct *task);
  8401. +extern void __wake_up_q(struct wake_q_head *head, bool sleeper);
  8402. +
  8403. +static inline void wake_up_q(struct wake_q_head *head)
  8404. +{
  8405. + __wake_up_q(head, false);
  8406. +}
  8407. +
  8408. +static inline void wake_up_q_sleeper(struct wake_q_head *head)
  8409. +{
  8410. + __wake_up_q(head, true);
  8411. +}
  8412. /*
  8413. * sched-domains (multiprocessor balancing) declarations:
  8414. @@ -1481,6 +1493,7 @@ struct task_struct {
  8415. struct thread_info thread_info;
  8416. #endif
  8417. volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
  8418. + volatile long saved_state; /* saved state for "spinlock sleepers" */
  8419. void *stack;
  8420. atomic_t usage;
  8421. unsigned int flags; /* per process flags, defined below */
  8422. @@ -1520,6 +1533,12 @@ struct task_struct {
  8423. #endif
  8424. unsigned int policy;
  8425. +#ifdef CONFIG_PREEMPT_RT_FULL
  8426. + int migrate_disable;
  8427. +# ifdef CONFIG_SCHED_DEBUG
  8428. + int migrate_disable_atomic;
  8429. +# endif
  8430. +#endif
  8431. int nr_cpus_allowed;
  8432. cpumask_t cpus_allowed;
  8433. @@ -1658,6 +1677,9 @@ struct task_struct {
  8434. struct task_cputime cputime_expires;
  8435. struct list_head cpu_timers[3];
  8436. +#ifdef CONFIG_PREEMPT_RT_BASE
  8437. + struct task_struct *posix_timer_list;
  8438. +#endif
  8439. /* process credentials */
  8440. const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */
  8441. @@ -1689,10 +1711,15 @@ struct task_struct {
  8442. /* signal handlers */
  8443. struct signal_struct *signal;
  8444. struct sighand_struct *sighand;
  8445. + struct sigqueue *sigqueue_cache;
  8446. sigset_t blocked, real_blocked;
  8447. sigset_t saved_sigmask; /* restored if set_restore_sigmask() was used */
  8448. struct sigpending pending;
  8449. +#ifdef CONFIG_PREEMPT_RT_FULL
  8450. + /* TODO: move me into ->restart_block ? */
  8451. + struct siginfo forced_info;
  8452. +#endif
  8453. unsigned long sas_ss_sp;
  8454. size_t sas_ss_size;
  8455. @@ -1723,6 +1750,8 @@ struct task_struct {
  8456. /* PI waiters blocked on a rt_mutex held by this task */
  8457. struct rb_root pi_waiters;
  8458. struct rb_node *pi_waiters_leftmost;
  8459. + /* Updated under owner's pi_lock and rq lock */
  8460. + struct task_struct *pi_top_task;
  8461. /* Deadlock detection and priority inheritance handling */
  8462. struct rt_mutex_waiter *pi_blocked_on;
  8463. #endif
  8464. @@ -1921,6 +1950,12 @@ struct task_struct {
  8465. /* bitmask and counter of trace recursion */
  8466. unsigned long trace_recursion;
  8467. #endif /* CONFIG_TRACING */
  8468. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  8469. + u64 preempt_timestamp_hist;
  8470. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  8471. + long timer_offset;
  8472. +#endif
  8473. +#endif
  8474. #ifdef CONFIG_KCOV
  8475. /* Coverage collection mode enabled for this task (0 if disabled). */
  8476. enum kcov_mode kcov_mode;
  8477. @@ -1946,9 +1981,23 @@ struct task_struct {
  8478. unsigned int sequential_io;
  8479. unsigned int sequential_io_avg;
  8480. #endif
  8481. +#ifdef CONFIG_PREEMPT_RT_BASE
  8482. + struct rcu_head put_rcu;
  8483. + int softirq_nestcnt;
  8484. + unsigned int softirqs_raised;
  8485. +#endif
  8486. +#ifdef CONFIG_PREEMPT_RT_FULL
  8487. +# if defined CONFIG_HIGHMEM || defined CONFIG_X86_32
  8488. + int kmap_idx;
  8489. + pte_t kmap_pte[KM_TYPE_NR];
  8490. +# endif
  8491. +#endif
  8492. #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
  8493. unsigned long task_state_change;
  8494. #endif
  8495. +#ifdef CONFIG_PREEMPT_RT_FULL
  8496. + int xmit_recursion;
  8497. +#endif
  8498. int pagefault_disabled;
  8499. #ifdef CONFIG_MMU
  8500. struct task_struct *oom_reaper_list;
  8501. @@ -1988,14 +2037,6 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t)
  8502. }
  8503. #endif
  8504. -/* Future-safe accessor for struct task_struct's cpus_allowed. */
  8505. -#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  8506. -
  8507. -static inline int tsk_nr_cpus_allowed(struct task_struct *p)
  8508. -{
  8509. - return p->nr_cpus_allowed;
  8510. -}
  8511. -
  8512. #define TNF_MIGRATED 0x01
  8513. #define TNF_NO_GROUP 0x02
  8514. #define TNF_SHARED 0x04
  8515. @@ -2211,6 +2252,15 @@ extern struct pid *cad_pid;
  8516. extern void free_task(struct task_struct *tsk);
  8517. #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
  8518. +#ifdef CONFIG_PREEMPT_RT_BASE
  8519. +extern void __put_task_struct_cb(struct rcu_head *rhp);
  8520. +
  8521. +static inline void put_task_struct(struct task_struct *t)
  8522. +{
  8523. + if (atomic_dec_and_test(&t->usage))
  8524. + call_rcu(&t->put_rcu, __put_task_struct_cb);
  8525. +}
  8526. +#else
  8527. extern void __put_task_struct(struct task_struct *t);
  8528. static inline void put_task_struct(struct task_struct *t)
  8529. @@ -2218,6 +2268,7 @@ static inline void put_task_struct(struct task_struct *t)
  8530. if (atomic_dec_and_test(&t->usage))
  8531. __put_task_struct(t);
  8532. }
  8533. +#endif
  8534. struct task_struct *task_rcu_dereference(struct task_struct **ptask);
  8535. struct task_struct *try_get_task_struct(struct task_struct **ptask);
  8536. @@ -2259,6 +2310,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
  8537. /*
  8538. * Per process flags
  8539. */
  8540. +#define PF_IN_SOFTIRQ 0x00000001 /* Task is serving softirq */
  8541. #define PF_EXITING 0x00000004 /* getting shut down */
  8542. #define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */
  8543. #define PF_VCPU 0x00000010 /* I'm a virtual CPU */
  8544. @@ -2427,6 +2479,10 @@ extern void do_set_cpus_allowed(struct task_struct *p,
  8545. extern int set_cpus_allowed_ptr(struct task_struct *p,
  8546. const struct cpumask *new_mask);
  8547. +int migrate_me(void);
  8548. +void tell_sched_cpu_down_begin(int cpu);
  8549. +void tell_sched_cpu_down_done(int cpu);
  8550. +
  8551. #else
  8552. static inline void do_set_cpus_allowed(struct task_struct *p,
  8553. const struct cpumask *new_mask)
  8554. @@ -2439,6 +2495,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
  8555. return -EINVAL;
  8556. return 0;
  8557. }
  8558. +static inline int migrate_me(void) { return 0; }
  8559. +static inline void tell_sched_cpu_down_begin(int cpu) { }
  8560. +static inline void tell_sched_cpu_down_done(int cpu) { }
  8561. #endif
  8562. #ifdef CONFIG_NO_HZ_COMMON
  8563. @@ -2677,6 +2736,7 @@ extern void xtime_update(unsigned long ticks);
  8564. extern int wake_up_state(struct task_struct *tsk, unsigned int state);
  8565. extern int wake_up_process(struct task_struct *tsk);
  8566. +extern int wake_up_lock_sleeper(struct task_struct * tsk);
  8567. extern void wake_up_new_task(struct task_struct *tsk);
  8568. #ifdef CONFIG_SMP
  8569. extern void kick_process(struct task_struct *tsk);
  8570. @@ -2885,6 +2945,17 @@ static inline void mmdrop(struct mm_struct *mm)
  8571. __mmdrop(mm);
  8572. }
  8573. +#ifdef CONFIG_PREEMPT_RT_BASE
  8574. +extern void __mmdrop_delayed(struct rcu_head *rhp);
  8575. +static inline void mmdrop_delayed(struct mm_struct *mm)
  8576. +{
  8577. + if (atomic_dec_and_test(&mm->mm_count))
  8578. + call_rcu(&mm->delayed_drop, __mmdrop_delayed);
  8579. +}
  8580. +#else
  8581. +# define mmdrop_delayed(mm) mmdrop(mm)
  8582. +#endif
  8583. +
  8584. static inline void mmdrop_async_fn(struct work_struct *work)
  8585. {
  8586. struct mm_struct *mm = container_of(work, struct mm_struct, async_put_work);
  8587. @@ -3277,6 +3348,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
  8588. return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
  8589. }
  8590. +#ifdef CONFIG_PREEMPT_LAZY
  8591. +static inline void set_tsk_need_resched_lazy(struct task_struct *tsk)
  8592. +{
  8593. + set_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
  8594. +}
  8595. +
  8596. +static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk)
  8597. +{
  8598. + clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
  8599. +}
  8600. +
  8601. +static inline int test_tsk_need_resched_lazy(struct task_struct *tsk)
  8602. +{
  8603. + return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY));
  8604. +}
  8605. +
  8606. +static inline int need_resched_lazy(void)
  8607. +{
  8608. + return test_thread_flag(TIF_NEED_RESCHED_LAZY);
  8609. +}
  8610. +
  8611. +static inline int need_resched_now(void)
  8612. +{
  8613. + return test_thread_flag(TIF_NEED_RESCHED);
  8614. +}
  8615. +
  8616. +#else
  8617. +static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk) { }
  8618. +static inline int need_resched_lazy(void) { return 0; }
  8619. +
  8620. +static inline int need_resched_now(void)
  8621. +{
  8622. + return test_thread_flag(TIF_NEED_RESCHED);
  8623. +}
  8624. +
  8625. +#endif
  8626. +
  8627. static inline int restart_syscall(void)
  8628. {
  8629. set_tsk_thread_flag(current, TIF_SIGPENDING);
  8630. @@ -3308,6 +3416,51 @@ static inline int signal_pending_state(long state, struct task_struct *p)
  8631. return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
  8632. }
  8633. +static inline bool __task_is_stopped_or_traced(struct task_struct *task)
  8634. +{
  8635. + if (task->state & (__TASK_STOPPED | __TASK_TRACED))
  8636. + return true;
  8637. +#ifdef CONFIG_PREEMPT_RT_FULL
  8638. + if (task->saved_state & (__TASK_STOPPED | __TASK_TRACED))
  8639. + return true;
  8640. +#endif
  8641. + return false;
  8642. +}
  8643. +
  8644. +static inline bool task_is_stopped_or_traced(struct task_struct *task)
  8645. +{
  8646. + bool traced_stopped;
  8647. +
  8648. +#ifdef CONFIG_PREEMPT_RT_FULL
  8649. + unsigned long flags;
  8650. +
  8651. + raw_spin_lock_irqsave(&task->pi_lock, flags);
  8652. + traced_stopped = __task_is_stopped_or_traced(task);
  8653. + raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  8654. +#else
  8655. + traced_stopped = __task_is_stopped_or_traced(task);
  8656. +#endif
  8657. + return traced_stopped;
  8658. +}
  8659. +
  8660. +static inline bool task_is_traced(struct task_struct *task)
  8661. +{
  8662. + bool traced = false;
  8663. +
  8664. + if (task->state & __TASK_TRACED)
  8665. + return true;
  8666. +#ifdef CONFIG_PREEMPT_RT_FULL
  8667. + /* in case the task is sleeping on tasklist_lock */
  8668. + raw_spin_lock_irq(&task->pi_lock);
  8669. + if (task->state & __TASK_TRACED)
  8670. + traced = true;
  8671. + else if (task->saved_state & __TASK_TRACED)
  8672. + traced = true;
  8673. + raw_spin_unlock_irq(&task->pi_lock);
  8674. +#endif
  8675. + return traced;
  8676. +}
  8677. +
  8678. /*
  8679. * cond_resched() and cond_resched_lock(): latency reduction via
  8680. * explicit rescheduling in places that are safe. The return
  8681. @@ -3333,12 +3486,16 @@ extern int __cond_resched_lock(spinlock_t *lock);
  8682. __cond_resched_lock(lock); \
  8683. })
  8684. +#ifndef CONFIG_PREEMPT_RT_FULL
  8685. extern int __cond_resched_softirq(void);
  8686. #define cond_resched_softirq() ({ \
  8687. ___might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET); \
  8688. __cond_resched_softirq(); \
  8689. })
  8690. +#else
  8691. +# define cond_resched_softirq() cond_resched()
  8692. +#endif
  8693. static inline void cond_resched_rcu(void)
  8694. {
  8695. @@ -3513,6 +3670,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
  8696. #endif /* CONFIG_SMP */
  8697. +static inline int __migrate_disabled(struct task_struct *p)
  8698. +{
  8699. +#ifdef CONFIG_PREEMPT_RT_FULL
  8700. + return p->migrate_disable;
  8701. +#else
  8702. + return 0;
  8703. +#endif
  8704. +}
  8705. +
  8706. +/* Future-safe accessor for struct task_struct's cpus_allowed. */
  8707. +static inline const struct cpumask *tsk_cpus_allowed(struct task_struct *p)
  8708. +{
  8709. + if (__migrate_disabled(p))
  8710. + return cpumask_of(task_cpu(p));
  8711. +
  8712. + return &p->cpus_allowed;
  8713. +}
  8714. +
  8715. +static inline int tsk_nr_cpus_allowed(struct task_struct *p)
  8716. +{
  8717. + if (__migrate_disabled(p))
  8718. + return 1;
  8719. + return p->nr_cpus_allowed;
  8720. +}
  8721. +
  8722. extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
  8723. extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
  8724. diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
  8725. index a30b172df6e1..db3e91f2bc03 100644
  8726. --- a/include/linux/sched/rt.h
  8727. +++ b/include/linux/sched/rt.h
  8728. @@ -16,27 +16,20 @@ static inline int rt_task(struct task_struct *p)
  8729. }
  8730. #ifdef CONFIG_RT_MUTEXES
  8731. -extern int rt_mutex_getprio(struct task_struct *p);
  8732. -extern void rt_mutex_setprio(struct task_struct *p, int prio);
  8733. -extern int rt_mutex_get_effective_prio(struct task_struct *task, int newprio);
  8734. -extern struct task_struct *rt_mutex_get_top_task(struct task_struct *task);
  8735. +/*
  8736. + * Must hold either p->pi_lock or task_rq(p)->lock.
  8737. + */
  8738. +static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *p)
  8739. +{
  8740. + return p->pi_top_task;
  8741. +}
  8742. +extern void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task);
  8743. extern void rt_mutex_adjust_pi(struct task_struct *p);
  8744. static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
  8745. {
  8746. return tsk->pi_blocked_on != NULL;
  8747. }
  8748. #else
  8749. -static inline int rt_mutex_getprio(struct task_struct *p)
  8750. -{
  8751. - return p->normal_prio;
  8752. -}
  8753. -
  8754. -static inline int rt_mutex_get_effective_prio(struct task_struct *task,
  8755. - int newprio)
  8756. -{
  8757. - return newprio;
  8758. -}
  8759. -
  8760. static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *task)
  8761. {
  8762. return NULL;
  8763. diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
  8764. index ead97654c4e9..3d7223ffdd3b 100644
  8765. --- a/include/linux/seqlock.h
  8766. +++ b/include/linux/seqlock.h
  8767. @@ -220,20 +220,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
  8768. return __read_seqcount_retry(s, start);
  8769. }
  8770. -
  8771. -
  8772. -static inline void raw_write_seqcount_begin(seqcount_t *s)
  8773. +static inline void __raw_write_seqcount_begin(seqcount_t *s)
  8774. {
  8775. s->sequence++;
  8776. smp_wmb();
  8777. }
  8778. -static inline void raw_write_seqcount_end(seqcount_t *s)
  8779. +static inline void raw_write_seqcount_begin(seqcount_t *s)
  8780. +{
  8781. + preempt_disable_rt();
  8782. + __raw_write_seqcount_begin(s);
  8783. +}
  8784. +
  8785. +static inline void __raw_write_seqcount_end(seqcount_t *s)
  8786. {
  8787. smp_wmb();
  8788. s->sequence++;
  8789. }
  8790. +static inline void raw_write_seqcount_end(seqcount_t *s)
  8791. +{
  8792. + __raw_write_seqcount_end(s);
  8793. + preempt_enable_rt();
  8794. +}
  8795. +
  8796. /**
  8797. * raw_write_seqcount_barrier - do a seq write barrier
  8798. * @s: pointer to seqcount_t
  8799. @@ -428,10 +438,32 @@ typedef struct {
  8800. /*
  8801. * Read side functions for starting and finalizing a read side section.
  8802. */
  8803. +#ifndef CONFIG_PREEMPT_RT_FULL
  8804. static inline unsigned read_seqbegin(const seqlock_t *sl)
  8805. {
  8806. return read_seqcount_begin(&sl->seqcount);
  8807. }
  8808. +#else
  8809. +/*
  8810. + * Starvation safe read side for RT
  8811. + */
  8812. +static inline unsigned read_seqbegin(seqlock_t *sl)
  8813. +{
  8814. + unsigned ret;
  8815. +
  8816. +repeat:
  8817. + ret = ACCESS_ONCE(sl->seqcount.sequence);
  8818. + if (unlikely(ret & 1)) {
  8819. + /*
  8820. + * Take the lock and let the writer proceed (i.e. evtl
  8821. + * boost it), otherwise we could loop here forever.
  8822. + */
  8823. + spin_unlock_wait(&sl->lock);
  8824. + goto repeat;
  8825. + }
  8826. + return ret;
  8827. +}
  8828. +#endif
  8829. static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
  8830. {
  8831. @@ -446,36 +478,45 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
  8832. static inline void write_seqlock(seqlock_t *sl)
  8833. {
  8834. spin_lock(&sl->lock);
  8835. - write_seqcount_begin(&sl->seqcount);
  8836. + __raw_write_seqcount_begin(&sl->seqcount);
  8837. +}
  8838. +
  8839. +static inline int try_write_seqlock(seqlock_t *sl)
  8840. +{
  8841. + if (spin_trylock(&sl->lock)) {
  8842. + __raw_write_seqcount_begin(&sl->seqcount);
  8843. + return 1;
  8844. + }
  8845. + return 0;
  8846. }
  8847. static inline void write_sequnlock(seqlock_t *sl)
  8848. {
  8849. - write_seqcount_end(&sl->seqcount);
  8850. + __raw_write_seqcount_end(&sl->seqcount);
  8851. spin_unlock(&sl->lock);
  8852. }
  8853. static inline void write_seqlock_bh(seqlock_t *sl)
  8854. {
  8855. spin_lock_bh(&sl->lock);
  8856. - write_seqcount_begin(&sl->seqcount);
  8857. + __raw_write_seqcount_begin(&sl->seqcount);
  8858. }
  8859. static inline void write_sequnlock_bh(seqlock_t *sl)
  8860. {
  8861. - write_seqcount_end(&sl->seqcount);
  8862. + __raw_write_seqcount_end(&sl->seqcount);
  8863. spin_unlock_bh(&sl->lock);
  8864. }
  8865. static inline void write_seqlock_irq(seqlock_t *sl)
  8866. {
  8867. spin_lock_irq(&sl->lock);
  8868. - write_seqcount_begin(&sl->seqcount);
  8869. + __raw_write_seqcount_begin(&sl->seqcount);
  8870. }
  8871. static inline void write_sequnlock_irq(seqlock_t *sl)
  8872. {
  8873. - write_seqcount_end(&sl->seqcount);
  8874. + __raw_write_seqcount_end(&sl->seqcount);
  8875. spin_unlock_irq(&sl->lock);
  8876. }
  8877. @@ -484,7 +525,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
  8878. unsigned long flags;
  8879. spin_lock_irqsave(&sl->lock, flags);
  8880. - write_seqcount_begin(&sl->seqcount);
  8881. + __raw_write_seqcount_begin(&sl->seqcount);
  8882. return flags;
  8883. }
  8884. @@ -494,7 +535,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
  8885. static inline void
  8886. write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
  8887. {
  8888. - write_seqcount_end(&sl->seqcount);
  8889. + __raw_write_seqcount_end(&sl->seqcount);
  8890. spin_unlock_irqrestore(&sl->lock, flags);
  8891. }
  8892. diff --git a/include/linux/signal.h b/include/linux/signal.h
  8893. index b63f63eaa39c..295540fdfc72 100644
  8894. --- a/include/linux/signal.h
  8895. +++ b/include/linux/signal.h
  8896. @@ -233,6 +233,7 @@ static inline void init_sigpending(struct sigpending *sig)
  8897. }
  8898. extern void flush_sigqueue(struct sigpending *queue);
  8899. +extern void flush_task_sigqueue(struct task_struct *tsk);
  8900. /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
  8901. static inline int valid_signal(unsigned long sig)
  8902. diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
  8903. index 32810f279f8e..0db6e31161f6 100644
  8904. --- a/include/linux/skbuff.h
  8905. +++ b/include/linux/skbuff.h
  8906. @@ -284,6 +284,7 @@ struct sk_buff_head {
  8907. __u32 qlen;
  8908. spinlock_t lock;
  8909. + raw_spinlock_t raw_lock;
  8910. };
  8911. struct sk_buff;
  8912. @@ -1573,6 +1574,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
  8913. __skb_queue_head_init(list);
  8914. }
  8915. +static inline void skb_queue_head_init_raw(struct sk_buff_head *list)
  8916. +{
  8917. + raw_spin_lock_init(&list->raw_lock);
  8918. + __skb_queue_head_init(list);
  8919. +}
  8920. +
  8921. static inline void skb_queue_head_init_class(struct sk_buff_head *list,
  8922. struct lock_class_key *class)
  8923. {
  8924. diff --git a/include/linux/smp.h b/include/linux/smp.h
  8925. index 8e0cb7a0f836..891c533724f5 100644
  8926. --- a/include/linux/smp.h
  8927. +++ b/include/linux/smp.h
  8928. @@ -120,6 +120,13 @@ extern unsigned int setup_max_cpus;
  8929. extern void __init setup_nr_cpu_ids(void);
  8930. extern void __init smp_init(void);
  8931. +extern int __boot_cpu_id;
  8932. +
  8933. +static inline int get_boot_cpu_id(void)
  8934. +{
  8935. + return __boot_cpu_id;
  8936. +}
  8937. +
  8938. #else /* !SMP */
  8939. static inline void smp_send_stop(void) { }
  8940. @@ -158,6 +165,11 @@ static inline void smp_init(void) { up_late_init(); }
  8941. static inline void smp_init(void) { }
  8942. #endif
  8943. +static inline int get_boot_cpu_id(void)
  8944. +{
  8945. + return 0;
  8946. +}
  8947. +
  8948. #endif /* !SMP */
  8949. /*
  8950. @@ -185,6 +197,9 @@ static inline void smp_init(void) { }
  8951. #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
  8952. #define put_cpu() preempt_enable()
  8953. +#define get_cpu_light() ({ migrate_disable(); smp_processor_id(); })
  8954. +#define put_cpu_light() migrate_enable()
  8955. +
  8956. /*
  8957. * Callback to arch code if there's nosmp or maxcpus=0 on the
  8958. * boot command line:
  8959. diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
  8960. index 47dd0cebd204..b241cc044bd3 100644
  8961. --- a/include/linux/spinlock.h
  8962. +++ b/include/linux/spinlock.h
  8963. @@ -271,7 +271,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
  8964. #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
  8965. /* Include rwlock functions */
  8966. -#include <linux/rwlock.h>
  8967. +#ifdef CONFIG_PREEMPT_RT_FULL
  8968. +# include <linux/rwlock_rt.h>
  8969. +#else
  8970. +# include <linux/rwlock.h>
  8971. +#endif
  8972. /*
  8973. * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
  8974. @@ -282,6 +286,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
  8975. # include <linux/spinlock_api_up.h>
  8976. #endif
  8977. +#ifdef CONFIG_PREEMPT_RT_FULL
  8978. +# include <linux/spinlock_rt.h>
  8979. +#else /* PREEMPT_RT_FULL */
  8980. +
  8981. /*
  8982. * Map the spin_lock functions to the raw variants for PREEMPT_RT=n
  8983. */
  8984. @@ -416,4 +424,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
  8985. #define atomic_dec_and_lock(atomic, lock) \
  8986. __cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
  8987. +#endif /* !PREEMPT_RT_FULL */
  8988. +
  8989. #endif /* __LINUX_SPINLOCK_H */
  8990. diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
  8991. index 5344268e6e62..043263f30e81 100644
  8992. --- a/include/linux/spinlock_api_smp.h
  8993. +++ b/include/linux/spinlock_api_smp.h
  8994. @@ -189,6 +189,8 @@ static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)
  8995. return 0;
  8996. }
  8997. -#include <linux/rwlock_api_smp.h>
  8998. +#ifndef CONFIG_PREEMPT_RT_FULL
  8999. +# include <linux/rwlock_api_smp.h>
  9000. +#endif
  9001. #endif /* __LINUX_SPINLOCK_API_SMP_H */
  9002. diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h
  9003. new file mode 100644
  9004. index 000000000000..43ca841b913a
  9005. --- /dev/null
  9006. +++ b/include/linux/spinlock_rt.h
  9007. @@ -0,0 +1,162 @@
  9008. +#ifndef __LINUX_SPINLOCK_RT_H
  9009. +#define __LINUX_SPINLOCK_RT_H
  9010. +
  9011. +#ifndef __LINUX_SPINLOCK_H
  9012. +#error Do not include directly. Use spinlock.h
  9013. +#endif
  9014. +
  9015. +#include <linux/bug.h>
  9016. +
  9017. +extern void
  9018. +__rt_spin_lock_init(spinlock_t *lock, char *name, struct lock_class_key *key);
  9019. +
  9020. +#define spin_lock_init(slock) \
  9021. +do { \
  9022. + static struct lock_class_key __key; \
  9023. + \
  9024. + rt_mutex_init(&(slock)->lock); \
  9025. + __rt_spin_lock_init(slock, #slock, &__key); \
  9026. +} while (0)
  9027. +
  9028. +void __lockfunc rt_spin_lock__no_mg(spinlock_t *lock);
  9029. +void __lockfunc rt_spin_unlock__no_mg(spinlock_t *lock);
  9030. +int __lockfunc rt_spin_trylock__no_mg(spinlock_t *lock);
  9031. +
  9032. +extern void __lockfunc rt_spin_lock(spinlock_t *lock);
  9033. +extern unsigned long __lockfunc rt_spin_lock_trace_flags(spinlock_t *lock);
  9034. +extern void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass);
  9035. +extern void __lockfunc rt_spin_unlock(spinlock_t *lock);
  9036. +extern void __lockfunc rt_spin_unlock_wait(spinlock_t *lock);
  9037. +extern int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags);
  9038. +extern int __lockfunc rt_spin_trylock_bh(spinlock_t *lock);
  9039. +extern int __lockfunc rt_spin_trylock(spinlock_t *lock);
  9040. +extern int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock);
  9041. +
  9042. +/*
  9043. + * lockdep-less calls, for derived types like rwlock:
  9044. + * (for trylock they can use rt_mutex_trylock() directly.
  9045. + */
  9046. +extern void __lockfunc __rt_spin_lock__no_mg(struct rt_mutex *lock);
  9047. +extern void __lockfunc __rt_spin_lock(struct rt_mutex *lock);
  9048. +extern void __lockfunc __rt_spin_unlock(struct rt_mutex *lock);
  9049. +
  9050. +#define spin_lock(lock) rt_spin_lock(lock)
  9051. +
  9052. +#define spin_lock_bh(lock) \
  9053. + do { \
  9054. + local_bh_disable(); \
  9055. + rt_spin_lock(lock); \
  9056. + } while (0)
  9057. +
  9058. +#define spin_lock_irq(lock) spin_lock(lock)
  9059. +
  9060. +#define spin_do_trylock(lock) __cond_lock(lock, rt_spin_trylock(lock))
  9061. +
  9062. +#define spin_trylock(lock) \
  9063. +({ \
  9064. + int __locked; \
  9065. + __locked = spin_do_trylock(lock); \
  9066. + __locked; \
  9067. +})
  9068. +
  9069. +#ifdef CONFIG_LOCKDEP
  9070. +# define spin_lock_nested(lock, subclass) \
  9071. + do { \
  9072. + rt_spin_lock_nested(lock, subclass); \
  9073. + } while (0)
  9074. +
  9075. +#define spin_lock_bh_nested(lock, subclass) \
  9076. + do { \
  9077. + local_bh_disable(); \
  9078. + rt_spin_lock_nested(lock, subclass); \
  9079. + } while (0)
  9080. +
  9081. +# define spin_lock_irqsave_nested(lock, flags, subclass) \
  9082. + do { \
  9083. + typecheck(unsigned long, flags); \
  9084. + flags = 0; \
  9085. + rt_spin_lock_nested(lock, subclass); \
  9086. + } while (0)
  9087. +#else
  9088. +# define spin_lock_nested(lock, subclass) spin_lock(lock)
  9089. +# define spin_lock_bh_nested(lock, subclass) spin_lock_bh(lock)
  9090. +
  9091. +# define spin_lock_irqsave_nested(lock, flags, subclass) \
  9092. + do { \
  9093. + typecheck(unsigned long, flags); \
  9094. + flags = 0; \
  9095. + spin_lock(lock); \
  9096. + } while (0)
  9097. +#endif
  9098. +
  9099. +#define spin_lock_irqsave(lock, flags) \
  9100. + do { \
  9101. + typecheck(unsigned long, flags); \
  9102. + flags = 0; \
  9103. + spin_lock(lock); \
  9104. + } while (0)
  9105. +
  9106. +static inline unsigned long spin_lock_trace_flags(spinlock_t *lock)
  9107. +{
  9108. + unsigned long flags = 0;
  9109. +#ifdef CONFIG_TRACE_IRQFLAGS
  9110. + flags = rt_spin_lock_trace_flags(lock);
  9111. +#else
  9112. + spin_lock(lock); /* lock_local */
  9113. +#endif
  9114. + return flags;
  9115. +}
  9116. +
  9117. +/* FIXME: we need rt_spin_lock_nest_lock */
  9118. +#define spin_lock_nest_lock(lock, nest_lock) spin_lock_nested(lock, 0)
  9119. +
  9120. +#define spin_unlock(lock) rt_spin_unlock(lock)
  9121. +
  9122. +#define spin_unlock_bh(lock) \
  9123. + do { \
  9124. + rt_spin_unlock(lock); \
  9125. + local_bh_enable(); \
  9126. + } while (0)
  9127. +
  9128. +#define spin_unlock_irq(lock) spin_unlock(lock)
  9129. +
  9130. +#define spin_unlock_irqrestore(lock, flags) \
  9131. + do { \
  9132. + typecheck(unsigned long, flags); \
  9133. + (void) flags; \
  9134. + spin_unlock(lock); \
  9135. + } while (0)
  9136. +
  9137. +#define spin_trylock_bh(lock) __cond_lock(lock, rt_spin_trylock_bh(lock))
  9138. +#define spin_trylock_irq(lock) spin_trylock(lock)
  9139. +
  9140. +#define spin_trylock_irqsave(lock, flags) \
  9141. + rt_spin_trylock_irqsave(lock, &(flags))
  9142. +
  9143. +#define spin_unlock_wait(lock) rt_spin_unlock_wait(lock)
  9144. +
  9145. +#ifdef CONFIG_GENERIC_LOCKBREAK
  9146. +# define spin_is_contended(lock) ((lock)->break_lock)
  9147. +#else
  9148. +# define spin_is_contended(lock) (((void)(lock), 0))
  9149. +#endif
  9150. +
  9151. +static inline int spin_can_lock(spinlock_t *lock)
  9152. +{
  9153. + return !rt_mutex_is_locked(&lock->lock);
  9154. +}
  9155. +
  9156. +static inline int spin_is_locked(spinlock_t *lock)
  9157. +{
  9158. + return rt_mutex_is_locked(&lock->lock);
  9159. +}
  9160. +
  9161. +static inline void assert_spin_locked(spinlock_t *lock)
  9162. +{
  9163. + BUG_ON(!spin_is_locked(lock));
  9164. +}
  9165. +
  9166. +#define atomic_dec_and_lock(atomic, lock) \
  9167. + atomic_dec_and_spin_lock(atomic, lock)
  9168. +
  9169. +#endif
  9170. diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
  9171. index 73548eb13a5d..10bac715ea96 100644
  9172. --- a/include/linux/spinlock_types.h
  9173. +++ b/include/linux/spinlock_types.h
  9174. @@ -9,80 +9,15 @@
  9175. * Released under the General Public License (GPL).
  9176. */
  9177. -#if defined(CONFIG_SMP)
  9178. -# include <asm/spinlock_types.h>
  9179. +#include <linux/spinlock_types_raw.h>
  9180. +
  9181. +#ifndef CONFIG_PREEMPT_RT_FULL
  9182. +# include <linux/spinlock_types_nort.h>
  9183. +# include <linux/rwlock_types.h>
  9184. #else
  9185. -# include <linux/spinlock_types_up.h>
  9186. +# include <linux/rtmutex.h>
  9187. +# include <linux/spinlock_types_rt.h>
  9188. +# include <linux/rwlock_types_rt.h>
  9189. #endif
  9190. -#include <linux/lockdep.h>
  9191. -
  9192. -typedef struct raw_spinlock {
  9193. - arch_spinlock_t raw_lock;
  9194. -#ifdef CONFIG_GENERIC_LOCKBREAK
  9195. - unsigned int break_lock;
  9196. -#endif
  9197. -#ifdef CONFIG_DEBUG_SPINLOCK
  9198. - unsigned int magic, owner_cpu;
  9199. - void *owner;
  9200. -#endif
  9201. -#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9202. - struct lockdep_map dep_map;
  9203. -#endif
  9204. -} raw_spinlock_t;
  9205. -
  9206. -#define SPINLOCK_MAGIC 0xdead4ead
  9207. -
  9208. -#define SPINLOCK_OWNER_INIT ((void *)-1L)
  9209. -
  9210. -#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9211. -# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
  9212. -#else
  9213. -# define SPIN_DEP_MAP_INIT(lockname)
  9214. -#endif
  9215. -
  9216. -#ifdef CONFIG_DEBUG_SPINLOCK
  9217. -# define SPIN_DEBUG_INIT(lockname) \
  9218. - .magic = SPINLOCK_MAGIC, \
  9219. - .owner_cpu = -1, \
  9220. - .owner = SPINLOCK_OWNER_INIT,
  9221. -#else
  9222. -# define SPIN_DEBUG_INIT(lockname)
  9223. -#endif
  9224. -
  9225. -#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \
  9226. - { \
  9227. - .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
  9228. - SPIN_DEBUG_INIT(lockname) \
  9229. - SPIN_DEP_MAP_INIT(lockname) }
  9230. -
  9231. -#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \
  9232. - (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
  9233. -
  9234. -#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
  9235. -
  9236. -typedef struct spinlock {
  9237. - union {
  9238. - struct raw_spinlock rlock;
  9239. -
  9240. -#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9241. -# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
  9242. - struct {
  9243. - u8 __padding[LOCK_PADSIZE];
  9244. - struct lockdep_map dep_map;
  9245. - };
  9246. -#endif
  9247. - };
  9248. -} spinlock_t;
  9249. -
  9250. -#define __SPIN_LOCK_INITIALIZER(lockname) \
  9251. - { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
  9252. -
  9253. -#define __SPIN_LOCK_UNLOCKED(lockname) \
  9254. - (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
  9255. -
  9256. -#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
  9257. -
  9258. -#include <linux/rwlock_types.h>
  9259. -
  9260. #endif /* __LINUX_SPINLOCK_TYPES_H */
  9261. diff --git a/include/linux/spinlock_types_nort.h b/include/linux/spinlock_types_nort.h
  9262. new file mode 100644
  9263. index 000000000000..f1dac1fb1d6a
  9264. --- /dev/null
  9265. +++ b/include/linux/spinlock_types_nort.h
  9266. @@ -0,0 +1,33 @@
  9267. +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
  9268. +#define __LINUX_SPINLOCK_TYPES_NORT_H
  9269. +
  9270. +#ifndef __LINUX_SPINLOCK_TYPES_H
  9271. +#error "Do not include directly. Include spinlock_types.h instead"
  9272. +#endif
  9273. +
  9274. +/*
  9275. + * The non RT version maps spinlocks to raw_spinlocks
  9276. + */
  9277. +typedef struct spinlock {
  9278. + union {
  9279. + struct raw_spinlock rlock;
  9280. +
  9281. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9282. +# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
  9283. + struct {
  9284. + u8 __padding[LOCK_PADSIZE];
  9285. + struct lockdep_map dep_map;
  9286. + };
  9287. +#endif
  9288. + };
  9289. +} spinlock_t;
  9290. +
  9291. +#define __SPIN_LOCK_INITIALIZER(lockname) \
  9292. + { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
  9293. +
  9294. +#define __SPIN_LOCK_UNLOCKED(lockname) \
  9295. + (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
  9296. +
  9297. +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
  9298. +
  9299. +#endif
  9300. diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h
  9301. new file mode 100644
  9302. index 000000000000..edffc4d53fc9
  9303. --- /dev/null
  9304. +++ b/include/linux/spinlock_types_raw.h
  9305. @@ -0,0 +1,56 @@
  9306. +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
  9307. +#define __LINUX_SPINLOCK_TYPES_RAW_H
  9308. +
  9309. +#if defined(CONFIG_SMP)
  9310. +# include <asm/spinlock_types.h>
  9311. +#else
  9312. +# include <linux/spinlock_types_up.h>
  9313. +#endif
  9314. +
  9315. +#include <linux/lockdep.h>
  9316. +
  9317. +typedef struct raw_spinlock {
  9318. + arch_spinlock_t raw_lock;
  9319. +#ifdef CONFIG_GENERIC_LOCKBREAK
  9320. + unsigned int break_lock;
  9321. +#endif
  9322. +#ifdef CONFIG_DEBUG_SPINLOCK
  9323. + unsigned int magic, owner_cpu;
  9324. + void *owner;
  9325. +#endif
  9326. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9327. + struct lockdep_map dep_map;
  9328. +#endif
  9329. +} raw_spinlock_t;
  9330. +
  9331. +#define SPINLOCK_MAGIC 0xdead4ead
  9332. +
  9333. +#define SPINLOCK_OWNER_INIT ((void *)-1L)
  9334. +
  9335. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9336. +# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
  9337. +#else
  9338. +# define SPIN_DEP_MAP_INIT(lockname)
  9339. +#endif
  9340. +
  9341. +#ifdef CONFIG_DEBUG_SPINLOCK
  9342. +# define SPIN_DEBUG_INIT(lockname) \
  9343. + .magic = SPINLOCK_MAGIC, \
  9344. + .owner_cpu = -1, \
  9345. + .owner = SPINLOCK_OWNER_INIT,
  9346. +#else
  9347. +# define SPIN_DEBUG_INIT(lockname)
  9348. +#endif
  9349. +
  9350. +#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \
  9351. + { \
  9352. + .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
  9353. + SPIN_DEBUG_INIT(lockname) \
  9354. + SPIN_DEP_MAP_INIT(lockname) }
  9355. +
  9356. +#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \
  9357. + (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
  9358. +
  9359. +#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
  9360. +
  9361. +#endif
  9362. diff --git a/include/linux/spinlock_types_rt.h b/include/linux/spinlock_types_rt.h
  9363. new file mode 100644
  9364. index 000000000000..3e3d8c5f7a9a
  9365. --- /dev/null
  9366. +++ b/include/linux/spinlock_types_rt.h
  9367. @@ -0,0 +1,48 @@
  9368. +#ifndef __LINUX_SPINLOCK_TYPES_RT_H
  9369. +#define __LINUX_SPINLOCK_TYPES_RT_H
  9370. +
  9371. +#ifndef __LINUX_SPINLOCK_TYPES_H
  9372. +#error "Do not include directly. Include spinlock_types.h instead"
  9373. +#endif
  9374. +
  9375. +#include <linux/cache.h>
  9376. +
  9377. +/*
  9378. + * PREEMPT_RT: spinlocks - an RT mutex plus lock-break field:
  9379. + */
  9380. +typedef struct spinlock {
  9381. + struct rt_mutex lock;
  9382. + unsigned int break_lock;
  9383. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  9384. + struct lockdep_map dep_map;
  9385. +#endif
  9386. +} spinlock_t;
  9387. +
  9388. +#ifdef CONFIG_DEBUG_RT_MUTEXES
  9389. +# define __RT_SPIN_INITIALIZER(name) \
  9390. + { \
  9391. + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \
  9392. + .save_state = 1, \
  9393. + .file = __FILE__, \
  9394. + .line = __LINE__ , \
  9395. + }
  9396. +#else
  9397. +# define __RT_SPIN_INITIALIZER(name) \
  9398. + { \
  9399. + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \
  9400. + .save_state = 1, \
  9401. + }
  9402. +#endif
  9403. +
  9404. +/*
  9405. +.wait_list = PLIST_HEAD_INIT_RAW((name).lock.wait_list, (name).lock.wait_lock)
  9406. +*/
  9407. +
  9408. +#define __SPIN_LOCK_UNLOCKED(name) \
  9409. + { .lock = __RT_SPIN_INITIALIZER(name.lock), \
  9410. + SPIN_DEP_MAP_INIT(name) }
  9411. +
  9412. +#define DEFINE_SPINLOCK(name) \
  9413. + spinlock_t name = __SPIN_LOCK_UNLOCKED(name)
  9414. +
  9415. +#endif
  9416. diff --git a/include/linux/srcu.h b/include/linux/srcu.h
  9417. index dc8eb63c6568..e793d3a257da 100644
  9418. --- a/include/linux/srcu.h
  9419. +++ b/include/linux/srcu.h
  9420. @@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct *sp);
  9421. void process_srcu(struct work_struct *work);
  9422. -#define __SRCU_STRUCT_INIT(name) \
  9423. +#define __SRCU_STRUCT_INIT(name, pcpu_name) \
  9424. { \
  9425. .completed = -300, \
  9426. - .per_cpu_ref = &name##_srcu_array, \
  9427. + .per_cpu_ref = &pcpu_name, \
  9428. .queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock), \
  9429. .running = false, \
  9430. .batch_queue = RCU_BATCH_INIT(name.batch_queue), \
  9431. @@ -119,7 +119,7 @@ void process_srcu(struct work_struct *work);
  9432. */
  9433. #define __DEFINE_SRCU(name, is_static) \
  9434. static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
  9435. - is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
  9436. + is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name##_srcu_array)
  9437. #define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
  9438. #define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
  9439. diff --git a/include/linux/suspend.h b/include/linux/suspend.h
  9440. index d9718378a8be..e81e6dc7dcb1 100644
  9441. --- a/include/linux/suspend.h
  9442. +++ b/include/linux/suspend.h
  9443. @@ -193,6 +193,12 @@ struct platform_freeze_ops {
  9444. void (*end)(void);
  9445. };
  9446. +#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATION)
  9447. +extern bool pm_in_action;
  9448. +#else
  9449. +# define pm_in_action false
  9450. +#endif
  9451. +
  9452. #ifdef CONFIG_SUSPEND
  9453. /**
  9454. * suspend_set_ops - set platform dependent suspend operations
  9455. diff --git a/include/linux/swait.h b/include/linux/swait.h
  9456. index c1f9c62a8a50..83f004a72320 100644
  9457. --- a/include/linux/swait.h
  9458. +++ b/include/linux/swait.h
  9459. @@ -87,6 +87,7 @@ static inline int swait_active(struct swait_queue_head *q)
  9460. extern void swake_up(struct swait_queue_head *q);
  9461. extern void swake_up_all(struct swait_queue_head *q);
  9462. extern void swake_up_locked(struct swait_queue_head *q);
  9463. +extern void swake_up_all_locked(struct swait_queue_head *q);
  9464. extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
  9465. extern void prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait, int state);
  9466. diff --git a/include/linux/swap.h b/include/linux/swap.h
  9467. index 55ff5593c193..52bf5477dc92 100644
  9468. --- a/include/linux/swap.h
  9469. +++ b/include/linux/swap.h
  9470. @@ -11,6 +11,7 @@
  9471. #include <linux/fs.h>
  9472. #include <linux/atomic.h>
  9473. #include <linux/page-flags.h>
  9474. +#include <linux/locallock.h>
  9475. #include <asm/page.h>
  9476. struct notifier_block;
  9477. @@ -247,7 +248,8 @@ struct swap_info_struct {
  9478. void *workingset_eviction(struct address_space *mapping, struct page *page);
  9479. bool workingset_refault(void *shadow);
  9480. void workingset_activation(struct page *page);
  9481. -extern struct list_lru workingset_shadow_nodes;
  9482. +extern struct list_lru __workingset_shadow_nodes;
  9483. +DECLARE_LOCAL_IRQ_LOCK(workingset_shadow_lock);
  9484. static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
  9485. {
  9486. @@ -292,6 +294,7 @@ extern unsigned long nr_free_pagecache_pages(void);
  9487. /* linux/mm/swap.c */
  9488. +DECLARE_LOCAL_IRQ_LOCK(swapvec_lock);
  9489. extern void lru_cache_add(struct page *);
  9490. extern void lru_cache_add_anon(struct page *page);
  9491. extern void lru_cache_add_file(struct page *page);
  9492. diff --git a/include/linux/swork.h b/include/linux/swork.h
  9493. new file mode 100644
  9494. index 000000000000..f175fa9a6016
  9495. --- /dev/null
  9496. +++ b/include/linux/swork.h
  9497. @@ -0,0 +1,24 @@
  9498. +#ifndef _LINUX_SWORK_H
  9499. +#define _LINUX_SWORK_H
  9500. +
  9501. +#include <linux/list.h>
  9502. +
  9503. +struct swork_event {
  9504. + struct list_head item;
  9505. + unsigned long flags;
  9506. + void (*func)(struct swork_event *);
  9507. +};
  9508. +
  9509. +static inline void INIT_SWORK(struct swork_event *event,
  9510. + void (*func)(struct swork_event *))
  9511. +{
  9512. + event->flags = 0;
  9513. + event->func = func;
  9514. +}
  9515. +
  9516. +bool swork_queue(struct swork_event *sev);
  9517. +
  9518. +int swork_get(void);
  9519. +void swork_put(void);
  9520. +
  9521. +#endif /* _LINUX_SWORK_H */
  9522. diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
  9523. index 2873baf5372a..eb1a108f17ca 100644
  9524. --- a/include/linux/thread_info.h
  9525. +++ b/include/linux/thread_info.h
  9526. @@ -107,7 +107,17 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
  9527. #define test_thread_flag(flag) \
  9528. test_ti_thread_flag(current_thread_info(), flag)
  9529. -#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
  9530. +#ifdef CONFIG_PREEMPT_LAZY
  9531. +#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
  9532. + test_thread_flag(TIF_NEED_RESCHED_LAZY))
  9533. +#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
  9534. +#define tif_need_resched_lazy() test_thread_flag(TIF_NEED_RESCHED_LAZY))
  9535. +
  9536. +#else
  9537. +#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
  9538. +#define tif_need_resched_now() test_thread_flag(TIF_NEED_RESCHED)
  9539. +#define tif_need_resched_lazy() 0
  9540. +#endif
  9541. #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
  9542. static inline int arch_within_stack_frames(const void * const stack,
  9543. diff --git a/include/linux/timer.h b/include/linux/timer.h
  9544. index 51d601f192d4..83cea629efe1 100644
  9545. --- a/include/linux/timer.h
  9546. +++ b/include/linux/timer.h
  9547. @@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer);
  9548. extern int try_to_del_timer_sync(struct timer_list *timer);
  9549. -#ifdef CONFIG_SMP
  9550. +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
  9551. extern int del_timer_sync(struct timer_list *timer);
  9552. #else
  9553. # define del_timer_sync(t) del_timer(t)
  9554. diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
  9555. index be007610ceb0..15154b13a53b 100644
  9556. --- a/include/linux/trace_events.h
  9557. +++ b/include/linux/trace_events.h
  9558. @@ -56,6 +56,9 @@ struct trace_entry {
  9559. unsigned char flags;
  9560. unsigned char preempt_count;
  9561. int pid;
  9562. + unsigned short migrate_disable;
  9563. + unsigned short padding;
  9564. + unsigned char preempt_lazy_count;
  9565. };
  9566. #define TRACE_EVENT_TYPE_MAX \
  9567. diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
  9568. index f30c187ed785..83bf0f798426 100644
  9569. --- a/include/linux/uaccess.h
  9570. +++ b/include/linux/uaccess.h
  9571. @@ -24,6 +24,7 @@ static __always_inline void pagefault_disabled_dec(void)
  9572. */
  9573. static inline void pagefault_disable(void)
  9574. {
  9575. + migrate_disable();
  9576. pagefault_disabled_inc();
  9577. /*
  9578. * make sure to have issued the store before a pagefault
  9579. @@ -40,6 +41,7 @@ static inline void pagefault_enable(void)
  9580. */
  9581. barrier();
  9582. pagefault_disabled_dec();
  9583. + migrate_enable();
  9584. }
  9585. /*
  9586. diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
  9587. index 4a29c75b146e..0a294e950df8 100644
  9588. --- a/include/linux/uprobes.h
  9589. +++ b/include/linux/uprobes.h
  9590. @@ -27,6 +27,7 @@
  9591. #include <linux/errno.h>
  9592. #include <linux/rbtree.h>
  9593. #include <linux/types.h>
  9594. +#include <linux/wait.h>
  9595. struct vm_area_struct;
  9596. struct mm_struct;
  9597. diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
  9598. index 613771909b6e..e28c5a43229d 100644
  9599. --- a/include/linux/vmstat.h
  9600. +++ b/include/linux/vmstat.h
  9601. @@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, vm_event_states);
  9602. */
  9603. static inline void __count_vm_event(enum vm_event_item item)
  9604. {
  9605. + preempt_disable_rt();
  9606. raw_cpu_inc(vm_event_states.event[item]);
  9607. + preempt_enable_rt();
  9608. }
  9609. static inline void count_vm_event(enum vm_event_item item)
  9610. @@ -43,7 +45,9 @@ static inline void count_vm_event(enum vm_event_item item)
  9611. static inline void __count_vm_events(enum vm_event_item item, long delta)
  9612. {
  9613. + preempt_disable_rt();
  9614. raw_cpu_add(vm_event_states.event[item], delta);
  9615. + preempt_enable_rt();
  9616. }
  9617. static inline void count_vm_events(enum vm_event_item item, long delta)
  9618. diff --git a/include/linux/wait.h b/include/linux/wait.h
  9619. index 2408e8d5c05c..db50d6609195 100644
  9620. --- a/include/linux/wait.h
  9621. +++ b/include/linux/wait.h
  9622. @@ -8,6 +8,7 @@
  9623. #include <linux/spinlock.h>
  9624. #include <asm/current.h>
  9625. #include <uapi/linux/wait.h>
  9626. +#include <linux/atomic.h>
  9627. typedef struct __wait_queue wait_queue_t;
  9628. typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
  9629. diff --git a/include/net/dst.h b/include/net/dst.h
  9630. index 6835d224d47b..55a5a9698f14 100644
  9631. --- a/include/net/dst.h
  9632. +++ b/include/net/dst.h
  9633. @@ -446,7 +446,7 @@ static inline void dst_confirm(struct dst_entry *dst)
  9634. static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
  9635. struct sk_buff *skb)
  9636. {
  9637. - const struct hh_cache *hh;
  9638. + struct hh_cache *hh;
  9639. if (dst->pending_confirm) {
  9640. unsigned long now = jiffies;
  9641. diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
  9642. index 231e121cc7d9..d125222b979d 100644
  9643. --- a/include/net/gen_stats.h
  9644. +++ b/include/net/gen_stats.h
  9645. @@ -5,6 +5,7 @@
  9646. #include <linux/socket.h>
  9647. #include <linux/rtnetlink.h>
  9648. #include <linux/pkt_sched.h>
  9649. +#include <net/net_seq_lock.h>
  9650. struct gnet_stats_basic_cpu {
  9651. struct gnet_stats_basic_packed bstats;
  9652. @@ -33,11 +34,11 @@ int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
  9653. spinlock_t *lock, struct gnet_dump *d,
  9654. int padattr);
  9655. -int gnet_stats_copy_basic(const seqcount_t *running,
  9656. +int gnet_stats_copy_basic(net_seqlock_t *running,
  9657. struct gnet_dump *d,
  9658. struct gnet_stats_basic_cpu __percpu *cpu,
  9659. struct gnet_stats_basic_packed *b);
  9660. -void __gnet_stats_copy_basic(const seqcount_t *running,
  9661. +void __gnet_stats_copy_basic(net_seqlock_t *running,
  9662. struct gnet_stats_basic_packed *bstats,
  9663. struct gnet_stats_basic_cpu __percpu *cpu,
  9664. struct gnet_stats_basic_packed *b);
  9665. @@ -55,14 +56,14 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
  9666. struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  9667. struct gnet_stats_rate_est64 *rate_est,
  9668. spinlock_t *stats_lock,
  9669. - seqcount_t *running, struct nlattr *opt);
  9670. + net_seqlock_t *running, struct nlattr *opt);
  9671. void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
  9672. struct gnet_stats_rate_est64 *rate_est);
  9673. int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
  9674. struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  9675. struct gnet_stats_rate_est64 *rate_est,
  9676. spinlock_t *stats_lock,
  9677. - seqcount_t *running, struct nlattr *opt);
  9678. + net_seqlock_t *running, struct nlattr *opt);
  9679. bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
  9680. const struct gnet_stats_rate_est64 *rate_est);
  9681. #endif
  9682. diff --git a/include/net/neighbour.h b/include/net/neighbour.h
  9683. index 8b683841e574..bf656008f6e7 100644
  9684. --- a/include/net/neighbour.h
  9685. +++ b/include/net/neighbour.h
  9686. @@ -446,7 +446,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
  9687. }
  9688. #endif
  9689. -static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
  9690. +static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
  9691. {
  9692. unsigned int seq;
  9693. int hh_len;
  9694. @@ -501,7 +501,7 @@ struct neighbour_cb {
  9695. #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb)
  9696. -static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n,
  9697. +static inline void neigh_ha_snapshot(char *dst, struct neighbour *n,
  9698. const struct net_device *dev)
  9699. {
  9700. unsigned int seq;
  9701. diff --git a/include/net/net_seq_lock.h b/include/net/net_seq_lock.h
  9702. new file mode 100644
  9703. index 000000000000..a7034298a82a
  9704. --- /dev/null
  9705. +++ b/include/net/net_seq_lock.h
  9706. @@ -0,0 +1,15 @@
  9707. +#ifndef __NET_NET_SEQ_LOCK_H__
  9708. +#define __NET_NET_SEQ_LOCK_H__
  9709. +
  9710. +#ifdef CONFIG_PREEMPT_RT_BASE
  9711. +# define net_seqlock_t seqlock_t
  9712. +# define net_seq_begin(__r) read_seqbegin(__r)
  9713. +# define net_seq_retry(__r, __s) read_seqretry(__r, __s)
  9714. +
  9715. +#else
  9716. +# define net_seqlock_t seqcount_t
  9717. +# define net_seq_begin(__r) read_seqcount_begin(__r)
  9718. +# define net_seq_retry(__r, __s) read_seqcount_retry(__r, __s)
  9719. +#endif
  9720. +
  9721. +#endif
  9722. diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
  9723. index 7adf4386ac8f..d3fd5c357268 100644
  9724. --- a/include/net/netns/ipv4.h
  9725. +++ b/include/net/netns/ipv4.h
  9726. @@ -69,6 +69,7 @@ struct netns_ipv4 {
  9727. int sysctl_icmp_echo_ignore_all;
  9728. int sysctl_icmp_echo_ignore_broadcasts;
  9729. + int sysctl_icmp_echo_sysrq;
  9730. int sysctl_icmp_ignore_bogus_error_responses;
  9731. int sysctl_icmp_ratelimit;
  9732. int sysctl_icmp_ratemask;
  9733. diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
  9734. index e6aa0a249672..b57736f2a8a3 100644
  9735. --- a/include/net/sch_generic.h
  9736. +++ b/include/net/sch_generic.h
  9737. @@ -10,6 +10,7 @@
  9738. #include <linux/dynamic_queue_limits.h>
  9739. #include <net/gen_stats.h>
  9740. #include <net/rtnetlink.h>
  9741. +#include <net/net_seq_lock.h>
  9742. struct Qdisc_ops;
  9743. struct qdisc_walker;
  9744. @@ -86,7 +87,7 @@ struct Qdisc {
  9745. struct sk_buff *gso_skb ____cacheline_aligned_in_smp;
  9746. struct qdisc_skb_head q;
  9747. struct gnet_stats_basic_packed bstats;
  9748. - seqcount_t running;
  9749. + net_seqlock_t running;
  9750. struct gnet_stats_queue qstats;
  9751. unsigned long state;
  9752. struct Qdisc *next_sched;
  9753. @@ -98,13 +99,22 @@ struct Qdisc {
  9754. spinlock_t busylock ____cacheline_aligned_in_smp;
  9755. };
  9756. -static inline bool qdisc_is_running(const struct Qdisc *qdisc)
  9757. +static inline bool qdisc_is_running(struct Qdisc *qdisc)
  9758. {
  9759. +#ifdef CONFIG_PREEMPT_RT_BASE
  9760. + return spin_is_locked(&qdisc->running.lock) ? true : false;
  9761. +#else
  9762. return (raw_read_seqcount(&qdisc->running) & 1) ? true : false;
  9763. +#endif
  9764. }
  9765. static inline bool qdisc_run_begin(struct Qdisc *qdisc)
  9766. {
  9767. +#ifdef CONFIG_PREEMPT_RT_BASE
  9768. + if (try_write_seqlock(&qdisc->running))
  9769. + return true;
  9770. + return false;
  9771. +#else
  9772. if (qdisc_is_running(qdisc))
  9773. return false;
  9774. /* Variant of write_seqcount_begin() telling lockdep a trylock
  9775. @@ -113,11 +123,16 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
  9776. raw_write_seqcount_begin(&qdisc->running);
  9777. seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
  9778. return true;
  9779. +#endif
  9780. }
  9781. static inline void qdisc_run_end(struct Qdisc *qdisc)
  9782. {
  9783. +#ifdef CONFIG_PREEMPT_RT_BASE
  9784. + write_sequnlock(&qdisc->running);
  9785. +#else
  9786. write_seqcount_end(&qdisc->running);
  9787. +#endif
  9788. }
  9789. static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
  9790. @@ -308,7 +323,7 @@ static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
  9791. return qdisc_lock(root);
  9792. }
  9793. -static inline seqcount_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
  9794. +static inline net_seqlock_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
  9795. {
  9796. struct Qdisc *root = qdisc_root_sleeping(qdisc);
  9797. diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
  9798. new file mode 100644
  9799. index 000000000000..f7710de1b1f3
  9800. --- /dev/null
  9801. +++ b/include/trace/events/hist.h
  9802. @@ -0,0 +1,73 @@
  9803. +#undef TRACE_SYSTEM
  9804. +#define TRACE_SYSTEM hist
  9805. +
  9806. +#if !defined(_TRACE_HIST_H) || defined(TRACE_HEADER_MULTI_READ)
  9807. +#define _TRACE_HIST_H
  9808. +
  9809. +#include "latency_hist.h"
  9810. +#include <linux/tracepoint.h>
  9811. +
  9812. +#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
  9813. +#define trace_preemptirqsoff_hist(a, b)
  9814. +#define trace_preemptirqsoff_hist_rcuidle(a, b)
  9815. +#else
  9816. +TRACE_EVENT(preemptirqsoff_hist,
  9817. +
  9818. + TP_PROTO(int reason, int starthist),
  9819. +
  9820. + TP_ARGS(reason, starthist),
  9821. +
  9822. + TP_STRUCT__entry(
  9823. + __field(int, reason)
  9824. + __field(int, starthist)
  9825. + ),
  9826. +
  9827. + TP_fast_assign(
  9828. + __entry->reason = reason;
  9829. + __entry->starthist = starthist;
  9830. + ),
  9831. +
  9832. + TP_printk("reason=%s starthist=%s", getaction(__entry->reason),
  9833. + __entry->starthist ? "start" : "stop")
  9834. +);
  9835. +#endif
  9836. +
  9837. +#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
  9838. +#define trace_hrtimer_interrupt(a, b, c, d)
  9839. +#else
  9840. +TRACE_EVENT(hrtimer_interrupt,
  9841. +
  9842. + TP_PROTO(int cpu, long long offset, struct task_struct *curr,
  9843. + struct task_struct *task),
  9844. +
  9845. + TP_ARGS(cpu, offset, curr, task),
  9846. +
  9847. + TP_STRUCT__entry(
  9848. + __field(int, cpu)
  9849. + __field(long long, offset)
  9850. + __array(char, ccomm, TASK_COMM_LEN)
  9851. + __field(int, cprio)
  9852. + __array(char, tcomm, TASK_COMM_LEN)
  9853. + __field(int, tprio)
  9854. + ),
  9855. +
  9856. + TP_fast_assign(
  9857. + __entry->cpu = cpu;
  9858. + __entry->offset = offset;
  9859. + memcpy(__entry->ccomm, curr->comm, TASK_COMM_LEN);
  9860. + __entry->cprio = curr->prio;
  9861. + memcpy(__entry->tcomm, task != NULL ? task->comm : "<none>",
  9862. + task != NULL ? TASK_COMM_LEN : 7);
  9863. + __entry->tprio = task != NULL ? task->prio : -1;
  9864. + ),
  9865. +
  9866. + TP_printk("cpu=%d offset=%lld curr=%s[%d] thread=%s[%d]",
  9867. + __entry->cpu, __entry->offset, __entry->ccomm,
  9868. + __entry->cprio, __entry->tcomm, __entry->tprio)
  9869. +);
  9870. +#endif
  9871. +
  9872. +#endif /* _TRACE_HIST_H */
  9873. +
  9874. +/* This part must be outside protection */
  9875. +#include <trace/define_trace.h>
  9876. diff --git a/include/trace/events/latency_hist.h b/include/trace/events/latency_hist.h
  9877. new file mode 100644
  9878. index 000000000000..d3f2fbd560b1
  9879. --- /dev/null
  9880. +++ b/include/trace/events/latency_hist.h
  9881. @@ -0,0 +1,29 @@
  9882. +#ifndef _LATENCY_HIST_H
  9883. +#define _LATENCY_HIST_H
  9884. +
  9885. +enum hist_action {
  9886. + IRQS_ON,
  9887. + PREEMPT_ON,
  9888. + TRACE_STOP,
  9889. + IRQS_OFF,
  9890. + PREEMPT_OFF,
  9891. + TRACE_START,
  9892. +};
  9893. +
  9894. +static char *actions[] = {
  9895. + "IRQS_ON",
  9896. + "PREEMPT_ON",
  9897. + "TRACE_STOP",
  9898. + "IRQS_OFF",
  9899. + "PREEMPT_OFF",
  9900. + "TRACE_START",
  9901. +};
  9902. +
  9903. +static inline char *getaction(int action)
  9904. +{
  9905. + if (action >= 0 && action <= sizeof(actions)/sizeof(actions[0]))
  9906. + return actions[action];
  9907. + return "unknown";
  9908. +}
  9909. +
  9910. +#endif /* _LATENCY_HIST_H */
  9911. diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
  9912. index 9b90c57517a9..516ae88cddf4 100644
  9913. --- a/include/trace/events/sched.h
  9914. +++ b/include/trace/events/sched.h
  9915. @@ -70,7 +70,7 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
  9916. TP_fast_assign(
  9917. memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
  9918. __entry->pid = p->pid;
  9919. - __entry->prio = p->prio;
  9920. + __entry->prio = p->prio; /* XXX SCHED_DEADLINE */
  9921. __entry->success = 1; /* rudiment, kill when possible */
  9922. __entry->target_cpu = task_cpu(p);
  9923. ),
  9924. @@ -147,6 +147,7 @@ TRACE_EVENT(sched_switch,
  9925. memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN);
  9926. __entry->next_pid = next->pid;
  9927. __entry->next_prio = next->prio;
  9928. + /* XXX SCHED_DEADLINE */
  9929. ),
  9930. TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_pid=%d next_prio=%d",
  9931. @@ -181,7 +182,7 @@ TRACE_EVENT(sched_migrate_task,
  9932. TP_fast_assign(
  9933. memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
  9934. __entry->pid = p->pid;
  9935. - __entry->prio = p->prio;
  9936. + __entry->prio = p->prio; /* XXX SCHED_DEADLINE */
  9937. __entry->orig_cpu = task_cpu(p);
  9938. __entry->dest_cpu = dest_cpu;
  9939. ),
  9940. @@ -206,7 +207,7 @@ DECLARE_EVENT_CLASS(sched_process_template,
  9941. TP_fast_assign(
  9942. memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
  9943. __entry->pid = p->pid;
  9944. - __entry->prio = p->prio;
  9945. + __entry->prio = p->prio; /* XXX SCHED_DEADLINE */
  9946. ),
  9947. TP_printk("comm=%s pid=%d prio=%d",
  9948. @@ -253,7 +254,7 @@ TRACE_EVENT(sched_process_wait,
  9949. TP_fast_assign(
  9950. memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
  9951. __entry->pid = pid_nr(pid);
  9952. - __entry->prio = current->prio;
  9953. + __entry->prio = current->prio; /* XXX SCHED_DEADLINE */
  9954. ),
  9955. TP_printk("comm=%s pid=%d prio=%d",
  9956. @@ -413,9 +414,9 @@ DEFINE_EVENT(sched_stat_runtime, sched_stat_runtime,
  9957. */
  9958. TRACE_EVENT(sched_pi_setprio,
  9959. - TP_PROTO(struct task_struct *tsk, int newprio),
  9960. + TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task),
  9961. - TP_ARGS(tsk, newprio),
  9962. + TP_ARGS(tsk, pi_task),
  9963. TP_STRUCT__entry(
  9964. __array( char, comm, TASK_COMM_LEN )
  9965. @@ -428,7 +429,8 @@ TRACE_EVENT(sched_pi_setprio,
  9966. memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
  9967. __entry->pid = tsk->pid;
  9968. __entry->oldprio = tsk->prio;
  9969. - __entry->newprio = newprio;
  9970. + __entry->newprio = pi_task ? pi_task->prio : tsk->prio;
  9971. + /* XXX SCHED_DEADLINE bits missing */
  9972. ),
  9973. TP_printk("comm=%s pid=%d oldprio=%d newprio=%d",
  9974. diff --git a/init/Kconfig b/init/Kconfig
  9975. index 34407f15e6d3..2ce33a32e65d 100644
  9976. --- a/init/Kconfig
  9977. +++ b/init/Kconfig
  9978. @@ -506,7 +506,7 @@ config TINY_RCU
  9979. config RCU_EXPERT
  9980. bool "Make expert-level adjustments to RCU configuration"
  9981. - default n
  9982. + default y if PREEMPT_RT_FULL
  9983. help
  9984. This option needs to be enabled if you wish to make
  9985. expert-level adjustments to RCU configuration. By default,
  9986. @@ -623,7 +623,7 @@ config RCU_FANOUT_LEAF
  9987. config RCU_FAST_NO_HZ
  9988. bool "Accelerate last non-dyntick-idle CPU's grace periods"
  9989. - depends on NO_HZ_COMMON && SMP && RCU_EXPERT
  9990. + depends on NO_HZ_COMMON && SMP && RCU_EXPERT && !PREEMPT_RT_FULL
  9991. default n
  9992. help
  9993. This option permits CPUs to enter dynticks-idle state even if
  9994. @@ -650,7 +650,7 @@ config TREE_RCU_TRACE
  9995. config RCU_BOOST
  9996. bool "Enable RCU priority boosting"
  9997. depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
  9998. - default n
  9999. + default y if PREEMPT_RT_FULL
  10000. help
  10001. This option boosts the priority of preempted RCU readers that
  10002. block the current preemptible RCU grace period for too long.
  10003. @@ -781,19 +781,6 @@ config RCU_NOCB_CPU_ALL
  10004. endchoice
  10005. -config RCU_EXPEDITE_BOOT
  10006. - bool
  10007. - default n
  10008. - help
  10009. - This option enables expedited grace periods at boot time,
  10010. - as if rcu_expedite_gp() had been invoked early in boot.
  10011. - The corresponding rcu_unexpedite_gp() is invoked from
  10012. - rcu_end_inkernel_boot(), which is intended to be invoked
  10013. - at the end of the kernel-only boot sequence, just before
  10014. - init is exec'ed.
  10015. -
  10016. - Accept the default if unsure.
  10017. -
  10018. endmenu # "RCU Subsystem"
  10019. config BUILD_BIN2C
  10020. @@ -1064,6 +1051,7 @@ config CFS_BANDWIDTH
  10021. config RT_GROUP_SCHED
  10022. bool "Group scheduling for SCHED_RR/FIFO"
  10023. depends on CGROUP_SCHED
  10024. + depends on !PREEMPT_RT_FULL
  10025. default n
  10026. help
  10027. This feature lets you explicitly allocate real CPU bandwidth
  10028. @@ -1772,6 +1760,7 @@ choice
  10029. config SLAB
  10030. bool "SLAB"
  10031. + depends on !PREEMPT_RT_FULL
  10032. select HAVE_HARDENED_USERCOPY_ALLOCATOR
  10033. help
  10034. The regular slab allocator that is established and known to work
  10035. @@ -1792,6 +1781,7 @@ config SLUB
  10036. config SLOB
  10037. depends on EXPERT
  10038. bool "SLOB (Simple Allocator)"
  10039. + depends on !PREEMPT_RT_FULL
  10040. help
  10041. SLOB replaces the stock allocator with a drastically simpler
  10042. allocator. SLOB is generally more space efficient but
  10043. @@ -1810,7 +1800,7 @@ config SLAB_FREELIST_RANDOM
  10044. config SLUB_CPU_PARTIAL
  10045. default y
  10046. - depends on SLUB && SMP
  10047. + depends on SLUB && SMP && !PREEMPT_RT_FULL
  10048. bool "SLUB per cpu partial cache"
  10049. help
  10050. Per cpu partial caches accellerate objects allocation and freeing
  10051. diff --git a/init/Makefile b/init/Makefile
  10052. index c4fb45525d08..821190dfaa75 100644
  10053. --- a/init/Makefile
  10054. +++ b/init/Makefile
  10055. @@ -35,4 +35,4 @@ $(obj)/version.o: include/generated/compile.h
  10056. include/generated/compile.h: FORCE
  10057. @$($(quiet)chk_compile.h)
  10058. $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
  10059. - "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
  10060. + "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
  10061. diff --git a/init/main.c b/init/main.c
  10062. index ae3996ae9bac..6470deef01c9 100644
  10063. --- a/init/main.c
  10064. +++ b/init/main.c
  10065. @@ -507,6 +507,7 @@ asmlinkage __visible void __init start_kernel(void)
  10066. setup_command_line(command_line);
  10067. setup_nr_cpu_ids();
  10068. setup_per_cpu_areas();
  10069. + softirq_early_init();
  10070. boot_cpu_state_init();
  10071. smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
  10072. diff --git a/ipc/sem.c b/ipc/sem.c
  10073. index 10b94bc59d4a..b8360eaacc7a 100644
  10074. --- a/ipc/sem.c
  10075. +++ b/ipc/sem.c
  10076. @@ -712,6 +712,13 @@ static int perform_atomic_semop(struct sem_array *sma, struct sem_queue *q)
  10077. static void wake_up_sem_queue_prepare(struct list_head *pt,
  10078. struct sem_queue *q, int error)
  10079. {
  10080. +#ifdef CONFIG_PREEMPT_RT_BASE
  10081. + struct task_struct *p = q->sleeper;
  10082. + get_task_struct(p);
  10083. + q->status = error;
  10084. + wake_up_process(p);
  10085. + put_task_struct(p);
  10086. +#else
  10087. if (list_empty(pt)) {
  10088. /*
  10089. * Hold preempt off so that we don't get preempted and have the
  10090. @@ -723,6 +730,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
  10091. q->pid = error;
  10092. list_add_tail(&q->list, pt);
  10093. +#endif
  10094. }
  10095. /**
  10096. @@ -736,6 +744,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
  10097. */
  10098. static void wake_up_sem_queue_do(struct list_head *pt)
  10099. {
  10100. +#ifndef CONFIG_PREEMPT_RT_BASE
  10101. struct sem_queue *q, *t;
  10102. int did_something;
  10103. @@ -748,6 +757,7 @@ static void wake_up_sem_queue_do(struct list_head *pt)
  10104. }
  10105. if (did_something)
  10106. preempt_enable();
  10107. +#endif
  10108. }
  10109. static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
  10110. diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
  10111. index ebdb0043203a..b9e6aa7e5aa6 100644
  10112. --- a/kernel/Kconfig.locks
  10113. +++ b/kernel/Kconfig.locks
  10114. @@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW
  10115. config MUTEX_SPIN_ON_OWNER
  10116. def_bool y
  10117. - depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
  10118. + depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
  10119. config RWSEM_SPIN_ON_OWNER
  10120. def_bool y
  10121. - depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
  10122. + depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
  10123. config LOCK_SPIN_ON_OWNER
  10124. def_bool y
  10125. diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
  10126. index 3f9c97419f02..11dbe26a8279 100644
  10127. --- a/kernel/Kconfig.preempt
  10128. +++ b/kernel/Kconfig.preempt
  10129. @@ -1,3 +1,16 @@
  10130. +config PREEMPT
  10131. + bool
  10132. + select PREEMPT_COUNT
  10133. +
  10134. +config PREEMPT_RT_BASE
  10135. + bool
  10136. + select PREEMPT
  10137. +
  10138. +config HAVE_PREEMPT_LAZY
  10139. + bool
  10140. +
  10141. +config PREEMPT_LAZY
  10142. + def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
  10143. choice
  10144. prompt "Preemption Model"
  10145. @@ -33,9 +46,9 @@ config PREEMPT_VOLUNTARY
  10146. Select this if you are building a kernel for a desktop system.
  10147. -config PREEMPT
  10148. +config PREEMPT__LL
  10149. bool "Preemptible Kernel (Low-Latency Desktop)"
  10150. - select PREEMPT_COUNT
  10151. + select PREEMPT
  10152. select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
  10153. help
  10154. This option reduces the latency of the kernel by making
  10155. @@ -52,6 +65,22 @@ config PREEMPT
  10156. embedded system with latency requirements in the milliseconds
  10157. range.
  10158. +config PREEMPT_RTB
  10159. + bool "Preemptible Kernel (Basic RT)"
  10160. + select PREEMPT_RT_BASE
  10161. + help
  10162. + This option is basically the same as (Low-Latency Desktop) but
  10163. + enables changes which are preliminary for the full preemptible
  10164. + RT kernel.
  10165. +
  10166. +config PREEMPT_RT_FULL
  10167. + bool "Fully Preemptible Kernel (RT)"
  10168. + depends on IRQ_FORCED_THREADING
  10169. + select PREEMPT_RT_BASE
  10170. + select PREEMPT_RCU
  10171. + help
  10172. + All and everything
  10173. +
  10174. endchoice
  10175. config PREEMPT_COUNT
  10176. diff --git a/kernel/cgroup.c b/kernel/cgroup.c
  10177. index a3d2aad2443f..bb6b252648ff 100644
  10178. --- a/kernel/cgroup.c
  10179. +++ b/kernel/cgroup.c
  10180. @@ -5041,10 +5041,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)
  10181. queue_work(cgroup_destroy_wq, &css->destroy_work);
  10182. }
  10183. -static void css_release_work_fn(struct work_struct *work)
  10184. +static void css_release_work_fn(struct swork_event *sev)
  10185. {
  10186. struct cgroup_subsys_state *css =
  10187. - container_of(work, struct cgroup_subsys_state, destroy_work);
  10188. + container_of(sev, struct cgroup_subsys_state, destroy_swork);
  10189. struct cgroup_subsys *ss = css->ss;
  10190. struct cgroup *cgrp = css->cgroup;
  10191. @@ -5087,8 +5087,8 @@ static void css_release(struct percpu_ref *ref)
  10192. struct cgroup_subsys_state *css =
  10193. container_of(ref, struct cgroup_subsys_state, refcnt);
  10194. - INIT_WORK(&css->destroy_work, css_release_work_fn);
  10195. - queue_work(cgroup_destroy_wq, &css->destroy_work);
  10196. + INIT_SWORK(&css->destroy_swork, css_release_work_fn);
  10197. + swork_queue(&css->destroy_swork);
  10198. }
  10199. static void init_and_link_css(struct cgroup_subsys_state *css,
  10200. @@ -5740,6 +5740,7 @@ static int __init cgroup_wq_init(void)
  10201. */
  10202. cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
  10203. BUG_ON(!cgroup_destroy_wq);
  10204. + BUG_ON(swork_get());
  10205. /*
  10206. * Used to destroy pidlists and separate to serve as flush domain.
  10207. diff --git a/kernel/cpu.c b/kernel/cpu.c
  10208. index 99c6c568bc55..f1c64e563970 100644
  10209. --- a/kernel/cpu.c
  10210. +++ b/kernel/cpu.c
  10211. @@ -239,6 +239,289 @@ static struct {
  10212. #define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map)
  10213. #define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map)
  10214. +/**
  10215. + * hotplug_pcp - per cpu hotplug descriptor
  10216. + * @unplug: set when pin_current_cpu() needs to sync tasks
  10217. + * @sync_tsk: the task that waits for tasks to finish pinned sections
  10218. + * @refcount: counter of tasks in pinned sections
  10219. + * @grab_lock: set when the tasks entering pinned sections should wait
  10220. + * @synced: notifier for @sync_tsk to tell cpu_down it's finished
  10221. + * @mutex: the mutex to make tasks wait (used when @grab_lock is true)
  10222. + * @mutex_init: zero if the mutex hasn't been initialized yet.
  10223. + *
  10224. + * Although @unplug and @sync_tsk may point to the same task, the @unplug
  10225. + * is used as a flag and still exists after @sync_tsk has exited and
  10226. + * @sync_tsk set to NULL.
  10227. + */
  10228. +struct hotplug_pcp {
  10229. + struct task_struct *unplug;
  10230. + struct task_struct *sync_tsk;
  10231. + int refcount;
  10232. + int grab_lock;
  10233. + struct completion synced;
  10234. + struct completion unplug_wait;
  10235. +#ifdef CONFIG_PREEMPT_RT_FULL
  10236. + /*
  10237. + * Note, on PREEMPT_RT, the hotplug lock must save the state of
  10238. + * the task, otherwise the mutex will cause the task to fail
  10239. + * to sleep when required. (Because it's called from migrate_disable())
  10240. + *
  10241. + * The spinlock_t on PREEMPT_RT is a mutex that saves the task's
  10242. + * state.
  10243. + */
  10244. + spinlock_t lock;
  10245. +#else
  10246. + struct mutex mutex;
  10247. +#endif
  10248. + int mutex_init;
  10249. +};
  10250. +
  10251. +#ifdef CONFIG_PREEMPT_RT_FULL
  10252. +# define hotplug_lock(hp) rt_spin_lock__no_mg(&(hp)->lock)
  10253. +# define hotplug_unlock(hp) rt_spin_unlock__no_mg(&(hp)->lock)
  10254. +#else
  10255. +# define hotplug_lock(hp) mutex_lock(&(hp)->mutex)
  10256. +# define hotplug_unlock(hp) mutex_unlock(&(hp)->mutex)
  10257. +#endif
  10258. +
  10259. +static DEFINE_PER_CPU(struct hotplug_pcp, hotplug_pcp);
  10260. +
  10261. +/**
  10262. + * pin_current_cpu - Prevent the current cpu from being unplugged
  10263. + *
  10264. + * Lightweight version of get_online_cpus() to prevent cpu from being
  10265. + * unplugged when code runs in a migration disabled region.
  10266. + *
  10267. + * Must be called with preemption disabled (preempt_count = 1)!
  10268. + */
  10269. +void pin_current_cpu(void)
  10270. +{
  10271. + struct hotplug_pcp *hp;
  10272. + int force = 0;
  10273. +
  10274. +retry:
  10275. + hp = this_cpu_ptr(&hotplug_pcp);
  10276. +
  10277. + if (!hp->unplug || hp->refcount || force || preempt_count() > 1 ||
  10278. + hp->unplug == current) {
  10279. + hp->refcount++;
  10280. + return;
  10281. + }
  10282. + if (hp->grab_lock) {
  10283. + preempt_enable();
  10284. + hotplug_lock(hp);
  10285. + hotplug_unlock(hp);
  10286. + } else {
  10287. + preempt_enable();
  10288. + /*
  10289. + * Try to push this task off of this CPU.
  10290. + */
  10291. + if (!migrate_me()) {
  10292. + preempt_disable();
  10293. + hp = this_cpu_ptr(&hotplug_pcp);
  10294. + if (!hp->grab_lock) {
  10295. + /*
  10296. + * Just let it continue it's already pinned
  10297. + * or about to sleep.
  10298. + */
  10299. + force = 1;
  10300. + goto retry;
  10301. + }
  10302. + preempt_enable();
  10303. + }
  10304. + }
  10305. + preempt_disable();
  10306. + goto retry;
  10307. +}
  10308. +
  10309. +/**
  10310. + * unpin_current_cpu - Allow unplug of current cpu
  10311. + *
  10312. + * Must be called with preemption or interrupts disabled!
  10313. + */
  10314. +void unpin_current_cpu(void)
  10315. +{
  10316. + struct hotplug_pcp *hp = this_cpu_ptr(&hotplug_pcp);
  10317. +
  10318. + WARN_ON(hp->refcount <= 0);
  10319. +
  10320. + /* This is safe. sync_unplug_thread is pinned to this cpu */
  10321. + if (!--hp->refcount && hp->unplug && hp->unplug != current)
  10322. + wake_up_process(hp->unplug);
  10323. +}
  10324. +
  10325. +static void wait_for_pinned_cpus(struct hotplug_pcp *hp)
  10326. +{
  10327. + set_current_state(TASK_UNINTERRUPTIBLE);
  10328. + while (hp->refcount) {
  10329. + schedule_preempt_disabled();
  10330. + set_current_state(TASK_UNINTERRUPTIBLE);
  10331. + }
  10332. +}
  10333. +
  10334. +static int sync_unplug_thread(void *data)
  10335. +{
  10336. + struct hotplug_pcp *hp = data;
  10337. +
  10338. + wait_for_completion(&hp->unplug_wait);
  10339. + preempt_disable();
  10340. + hp->unplug = current;
  10341. + wait_for_pinned_cpus(hp);
  10342. +
  10343. + /*
  10344. + * This thread will synchronize the cpu_down() with threads
  10345. + * that have pinned the CPU. When the pinned CPU count reaches
  10346. + * zero, we inform the cpu_down code to continue to the next step.
  10347. + */
  10348. + set_current_state(TASK_UNINTERRUPTIBLE);
  10349. + preempt_enable();
  10350. + complete(&hp->synced);
  10351. +
  10352. + /*
  10353. + * If all succeeds, the next step will need tasks to wait till
  10354. + * the CPU is offline before continuing. To do this, the grab_lock
  10355. + * is set and tasks going into pin_current_cpu() will block on the
  10356. + * mutex. But we still need to wait for those that are already in
  10357. + * pinned CPU sections. If the cpu_down() failed, the kthread_should_stop()
  10358. + * will kick this thread out.
  10359. + */
  10360. + while (!hp->grab_lock && !kthread_should_stop()) {
  10361. + schedule();
  10362. + set_current_state(TASK_UNINTERRUPTIBLE);
  10363. + }
  10364. +
  10365. + /* Make sure grab_lock is seen before we see a stale completion */
  10366. + smp_mb();
  10367. +
  10368. + /*
  10369. + * Now just before cpu_down() enters stop machine, we need to make
  10370. + * sure all tasks that are in pinned CPU sections are out, and new
  10371. + * tasks will now grab the lock, keeping them from entering pinned
  10372. + * CPU sections.
  10373. + */
  10374. + if (!kthread_should_stop()) {
  10375. + preempt_disable();
  10376. + wait_for_pinned_cpus(hp);
  10377. + preempt_enable();
  10378. + complete(&hp->synced);
  10379. + }
  10380. +
  10381. + set_current_state(TASK_UNINTERRUPTIBLE);
  10382. + while (!kthread_should_stop()) {
  10383. + schedule();
  10384. + set_current_state(TASK_UNINTERRUPTIBLE);
  10385. + }
  10386. + set_current_state(TASK_RUNNING);
  10387. +
  10388. + /*
  10389. + * Force this thread off this CPU as it's going down and
  10390. + * we don't want any more work on this CPU.
  10391. + */
  10392. + current->flags &= ~PF_NO_SETAFFINITY;
  10393. + set_cpus_allowed_ptr(current, cpu_present_mask);
  10394. + migrate_me();
  10395. + return 0;
  10396. +}
  10397. +
  10398. +static void __cpu_unplug_sync(struct hotplug_pcp *hp)
  10399. +{
  10400. + wake_up_process(hp->sync_tsk);
  10401. + wait_for_completion(&hp->synced);
  10402. +}
  10403. +
  10404. +static void __cpu_unplug_wait(unsigned int cpu)
  10405. +{
  10406. + struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
  10407. +
  10408. + complete(&hp->unplug_wait);
  10409. + wait_for_completion(&hp->synced);
  10410. +}
  10411. +
  10412. +/*
  10413. + * Start the sync_unplug_thread on the target cpu and wait for it to
  10414. + * complete.
  10415. + */
  10416. +static int cpu_unplug_begin(unsigned int cpu)
  10417. +{
  10418. + struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
  10419. + int err;
  10420. +
  10421. + /* Protected by cpu_hotplug.lock */
  10422. + if (!hp->mutex_init) {
  10423. +#ifdef CONFIG_PREEMPT_RT_FULL
  10424. + spin_lock_init(&hp->lock);
  10425. +#else
  10426. + mutex_init(&hp->mutex);
  10427. +#endif
  10428. + hp->mutex_init = 1;
  10429. + }
  10430. +
  10431. + /* Inform the scheduler to migrate tasks off this CPU */
  10432. + tell_sched_cpu_down_begin(cpu);
  10433. +
  10434. + init_completion(&hp->synced);
  10435. + init_completion(&hp->unplug_wait);
  10436. +
  10437. + hp->sync_tsk = kthread_create(sync_unplug_thread, hp, "sync_unplug/%d", cpu);
  10438. + if (IS_ERR(hp->sync_tsk)) {
  10439. + err = PTR_ERR(hp->sync_tsk);
  10440. + hp->sync_tsk = NULL;
  10441. + return err;
  10442. + }
  10443. + kthread_bind(hp->sync_tsk, cpu);
  10444. +
  10445. + /*
  10446. + * Wait for tasks to get out of the pinned sections,
  10447. + * it's still OK if new tasks enter. Some CPU notifiers will
  10448. + * wait for tasks that are going to enter these sections and
  10449. + * we must not have them block.
  10450. + */
  10451. + wake_up_process(hp->sync_tsk);
  10452. + return 0;
  10453. +}
  10454. +
  10455. +static void cpu_unplug_sync(unsigned int cpu)
  10456. +{
  10457. + struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
  10458. +
  10459. + init_completion(&hp->synced);
  10460. + /* The completion needs to be initialzied before setting grab_lock */
  10461. + smp_wmb();
  10462. +
  10463. + /* Grab the mutex before setting grab_lock */
  10464. + hotplug_lock(hp);
  10465. + hp->grab_lock = 1;
  10466. +
  10467. + /*
  10468. + * The CPU notifiers have been completed.
  10469. + * Wait for tasks to get out of pinned CPU sections and have new
  10470. + * tasks block until the CPU is completely down.
  10471. + */
  10472. + __cpu_unplug_sync(hp);
  10473. +
  10474. + /* All done with the sync thread */
  10475. + kthread_stop(hp->sync_tsk);
  10476. + hp->sync_tsk = NULL;
  10477. +}
  10478. +
  10479. +static void cpu_unplug_done(unsigned int cpu)
  10480. +{
  10481. + struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
  10482. +
  10483. + hp->unplug = NULL;
  10484. + /* Let all tasks know cpu unplug is finished before cleaning up */
  10485. + smp_wmb();
  10486. +
  10487. + if (hp->sync_tsk)
  10488. + kthread_stop(hp->sync_tsk);
  10489. +
  10490. + if (hp->grab_lock) {
  10491. + hotplug_unlock(hp);
  10492. + /* protected by cpu_hotplug.lock */
  10493. + hp->grab_lock = 0;
  10494. + }
  10495. + tell_sched_cpu_down_done(cpu);
  10496. +}
  10497. void get_online_cpus(void)
  10498. {
  10499. @@ -789,10 +1072,14 @@ static int takedown_cpu(unsigned int cpu)
  10500. struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
  10501. int err;
  10502. + __cpu_unplug_wait(cpu);
  10503. /* Park the smpboot threads */
  10504. kthread_park(per_cpu_ptr(&cpuhp_state, cpu)->thread);
  10505. smpboot_park_threads(cpu);
  10506. + /* Notifiers are done. Don't let any more tasks pin this CPU. */
  10507. + cpu_unplug_sync(cpu);
  10508. +
  10509. /*
  10510. * Prevent irq alloc/free while the dying cpu reorganizes the
  10511. * interrupt affinities.
  10512. @@ -877,6 +1164,9 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
  10513. struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
  10514. int prev_state, ret = 0;
  10515. bool hasdied = false;
  10516. + int mycpu;
  10517. + cpumask_var_t cpumask;
  10518. + cpumask_var_t cpumask_org;
  10519. if (num_online_cpus() == 1)
  10520. return -EBUSY;
  10521. @@ -884,7 +1174,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
  10522. if (!cpu_present(cpu))
  10523. return -EINVAL;
  10524. + /* Move the downtaker off the unplug cpu */
  10525. + if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))
  10526. + return -ENOMEM;
  10527. + if (!alloc_cpumask_var(&cpumask_org, GFP_KERNEL)) {
  10528. + free_cpumask_var(cpumask);
  10529. + return -ENOMEM;
  10530. + }
  10531. +
  10532. + cpumask_copy(cpumask_org, tsk_cpus_allowed(current));
  10533. + cpumask_andnot(cpumask, cpu_online_mask, cpumask_of(cpu));
  10534. + set_cpus_allowed_ptr(current, cpumask);
  10535. + free_cpumask_var(cpumask);
  10536. + migrate_disable();
  10537. + mycpu = smp_processor_id();
  10538. + if (mycpu == cpu) {
  10539. + printk(KERN_ERR "Yuck! Still on unplug CPU\n!");
  10540. + migrate_enable();
  10541. + ret = -EBUSY;
  10542. + goto restore_cpus;
  10543. + }
  10544. +
  10545. + migrate_enable();
  10546. cpu_hotplug_begin();
  10547. + ret = cpu_unplug_begin(cpu);
  10548. + if (ret) {
  10549. + printk("cpu_unplug_begin(%d) failed\n", cpu);
  10550. + goto out_cancel;
  10551. + }
  10552. cpuhp_tasks_frozen = tasks_frozen;
  10553. @@ -923,10 +1240,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
  10554. hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
  10555. out:
  10556. + cpu_unplug_done(cpu);
  10557. +out_cancel:
  10558. cpu_hotplug_done();
  10559. /* This post dead nonsense must die */
  10560. if (!ret && hasdied)
  10561. cpu_notify_nofail(CPU_POST_DEAD, cpu);
  10562. +restore_cpus:
  10563. + set_cpus_allowed_ptr(current, cpumask_org);
  10564. + free_cpumask_var(cpumask_org);
  10565. return ret;
  10566. }
  10567. @@ -1240,6 +1562,8 @@ core_initcall(cpu_hotplug_pm_sync_init);
  10568. #endif /* CONFIG_PM_SLEEP_SMP */
  10569. +int __boot_cpu_id;
  10570. +
  10571. #endif /* CONFIG_SMP */
  10572. /* Boot processor state steps */
  10573. @@ -1924,6 +2248,10 @@ void __init boot_cpu_init(void)
  10574. set_cpu_active(cpu, true);
  10575. set_cpu_present(cpu, true);
  10576. set_cpu_possible(cpu, true);
  10577. +
  10578. +#ifdef CONFIG_SMP
  10579. + __boot_cpu_id = cpu;
  10580. +#endif
  10581. }
  10582. /*
  10583. diff --git a/kernel/cpuset.c b/kernel/cpuset.c
  10584. index 29f815d2ef7e..341b17f24f95 100644
  10585. --- a/kernel/cpuset.c
  10586. +++ b/kernel/cpuset.c
  10587. @@ -284,7 +284,7 @@ static struct cpuset top_cpuset = {
  10588. */
  10589. static DEFINE_MUTEX(cpuset_mutex);
  10590. -static DEFINE_SPINLOCK(callback_lock);
  10591. +static DEFINE_RAW_SPINLOCK(callback_lock);
  10592. static struct workqueue_struct *cpuset_migrate_mm_wq;
  10593. @@ -907,9 +907,9 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus)
  10594. continue;
  10595. rcu_read_unlock();
  10596. - spin_lock_irq(&callback_lock);
  10597. + raw_spin_lock_irq(&callback_lock);
  10598. cpumask_copy(cp->effective_cpus, new_cpus);
  10599. - spin_unlock_irq(&callback_lock);
  10600. + raw_spin_unlock_irq(&callback_lock);
  10601. WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) &&
  10602. !cpumask_equal(cp->cpus_allowed, cp->effective_cpus));
  10603. @@ -974,9 +974,9 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
  10604. if (retval < 0)
  10605. return retval;
  10606. - spin_lock_irq(&callback_lock);
  10607. + raw_spin_lock_irq(&callback_lock);
  10608. cpumask_copy(cs->cpus_allowed, trialcs->cpus_allowed);
  10609. - spin_unlock_irq(&callback_lock);
  10610. + raw_spin_unlock_irq(&callback_lock);
  10611. /* use trialcs->cpus_allowed as a temp variable */
  10612. update_cpumasks_hier(cs, trialcs->cpus_allowed);
  10613. @@ -1176,9 +1176,9 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)
  10614. continue;
  10615. rcu_read_unlock();
  10616. - spin_lock_irq(&callback_lock);
  10617. + raw_spin_lock_irq(&callback_lock);
  10618. cp->effective_mems = *new_mems;
  10619. - spin_unlock_irq(&callback_lock);
  10620. + raw_spin_unlock_irq(&callback_lock);
  10621. WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) &&
  10622. !nodes_equal(cp->mems_allowed, cp->effective_mems));
  10623. @@ -1246,9 +1246,9 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs,
  10624. if (retval < 0)
  10625. goto done;
  10626. - spin_lock_irq(&callback_lock);
  10627. + raw_spin_lock_irq(&callback_lock);
  10628. cs->mems_allowed = trialcs->mems_allowed;
  10629. - spin_unlock_irq(&callback_lock);
  10630. + raw_spin_unlock_irq(&callback_lock);
  10631. /* use trialcs->mems_allowed as a temp variable */
  10632. update_nodemasks_hier(cs, &trialcs->mems_allowed);
  10633. @@ -1339,9 +1339,9 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs,
  10634. spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs))
  10635. || (is_spread_page(cs) != is_spread_page(trialcs)));
  10636. - spin_lock_irq(&callback_lock);
  10637. + raw_spin_lock_irq(&callback_lock);
  10638. cs->flags = trialcs->flags;
  10639. - spin_unlock_irq(&callback_lock);
  10640. + raw_spin_unlock_irq(&callback_lock);
  10641. if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
  10642. rebuild_sched_domains_locked();
  10643. @@ -1756,7 +1756,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
  10644. cpuset_filetype_t type = seq_cft(sf)->private;
  10645. int ret = 0;
  10646. - spin_lock_irq(&callback_lock);
  10647. + raw_spin_lock_irq(&callback_lock);
  10648. switch (type) {
  10649. case FILE_CPULIST:
  10650. @@ -1775,7 +1775,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
  10651. ret = -EINVAL;
  10652. }
  10653. - spin_unlock_irq(&callback_lock);
  10654. + raw_spin_unlock_irq(&callback_lock);
  10655. return ret;
  10656. }
  10657. @@ -1989,12 +1989,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
  10658. cpuset_inc();
  10659. - spin_lock_irq(&callback_lock);
  10660. + raw_spin_lock_irq(&callback_lock);
  10661. if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) {
  10662. cpumask_copy(cs->effective_cpus, parent->effective_cpus);
  10663. cs->effective_mems = parent->effective_mems;
  10664. }
  10665. - spin_unlock_irq(&callback_lock);
  10666. + raw_spin_unlock_irq(&callback_lock);
  10667. if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags))
  10668. goto out_unlock;
  10669. @@ -2021,12 +2021,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
  10670. }
  10671. rcu_read_unlock();
  10672. - spin_lock_irq(&callback_lock);
  10673. + raw_spin_lock_irq(&callback_lock);
  10674. cs->mems_allowed = parent->mems_allowed;
  10675. cs->effective_mems = parent->mems_allowed;
  10676. cpumask_copy(cs->cpus_allowed, parent->cpus_allowed);
  10677. cpumask_copy(cs->effective_cpus, parent->cpus_allowed);
  10678. - spin_unlock_irq(&callback_lock);
  10679. + raw_spin_unlock_irq(&callback_lock);
  10680. out_unlock:
  10681. mutex_unlock(&cpuset_mutex);
  10682. return 0;
  10683. @@ -2065,7 +2065,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
  10684. static void cpuset_bind(struct cgroup_subsys_state *root_css)
  10685. {
  10686. mutex_lock(&cpuset_mutex);
  10687. - spin_lock_irq(&callback_lock);
  10688. + raw_spin_lock_irq(&callback_lock);
  10689. if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) {
  10690. cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask);
  10691. @@ -2076,7 +2076,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
  10692. top_cpuset.mems_allowed = top_cpuset.effective_mems;
  10693. }
  10694. - spin_unlock_irq(&callback_lock);
  10695. + raw_spin_unlock_irq(&callback_lock);
  10696. mutex_unlock(&cpuset_mutex);
  10697. }
  10698. @@ -2177,12 +2177,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
  10699. {
  10700. bool is_empty;
  10701. - spin_lock_irq(&callback_lock);
  10702. + raw_spin_lock_irq(&callback_lock);
  10703. cpumask_copy(cs->cpus_allowed, new_cpus);
  10704. cpumask_copy(cs->effective_cpus, new_cpus);
  10705. cs->mems_allowed = *new_mems;
  10706. cs->effective_mems = *new_mems;
  10707. - spin_unlock_irq(&callback_lock);
  10708. + raw_spin_unlock_irq(&callback_lock);
  10709. /*
  10710. * Don't call update_tasks_cpumask() if the cpuset becomes empty,
  10711. @@ -2219,10 +2219,10 @@ hotplug_update_tasks(struct cpuset *cs,
  10712. if (nodes_empty(*new_mems))
  10713. *new_mems = parent_cs(cs)->effective_mems;
  10714. - spin_lock_irq(&callback_lock);
  10715. + raw_spin_lock_irq(&callback_lock);
  10716. cpumask_copy(cs->effective_cpus, new_cpus);
  10717. cs->effective_mems = *new_mems;
  10718. - spin_unlock_irq(&callback_lock);
  10719. + raw_spin_unlock_irq(&callback_lock);
  10720. if (cpus_updated)
  10721. update_tasks_cpumask(cs);
  10722. @@ -2308,21 +2308,21 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
  10723. /* synchronize cpus_allowed to cpu_active_mask */
  10724. if (cpus_updated) {
  10725. - spin_lock_irq(&callback_lock);
  10726. + raw_spin_lock_irq(&callback_lock);
  10727. if (!on_dfl)
  10728. cpumask_copy(top_cpuset.cpus_allowed, &new_cpus);
  10729. cpumask_copy(top_cpuset.effective_cpus, &new_cpus);
  10730. - spin_unlock_irq(&callback_lock);
  10731. + raw_spin_unlock_irq(&callback_lock);
  10732. /* we don't mess with cpumasks of tasks in top_cpuset */
  10733. }
  10734. /* synchronize mems_allowed to N_MEMORY */
  10735. if (mems_updated) {
  10736. - spin_lock_irq(&callback_lock);
  10737. + raw_spin_lock_irq(&callback_lock);
  10738. if (!on_dfl)
  10739. top_cpuset.mems_allowed = new_mems;
  10740. top_cpuset.effective_mems = new_mems;
  10741. - spin_unlock_irq(&callback_lock);
  10742. + raw_spin_unlock_irq(&callback_lock);
  10743. update_tasks_nodemask(&top_cpuset);
  10744. }
  10745. @@ -2420,11 +2420,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
  10746. {
  10747. unsigned long flags;
  10748. - spin_lock_irqsave(&callback_lock, flags);
  10749. + raw_spin_lock_irqsave(&callback_lock, flags);
  10750. rcu_read_lock();
  10751. guarantee_online_cpus(task_cs(tsk), pmask);
  10752. rcu_read_unlock();
  10753. - spin_unlock_irqrestore(&callback_lock, flags);
  10754. + raw_spin_unlock_irqrestore(&callback_lock, flags);
  10755. }
  10756. void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
  10757. @@ -2472,11 +2472,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
  10758. nodemask_t mask;
  10759. unsigned long flags;
  10760. - spin_lock_irqsave(&callback_lock, flags);
  10761. + raw_spin_lock_irqsave(&callback_lock, flags);
  10762. rcu_read_lock();
  10763. guarantee_online_mems(task_cs(tsk), &mask);
  10764. rcu_read_unlock();
  10765. - spin_unlock_irqrestore(&callback_lock, flags);
  10766. + raw_spin_unlock_irqrestore(&callback_lock, flags);
  10767. return mask;
  10768. }
  10769. @@ -2568,14 +2568,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
  10770. return true;
  10771. /* Not hardwall and node outside mems_allowed: scan up cpusets */
  10772. - spin_lock_irqsave(&callback_lock, flags);
  10773. + raw_spin_lock_irqsave(&callback_lock, flags);
  10774. rcu_read_lock();
  10775. cs = nearest_hardwall_ancestor(task_cs(current));
  10776. allowed = node_isset(node, cs->mems_allowed);
  10777. rcu_read_unlock();
  10778. - spin_unlock_irqrestore(&callback_lock, flags);
  10779. + raw_spin_unlock_irqrestore(&callback_lock, flags);
  10780. return allowed;
  10781. }
  10782. diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
  10783. index fc1ef736253c..83c666537a7a 100644
  10784. --- a/kernel/debug/kdb/kdb_io.c
  10785. +++ b/kernel/debug/kdb/kdb_io.c
  10786. @@ -554,7 +554,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
  10787. int linecount;
  10788. int colcount;
  10789. int logging, saved_loglevel = 0;
  10790. - int saved_trap_printk;
  10791. int got_printf_lock = 0;
  10792. int retlen = 0;
  10793. int fnd, len;
  10794. @@ -565,8 +564,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
  10795. unsigned long uninitialized_var(flags);
  10796. preempt_disable();
  10797. - saved_trap_printk = kdb_trap_printk;
  10798. - kdb_trap_printk = 0;
  10799. /* Serialize kdb_printf if multiple cpus try to write at once.
  10800. * But if any cpu goes recursive in kdb, just print the output,
  10801. @@ -855,7 +852,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
  10802. } else {
  10803. __release(kdb_printf_lock);
  10804. }
  10805. - kdb_trap_printk = saved_trap_printk;
  10806. preempt_enable();
  10807. return retlen;
  10808. }
  10809. @@ -865,9 +861,11 @@ int kdb_printf(const char *fmt, ...)
  10810. va_list ap;
  10811. int r;
  10812. + kdb_trap_printk++;
  10813. va_start(ap, fmt);
  10814. r = vkdb_printf(KDB_MSGSRC_INTERNAL, fmt, ap);
  10815. va_end(ap);
  10816. + kdb_trap_printk--;
  10817. return r;
  10818. }
  10819. diff --git a/kernel/events/core.c b/kernel/events/core.c
  10820. index 07c0dc806dfc..baf1a2867d74 100644
  10821. --- a/kernel/events/core.c
  10822. +++ b/kernel/events/core.c
  10823. @@ -1050,6 +1050,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu)
  10824. raw_spin_lock_init(&cpuctx->hrtimer_lock);
  10825. hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
  10826. timer->function = perf_mux_hrtimer_handler;
  10827. + timer->irqsafe = 1;
  10828. }
  10829. static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
  10830. @@ -8363,6 +8364,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
  10831. hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  10832. hwc->hrtimer.function = perf_swevent_hrtimer;
  10833. + hwc->hrtimer.irqsafe = 1;
  10834. /*
  10835. * Since hrtimers have a fixed rate, we can do a static freq->period
  10836. diff --git a/kernel/exit.c b/kernel/exit.c
  10837. index 3076f3089919..fb2ebcf3ca7c 100644
  10838. --- a/kernel/exit.c
  10839. +++ b/kernel/exit.c
  10840. @@ -143,7 +143,7 @@ static void __exit_signal(struct task_struct *tsk)
  10841. * Do this under ->siglock, we can race with another thread
  10842. * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
  10843. */
  10844. - flush_sigqueue(&tsk->pending);
  10845. + flush_task_sigqueue(tsk);
  10846. tsk->sighand = NULL;
  10847. spin_unlock(&sighand->siglock);
  10848. diff --git a/kernel/fork.c b/kernel/fork.c
  10849. index 59faac4de181..0edb0f3c1db8 100644
  10850. --- a/kernel/fork.c
  10851. +++ b/kernel/fork.c
  10852. @@ -76,6 +76,7 @@
  10853. #include <linux/compiler.h>
  10854. #include <linux/sysctl.h>
  10855. #include <linux/kcov.h>
  10856. +#include <linux/kprobes.h>
  10857. #include <asm/pgtable.h>
  10858. #include <asm/pgalloc.h>
  10859. @@ -376,13 +377,24 @@ static inline void put_signal_struct(struct signal_struct *sig)
  10860. if (atomic_dec_and_test(&sig->sigcnt))
  10861. free_signal_struct(sig);
  10862. }
  10863. -
  10864. +#ifdef CONFIG_PREEMPT_RT_BASE
  10865. +static
  10866. +#endif
  10867. void __put_task_struct(struct task_struct *tsk)
  10868. {
  10869. WARN_ON(!tsk->exit_state);
  10870. WARN_ON(atomic_read(&tsk->usage));
  10871. WARN_ON(tsk == current);
  10872. + /*
  10873. + * Remove function-return probe instances associated with this
  10874. + * task and put them back on the free list.
  10875. + */
  10876. + kprobe_flush_task(tsk);
  10877. +
  10878. + /* Task is done with its stack. */
  10879. + put_task_stack(tsk);
  10880. +
  10881. cgroup_free(tsk);
  10882. task_numa_free(tsk);
  10883. security_task_free(tsk);
  10884. @@ -393,7 +405,18 @@ void __put_task_struct(struct task_struct *tsk)
  10885. if (!profile_handoff_task(tsk))
  10886. free_task(tsk);
  10887. }
  10888. +#ifndef CONFIG_PREEMPT_RT_BASE
  10889. EXPORT_SYMBOL_GPL(__put_task_struct);
  10890. +#else
  10891. +void __put_task_struct_cb(struct rcu_head *rhp)
  10892. +{
  10893. + struct task_struct *tsk = container_of(rhp, struct task_struct, put_rcu);
  10894. +
  10895. + __put_task_struct(tsk);
  10896. +
  10897. +}
  10898. +EXPORT_SYMBOL_GPL(__put_task_struct_cb);
  10899. +#endif
  10900. void __init __weak arch_task_cache_init(void) { }
  10901. @@ -852,6 +875,19 @@ void __mmdrop(struct mm_struct *mm)
  10902. }
  10903. EXPORT_SYMBOL_GPL(__mmdrop);
  10904. +#ifdef CONFIG_PREEMPT_RT_BASE
  10905. +/*
  10906. + * RCU callback for delayed mm drop. Not strictly rcu, but we don't
  10907. + * want another facility to make this work.
  10908. + */
  10909. +void __mmdrop_delayed(struct rcu_head *rhp)
  10910. +{
  10911. + struct mm_struct *mm = container_of(rhp, struct mm_struct, delayed_drop);
  10912. +
  10913. + __mmdrop(mm);
  10914. +}
  10915. +#endif
  10916. +
  10917. static inline void __mmput(struct mm_struct *mm)
  10918. {
  10919. VM_BUG_ON(atomic_read(&mm->mm_users));
  10920. @@ -1417,6 +1453,7 @@ static void rt_mutex_init_task(struct task_struct *p)
  10921. #ifdef CONFIG_RT_MUTEXES
  10922. p->pi_waiters = RB_ROOT;
  10923. p->pi_waiters_leftmost = NULL;
  10924. + p->pi_top_task = NULL;
  10925. p->pi_blocked_on = NULL;
  10926. #endif
  10927. }
  10928. @@ -1426,6 +1463,9 @@ static void rt_mutex_init_task(struct task_struct *p)
  10929. */
  10930. static void posix_cpu_timers_init(struct task_struct *tsk)
  10931. {
  10932. +#ifdef CONFIG_PREEMPT_RT_BASE
  10933. + tsk->posix_timer_list = NULL;
  10934. +#endif
  10935. tsk->cputime_expires.prof_exp = 0;
  10936. tsk->cputime_expires.virt_exp = 0;
  10937. tsk->cputime_expires.sched_exp = 0;
  10938. @@ -1552,6 +1592,7 @@ static __latent_entropy struct task_struct *copy_process(
  10939. spin_lock_init(&p->alloc_lock);
  10940. init_sigpending(&p->pending);
  10941. + p->sigqueue_cache = NULL;
  10942. p->utime = p->stime = p->gtime = 0;
  10943. p->utimescaled = p->stimescaled = 0;
  10944. diff --git a/kernel/futex.c b/kernel/futex.c
  10945. index 4c6b6e697b73..d9bab63efccb 100644
  10946. --- a/kernel/futex.c
  10947. +++ b/kernel/futex.c
  10948. @@ -800,7 +800,7 @@ static int refill_pi_state_cache(void)
  10949. return 0;
  10950. }
  10951. -static struct futex_pi_state * alloc_pi_state(void)
  10952. +static struct futex_pi_state *alloc_pi_state(void)
  10953. {
  10954. struct futex_pi_state *pi_state = current->pi_state_cache;
  10955. @@ -810,6 +810,11 @@ static struct futex_pi_state * alloc_pi_state(void)
  10956. return pi_state;
  10957. }
  10958. +static void get_pi_state(struct futex_pi_state *pi_state)
  10959. +{
  10960. + WARN_ON_ONCE(!atomic_inc_not_zero(&pi_state->refcount));
  10961. +}
  10962. +
  10963. /*
  10964. * Drops a reference to the pi_state object and frees or caches it
  10965. * when the last reference is gone.
  10966. @@ -854,7 +859,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
  10967. * Look up the task based on what TID userspace gave us.
  10968. * We dont trust it.
  10969. */
  10970. -static struct task_struct * futex_find_get_task(pid_t pid)
  10971. +static struct task_struct *futex_find_get_task(pid_t pid)
  10972. {
  10973. struct task_struct *p;
  10974. @@ -904,7 +909,9 @@ void exit_pi_state_list(struct task_struct *curr)
  10975. * task still owns the PI-state:
  10976. */
  10977. if (head->next != next) {
  10978. + raw_spin_unlock_irq(&curr->pi_lock);
  10979. spin_unlock(&hb->lock);
  10980. + raw_spin_lock_irq(&curr->pi_lock);
  10981. continue;
  10982. }
  10983. @@ -914,10 +921,12 @@ void exit_pi_state_list(struct task_struct *curr)
  10984. pi_state->owner = NULL;
  10985. raw_spin_unlock_irq(&curr->pi_lock);
  10986. - rt_mutex_unlock(&pi_state->pi_mutex);
  10987. -
  10988. + get_pi_state(pi_state);
  10989. spin_unlock(&hb->lock);
  10990. + rt_mutex_futex_unlock(&pi_state->pi_mutex);
  10991. + put_pi_state(pi_state);
  10992. +
  10993. raw_spin_lock_irq(&curr->pi_lock);
  10994. }
  10995. raw_spin_unlock_irq(&curr->pi_lock);
  10996. @@ -971,6 +980,39 @@ void exit_pi_state_list(struct task_struct *curr)
  10997. *
  10998. * [10] There is no transient state which leaves owner and user space
  10999. * TID out of sync.
  11000. + *
  11001. + *
  11002. + * Serialization and lifetime rules:
  11003. + *
  11004. + * hb->lock:
  11005. + *
  11006. + * hb -> futex_q, relation
  11007. + * futex_q -> pi_state, relation
  11008. + *
  11009. + * (cannot be raw because hb can contain arbitrary amount
  11010. + * of futex_q's)
  11011. + *
  11012. + * pi_mutex->wait_lock:
  11013. + *
  11014. + * {uval, pi_state}
  11015. + *
  11016. + * (and pi_mutex 'obviously')
  11017. + *
  11018. + * p->pi_lock:
  11019. + *
  11020. + * p->pi_state_list -> pi_state->list, relation
  11021. + *
  11022. + * pi_state->refcount:
  11023. + *
  11024. + * pi_state lifetime
  11025. + *
  11026. + *
  11027. + * Lock order:
  11028. + *
  11029. + * hb->lock
  11030. + * pi_mutex->wait_lock
  11031. + * p->pi_lock
  11032. + *
  11033. */
  11034. /*
  11035. @@ -978,10 +1020,13 @@ void exit_pi_state_list(struct task_struct *curr)
  11036. * the pi_state against the user space value. If correct, attach to
  11037. * it.
  11038. */
  11039. -static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
  11040. +static int attach_to_pi_state(u32 __user *uaddr, u32 uval,
  11041. + struct futex_pi_state *pi_state,
  11042. struct futex_pi_state **ps)
  11043. {
  11044. pid_t pid = uval & FUTEX_TID_MASK;
  11045. + u32 uval2;
  11046. + int ret;
  11047. /*
  11048. * Userspace might have messed up non-PI and PI futexes [3]
  11049. @@ -989,9 +1034,39 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
  11050. if (unlikely(!pi_state))
  11051. return -EINVAL;
  11052. + /*
  11053. + * We get here with hb->lock held, and having found a
  11054. + * futex_top_waiter(). This means that futex_lock_pi() of said futex_q
  11055. + * has dropped the hb->lock in between queue_me() and unqueue_me_pi(),
  11056. + * which in turn means that futex_lock_pi() still has a reference on
  11057. + * our pi_state.
  11058. + *
  11059. + * The waiter holding a reference on @pi_state also protects against
  11060. + * the unlocked put_pi_state() in futex_unlock_pi(), futex_lock_pi()
  11061. + * and futex_wait_requeue_pi() as it cannot go to 0 and consequently
  11062. + * free pi_state before we can take a reference ourselves.
  11063. + */
  11064. WARN_ON(!atomic_read(&pi_state->refcount));
  11065. /*
  11066. + * Now that we have a pi_state, we can acquire wait_lock
  11067. + * and do the state validation.
  11068. + */
  11069. + raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
  11070. +
  11071. + /*
  11072. + * Since {uval, pi_state} is serialized by wait_lock, and our current
  11073. + * uval was read without holding it, it can have changed. Verify it
  11074. + * still is what we expect it to be, otherwise retry the entire
  11075. + * operation.
  11076. + */
  11077. + if (get_futex_value_locked(&uval2, uaddr))
  11078. + goto out_efault;
  11079. +
  11080. + if (uval != uval2)
  11081. + goto out_eagain;
  11082. +
  11083. + /*
  11084. * Handle the owner died case:
  11085. */
  11086. if (uval & FUTEX_OWNER_DIED) {
  11087. @@ -1006,11 +1081,11 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
  11088. * is not 0. Inconsistent state. [5]
  11089. */
  11090. if (pid)
  11091. - return -EINVAL;
  11092. + goto out_einval;
  11093. /*
  11094. * Take a ref on the state and return success. [4]
  11095. */
  11096. - goto out_state;
  11097. + goto out_attach;
  11098. }
  11099. /*
  11100. @@ -1022,14 +1097,14 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
  11101. * Take a ref on the state and return success. [6]
  11102. */
  11103. if (!pid)
  11104. - goto out_state;
  11105. + goto out_attach;
  11106. } else {
  11107. /*
  11108. * If the owner died bit is not set, then the pi_state
  11109. * must have an owner. [7]
  11110. */
  11111. if (!pi_state->owner)
  11112. - return -EINVAL;
  11113. + goto out_einval;
  11114. }
  11115. /*
  11116. @@ -1038,11 +1113,29 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
  11117. * user space TID. [9/10]
  11118. */
  11119. if (pid != task_pid_vnr(pi_state->owner))
  11120. - return -EINVAL;
  11121. -out_state:
  11122. - atomic_inc(&pi_state->refcount);
  11123. + goto out_einval;
  11124. +
  11125. +out_attach:
  11126. + get_pi_state(pi_state);
  11127. + raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11128. *ps = pi_state;
  11129. return 0;
  11130. +
  11131. +out_einval:
  11132. + ret = -EINVAL;
  11133. + goto out_error;
  11134. +
  11135. +out_eagain:
  11136. + ret = -EAGAIN;
  11137. + goto out_error;
  11138. +
  11139. +out_efault:
  11140. + ret = -EFAULT;
  11141. + goto out_error;
  11142. +
  11143. +out_error:
  11144. + raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11145. + return ret;
  11146. }
  11147. /*
  11148. @@ -1093,6 +1186,9 @@ static int attach_to_pi_owner(u32 uval, union futex_key *key,
  11149. /*
  11150. * No existing pi state. First waiter. [2]
  11151. + *
  11152. + * This creates pi_state, we have hb->lock held, this means nothing can
  11153. + * observe this state, wait_lock is irrelevant.
  11154. */
  11155. pi_state = alloc_pi_state();
  11156. @@ -1117,17 +1213,18 @@ static int attach_to_pi_owner(u32 uval, union futex_key *key,
  11157. return 0;
  11158. }
  11159. -static int lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
  11160. +static int lookup_pi_state(u32 __user *uaddr, u32 uval,
  11161. + struct futex_hash_bucket *hb,
  11162. union futex_key *key, struct futex_pi_state **ps)
  11163. {
  11164. - struct futex_q *match = futex_top_waiter(hb, key);
  11165. + struct futex_q *top_waiter = futex_top_waiter(hb, key);
  11166. /*
  11167. * If there is a waiter on that futex, validate it and
  11168. * attach to the pi_state when the validation succeeds.
  11169. */
  11170. - if (match)
  11171. - return attach_to_pi_state(uval, match->pi_state, ps);
  11172. + if (top_waiter)
  11173. + return attach_to_pi_state(uaddr, uval, top_waiter->pi_state, ps);
  11174. /*
  11175. * We are the first waiter - try to look up the owner based on
  11176. @@ -1146,7 +1243,7 @@ static int lock_pi_update_atomic(u32 __user *uaddr, u32 uval, u32 newval)
  11177. if (unlikely(cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)))
  11178. return -EFAULT;
  11179. - /*If user space value changed, let the caller retry */
  11180. + /* If user space value changed, let the caller retry */
  11181. return curval != uval ? -EAGAIN : 0;
  11182. }
  11183. @@ -1174,7 +1271,7 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb,
  11184. struct task_struct *task, int set_waiters)
  11185. {
  11186. u32 uval, newval, vpid = task_pid_vnr(task);
  11187. - struct futex_q *match;
  11188. + struct futex_q *top_waiter;
  11189. int ret;
  11190. /*
  11191. @@ -1200,9 +1297,9 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb,
  11192. * Lookup existing state first. If it exists, try to attach to
  11193. * its pi_state.
  11194. */
  11195. - match = futex_top_waiter(hb, key);
  11196. - if (match)
  11197. - return attach_to_pi_state(uval, match->pi_state, ps);
  11198. + top_waiter = futex_top_waiter(hb, key);
  11199. + if (top_waiter)
  11200. + return attach_to_pi_state(uaddr, uval, top_waiter->pi_state, ps);
  11201. /*
  11202. * No waiter and user TID is 0. We are here because the
  11203. @@ -1283,50 +1380,45 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)
  11204. wake_q_add(wake_q, p);
  11205. __unqueue_futex(q);
  11206. /*
  11207. - * The waiting task can free the futex_q as soon as
  11208. - * q->lock_ptr = NULL is written, without taking any locks. A
  11209. - * memory barrier is required here to prevent the following
  11210. - * store to lock_ptr from getting ahead of the plist_del.
  11211. + * The waiting task can free the futex_q as soon as q->lock_ptr = NULL
  11212. + * is written, without taking any locks. This is possible in the event
  11213. + * of a spurious wakeup, for example. A memory barrier is required here
  11214. + * to prevent the following store to lock_ptr from getting ahead of the
  11215. + * plist_del in __unqueue_futex().
  11216. */
  11217. - smp_wmb();
  11218. - q->lock_ptr = NULL;
  11219. + smp_store_release(&q->lock_ptr, NULL);
  11220. }
  11221. -static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
  11222. - struct futex_hash_bucket *hb)
  11223. +/*
  11224. + * Caller must hold a reference on @pi_state.
  11225. + */
  11226. +static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_state)
  11227. {
  11228. - struct task_struct *new_owner;
  11229. - struct futex_pi_state *pi_state = this->pi_state;
  11230. u32 uninitialized_var(curval), newval;
  11231. + struct task_struct *new_owner;
  11232. + bool postunlock = false;
  11233. WAKE_Q(wake_q);
  11234. - bool deboost;
  11235. + WAKE_Q(wake_sleeper_q);
  11236. int ret = 0;
  11237. - if (!pi_state)
  11238. - return -EINVAL;
  11239. -
  11240. - /*
  11241. - * If current does not own the pi_state then the futex is
  11242. - * inconsistent and user space fiddled with the futex value.
  11243. - */
  11244. - if (pi_state->owner != current)
  11245. - return -EINVAL;
  11246. -
  11247. - raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
  11248. new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
  11249. + if (WARN_ON_ONCE(!new_owner)) {
  11250. + /*
  11251. + * As per the comment in futex_unlock_pi() this should not happen.
  11252. + *
  11253. + * When this happens, give up our locks and try again, giving
  11254. + * the futex_lock_pi() instance time to complete, either by
  11255. + * waiting on the rtmutex or removing itself from the futex
  11256. + * queue.
  11257. + */
  11258. + ret = -EAGAIN;
  11259. + goto out_unlock;
  11260. + }
  11261. /*
  11262. - * It is possible that the next waiter (the one that brought
  11263. - * this owner to the kernel) timed out and is no longer
  11264. - * waiting on the lock.
  11265. - */
  11266. - if (!new_owner)
  11267. - new_owner = this->task;
  11268. -
  11269. - /*
  11270. - * We pass it to the next owner. The WAITERS bit is always
  11271. - * kept enabled while there is PI state around. We cleanup the
  11272. - * owner died bit, because we are the owner.
  11273. + * We pass it to the next owner. The WAITERS bit is always kept
  11274. + * enabled while there is PI state around. We cleanup the owner
  11275. + * died bit, because we are the owner.
  11276. */
  11277. newval = FUTEX_WAITERS | task_pid_vnr(new_owner);
  11278. @@ -1335,6 +1427,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
  11279. if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)) {
  11280. ret = -EFAULT;
  11281. +
  11282. } else if (curval != uval) {
  11283. /*
  11284. * If a unconditional UNLOCK_PI operation (user space did not
  11285. @@ -1347,10 +1440,14 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
  11286. else
  11287. ret = -EINVAL;
  11288. }
  11289. - if (ret) {
  11290. - raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11291. - return ret;
  11292. - }
  11293. +
  11294. + if (ret)
  11295. + goto out_unlock;
  11296. +
  11297. + /*
  11298. + * This is a point of no return; once we modify the uval there is no
  11299. + * going back and subsequent operations must not fail.
  11300. + */
  11301. raw_spin_lock(&pi_state->owner->pi_lock);
  11302. WARN_ON(list_empty(&pi_state->list));
  11303. @@ -1363,22 +1460,15 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
  11304. pi_state->owner = new_owner;
  11305. raw_spin_unlock(&new_owner->pi_lock);
  11306. + postunlock = __rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q,
  11307. + &wake_sleeper_q);
  11308. +out_unlock:
  11309. raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11310. - deboost = rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q);
  11311. + if (postunlock)
  11312. + rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
  11313. - /*
  11314. - * First unlock HB so the waiter does not spin on it once he got woken
  11315. - * up. Second wake up the waiter before the priority is adjusted. If we
  11316. - * deboost first (and lose our higher priority), then the task might get
  11317. - * scheduled away before the wake up can take place.
  11318. - */
  11319. - spin_unlock(&hb->lock);
  11320. - wake_up_q(&wake_q);
  11321. - if (deboost)
  11322. - rt_mutex_adjust_prio(current);
  11323. -
  11324. - return 0;
  11325. + return ret;
  11326. }
  11327. /*
  11328. @@ -1824,7 +1914,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
  11329. * If that call succeeds then we have pi_state and an
  11330. * initial refcount on it.
  11331. */
  11332. - ret = lookup_pi_state(ret, hb2, &key2, &pi_state);
  11333. + ret = lookup_pi_state(uaddr2, ret, hb2, &key2, &pi_state);
  11334. }
  11335. switch (ret) {
  11336. @@ -1907,7 +1997,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
  11337. * refcount on the pi_state and store the pointer in
  11338. * the futex_q object of the waiter.
  11339. */
  11340. - atomic_inc(&pi_state->refcount);
  11341. + get_pi_state(pi_state);
  11342. this->pi_state = pi_state;
  11343. ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
  11344. this->rt_waiter,
  11345. @@ -1924,6 +2014,16 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
  11346. requeue_pi_wake_futex(this, &key2, hb2);
  11347. drop_count++;
  11348. continue;
  11349. + } else if (ret == -EAGAIN) {
  11350. + /*
  11351. + * Waiter was woken by timeout or
  11352. + * signal and has set pi_blocked_on to
  11353. + * PI_WAKEUP_INPROGRESS before we
  11354. + * tried to enqueue it on the rtmutex.
  11355. + */
  11356. + this->pi_state = NULL;
  11357. + put_pi_state(pi_state);
  11358. + continue;
  11359. } else if (ret) {
  11360. /*
  11361. * rt_mutex_start_proxy_lock() detected a
  11362. @@ -2007,20 +2107,7 @@ queue_unlock(struct futex_hash_bucket *hb)
  11363. hb_waiters_dec(hb);
  11364. }
  11365. -/**
  11366. - * queue_me() - Enqueue the futex_q on the futex_hash_bucket
  11367. - * @q: The futex_q to enqueue
  11368. - * @hb: The destination hash bucket
  11369. - *
  11370. - * The hb->lock must be held by the caller, and is released here. A call to
  11371. - * queue_me() is typically paired with exactly one call to unqueue_me(). The
  11372. - * exceptions involve the PI related operations, which may use unqueue_me_pi()
  11373. - * or nothing if the unqueue is done as part of the wake process and the unqueue
  11374. - * state is implicit in the state of woken task (see futex_wait_requeue_pi() for
  11375. - * an example).
  11376. - */
  11377. -static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
  11378. - __releases(&hb->lock)
  11379. +static inline void __queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
  11380. {
  11381. int prio;
  11382. @@ -2037,6 +2124,24 @@ static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
  11383. plist_node_init(&q->list, prio);
  11384. plist_add(&q->list, &hb->chain);
  11385. q->task = current;
  11386. +}
  11387. +
  11388. +/**
  11389. + * queue_me() - Enqueue the futex_q on the futex_hash_bucket
  11390. + * @q: The futex_q to enqueue
  11391. + * @hb: The destination hash bucket
  11392. + *
  11393. + * The hb->lock must be held by the caller, and is released here. A call to
  11394. + * queue_me() is typically paired with exactly one call to unqueue_me(). The
  11395. + * exceptions involve the PI related operations, which may use unqueue_me_pi()
  11396. + * or nothing if the unqueue is done as part of the wake process and the unqueue
  11397. + * state is implicit in the state of woken task (see futex_wait_requeue_pi() for
  11398. + * an example).
  11399. + */
  11400. +static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
  11401. + __releases(&hb->lock)
  11402. +{
  11403. + __queue_me(q, hb);
  11404. spin_unlock(&hb->lock);
  11405. }
  11406. @@ -2123,10 +2228,13 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
  11407. {
  11408. u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
  11409. struct futex_pi_state *pi_state = q->pi_state;
  11410. - struct task_struct *oldowner = pi_state->owner;
  11411. u32 uval, uninitialized_var(curval), newval;
  11412. + struct task_struct *oldowner;
  11413. int ret;
  11414. + raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
  11415. +
  11416. + oldowner = pi_state->owner;
  11417. /* Owner died? */
  11418. if (!pi_state->owner)
  11419. newtid |= FUTEX_OWNER_DIED;
  11420. @@ -2134,7 +2242,8 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
  11421. /*
  11422. * We are here either because we stole the rtmutex from the
  11423. * previous highest priority waiter or we are the highest priority
  11424. - * waiter but failed to get the rtmutex the first time.
  11425. + * waiter but have failed to get the rtmutex the first time.
  11426. + *
  11427. * We have to replace the newowner TID in the user space variable.
  11428. * This must be atomic as we have to preserve the owner died bit here.
  11429. *
  11430. @@ -2142,17 +2251,16 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
  11431. * because we can fault here. Imagine swapped out pages or a fork
  11432. * that marked all the anonymous memory readonly for cow.
  11433. *
  11434. - * Modifying pi_state _before_ the user space value would
  11435. - * leave the pi_state in an inconsistent state when we fault
  11436. - * here, because we need to drop the hash bucket lock to
  11437. - * handle the fault. This might be observed in the PID check
  11438. - * in lookup_pi_state.
  11439. + * Modifying pi_state _before_ the user space value would leave the
  11440. + * pi_state in an inconsistent state when we fault here, because we
  11441. + * need to drop the locks to handle the fault. This might be observed
  11442. + * in the PID check in lookup_pi_state.
  11443. */
  11444. retry:
  11445. if (get_futex_value_locked(&uval, uaddr))
  11446. goto handle_fault;
  11447. - while (1) {
  11448. + for (;;) {
  11449. newval = (uval & FUTEX_OWNER_DIED) | newtid;
  11450. if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval))
  11451. @@ -2167,47 +2275,60 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
  11452. * itself.
  11453. */
  11454. if (pi_state->owner != NULL) {
  11455. - raw_spin_lock_irq(&pi_state->owner->pi_lock);
  11456. + raw_spin_lock(&pi_state->owner->pi_lock);
  11457. WARN_ON(list_empty(&pi_state->list));
  11458. list_del_init(&pi_state->list);
  11459. - raw_spin_unlock_irq(&pi_state->owner->pi_lock);
  11460. + raw_spin_unlock(&pi_state->owner->pi_lock);
  11461. }
  11462. pi_state->owner = newowner;
  11463. - raw_spin_lock_irq(&newowner->pi_lock);
  11464. + raw_spin_lock(&newowner->pi_lock);
  11465. WARN_ON(!list_empty(&pi_state->list));
  11466. list_add(&pi_state->list, &newowner->pi_state_list);
  11467. - raw_spin_unlock_irq(&newowner->pi_lock);
  11468. + raw_spin_unlock(&newowner->pi_lock);
  11469. + raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11470. +
  11471. return 0;
  11472. /*
  11473. - * To handle the page fault we need to drop the hash bucket
  11474. - * lock here. That gives the other task (either the highest priority
  11475. - * waiter itself or the task which stole the rtmutex) the
  11476. - * chance to try the fixup of the pi_state. So once we are
  11477. - * back from handling the fault we need to check the pi_state
  11478. - * after reacquiring the hash bucket lock and before trying to
  11479. - * do another fixup. When the fixup has been done already we
  11480. - * simply return.
  11481. + * To handle the page fault we need to drop the locks here. That gives
  11482. + * the other task (either the highest priority waiter itself or the
  11483. + * task which stole the rtmutex) the chance to try the fixup of the
  11484. + * pi_state. So once we are back from handling the fault we need to
  11485. + * check the pi_state after reacquiring the locks and before trying to
  11486. + * do another fixup. When the fixup has been done already we simply
  11487. + * return.
  11488. + *
  11489. + * Note: we hold both hb->lock and pi_mutex->wait_lock. We can safely
  11490. + * drop hb->lock since the caller owns the hb -> futex_q relation.
  11491. + * Dropping the pi_mutex->wait_lock requires the state revalidate.
  11492. */
  11493. handle_fault:
  11494. + raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11495. spin_unlock(q->lock_ptr);
  11496. ret = fault_in_user_writeable(uaddr);
  11497. spin_lock(q->lock_ptr);
  11498. + raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
  11499. /*
  11500. * Check if someone else fixed it for us:
  11501. */
  11502. - if (pi_state->owner != oldowner)
  11503. - return 0;
  11504. + if (pi_state->owner != oldowner) {
  11505. + ret = 0;
  11506. + goto out_unlock;
  11507. + }
  11508. if (ret)
  11509. - return ret;
  11510. + goto out_unlock;
  11511. goto retry;
  11512. +
  11513. +out_unlock:
  11514. + raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  11515. + return ret;
  11516. }
  11517. static long futex_wait_restart(struct restart_block *restart);
  11518. @@ -2229,13 +2350,16 @@ static long futex_wait_restart(struct restart_block *restart);
  11519. */
  11520. static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
  11521. {
  11522. - struct task_struct *owner;
  11523. int ret = 0;
  11524. if (locked) {
  11525. /*
  11526. * Got the lock. We might not be the anticipated owner if we
  11527. * did a lock-steal - fix up the PI-state in that case:
  11528. + *
  11529. + * We can safely read pi_state->owner without holding wait_lock
  11530. + * because we now own the rt_mutex, only the owner will attempt
  11531. + * to change it.
  11532. */
  11533. if (q->pi_state->owner != current)
  11534. ret = fixup_pi_state_owner(uaddr, q, current);
  11535. @@ -2243,43 +2367,15 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
  11536. }
  11537. /*
  11538. - * Catch the rare case, where the lock was released when we were on the
  11539. - * way back before we locked the hash bucket.
  11540. - */
  11541. - if (q->pi_state->owner == current) {
  11542. - /*
  11543. - * Try to get the rt_mutex now. This might fail as some other
  11544. - * task acquired the rt_mutex after we removed ourself from the
  11545. - * rt_mutex waiters list.
  11546. - */
  11547. - if (rt_mutex_trylock(&q->pi_state->pi_mutex)) {
  11548. - locked = 1;
  11549. - goto out;
  11550. - }
  11551. -
  11552. - /*
  11553. - * pi_state is incorrect, some other task did a lock steal and
  11554. - * we returned due to timeout or signal without taking the
  11555. - * rt_mutex. Too late.
  11556. - */
  11557. - raw_spin_lock_irq(&q->pi_state->pi_mutex.wait_lock);
  11558. - owner = rt_mutex_owner(&q->pi_state->pi_mutex);
  11559. - if (!owner)
  11560. - owner = rt_mutex_next_owner(&q->pi_state->pi_mutex);
  11561. - raw_spin_unlock_irq(&q->pi_state->pi_mutex.wait_lock);
  11562. - ret = fixup_pi_state_owner(uaddr, q, owner);
  11563. - goto out;
  11564. - }
  11565. -
  11566. - /*
  11567. * Paranoia check. If we did not take the lock, then we should not be
  11568. * the owner of the rt_mutex.
  11569. */
  11570. - if (rt_mutex_owner(&q->pi_state->pi_mutex) == current)
  11571. + if (rt_mutex_owner(&q->pi_state->pi_mutex) == current) {
  11572. printk(KERN_ERR "fixup_owner: ret = %d pi-mutex: %p "
  11573. "pi-state %p\n", ret,
  11574. q->pi_state->pi_mutex.owner,
  11575. q->pi_state->owner);
  11576. + }
  11577. out:
  11578. return ret ? ret : locked;
  11579. @@ -2503,6 +2599,8 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
  11580. ktime_t *time, int trylock)
  11581. {
  11582. struct hrtimer_sleeper timeout, *to = NULL;
  11583. + struct futex_pi_state *pi_state = NULL;
  11584. + struct rt_mutex_waiter rt_waiter;
  11585. struct futex_hash_bucket *hb;
  11586. struct futex_q q = futex_q_init;
  11587. int res, ret;
  11588. @@ -2555,25 +2653,77 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
  11589. }
  11590. }
  11591. + WARN_ON(!q.pi_state);
  11592. +
  11593. /*
  11594. * Only actually queue now that the atomic ops are done:
  11595. */
  11596. - queue_me(&q, hb);
  11597. + __queue_me(&q, hb);
  11598. - WARN_ON(!q.pi_state);
  11599. - /*
  11600. - * Block on the PI mutex:
  11601. - */
  11602. - if (!trylock) {
  11603. - ret = rt_mutex_timed_futex_lock(&q.pi_state->pi_mutex, to);
  11604. - } else {
  11605. - ret = rt_mutex_trylock(&q.pi_state->pi_mutex);
  11606. + if (trylock) {
  11607. + ret = rt_mutex_futex_trylock(&q.pi_state->pi_mutex);
  11608. /* Fixup the trylock return value: */
  11609. ret = ret ? 0 : -EWOULDBLOCK;
  11610. + goto no_block;
  11611. }
  11612. + rt_mutex_init_waiter(&rt_waiter, false);
  11613. +
  11614. + /*
  11615. + * On PREEMPT_RT_FULL, when hb->lock becomes an rt_mutex, we must not
  11616. + * hold it while doing rt_mutex_start_proxy(), because then it will
  11617. + * include hb->lock in the blocking chain, even through we'll not in
  11618. + * fact hold it while blocking. This will lead it to report -EDEADLK
  11619. + * and BUG when futex_unlock_pi() interleaves with this.
  11620. + *
  11621. + * Therefore acquire wait_lock while holding hb->lock, but drop the
  11622. + * latter before calling rt_mutex_start_proxy_lock(). This still fully
  11623. + * serializes against futex_unlock_pi() as that does the exact same
  11624. + * lock handoff sequence.
  11625. + */
  11626. + raw_spin_lock_irq(&q.pi_state->pi_mutex.wait_lock);
  11627. + /*
  11628. + * the migrate_disable() here disables migration in the in_atomic() fast
  11629. + * path which is enabled again in the following spin_unlock(). We have
  11630. + * one migrate_disable() pending in the slow-path which is reversed
  11631. + * after the raw_spin_unlock_irq() where we leave the atomic context.
  11632. + */
  11633. + migrate_disable();
  11634. +
  11635. + spin_unlock(q.lock_ptr);
  11636. + ret = __rt_mutex_start_proxy_lock(&q.pi_state->pi_mutex, &rt_waiter, current);
  11637. + raw_spin_unlock_irq(&q.pi_state->pi_mutex.wait_lock);
  11638. + migrate_enable();
  11639. +
  11640. + if (ret) {
  11641. + if (ret == 1)
  11642. + ret = 0;
  11643. +
  11644. + spin_lock(q.lock_ptr);
  11645. + goto no_block;
  11646. + }
  11647. +
  11648. +
  11649. + if (unlikely(to))
  11650. + hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
  11651. +
  11652. + ret = rt_mutex_wait_proxy_lock(&q.pi_state->pi_mutex, to, &rt_waiter);
  11653. +
  11654. spin_lock(q.lock_ptr);
  11655. /*
  11656. + * If we failed to acquire the lock (signal/timeout), we must
  11657. + * first acquire the hb->lock before removing the lock from the
  11658. + * rt_mutex waitqueue, such that we can keep the hb and rt_mutex
  11659. + * wait lists consistent.
  11660. + *
  11661. + * In particular; it is important that futex_unlock_pi() can not
  11662. + * observe this inconsistency.
  11663. + */
  11664. + if (ret && !rt_mutex_cleanup_proxy_lock(&q.pi_state->pi_mutex, &rt_waiter))
  11665. + ret = 0;
  11666. +
  11667. +no_block:
  11668. + /*
  11669. * Fixup the pi_state owner and possibly acquire the lock if we
  11670. * haven't already.
  11671. */
  11672. @@ -2589,12 +2739,19 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
  11673. * If fixup_owner() faulted and was unable to handle the fault, unlock
  11674. * it and return the fault to userspace.
  11675. */
  11676. - if (ret && (rt_mutex_owner(&q.pi_state->pi_mutex) == current))
  11677. - rt_mutex_unlock(&q.pi_state->pi_mutex);
  11678. + if (ret && (rt_mutex_owner(&q.pi_state->pi_mutex) == current)) {
  11679. + pi_state = q.pi_state;
  11680. + get_pi_state(pi_state);
  11681. + }
  11682. /* Unqueue and drop the lock */
  11683. unqueue_me_pi(&q);
  11684. + if (pi_state) {
  11685. + rt_mutex_futex_unlock(&pi_state->pi_mutex);
  11686. + put_pi_state(pi_state);
  11687. + }
  11688. +
  11689. goto out_put_key;
  11690. out_unlock_put_key:
  11691. @@ -2603,8 +2760,10 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
  11692. out_put_key:
  11693. put_futex_key(&q.key);
  11694. out:
  11695. - if (to)
  11696. + if (to) {
  11697. + hrtimer_cancel(&to->timer);
  11698. destroy_hrtimer_on_stack(&to->timer);
  11699. + }
  11700. return ret != -EINTR ? ret : -ERESTARTNOINTR;
  11701. uaddr_faulted:
  11702. @@ -2631,7 +2790,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11703. u32 uninitialized_var(curval), uval, vpid = task_pid_vnr(current);
  11704. union futex_key key = FUTEX_KEY_INIT;
  11705. struct futex_hash_bucket *hb;
  11706. - struct futex_q *match;
  11707. + struct futex_q *top_waiter;
  11708. int ret;
  11709. retry:
  11710. @@ -2655,12 +2814,48 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11711. * all and we at least want to know if user space fiddled
  11712. * with the futex value instead of blindly unlocking.
  11713. */
  11714. - match = futex_top_waiter(hb, &key);
  11715. - if (match) {
  11716. - ret = wake_futex_pi(uaddr, uval, match, hb);
  11717. + top_waiter = futex_top_waiter(hb, &key);
  11718. + if (top_waiter) {
  11719. + struct futex_pi_state *pi_state = top_waiter->pi_state;
  11720. +
  11721. + ret = -EINVAL;
  11722. + if (!pi_state)
  11723. + goto out_unlock;
  11724. +
  11725. /*
  11726. - * In case of success wake_futex_pi dropped the hash
  11727. - * bucket lock.
  11728. + * If current does not own the pi_state then the futex is
  11729. + * inconsistent and user space fiddled with the futex value.
  11730. + */
  11731. + if (pi_state->owner != current)
  11732. + goto out_unlock;
  11733. +
  11734. + get_pi_state(pi_state);
  11735. + /*
  11736. + * By taking wait_lock while still holding hb->lock, we ensure
  11737. + * there is no point where we hold neither; and therefore
  11738. + * wake_futex_pi() must observe a state consistent with what we
  11739. + * observed.
  11740. + */
  11741. + raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
  11742. + /*
  11743. + * Magic trickery for now to make the RT migrate disable
  11744. + * logic happy. The following spin_unlock() happens with
  11745. + * interrupts disabled so the internal migrate_enable()
  11746. + * won't undo the migrate_disable() which was issued when
  11747. + * locking hb->lock.
  11748. + */
  11749. + migrate_disable();
  11750. + spin_unlock(&hb->lock);
  11751. +
  11752. + /* Drops pi_state->pi_mutex.wait_lock */
  11753. + ret = wake_futex_pi(uaddr, uval, pi_state);
  11754. +
  11755. + migrate_enable();
  11756. +
  11757. + put_pi_state(pi_state);
  11758. +
  11759. + /*
  11760. + * Success, we're done! No tricky corner cases.
  11761. */
  11762. if (!ret)
  11763. goto out_putkey;
  11764. @@ -2675,7 +2870,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11765. * setting the FUTEX_WAITERS bit. Try again.
  11766. */
  11767. if (ret == -EAGAIN) {
  11768. - spin_unlock(&hb->lock);
  11769. put_futex_key(&key);
  11770. goto retry;
  11771. }
  11772. @@ -2683,7 +2877,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11773. * wake_futex_pi has detected invalid state. Tell user
  11774. * space.
  11775. */
  11776. - goto out_unlock;
  11777. + goto out_putkey;
  11778. }
  11779. /*
  11780. @@ -2693,8 +2887,10 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11781. * preserve the WAITERS bit not the OWNER_DIED one. We are the
  11782. * owner.
  11783. */
  11784. - if (cmpxchg_futex_value_locked(&curval, uaddr, uval, 0))
  11785. + if (cmpxchg_futex_value_locked(&curval, uaddr, uval, 0)) {
  11786. + spin_unlock(&hb->lock);
  11787. goto pi_faulted;
  11788. + }
  11789. /*
  11790. * If uval has changed, let user space handle it.
  11791. @@ -2708,7 +2904,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
  11792. return ret;
  11793. pi_faulted:
  11794. - spin_unlock(&hb->lock);
  11795. put_futex_key(&key);
  11796. ret = fault_in_user_writeable(uaddr);
  11797. @@ -2812,8 +3007,9 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11798. u32 __user *uaddr2)
  11799. {
  11800. struct hrtimer_sleeper timeout, *to = NULL;
  11801. + struct futex_pi_state *pi_state = NULL;
  11802. struct rt_mutex_waiter rt_waiter;
  11803. - struct futex_hash_bucket *hb;
  11804. + struct futex_hash_bucket *hb, *hb2;
  11805. union futex_key key2 = FUTEX_KEY_INIT;
  11806. struct futex_q q = futex_q_init;
  11807. int res, ret;
  11808. @@ -2838,10 +3034,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11809. * The waiter is allocated on our stack, manipulated by the requeue
  11810. * code while we sleep on uaddr.
  11811. */
  11812. - debug_rt_mutex_init_waiter(&rt_waiter);
  11813. - RB_CLEAR_NODE(&rt_waiter.pi_tree_entry);
  11814. - RB_CLEAR_NODE(&rt_waiter.tree_entry);
  11815. - rt_waiter.task = NULL;
  11816. + rt_mutex_init_waiter(&rt_waiter, false);
  11817. ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
  11818. if (unlikely(ret != 0))
  11819. @@ -2872,20 +3065,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11820. /* Queue the futex_q, drop the hb lock, wait for wakeup. */
  11821. futex_wait_queue_me(hb, &q, to);
  11822. - spin_lock(&hb->lock);
  11823. - ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
  11824. - spin_unlock(&hb->lock);
  11825. - if (ret)
  11826. - goto out_put_keys;
  11827. + /*
  11828. + * On RT we must avoid races with requeue and trying to block
  11829. + * on two mutexes (hb->lock and uaddr2's rtmutex) by
  11830. + * serializing access to pi_blocked_on with pi_lock.
  11831. + */
  11832. + raw_spin_lock_irq(&current->pi_lock);
  11833. + if (current->pi_blocked_on) {
  11834. + /*
  11835. + * We have been requeued or are in the process of
  11836. + * being requeued.
  11837. + */
  11838. + raw_spin_unlock_irq(&current->pi_lock);
  11839. + } else {
  11840. + /*
  11841. + * Setting pi_blocked_on to PI_WAKEUP_INPROGRESS
  11842. + * prevents a concurrent requeue from moving us to the
  11843. + * uaddr2 rtmutex. After that we can safely acquire
  11844. + * (and possibly block on) hb->lock.
  11845. + */
  11846. + current->pi_blocked_on = PI_WAKEUP_INPROGRESS;
  11847. + raw_spin_unlock_irq(&current->pi_lock);
  11848. +
  11849. + spin_lock(&hb->lock);
  11850. +
  11851. + /*
  11852. + * Clean up pi_blocked_on. We might leak it otherwise
  11853. + * when we succeeded with the hb->lock in the fast
  11854. + * path.
  11855. + */
  11856. + raw_spin_lock_irq(&current->pi_lock);
  11857. + current->pi_blocked_on = NULL;
  11858. + raw_spin_unlock_irq(&current->pi_lock);
  11859. +
  11860. + ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
  11861. + spin_unlock(&hb->lock);
  11862. + if (ret)
  11863. + goto out_put_keys;
  11864. + }
  11865. /*
  11866. - * In order for us to be here, we know our q.key == key2, and since
  11867. - * we took the hb->lock above, we also know that futex_requeue() has
  11868. - * completed and we no longer have to concern ourselves with a wakeup
  11869. - * race with the atomic proxy lock acquisition by the requeue code. The
  11870. - * futex_requeue dropped our key1 reference and incremented our key2
  11871. - * reference count.
  11872. + * In order to be here, we have either been requeued, are in
  11873. + * the process of being requeued, or requeue successfully
  11874. + * acquired uaddr2 on our behalf. If pi_blocked_on was
  11875. + * non-null above, we may be racing with a requeue. Do not
  11876. + * rely on q->lock_ptr to be hb2->lock until after blocking on
  11877. + * hb->lock or hb2->lock. The futex_requeue dropped our key1
  11878. + * reference and incremented our key2 reference count.
  11879. */
  11880. + hb2 = hash_futex(&key2);
  11881. /* Check if the requeue code acquired the second futex for us. */
  11882. if (!q.rt_waiter) {
  11883. @@ -2894,16 +3122,19 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11884. * did a lock-steal - fix up the PI-state in that case.
  11885. */
  11886. if (q.pi_state && (q.pi_state->owner != current)) {
  11887. - spin_lock(q.lock_ptr);
  11888. + spin_lock(&hb2->lock);
  11889. + BUG_ON(&hb2->lock != q.lock_ptr);
  11890. ret = fixup_pi_state_owner(uaddr2, &q, current);
  11891. - if (ret && rt_mutex_owner(&q.pi_state->pi_mutex) == current)
  11892. - rt_mutex_unlock(&q.pi_state->pi_mutex);
  11893. + if (ret && rt_mutex_owner(&q.pi_state->pi_mutex) == current) {
  11894. + pi_state = q.pi_state;
  11895. + get_pi_state(pi_state);
  11896. + }
  11897. /*
  11898. * Drop the reference to the pi state which
  11899. * the requeue_pi() code acquired for us.
  11900. */
  11901. put_pi_state(q.pi_state);
  11902. - spin_unlock(q.lock_ptr);
  11903. + spin_unlock(&hb2->lock);
  11904. }
  11905. } else {
  11906. struct rt_mutex *pi_mutex;
  11907. @@ -2915,10 +3146,14 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11908. */
  11909. WARN_ON(!q.pi_state);
  11910. pi_mutex = &q.pi_state->pi_mutex;
  11911. - ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter);
  11912. - debug_rt_mutex_free_waiter(&rt_waiter);
  11913. + ret = rt_mutex_wait_proxy_lock(pi_mutex, to, &rt_waiter);
  11914. - spin_lock(q.lock_ptr);
  11915. + spin_lock(&hb2->lock);
  11916. + BUG_ON(&hb2->lock != q.lock_ptr);
  11917. + if (ret && !rt_mutex_cleanup_proxy_lock(pi_mutex, &rt_waiter))
  11918. + ret = 0;
  11919. +
  11920. + debug_rt_mutex_free_waiter(&rt_waiter);
  11921. /*
  11922. * Fixup the pi_state owner and possibly acquire the lock if we
  11923. * haven't already.
  11924. @@ -2936,13 +3171,20 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
  11925. * the fault, unlock the rt_mutex and return the fault to
  11926. * userspace.
  11927. */
  11928. - if (ret && rt_mutex_owner(pi_mutex) == current)
  11929. - rt_mutex_unlock(pi_mutex);
  11930. + if (ret && rt_mutex_owner(&q.pi_state->pi_mutex) == current) {
  11931. + pi_state = q.pi_state;
  11932. + get_pi_state(pi_state);
  11933. + }
  11934. /* Unqueue and drop the lock. */
  11935. unqueue_me_pi(&q);
  11936. }
  11937. + if (pi_state) {
  11938. + rt_mutex_futex_unlock(&pi_state->pi_mutex);
  11939. + put_pi_state(pi_state);
  11940. + }
  11941. +
  11942. if (ret == -EINTR) {
  11943. /*
  11944. * We've already been requeued, but cannot restart by calling
  11945. diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
  11946. index d3f24905852c..f87aa8fdcc51 100644
  11947. --- a/kernel/irq/handle.c
  11948. +++ b/kernel/irq/handle.c
  11949. @@ -181,10 +181,16 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
  11950. {
  11951. irqreturn_t retval;
  11952. unsigned int flags = 0;
  11953. + struct pt_regs *regs = get_irq_regs();
  11954. + u64 ip = regs ? instruction_pointer(regs) : 0;
  11955. retval = __handle_irq_event_percpu(desc, &flags);
  11956. - add_interrupt_randomness(desc->irq_data.irq, flags);
  11957. +#ifdef CONFIG_PREEMPT_RT_FULL
  11958. + desc->random_ip = ip;
  11959. +#else
  11960. + add_interrupt_randomness(desc->irq_data.irq, flags, ip);
  11961. +#endif
  11962. if (!noirqdebug)
  11963. note_interrupt(desc, retval);
  11964. diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
  11965. index 6b669593e7eb..e357bf6c59d5 100644
  11966. --- a/kernel/irq/manage.c
  11967. +++ b/kernel/irq/manage.c
  11968. @@ -22,6 +22,7 @@
  11969. #include "internals.h"
  11970. #ifdef CONFIG_IRQ_FORCED_THREADING
  11971. +# ifndef CONFIG_PREEMPT_RT_BASE
  11972. __read_mostly bool force_irqthreads;
  11973. static int __init setup_forced_irqthreads(char *arg)
  11974. @@ -30,6 +31,7 @@ static int __init setup_forced_irqthreads(char *arg)
  11975. return 0;
  11976. }
  11977. early_param("threadirqs", setup_forced_irqthreads);
  11978. +# endif
  11979. #endif
  11980. static void __synchronize_hardirq(struct irq_desc *desc)
  11981. @@ -233,7 +235,12 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
  11982. if (desc->affinity_notify) {
  11983. kref_get(&desc->affinity_notify->kref);
  11984. +
  11985. +#ifdef CONFIG_PREEMPT_RT_BASE
  11986. + swork_queue(&desc->affinity_notify->swork);
  11987. +#else
  11988. schedule_work(&desc->affinity_notify->work);
  11989. +#endif
  11990. }
  11991. irqd_set(data, IRQD_AFFINITY_SET);
  11992. @@ -271,10 +278,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
  11993. }
  11994. EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
  11995. -static void irq_affinity_notify(struct work_struct *work)
  11996. +static void _irq_affinity_notify(struct irq_affinity_notify *notify)
  11997. {
  11998. - struct irq_affinity_notify *notify =
  11999. - container_of(work, struct irq_affinity_notify, work);
  12000. struct irq_desc *desc = irq_to_desc(notify->irq);
  12001. cpumask_var_t cpumask;
  12002. unsigned long flags;
  12003. @@ -296,6 +301,35 @@ static void irq_affinity_notify(struct work_struct *work)
  12004. kref_put(&notify->kref, notify->release);
  12005. }
  12006. +#ifdef CONFIG_PREEMPT_RT_BASE
  12007. +static void init_helper_thread(void)
  12008. +{
  12009. + static int init_sworker_once;
  12010. +
  12011. + if (init_sworker_once)
  12012. + return;
  12013. + if (WARN_ON(swork_get()))
  12014. + return;
  12015. + init_sworker_once = 1;
  12016. +}
  12017. +
  12018. +static void irq_affinity_notify(struct swork_event *swork)
  12019. +{
  12020. + struct irq_affinity_notify *notify =
  12021. + container_of(swork, struct irq_affinity_notify, swork);
  12022. + _irq_affinity_notify(notify);
  12023. +}
  12024. +
  12025. +#else
  12026. +
  12027. +static void irq_affinity_notify(struct work_struct *work)
  12028. +{
  12029. + struct irq_affinity_notify *notify =
  12030. + container_of(work, struct irq_affinity_notify, work);
  12031. + _irq_affinity_notify(notify);
  12032. +}
  12033. +#endif
  12034. +
  12035. /**
  12036. * irq_set_affinity_notifier - control notification of IRQ affinity changes
  12037. * @irq: Interrupt for which to enable/disable notification
  12038. @@ -324,7 +358,12 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
  12039. if (notify) {
  12040. notify->irq = irq;
  12041. kref_init(&notify->kref);
  12042. +#ifdef CONFIG_PREEMPT_RT_BASE
  12043. + INIT_SWORK(&notify->swork, irq_affinity_notify);
  12044. + init_helper_thread();
  12045. +#else
  12046. INIT_WORK(&notify->work, irq_affinity_notify);
  12047. +#endif
  12048. }
  12049. raw_spin_lock_irqsave(&desc->lock, flags);
  12050. @@ -879,7 +918,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
  12051. local_bh_disable();
  12052. ret = action->thread_fn(action->irq, action->dev_id);
  12053. irq_finalize_oneshot(desc, action);
  12054. - local_bh_enable();
  12055. + /*
  12056. + * Interrupts which have real time requirements can be set up
  12057. + * to avoid softirq processing in the thread handler. This is
  12058. + * safe as these interrupts do not raise soft interrupts.
  12059. + */
  12060. + if (irq_settings_no_softirq_call(desc))
  12061. + _local_bh_enable();
  12062. + else
  12063. + local_bh_enable();
  12064. return ret;
  12065. }
  12066. @@ -976,6 +1023,12 @@ static int irq_thread(void *data)
  12067. if (action_ret == IRQ_WAKE_THREAD)
  12068. irq_wake_secondary(desc, action);
  12069. +#ifdef CONFIG_PREEMPT_RT_FULL
  12070. + migrate_disable();
  12071. + add_interrupt_randomness(action->irq, 0,
  12072. + desc->random_ip ^ (unsigned long) action);
  12073. + migrate_enable();
  12074. +#endif
  12075. wake_threads_waitq(desc);
  12076. }
  12077. @@ -1336,6 +1389,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
  12078. irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
  12079. }
  12080. + if (new->flags & IRQF_NO_SOFTIRQ_CALL)
  12081. + irq_settings_set_no_softirq_call(desc);
  12082. +
  12083. /* Set default affinity mask once everything is setup */
  12084. setup_affinity(desc, mask);
  12085. @@ -2061,7 +2117,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
  12086. * This call sets the internal irqchip state of an interrupt,
  12087. * depending on the value of @which.
  12088. *
  12089. - * This function should be called with preemption disabled if the
  12090. + * This function should be called with migration disabled if the
  12091. * interrupt controller has per-cpu registers.
  12092. */
  12093. int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
  12094. diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
  12095. index 320579d89091..2df2d4445b1e 100644
  12096. --- a/kernel/irq/settings.h
  12097. +++ b/kernel/irq/settings.h
  12098. @@ -16,6 +16,7 @@ enum {
  12099. _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
  12100. _IRQ_IS_POLLED = IRQ_IS_POLLED,
  12101. _IRQ_DISABLE_UNLAZY = IRQ_DISABLE_UNLAZY,
  12102. + _IRQ_NO_SOFTIRQ_CALL = IRQ_NO_SOFTIRQ_CALL,
  12103. _IRQF_MODIFY_MASK = IRQF_MODIFY_MASK,
  12104. };
  12105. @@ -30,6 +31,7 @@ enum {
  12106. #define IRQ_PER_CPU_DEVID GOT_YOU_MORON
  12107. #define IRQ_IS_POLLED GOT_YOU_MORON
  12108. #define IRQ_DISABLE_UNLAZY GOT_YOU_MORON
  12109. +#define IRQ_NO_SOFTIRQ_CALL GOT_YOU_MORON
  12110. #undef IRQF_MODIFY_MASK
  12111. #define IRQF_MODIFY_MASK GOT_YOU_MORON
  12112. @@ -40,6 +42,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set)
  12113. desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK);
  12114. }
  12115. +static inline bool irq_settings_no_softirq_call(struct irq_desc *desc)
  12116. +{
  12117. + return desc->status_use_accessors & _IRQ_NO_SOFTIRQ_CALL;
  12118. +}
  12119. +
  12120. +static inline void irq_settings_set_no_softirq_call(struct irq_desc *desc)
  12121. +{
  12122. + desc->status_use_accessors |= _IRQ_NO_SOFTIRQ_CALL;
  12123. +}
  12124. +
  12125. static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
  12126. {
  12127. return desc->status_use_accessors & _IRQ_PER_CPU;
  12128. diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
  12129. index 5707f97a3e6a..73f38dc7a7fb 100644
  12130. --- a/kernel/irq/spurious.c
  12131. +++ b/kernel/irq/spurious.c
  12132. @@ -442,6 +442,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true");
  12133. static int __init irqfixup_setup(char *str)
  12134. {
  12135. +#ifdef CONFIG_PREEMPT_RT_BASE
  12136. + pr_warn("irqfixup boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
  12137. + return 1;
  12138. +#endif
  12139. irqfixup = 1;
  12140. printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
  12141. printk(KERN_WARNING "This may impact system performance.\n");
  12142. @@ -454,6 +458,10 @@ module_param(irqfixup, int, 0644);
  12143. static int __init irqpoll_setup(char *str)
  12144. {
  12145. +#ifdef CONFIG_PREEMPT_RT_BASE
  12146. + pr_warn("irqpoll boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
  12147. + return 1;
  12148. +#endif
  12149. irqfixup = 2;
  12150. printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
  12151. "enabled\n");
  12152. diff --git a/kernel/irq_work.c b/kernel/irq_work.c
  12153. index bcf107ce0854..2899ba0d23d1 100644
  12154. --- a/kernel/irq_work.c
  12155. +++ b/kernel/irq_work.c
  12156. @@ -17,6 +17,7 @@
  12157. #include <linux/cpu.h>
  12158. #include <linux/notifier.h>
  12159. #include <linux/smp.h>
  12160. +#include <linux/interrupt.h>
  12161. #include <asm/processor.h>
  12162. @@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void)
  12163. */
  12164. bool irq_work_queue_on(struct irq_work *work, int cpu)
  12165. {
  12166. + struct llist_head *list;
  12167. +
  12168. /* All work should have been flushed before going offline */
  12169. WARN_ON_ONCE(cpu_is_offline(cpu));
  12170. @@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
  12171. if (!irq_work_claim(work))
  12172. return false;
  12173. - if (llist_add(&work->llnode, &per_cpu(raised_list, cpu)))
  12174. + if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL) && !(work->flags & IRQ_WORK_HARD_IRQ))
  12175. + list = &per_cpu(lazy_list, cpu);
  12176. + else
  12177. + list = &per_cpu(raised_list, cpu);
  12178. +
  12179. + if (llist_add(&work->llnode, list))
  12180. arch_send_call_function_single_ipi(cpu);
  12181. return true;
  12182. @@ -86,6 +94,9 @@ EXPORT_SYMBOL_GPL(irq_work_queue_on);
  12183. /* Enqueue the irq work @work on the current CPU */
  12184. bool irq_work_queue(struct irq_work *work)
  12185. {
  12186. + struct llist_head *list;
  12187. + bool lazy_work, realtime = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
  12188. +
  12189. /* Only queue if not already pending */
  12190. if (!irq_work_claim(work))
  12191. return false;
  12192. @@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *work)
  12193. /* Queue the entry and raise the IPI if needed. */
  12194. preempt_disable();
  12195. - /* If the work is "lazy", handle it from next tick if any */
  12196. - if (work->flags & IRQ_WORK_LAZY) {
  12197. - if (llist_add(&work->llnode, this_cpu_ptr(&lazy_list)) &&
  12198. - tick_nohz_tick_stopped())
  12199. - arch_irq_work_raise();
  12200. - } else {
  12201. - if (llist_add(&work->llnode, this_cpu_ptr(&raised_list)))
  12202. + lazy_work = work->flags & IRQ_WORK_LAZY;
  12203. +
  12204. + if (lazy_work || (realtime && !(work->flags & IRQ_WORK_HARD_IRQ)))
  12205. + list = this_cpu_ptr(&lazy_list);
  12206. + else
  12207. + list = this_cpu_ptr(&raised_list);
  12208. +
  12209. + if (llist_add(&work->llnode, list)) {
  12210. + if (!lazy_work || tick_nohz_tick_stopped())
  12211. arch_irq_work_raise();
  12212. }
  12213. @@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void)
  12214. raised = this_cpu_ptr(&raised_list);
  12215. lazy = this_cpu_ptr(&lazy_list);
  12216. - if (llist_empty(raised) || arch_irq_work_has_interrupt())
  12217. - if (llist_empty(lazy))
  12218. - return false;
  12219. + if (llist_empty(raised) && llist_empty(lazy))
  12220. + return false;
  12221. /* All work should have been flushed before going offline */
  12222. WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
  12223. @@ -132,7 +144,7 @@ static void irq_work_run_list(struct llist_head *list)
  12224. struct irq_work *work;
  12225. struct llist_node *llnode;
  12226. - BUG_ON(!irqs_disabled());
  12227. + BUG_ON_NONRT(!irqs_disabled());
  12228. if (llist_empty(list))
  12229. return;
  12230. @@ -169,7 +181,16 @@ static void irq_work_run_list(struct llist_head *list)
  12231. void irq_work_run(void)
  12232. {
  12233. irq_work_run_list(this_cpu_ptr(&raised_list));
  12234. - irq_work_run_list(this_cpu_ptr(&lazy_list));
  12235. + if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) {
  12236. + /*
  12237. + * NOTE: we raise softirq via IPI for safety,
  12238. + * and execute in irq_work_tick() to move the
  12239. + * overhead from hard to soft irq context.
  12240. + */
  12241. + if (!llist_empty(this_cpu_ptr(&lazy_list)))
  12242. + raise_softirq(TIMER_SOFTIRQ);
  12243. + } else
  12244. + irq_work_run_list(this_cpu_ptr(&lazy_list));
  12245. }
  12246. EXPORT_SYMBOL_GPL(irq_work_run);
  12247. @@ -179,8 +200,17 @@ void irq_work_tick(void)
  12248. if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
  12249. irq_work_run_list(raised);
  12250. +
  12251. + if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
  12252. + irq_work_run_list(this_cpu_ptr(&lazy_list));
  12253. +}
  12254. +
  12255. +#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
  12256. +void irq_work_tick_soft(void)
  12257. +{
  12258. irq_work_run_list(this_cpu_ptr(&lazy_list));
  12259. }
  12260. +#endif
  12261. /*
  12262. * Synchronize against the irq_work @entry, ensures the entry is not
  12263. diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
  12264. index ee1bc1bb8feb..ddef07958840 100644
  12265. --- a/kernel/ksysfs.c
  12266. +++ b/kernel/ksysfs.c
  12267. @@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
  12268. #endif /* CONFIG_KEXEC_CORE */
  12269. +#if defined(CONFIG_PREEMPT_RT_FULL)
  12270. +static ssize_t realtime_show(struct kobject *kobj,
  12271. + struct kobj_attribute *attr, char *buf)
  12272. +{
  12273. + return sprintf(buf, "%d\n", 1);
  12274. +}
  12275. +KERNEL_ATTR_RO(realtime);
  12276. +#endif
  12277. +
  12278. /* whether file capabilities are enabled */
  12279. static ssize_t fscaps_show(struct kobject *kobj,
  12280. struct kobj_attribute *attr, char *buf)
  12281. @@ -225,6 +234,9 @@ static struct attribute * kernel_attrs[] = {
  12282. &rcu_expedited_attr.attr,
  12283. &rcu_normal_attr.attr,
  12284. #endif
  12285. +#ifdef CONFIG_PREEMPT_RT_FULL
  12286. + &realtime_attr.attr,
  12287. +#endif
  12288. NULL
  12289. };
  12290. diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
  12291. index 6f88e352cd4f..6ff9e8011dd0 100644
  12292. --- a/kernel/locking/Makefile
  12293. +++ b/kernel/locking/Makefile
  12294. @@ -2,7 +2,7 @@
  12295. # and is generally not a function of system call inputs.
  12296. KCOV_INSTRUMENT := n
  12297. -obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
  12298. +obj-y += semaphore.o percpu-rwsem.o
  12299. ifdef CONFIG_FUNCTION_TRACER
  12300. CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
  12301. @@ -11,7 +11,11 @@ CFLAGS_REMOVE_mutex-debug.o = $(CC_FLAGS_FTRACE)
  12302. CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
  12303. endif
  12304. +ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
  12305. +obj-y += mutex.o
  12306. obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
  12307. +endif
  12308. +obj-y += rwsem.o
  12309. obj-$(CONFIG_LOCKDEP) += lockdep.o
  12310. ifeq ($(CONFIG_PROC_FS),y)
  12311. obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
  12312. @@ -24,7 +28,10 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
  12313. obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
  12314. obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
  12315. obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
  12316. +ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
  12317. obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
  12318. obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
  12319. +endif
  12320. +obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o rwsem-rt.o
  12321. obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
  12322. obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
  12323. diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
  12324. index 4d7ffc0a0d00..3d157b3128eb 100644
  12325. --- a/kernel/locking/lockdep.c
  12326. +++ b/kernel/locking/lockdep.c
  12327. @@ -658,6 +658,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
  12328. struct lockdep_subclass_key *key;
  12329. struct hlist_head *hash_head;
  12330. struct lock_class *class;
  12331. + bool is_static = false;
  12332. if (unlikely(subclass >= MAX_LOCKDEP_SUBCLASSES)) {
  12333. debug_locks_off();
  12334. @@ -671,10 +672,23 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
  12335. /*
  12336. * Static locks do not have their class-keys yet - for them the key
  12337. - * is the lock object itself:
  12338. + * is the lock object itself. If the lock is in the per cpu area,
  12339. + * the canonical address of the lock (per cpu offset removed) is
  12340. + * used.
  12341. */
  12342. - if (unlikely(!lock->key))
  12343. - lock->key = (void *)lock;
  12344. + if (unlikely(!lock->key)) {
  12345. + unsigned long can_addr, addr = (unsigned long)lock;
  12346. +
  12347. + if (__is_kernel_percpu_address(addr, &can_addr))
  12348. + lock->key = (void *)can_addr;
  12349. + else if (__is_module_percpu_address(addr, &can_addr))
  12350. + lock->key = (void *)can_addr;
  12351. + else if (static_obj(lock))
  12352. + lock->key = (void *)lock;
  12353. + else
  12354. + return ERR_PTR(-EINVAL);
  12355. + is_static = true;
  12356. + }
  12357. /*
  12358. * NOTE: the class-key must be unique. For dynamic locks, a static
  12359. @@ -706,7 +720,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
  12360. }
  12361. }
  12362. - return NULL;
  12363. + return is_static || static_obj(lock->key) ? NULL : ERR_PTR(-EINVAL);
  12364. }
  12365. /*
  12366. @@ -724,19 +738,18 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
  12367. DEBUG_LOCKS_WARN_ON(!irqs_disabled());
  12368. class = look_up_lock_class(lock, subclass);
  12369. - if (likely(class))
  12370. + if (likely(!IS_ERR_OR_NULL(class)))
  12371. goto out_set_class_cache;
  12372. /*
  12373. * Debug-check: all keys must be persistent!
  12374. - */
  12375. - if (!static_obj(lock->key)) {
  12376. + */
  12377. + if (IS_ERR(class)) {
  12378. debug_locks_off();
  12379. printk("INFO: trying to register non-static key.\n");
  12380. printk("the code is fine but needs lockdep annotation.\n");
  12381. printk("turning off the locking correctness validator.\n");
  12382. dump_stack();
  12383. -
  12384. return NULL;
  12385. }
  12386. @@ -3410,7 +3423,7 @@ static int match_held_lock(struct held_lock *hlock, struct lockdep_map *lock)
  12387. * Clearly if the lock hasn't been acquired _ever_, we're not
  12388. * holding it either, so report failure.
  12389. */
  12390. - if (!class)
  12391. + if (IS_ERR_OR_NULL(class))
  12392. return 0;
  12393. /*
  12394. @@ -3689,6 +3702,7 @@ static void check_flags(unsigned long flags)
  12395. }
  12396. }
  12397. +#ifndef CONFIG_PREEMPT_RT_FULL
  12398. /*
  12399. * We dont accurately track softirq state in e.g.
  12400. * hardirq contexts (such as on 4KSTACKS), so only
  12401. @@ -3703,6 +3717,7 @@ static void check_flags(unsigned long flags)
  12402. DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
  12403. }
  12404. }
  12405. +#endif
  12406. if (!debug_locks)
  12407. print_irqtrace_events(current);
  12408. @@ -4159,7 +4174,7 @@ void lockdep_reset_lock(struct lockdep_map *lock)
  12409. * If the class exists we look it up and zap it:
  12410. */
  12411. class = look_up_lock_class(lock, j);
  12412. - if (class)
  12413. + if (!IS_ERR_OR_NULL(class))
  12414. zap_class(class);
  12415. }
  12416. /*
  12417. diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
  12418. index f8c5af52a131..788068773e61 100644
  12419. --- a/kernel/locking/locktorture.c
  12420. +++ b/kernel/locking/locktorture.c
  12421. @@ -26,7 +26,6 @@
  12422. #include <linux/kthread.h>
  12423. #include <linux/sched/rt.h>
  12424. #include <linux/spinlock.h>
  12425. -#include <linux/rwlock.h>
  12426. #include <linux/mutex.h>
  12427. #include <linux/rwsem.h>
  12428. #include <linux/smp.h>
  12429. diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c
  12430. index ce182599cf2e..2ad3a1e8344c 100644
  12431. --- a/kernel/locking/percpu-rwsem.c
  12432. +++ b/kernel/locking/percpu-rwsem.c
  12433. @@ -18,7 +18,7 @@ int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,
  12434. /* ->rw_sem represents the whole percpu_rw_semaphore for lockdep */
  12435. rcu_sync_init(&sem->rss, RCU_SCHED_SYNC);
  12436. __init_rwsem(&sem->rw_sem, name, rwsem_key);
  12437. - init_waitqueue_head(&sem->writer);
  12438. + init_swait_queue_head(&sem->writer);
  12439. sem->readers_block = 0;
  12440. return 0;
  12441. }
  12442. @@ -103,7 +103,7 @@ void __percpu_up_read(struct percpu_rw_semaphore *sem)
  12443. __this_cpu_dec(*sem->read_count);
  12444. /* Prod writer to recheck readers_active */
  12445. - wake_up(&sem->writer);
  12446. + swake_up(&sem->writer);
  12447. }
  12448. EXPORT_SYMBOL_GPL(__percpu_up_read);
  12449. @@ -160,7 +160,7 @@ void percpu_down_write(struct percpu_rw_semaphore *sem)
  12450. */
  12451. /* Wait for all now active readers to complete. */
  12452. - wait_event(sem->writer, readers_active_check(sem));
  12453. + swait_event(sem->writer, readers_active_check(sem));
  12454. }
  12455. EXPORT_SYMBOL_GPL(percpu_down_write);
  12456. diff --git a/kernel/locking/rt.c b/kernel/locking/rt.c
  12457. new file mode 100644
  12458. index 000000000000..6284e3b15091
  12459. --- /dev/null
  12460. +++ b/kernel/locking/rt.c
  12461. @@ -0,0 +1,331 @@
  12462. +/*
  12463. + * kernel/rt.c
  12464. + *
  12465. + * Real-Time Preemption Support
  12466. + *
  12467. + * started by Ingo Molnar:
  12468. + *
  12469. + * Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
  12470. + * Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
  12471. + *
  12472. + * historic credit for proving that Linux spinlocks can be implemented via
  12473. + * RT-aware mutexes goes to many people: The Pmutex project (Dirk Grambow
  12474. + * and others) who prototyped it on 2.4 and did lots of comparative
  12475. + * research and analysis; TimeSys, for proving that you can implement a
  12476. + * fully preemptible kernel via the use of IRQ threading and mutexes;
  12477. + * Bill Huey for persuasively arguing on lkml that the mutex model is the
  12478. + * right one; and to MontaVista, who ported pmutexes to 2.6.
  12479. + *
  12480. + * This code is a from-scratch implementation and is not based on pmutexes,
  12481. + * but the idea of converting spinlocks to mutexes is used here too.
  12482. + *
  12483. + * lock debugging, locking tree, deadlock detection:
  12484. + *
  12485. + * Copyright (C) 2004, LynuxWorks, Inc., Igor Manyilov, Bill Huey
  12486. + * Released under the General Public License (GPL).
  12487. + *
  12488. + * Includes portions of the generic R/W semaphore implementation from:
  12489. + *
  12490. + * Copyright (c) 2001 David Howells (dhowells@redhat.com).
  12491. + * - Derived partially from idea by Andrea Arcangeli <andrea@suse.de>
  12492. + * - Derived also from comments by Linus
  12493. + *
  12494. + * Pending ownership of locks and ownership stealing:
  12495. + *
  12496. + * Copyright (C) 2005, Kihon Technologies Inc., Steven Rostedt
  12497. + *
  12498. + * (also by Steven Rostedt)
  12499. + * - Converted single pi_lock to individual task locks.
  12500. + *
  12501. + * By Esben Nielsen:
  12502. + * Doing priority inheritance with help of the scheduler.
  12503. + *
  12504. + * Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
  12505. + * - major rework based on Esben Nielsens initial patch
  12506. + * - replaced thread_info references by task_struct refs
  12507. + * - removed task->pending_owner dependency
  12508. + * - BKL drop/reacquire for semaphore style locks to avoid deadlocks
  12509. + * in the scheduler return path as discussed with Steven Rostedt
  12510. + *
  12511. + * Copyright (C) 2006, Kihon Technologies Inc.
  12512. + * Steven Rostedt <rostedt@goodmis.org>
  12513. + * - debugged and patched Thomas Gleixner's rework.
  12514. + * - added back the cmpxchg to the rework.
  12515. + * - turned atomic require back on for SMP.
  12516. + */
  12517. +
  12518. +#include <linux/spinlock.h>
  12519. +#include <linux/rtmutex.h>
  12520. +#include <linux/sched.h>
  12521. +#include <linux/delay.h>
  12522. +#include <linux/module.h>
  12523. +#include <linux/kallsyms.h>
  12524. +#include <linux/syscalls.h>
  12525. +#include <linux/interrupt.h>
  12526. +#include <linux/plist.h>
  12527. +#include <linux/fs.h>
  12528. +#include <linux/futex.h>
  12529. +#include <linux/hrtimer.h>
  12530. +
  12531. +#include "rtmutex_common.h"
  12532. +
  12533. +/*
  12534. + * struct mutex functions
  12535. + */
  12536. +void __mutex_do_init(struct mutex *mutex, const char *name,
  12537. + struct lock_class_key *key)
  12538. +{
  12539. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  12540. + /*
  12541. + * Make sure we are not reinitializing a held lock:
  12542. + */
  12543. + debug_check_no_locks_freed((void *)mutex, sizeof(*mutex));
  12544. + lockdep_init_map(&mutex->dep_map, name, key, 0);
  12545. +#endif
  12546. + mutex->lock.save_state = 0;
  12547. +}
  12548. +EXPORT_SYMBOL(__mutex_do_init);
  12549. +
  12550. +void __lockfunc _mutex_lock(struct mutex *lock)
  12551. +{
  12552. + mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
  12553. + rt_mutex_lock(&lock->lock);
  12554. +}
  12555. +EXPORT_SYMBOL(_mutex_lock);
  12556. +
  12557. +int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
  12558. +{
  12559. + int ret;
  12560. +
  12561. + mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
  12562. + ret = rt_mutex_lock_interruptible(&lock->lock);
  12563. + if (ret)
  12564. + mutex_release(&lock->dep_map, 1, _RET_IP_);
  12565. + return ret;
  12566. +}
  12567. +EXPORT_SYMBOL(_mutex_lock_interruptible);
  12568. +
  12569. +int __lockfunc _mutex_lock_killable(struct mutex *lock)
  12570. +{
  12571. + int ret;
  12572. +
  12573. + mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
  12574. + ret = rt_mutex_lock_killable(&lock->lock);
  12575. + if (ret)
  12576. + mutex_release(&lock->dep_map, 1, _RET_IP_);
  12577. + return ret;
  12578. +}
  12579. +EXPORT_SYMBOL(_mutex_lock_killable);
  12580. +
  12581. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  12582. +void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass)
  12583. +{
  12584. + mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
  12585. + rt_mutex_lock(&lock->lock);
  12586. +}
  12587. +EXPORT_SYMBOL(_mutex_lock_nested);
  12588. +
  12589. +void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)
  12590. +{
  12591. + mutex_acquire_nest(&lock->dep_map, 0, 0, nest, _RET_IP_);
  12592. + rt_mutex_lock(&lock->lock);
  12593. +}
  12594. +EXPORT_SYMBOL(_mutex_lock_nest_lock);
  12595. +
  12596. +int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass)
  12597. +{
  12598. + int ret;
  12599. +
  12600. + mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
  12601. + ret = rt_mutex_lock_interruptible(&lock->lock);
  12602. + if (ret)
  12603. + mutex_release(&lock->dep_map, 1, _RET_IP_);
  12604. + return ret;
  12605. +}
  12606. +EXPORT_SYMBOL(_mutex_lock_interruptible_nested);
  12607. +
  12608. +int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass)
  12609. +{
  12610. + int ret;
  12611. +
  12612. + mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
  12613. + ret = rt_mutex_lock_killable(&lock->lock);
  12614. + if (ret)
  12615. + mutex_release(&lock->dep_map, 1, _RET_IP_);
  12616. + return ret;
  12617. +}
  12618. +EXPORT_SYMBOL(_mutex_lock_killable_nested);
  12619. +#endif
  12620. +
  12621. +int __lockfunc _mutex_trylock(struct mutex *lock)
  12622. +{
  12623. + int ret = rt_mutex_trylock(&lock->lock);
  12624. +
  12625. + if (ret)
  12626. + mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
  12627. +
  12628. + return ret;
  12629. +}
  12630. +EXPORT_SYMBOL(_mutex_trylock);
  12631. +
  12632. +void __lockfunc _mutex_unlock(struct mutex *lock)
  12633. +{
  12634. + mutex_release(&lock->dep_map, 1, _RET_IP_);
  12635. + rt_mutex_unlock(&lock->lock);
  12636. +}
  12637. +EXPORT_SYMBOL(_mutex_unlock);
  12638. +
  12639. +/*
  12640. + * rwlock_t functions
  12641. + */
  12642. +int __lockfunc rt_write_trylock(rwlock_t *rwlock)
  12643. +{
  12644. + int ret;
  12645. +
  12646. + migrate_disable();
  12647. + ret = rt_mutex_trylock(&rwlock->lock);
  12648. + if (ret)
  12649. + rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
  12650. + else
  12651. + migrate_enable();
  12652. +
  12653. + return ret;
  12654. +}
  12655. +EXPORT_SYMBOL(rt_write_trylock);
  12656. +
  12657. +int __lockfunc rt_write_trylock_irqsave(rwlock_t *rwlock, unsigned long *flags)
  12658. +{
  12659. + int ret;
  12660. +
  12661. + *flags = 0;
  12662. + ret = rt_write_trylock(rwlock);
  12663. + return ret;
  12664. +}
  12665. +EXPORT_SYMBOL(rt_write_trylock_irqsave);
  12666. +
  12667. +int __lockfunc rt_read_trylock(rwlock_t *rwlock)
  12668. +{
  12669. + struct rt_mutex *lock = &rwlock->lock;
  12670. + int ret = 1;
  12671. +
  12672. + /*
  12673. + * recursive read locks succeed when current owns the lock,
  12674. + * but not when read_depth == 0 which means that the lock is
  12675. + * write locked.
  12676. + */
  12677. + if (rt_mutex_owner(lock) != current) {
  12678. + migrate_disable();
  12679. + ret = rt_mutex_trylock(lock);
  12680. + if (ret)
  12681. + rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
  12682. + else
  12683. + migrate_enable();
  12684. +
  12685. + } else if (!rwlock->read_depth) {
  12686. + ret = 0;
  12687. + }
  12688. +
  12689. + if (ret)
  12690. + rwlock->read_depth++;
  12691. +
  12692. + return ret;
  12693. +}
  12694. +EXPORT_SYMBOL(rt_read_trylock);
  12695. +
  12696. +void __lockfunc rt_write_lock(rwlock_t *rwlock)
  12697. +{
  12698. + rwlock_acquire(&rwlock->dep_map, 0, 0, _RET_IP_);
  12699. + __rt_spin_lock(&rwlock->lock);
  12700. +}
  12701. +EXPORT_SYMBOL(rt_write_lock);
  12702. +
  12703. +void __lockfunc rt_read_lock(rwlock_t *rwlock)
  12704. +{
  12705. + struct rt_mutex *lock = &rwlock->lock;
  12706. +
  12707. +
  12708. + /*
  12709. + * recursive read locks succeed when current owns the lock
  12710. + */
  12711. + if (rt_mutex_owner(lock) != current) {
  12712. + rwlock_acquire(&rwlock->dep_map, 0, 0, _RET_IP_);
  12713. + __rt_spin_lock(lock);
  12714. + }
  12715. + rwlock->read_depth++;
  12716. +}
  12717. +
  12718. +EXPORT_SYMBOL(rt_read_lock);
  12719. +
  12720. +void __lockfunc rt_write_unlock(rwlock_t *rwlock)
  12721. +{
  12722. + /* NOTE: we always pass in '1' for nested, for simplicity */
  12723. + rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
  12724. + __rt_spin_unlock(&rwlock->lock);
  12725. + migrate_enable();
  12726. +}
  12727. +EXPORT_SYMBOL(rt_write_unlock);
  12728. +
  12729. +void __lockfunc rt_read_unlock(rwlock_t *rwlock)
  12730. +{
  12731. + /* Release the lock only when read_depth is down to 0 */
  12732. + if (--rwlock->read_depth == 0) {
  12733. + rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
  12734. + __rt_spin_unlock(&rwlock->lock);
  12735. + migrate_enable();
  12736. + }
  12737. +}
  12738. +EXPORT_SYMBOL(rt_read_unlock);
  12739. +
  12740. +unsigned long __lockfunc rt_write_lock_irqsave(rwlock_t *rwlock)
  12741. +{
  12742. + rt_write_lock(rwlock);
  12743. +
  12744. + return 0;
  12745. +}
  12746. +EXPORT_SYMBOL(rt_write_lock_irqsave);
  12747. +
  12748. +unsigned long __lockfunc rt_read_lock_irqsave(rwlock_t *rwlock)
  12749. +{
  12750. + rt_read_lock(rwlock);
  12751. +
  12752. + return 0;
  12753. +}
  12754. +EXPORT_SYMBOL(rt_read_lock_irqsave);
  12755. +
  12756. +void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key)
  12757. +{
  12758. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  12759. + /*
  12760. + * Make sure we are not reinitializing a held lock:
  12761. + */
  12762. + debug_check_no_locks_freed((void *)rwlock, sizeof(*rwlock));
  12763. + lockdep_init_map(&rwlock->dep_map, name, key, 0);
  12764. +#endif
  12765. + rwlock->lock.save_state = 1;
  12766. + rwlock->read_depth = 0;
  12767. +}
  12768. +EXPORT_SYMBOL(__rt_rwlock_init);
  12769. +
  12770. +/**
  12771. + * atomic_dec_and_mutex_lock - return holding mutex if we dec to 0
  12772. + * @cnt: the atomic which we are to dec
  12773. + * @lock: the mutex to return holding if we dec to 0
  12774. + *
  12775. + * return true and hold lock if we dec to 0, return false otherwise
  12776. + */
  12777. +int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock)
  12778. +{
  12779. + /* dec if we can't possibly hit 0 */
  12780. + if (atomic_add_unless(cnt, -1, 1))
  12781. + return 0;
  12782. + /* we might hit 0, so take the lock */
  12783. + mutex_lock(lock);
  12784. + if (!atomic_dec_and_test(cnt)) {
  12785. + /* when we actually did the dec, we didn't hit 0 */
  12786. + mutex_unlock(lock);
  12787. + return 0;
  12788. + }
  12789. + /* we hit 0, and we hold the lock */
  12790. + return 1;
  12791. +}
  12792. +EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
  12793. diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
  12794. index 62b6cee8ea7f..0613c4b1d059 100644
  12795. --- a/kernel/locking/rtmutex-debug.c
  12796. +++ b/kernel/locking/rtmutex-debug.c
  12797. @@ -173,12 +173,3 @@ void debug_rt_mutex_init(struct rt_mutex *lock, const char *name)
  12798. lock->name = name;
  12799. }
  12800. -void
  12801. -rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task)
  12802. -{
  12803. -}
  12804. -
  12805. -void rt_mutex_deadlock_account_unlock(struct task_struct *task)
  12806. -{
  12807. -}
  12808. -
  12809. diff --git a/kernel/locking/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h
  12810. index d0519c3432b6..b585af9a1b50 100644
  12811. --- a/kernel/locking/rtmutex-debug.h
  12812. +++ b/kernel/locking/rtmutex-debug.h
  12813. @@ -9,9 +9,6 @@
  12814. * This file contains macros used solely by rtmutex.c. Debug version.
  12815. */
  12816. -extern void
  12817. -rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
  12818. -extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
  12819. extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
  12820. extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
  12821. extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
  12822. diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
  12823. index 2c49d76f96c3..218f1d26afe7 100644
  12824. --- a/kernel/locking/rtmutex.c
  12825. +++ b/kernel/locking/rtmutex.c
  12826. @@ -7,6 +7,11 @@
  12827. * Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
  12828. * Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
  12829. * Copyright (C) 2006 Esben Nielsen
  12830. + * Adaptive Spinlocks:
  12831. + * Copyright (C) 2008 Novell, Inc., Gregory Haskins, Sven Dietrich,
  12832. + * and Peter Morreale,
  12833. + * Adaptive Spinlocks simplification:
  12834. + * Copyright (C) 2008 Red Hat, Inc., Steven Rostedt <srostedt@redhat.com>
  12835. *
  12836. * See Documentation/locking/rt-mutex-design.txt for details.
  12837. */
  12838. @@ -16,6 +21,7 @@
  12839. #include <linux/sched/rt.h>
  12840. #include <linux/sched/deadline.h>
  12841. #include <linux/timer.h>
  12842. +#include <linux/ww_mutex.h>
  12843. #include "rtmutex_common.h"
  12844. @@ -133,6 +139,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
  12845. WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
  12846. }
  12847. +static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
  12848. +{
  12849. + return waiter && waiter != PI_WAKEUP_INPROGRESS &&
  12850. + waiter != PI_REQUEUE_INPROGRESS;
  12851. +}
  12852. +
  12853. /*
  12854. * We can speed up the acquire/release, if there's no debugging state to be
  12855. * set up.
  12856. @@ -222,12 +234,25 @@ static inline bool unlock_rt_mutex_safe(struct rt_mutex *lock,
  12857. }
  12858. #endif
  12859. +#define STEAL_NORMAL 0
  12860. +#define STEAL_LATERAL 1
  12861. +/*
  12862. + * Only use with rt_mutex_waiter_{less,equal}()
  12863. + */
  12864. +#define task_to_waiter(p) \
  12865. + &(struct rt_mutex_waiter){ .prio = (p)->prio, .deadline = (p)->dl.deadline }
  12866. +
  12867. static inline int
  12868. rt_mutex_waiter_less(struct rt_mutex_waiter *left,
  12869. - struct rt_mutex_waiter *right)
  12870. + struct rt_mutex_waiter *right, int mode)
  12871. {
  12872. - if (left->prio < right->prio)
  12873. - return 1;
  12874. + if (mode == STEAL_NORMAL) {
  12875. + if (left->prio < right->prio)
  12876. + return 1;
  12877. + } else {
  12878. + if (left->prio <= right->prio)
  12879. + return 1;
  12880. + }
  12881. /*
  12882. * If both waiters have dl_prio(), we check the deadlines of the
  12883. @@ -236,12 +261,30 @@ rt_mutex_waiter_less(struct rt_mutex_waiter *left,
  12884. * then right waiter has a dl_prio() too.
  12885. */
  12886. if (dl_prio(left->prio))
  12887. - return dl_time_before(left->task->dl.deadline,
  12888. - right->task->dl.deadline);
  12889. + return dl_time_before(left->deadline, right->deadline);
  12890. return 0;
  12891. }
  12892. +static inline int
  12893. +rt_mutex_waiter_equal(struct rt_mutex_waiter *left,
  12894. + struct rt_mutex_waiter *right)
  12895. +{
  12896. + if (left->prio != right->prio)
  12897. + return 0;
  12898. +
  12899. + /*
  12900. + * If both waiters have dl_prio(), we check the deadlines of the
  12901. + * associated tasks.
  12902. + * If left waiter has a dl_prio(), and we didn't return 0 above,
  12903. + * then right waiter has a dl_prio() too.
  12904. + */
  12905. + if (dl_prio(left->prio))
  12906. + return left->deadline == right->deadline;
  12907. +
  12908. + return 1;
  12909. +}
  12910. +
  12911. static void
  12912. rt_mutex_enqueue(struct rt_mutex *lock, struct rt_mutex_waiter *waiter)
  12913. {
  12914. @@ -253,7 +296,7 @@ rt_mutex_enqueue(struct rt_mutex *lock, struct rt_mutex_waiter *waiter)
  12915. while (*link) {
  12916. parent = *link;
  12917. entry = rb_entry(parent, struct rt_mutex_waiter, tree_entry);
  12918. - if (rt_mutex_waiter_less(waiter, entry)) {
  12919. + if (rt_mutex_waiter_less(waiter, entry, STEAL_NORMAL)) {
  12920. link = &parent->rb_left;
  12921. } else {
  12922. link = &parent->rb_right;
  12923. @@ -292,7 +335,7 @@ rt_mutex_enqueue_pi(struct task_struct *task, struct rt_mutex_waiter *waiter)
  12924. while (*link) {
  12925. parent = *link;
  12926. entry = rb_entry(parent, struct rt_mutex_waiter, pi_tree_entry);
  12927. - if (rt_mutex_waiter_less(waiter, entry)) {
  12928. + if (rt_mutex_waiter_less(waiter, entry, STEAL_NORMAL)) {
  12929. link = &parent->rb_left;
  12930. } else {
  12931. link = &parent->rb_right;
  12932. @@ -320,72 +363,16 @@ rt_mutex_dequeue_pi(struct task_struct *task, struct rt_mutex_waiter *waiter)
  12933. RB_CLEAR_NODE(&waiter->pi_tree_entry);
  12934. }
  12935. -/*
  12936. - * Calculate task priority from the waiter tree priority
  12937. - *
  12938. - * Return task->normal_prio when the waiter tree is empty or when
  12939. - * the waiter is not allowed to do priority boosting
  12940. - */
  12941. -int rt_mutex_getprio(struct task_struct *task)
  12942. +static void rt_mutex_adjust_prio(struct task_struct *p)
  12943. {
  12944. - if (likely(!task_has_pi_waiters(task)))
  12945. - return task->normal_prio;
  12946. + struct task_struct *pi_task = NULL;
  12947. - return min(task_top_pi_waiter(task)->prio,
  12948. - task->normal_prio);
  12949. -}
  12950. + lockdep_assert_held(&p->pi_lock);
  12951. -struct task_struct *rt_mutex_get_top_task(struct task_struct *task)
  12952. -{
  12953. - if (likely(!task_has_pi_waiters(task)))
  12954. - return NULL;
  12955. + if (task_has_pi_waiters(p))
  12956. + pi_task = task_top_pi_waiter(p)->task;
  12957. - return task_top_pi_waiter(task)->task;
  12958. -}
  12959. -
  12960. -/*
  12961. - * Called by sched_setscheduler() to get the priority which will be
  12962. - * effective after the change.
  12963. - */
  12964. -int rt_mutex_get_effective_prio(struct task_struct *task, int newprio)
  12965. -{
  12966. - if (!task_has_pi_waiters(task))
  12967. - return newprio;
  12968. -
  12969. - if (task_top_pi_waiter(task)->task->prio <= newprio)
  12970. - return task_top_pi_waiter(task)->task->prio;
  12971. - return newprio;
  12972. -}
  12973. -
  12974. -/*
  12975. - * Adjust the priority of a task, after its pi_waiters got modified.
  12976. - *
  12977. - * This can be both boosting and unboosting. task->pi_lock must be held.
  12978. - */
  12979. -static void __rt_mutex_adjust_prio(struct task_struct *task)
  12980. -{
  12981. - int prio = rt_mutex_getprio(task);
  12982. -
  12983. - if (task->prio != prio || dl_prio(prio))
  12984. - rt_mutex_setprio(task, prio);
  12985. -}
  12986. -
  12987. -/*
  12988. - * Adjust task priority (undo boosting). Called from the exit path of
  12989. - * rt_mutex_slowunlock() and rt_mutex_slowlock().
  12990. - *
  12991. - * (Note: We do this outside of the protection of lock->wait_lock to
  12992. - * allow the lock to be taken while or before we readjust the priority
  12993. - * of task. We do not use the spin_xx_mutex() variants here as we are
  12994. - * outside of the debug path.)
  12995. - */
  12996. -void rt_mutex_adjust_prio(struct task_struct *task)
  12997. -{
  12998. - unsigned long flags;
  12999. -
  13000. - raw_spin_lock_irqsave(&task->pi_lock, flags);
  13001. - __rt_mutex_adjust_prio(task);
  13002. - raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  13003. + rt_mutex_setprio(p, pi_task);
  13004. }
  13005. /*
  13006. @@ -414,6 +401,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter,
  13007. return debug_rt_mutex_detect_deadlock(waiter, chwalk);
  13008. }
  13009. +static void rt_mutex_wake_waiter(struct rt_mutex_waiter *waiter)
  13010. +{
  13011. + if (waiter->savestate)
  13012. + wake_up_lock_sleeper(waiter->task);
  13013. + else
  13014. + wake_up_process(waiter->task);
  13015. +}
  13016. +
  13017. /*
  13018. * Max number of times we'll walk the boosting chain:
  13019. */
  13020. @@ -421,7 +416,8 @@ int max_lock_depth = 1024;
  13021. static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
  13022. {
  13023. - return p->pi_blocked_on ? p->pi_blocked_on->lock : NULL;
  13024. + return rt_mutex_real_waiter(p->pi_blocked_on) ?
  13025. + p->pi_blocked_on->lock : NULL;
  13026. }
  13027. /*
  13028. @@ -557,7 +553,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13029. * reached or the state of the chain has changed while we
  13030. * dropped the locks.
  13031. */
  13032. - if (!waiter)
  13033. + if (!rt_mutex_real_waiter(waiter))
  13034. goto out_unlock_pi;
  13035. /*
  13036. @@ -608,7 +604,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13037. * enabled we continue, but stop the requeueing in the chain
  13038. * walk.
  13039. */
  13040. - if (waiter->prio == task->prio) {
  13041. + if (rt_mutex_waiter_equal(waiter, task_to_waiter(task))) {
  13042. if (!detect_deadlock)
  13043. goto out_unlock_pi;
  13044. else
  13045. @@ -704,7 +700,26 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13046. /* [7] Requeue the waiter in the lock waiter tree. */
  13047. rt_mutex_dequeue(lock, waiter);
  13048. +
  13049. + /*
  13050. + * Update the waiter prio fields now that we're dequeued.
  13051. + *
  13052. + * These values can have changed through either:
  13053. + *
  13054. + * sys_sched_set_scheduler() / sys_sched_setattr()
  13055. + *
  13056. + * or
  13057. + *
  13058. + * DL CBS enforcement advancing the effective deadline.
  13059. + *
  13060. + * Even though pi_waiters also uses these fields, and that tree is only
  13061. + * updated in [11], we can do this here, since we hold [L], which
  13062. + * serializes all pi_waiters access and rb_erase() does not care about
  13063. + * the values of the node being removed.
  13064. + */
  13065. waiter->prio = task->prio;
  13066. + waiter->deadline = task->dl.deadline;
  13067. +
  13068. rt_mutex_enqueue(lock, waiter);
  13069. /* [8] Release the task */
  13070. @@ -719,13 +734,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13071. * follow here. This is the end of the chain we are walking.
  13072. */
  13073. if (!rt_mutex_owner(lock)) {
  13074. + struct rt_mutex_waiter *lock_top_waiter;
  13075. +
  13076. /*
  13077. * If the requeue [7] above changed the top waiter,
  13078. * then we need to wake the new top waiter up to try
  13079. * to get the lock.
  13080. */
  13081. - if (prerequeue_top_waiter != rt_mutex_top_waiter(lock))
  13082. - wake_up_process(rt_mutex_top_waiter(lock)->task);
  13083. + lock_top_waiter = rt_mutex_top_waiter(lock);
  13084. + if (prerequeue_top_waiter != lock_top_waiter)
  13085. + rt_mutex_wake_waiter(lock_top_waiter);
  13086. raw_spin_unlock_irq(&lock->wait_lock);
  13087. return 0;
  13088. }
  13089. @@ -745,7 +763,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13090. */
  13091. rt_mutex_dequeue_pi(task, prerequeue_top_waiter);
  13092. rt_mutex_enqueue_pi(task, waiter);
  13093. - __rt_mutex_adjust_prio(task);
  13094. + rt_mutex_adjust_prio(task);
  13095. } else if (prerequeue_top_waiter == waiter) {
  13096. /*
  13097. @@ -761,7 +779,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13098. rt_mutex_dequeue_pi(task, waiter);
  13099. waiter = rt_mutex_top_waiter(lock);
  13100. rt_mutex_enqueue_pi(task, waiter);
  13101. - __rt_mutex_adjust_prio(task);
  13102. + rt_mutex_adjust_prio(task);
  13103. } else {
  13104. /*
  13105. * Nothing changed. No need to do any priority
  13106. @@ -818,6 +836,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13107. return ret;
  13108. }
  13109. +
  13110. /*
  13111. * Try to take an rt-mutex
  13112. *
  13113. @@ -828,9 +847,12 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
  13114. * @waiter: The waiter that is queued to the lock's wait tree if the
  13115. * callsite called task_blocked_on_lock(), otherwise NULL
  13116. */
  13117. -static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
  13118. - struct rt_mutex_waiter *waiter)
  13119. +static int __try_to_take_rt_mutex(struct rt_mutex *lock,
  13120. + struct task_struct *task,
  13121. + struct rt_mutex_waiter *waiter, int mode)
  13122. {
  13123. + lockdep_assert_held(&lock->wait_lock);
  13124. +
  13125. /*
  13126. * Before testing whether we can acquire @lock, we set the
  13127. * RT_MUTEX_HAS_WAITERS bit in @lock->owner. This forces all
  13128. @@ -866,8 +888,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
  13129. * If waiter is not the highest priority waiter of
  13130. * @lock, give up.
  13131. */
  13132. - if (waiter != rt_mutex_top_waiter(lock))
  13133. + if (waiter != rt_mutex_top_waiter(lock)) {
  13134. + /* XXX rt_mutex_waiter_less() ? */
  13135. return 0;
  13136. + }
  13137. /*
  13138. * We can acquire the lock. Remove the waiter from the
  13139. @@ -885,14 +909,26 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
  13140. * not need to be dequeued.
  13141. */
  13142. if (rt_mutex_has_waiters(lock)) {
  13143. + struct task_struct *pown = rt_mutex_top_waiter(lock)->task;
  13144. +
  13145. + if (task != pown)
  13146. + return 0;
  13147. +
  13148. + /*
  13149. + * Note that RT tasks are excluded from lateral-steals
  13150. + * to prevent the introduction of an unbounded latency.
  13151. + */
  13152. + if (rt_task(task))
  13153. + mode = STEAL_NORMAL;
  13154. /*
  13155. * If @task->prio is greater than or equal to
  13156. * the top waiter priority (kernel view),
  13157. * @task lost.
  13158. */
  13159. - if (task->prio >= rt_mutex_top_waiter(lock)->prio)
  13160. + if (!rt_mutex_waiter_less(task_to_waiter(task),
  13161. + rt_mutex_top_waiter(lock),
  13162. + mode))
  13163. return 0;
  13164. -
  13165. /*
  13166. * The current top waiter stays enqueued. We
  13167. * don't have to change anything in the lock
  13168. @@ -936,11 +972,384 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
  13169. */
  13170. rt_mutex_set_owner(lock, task);
  13171. - rt_mutex_deadlock_account_lock(lock, task);
  13172. -
  13173. return 1;
  13174. }
  13175. +#ifdef CONFIG_PREEMPT_RT_FULL
  13176. +/*
  13177. + * preemptible spin_lock functions:
  13178. + */
  13179. +static inline void rt_spin_lock_fastlock(struct rt_mutex *lock,
  13180. + void (*slowfn)(struct rt_mutex *lock,
  13181. + bool mg_off),
  13182. + bool do_mig_dis)
  13183. +{
  13184. + might_sleep_no_state_check();
  13185. +
  13186. + if (do_mig_dis)
  13187. + migrate_disable();
  13188. +
  13189. + if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
  13190. + return;
  13191. + else
  13192. + slowfn(lock, do_mig_dis);
  13193. +}
  13194. +
  13195. +static inline void rt_spin_lock_fastunlock(struct rt_mutex *lock,
  13196. + void (*slowfn)(struct rt_mutex *lock))
  13197. +{
  13198. + if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
  13199. + return;
  13200. + else
  13201. + slowfn(lock);
  13202. +}
  13203. +#ifdef CONFIG_SMP
  13204. +/*
  13205. + * Note that owner is a speculative pointer and dereferencing relies
  13206. + * on rcu_read_lock() and the check against the lock owner.
  13207. + */
  13208. +static int adaptive_wait(struct rt_mutex *lock,
  13209. + struct task_struct *owner)
  13210. +{
  13211. + int res = 0;
  13212. +
  13213. + rcu_read_lock();
  13214. + for (;;) {
  13215. + if (owner != rt_mutex_owner(lock))
  13216. + break;
  13217. + /*
  13218. + * Ensure that owner->on_cpu is dereferenced _after_
  13219. + * checking the above to be valid.
  13220. + */
  13221. + barrier();
  13222. + if (!owner->on_cpu) {
  13223. + res = 1;
  13224. + break;
  13225. + }
  13226. + cpu_relax();
  13227. + }
  13228. + rcu_read_unlock();
  13229. + return res;
  13230. +}
  13231. +#else
  13232. +static int adaptive_wait(struct rt_mutex *lock,
  13233. + struct task_struct *orig_owner)
  13234. +{
  13235. + return 1;
  13236. +}
  13237. +#endif
  13238. +
  13239. +static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
  13240. + struct rt_mutex_waiter *waiter,
  13241. + struct task_struct *task,
  13242. + enum rtmutex_chainwalk chwalk);
  13243. +/*
  13244. + * Slow path lock function spin_lock style: this variant is very
  13245. + * careful not to miss any non-lock wakeups.
  13246. + *
  13247. + * We store the current state under p->pi_lock in p->saved_state and
  13248. + * the try_to_wake_up() code handles this accordingly.
  13249. + */
  13250. +static void noinline __sched rt_spin_lock_slowlock(struct rt_mutex *lock,
  13251. + bool mg_off)
  13252. +{
  13253. + struct task_struct *lock_owner, *self = current;
  13254. + struct rt_mutex_waiter waiter, *top_waiter;
  13255. + unsigned long flags;
  13256. + int ret;
  13257. +
  13258. + rt_mutex_init_waiter(&waiter, true);
  13259. +
  13260. + raw_spin_lock_irqsave(&lock->wait_lock, flags);
  13261. +
  13262. + if (__try_to_take_rt_mutex(lock, self, NULL, STEAL_LATERAL)) {
  13263. + raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13264. + return;
  13265. + }
  13266. +
  13267. + BUG_ON(rt_mutex_owner(lock) == self);
  13268. +
  13269. + /*
  13270. + * We save whatever state the task is in and we'll restore it
  13271. + * after acquiring the lock taking real wakeups into account
  13272. + * as well. We are serialized via pi_lock against wakeups. See
  13273. + * try_to_wake_up().
  13274. + */
  13275. + raw_spin_lock(&self->pi_lock);
  13276. + self->saved_state = self->state;
  13277. + __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
  13278. + raw_spin_unlock(&self->pi_lock);
  13279. +
  13280. + ret = task_blocks_on_rt_mutex(lock, &waiter, self, RT_MUTEX_MIN_CHAINWALK);
  13281. + BUG_ON(ret);
  13282. +
  13283. + for (;;) {
  13284. + /* Try to acquire the lock again. */
  13285. + if (__try_to_take_rt_mutex(lock, self, &waiter, STEAL_LATERAL))
  13286. + break;
  13287. +
  13288. + top_waiter = rt_mutex_top_waiter(lock);
  13289. + lock_owner = rt_mutex_owner(lock);
  13290. +
  13291. + raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13292. +
  13293. + debug_rt_mutex_print_deadlock(&waiter);
  13294. +
  13295. + if (top_waiter != &waiter || adaptive_wait(lock, lock_owner)) {
  13296. + if (mg_off)
  13297. + migrate_enable();
  13298. + schedule();
  13299. + if (mg_off)
  13300. + migrate_disable();
  13301. + }
  13302. +
  13303. + raw_spin_lock_irqsave(&lock->wait_lock, flags);
  13304. +
  13305. + raw_spin_lock(&self->pi_lock);
  13306. + __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
  13307. + raw_spin_unlock(&self->pi_lock);
  13308. + }
  13309. +
  13310. + /*
  13311. + * Restore the task state to current->saved_state. We set it
  13312. + * to the original state above and the try_to_wake_up() code
  13313. + * has possibly updated it when a real (non-rtmutex) wakeup
  13314. + * happened while we were blocked. Clear saved_state so
  13315. + * try_to_wakeup() does not get confused.
  13316. + */
  13317. + raw_spin_lock(&self->pi_lock);
  13318. + __set_current_state_no_track(self->saved_state);
  13319. + self->saved_state = TASK_RUNNING;
  13320. + raw_spin_unlock(&self->pi_lock);
  13321. +
  13322. + /*
  13323. + * try_to_take_rt_mutex() sets the waiter bit
  13324. + * unconditionally. We might have to fix that up:
  13325. + */
  13326. + fixup_rt_mutex_waiters(lock);
  13327. +
  13328. + BUG_ON(rt_mutex_has_waiters(lock) && &waiter == rt_mutex_top_waiter(lock));
  13329. + BUG_ON(!RB_EMPTY_NODE(&waiter.tree_entry));
  13330. +
  13331. + raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13332. +
  13333. + debug_rt_mutex_free_waiter(&waiter);
  13334. +}
  13335. +
  13336. +static bool __sched __rt_mutex_unlock_common(struct rt_mutex *lock,
  13337. + struct wake_q_head *wake_q,
  13338. + struct wake_q_head *wq_sleeper);
  13339. +/*
  13340. + * Slow path to release a rt_mutex spin_lock style
  13341. + */
  13342. +static void noinline __sched rt_spin_lock_slowunlock(struct rt_mutex *lock)
  13343. +{
  13344. + unsigned long flags;
  13345. + WAKE_Q(wake_q);
  13346. + WAKE_Q(wake_sleeper_q);
  13347. + bool postunlock;
  13348. +
  13349. + raw_spin_lock_irqsave(&lock->wait_lock, flags);
  13350. + postunlock = __rt_mutex_unlock_common(lock, &wake_q, &wake_sleeper_q);
  13351. + raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13352. +
  13353. + if (postunlock)
  13354. + rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
  13355. +}
  13356. +
  13357. +void __lockfunc rt_spin_lock__no_mg(spinlock_t *lock)
  13358. +{
  13359. + rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, false);
  13360. + spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
  13361. +}
  13362. +EXPORT_SYMBOL(rt_spin_lock__no_mg);
  13363. +
  13364. +void __lockfunc rt_spin_lock(spinlock_t *lock)
  13365. +{
  13366. + rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, true);
  13367. + spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
  13368. +}
  13369. +EXPORT_SYMBOL(rt_spin_lock);
  13370. +
  13371. +void __lockfunc __rt_spin_lock(struct rt_mutex *lock)
  13372. +{
  13373. + rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, true);
  13374. +}
  13375. +EXPORT_SYMBOL(__rt_spin_lock);
  13376. +
  13377. +void __lockfunc __rt_spin_lock__no_mg(struct rt_mutex *lock)
  13378. +{
  13379. + rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, false);
  13380. +}
  13381. +EXPORT_SYMBOL(__rt_spin_lock__no_mg);
  13382. +
  13383. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  13384. +void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass)
  13385. +{
  13386. + spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
  13387. + rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, true);
  13388. +}
  13389. +EXPORT_SYMBOL(rt_spin_lock_nested);
  13390. +#endif
  13391. +
  13392. +void __lockfunc rt_spin_unlock__no_mg(spinlock_t *lock)
  13393. +{
  13394. + /* NOTE: we always pass in '1' for nested, for simplicity */
  13395. + spin_release(&lock->dep_map, 1, _RET_IP_);
  13396. + rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
  13397. +}
  13398. +EXPORT_SYMBOL(rt_spin_unlock__no_mg);
  13399. +
  13400. +void __lockfunc rt_spin_unlock(spinlock_t *lock)
  13401. +{
  13402. + /* NOTE: we always pass in '1' for nested, for simplicity */
  13403. + spin_release(&lock->dep_map, 1, _RET_IP_);
  13404. + rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
  13405. + migrate_enable();
  13406. +}
  13407. +EXPORT_SYMBOL(rt_spin_unlock);
  13408. +
  13409. +void __lockfunc __rt_spin_unlock(struct rt_mutex *lock)
  13410. +{
  13411. + rt_spin_lock_fastunlock(lock, rt_spin_lock_slowunlock);
  13412. +}
  13413. +EXPORT_SYMBOL(__rt_spin_unlock);
  13414. +
  13415. +/*
  13416. + * Wait for the lock to get unlocked: instead of polling for an unlock
  13417. + * (like raw spinlocks do), we lock and unlock, to force the kernel to
  13418. + * schedule if there's contention:
  13419. + */
  13420. +void __lockfunc rt_spin_unlock_wait(spinlock_t *lock)
  13421. +{
  13422. + spin_lock(lock);
  13423. + spin_unlock(lock);
  13424. +}
  13425. +EXPORT_SYMBOL(rt_spin_unlock_wait);
  13426. +
  13427. +int __lockfunc rt_spin_trylock__no_mg(spinlock_t *lock)
  13428. +{
  13429. + int ret;
  13430. +
  13431. + ret = rt_mutex_trylock(&lock->lock);
  13432. + if (ret)
  13433. + spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
  13434. + return ret;
  13435. +}
  13436. +EXPORT_SYMBOL(rt_spin_trylock__no_mg);
  13437. +
  13438. +int __lockfunc rt_spin_trylock(spinlock_t *lock)
  13439. +{
  13440. + int ret;
  13441. +
  13442. + migrate_disable();
  13443. + ret = rt_mutex_trylock(&lock->lock);
  13444. + if (ret)
  13445. + spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
  13446. + else
  13447. + migrate_enable();
  13448. + return ret;
  13449. +}
  13450. +EXPORT_SYMBOL(rt_spin_trylock);
  13451. +
  13452. +int __lockfunc rt_spin_trylock_bh(spinlock_t *lock)
  13453. +{
  13454. + int ret;
  13455. +
  13456. + local_bh_disable();
  13457. + ret = rt_mutex_trylock(&lock->lock);
  13458. + if (ret) {
  13459. + migrate_disable();
  13460. + spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
  13461. + } else
  13462. + local_bh_enable();
  13463. + return ret;
  13464. +}
  13465. +EXPORT_SYMBOL(rt_spin_trylock_bh);
  13466. +
  13467. +int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags)
  13468. +{
  13469. + int ret;
  13470. +
  13471. + *flags = 0;
  13472. + ret = rt_mutex_trylock(&lock->lock);
  13473. + if (ret) {
  13474. + migrate_disable();
  13475. + spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
  13476. + }
  13477. + return ret;
  13478. +}
  13479. +EXPORT_SYMBOL(rt_spin_trylock_irqsave);
  13480. +
  13481. +int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock)
  13482. +{
  13483. + /* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
  13484. + if (atomic_add_unless(atomic, -1, 1))
  13485. + return 0;
  13486. + rt_spin_lock(lock);
  13487. + if (atomic_dec_and_test(atomic))
  13488. + return 1;
  13489. + rt_spin_unlock(lock);
  13490. + return 0;
  13491. +}
  13492. +EXPORT_SYMBOL(atomic_dec_and_spin_lock);
  13493. +
  13494. + void
  13495. +__rt_spin_lock_init(spinlock_t *lock, char *name, struct lock_class_key *key)
  13496. +{
  13497. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  13498. + /*
  13499. + * Make sure we are not reinitializing a held lock:
  13500. + */
  13501. + debug_check_no_locks_freed((void *)lock, sizeof(*lock));
  13502. + lockdep_init_map(&lock->dep_map, name, key, 0);
  13503. +#endif
  13504. +}
  13505. +EXPORT_SYMBOL(__rt_spin_lock_init);
  13506. +
  13507. +#endif /* PREEMPT_RT_FULL */
  13508. +
  13509. +#ifdef CONFIG_PREEMPT_RT_FULL
  13510. + static inline int __sched
  13511. +__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
  13512. +{
  13513. + struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
  13514. + struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx);
  13515. +
  13516. + if (!hold_ctx)
  13517. + return 0;
  13518. +
  13519. + if (unlikely(ctx == hold_ctx))
  13520. + return -EALREADY;
  13521. +
  13522. + if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
  13523. + (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
  13524. +#ifdef CONFIG_DEBUG_MUTEXES
  13525. + DEBUG_LOCKS_WARN_ON(ctx->contending_lock);
  13526. + ctx->contending_lock = ww;
  13527. +#endif
  13528. + return -EDEADLK;
  13529. + }
  13530. +
  13531. + return 0;
  13532. +}
  13533. +#else
  13534. + static inline int __sched
  13535. +__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
  13536. +{
  13537. + BUG();
  13538. + return 0;
  13539. +}
  13540. +
  13541. +#endif
  13542. +
  13543. +static inline int
  13544. +try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
  13545. + struct rt_mutex_waiter *waiter)
  13546. +{
  13547. + return __try_to_take_rt_mutex(lock, task, waiter, STEAL_NORMAL);
  13548. +}
  13549. +
  13550. /*
  13551. * Task blocks on lock.
  13552. *
  13553. @@ -958,6 +1367,8 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
  13554. struct rt_mutex *next_lock;
  13555. int chain_walk = 0, res;
  13556. + lockdep_assert_held(&lock->wait_lock);
  13557. +
  13558. /*
  13559. * Early deadlock detection. We really don't want the task to
  13560. * enqueue on itself just to untangle the mess later. It's not
  13561. @@ -971,10 +1382,28 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
  13562. return -EDEADLK;
  13563. raw_spin_lock(&task->pi_lock);
  13564. - __rt_mutex_adjust_prio(task);
  13565. +
  13566. + /*
  13567. + * In the case of futex requeue PI, this will be a proxy
  13568. + * lock. The task will wake unaware that it is enqueueed on
  13569. + * this lock. Avoid blocking on two locks and corrupting
  13570. + * pi_blocked_on via the PI_WAKEUP_INPROGRESS
  13571. + * flag. futex_wait_requeue_pi() sets this when it wakes up
  13572. + * before requeue (due to a signal or timeout). Do not enqueue
  13573. + * the task if PI_WAKEUP_INPROGRESS is set.
  13574. + */
  13575. + if (task != current && task->pi_blocked_on == PI_WAKEUP_INPROGRESS) {
  13576. + raw_spin_unlock(&task->pi_lock);
  13577. + return -EAGAIN;
  13578. + }
  13579. +
  13580. + BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on));
  13581. +
  13582. + rt_mutex_adjust_prio(task);
  13583. waiter->task = task;
  13584. waiter->lock = lock;
  13585. waiter->prio = task->prio;
  13586. + waiter->deadline = task->dl.deadline;
  13587. /* Get the top priority waiter on the lock */
  13588. if (rt_mutex_has_waiters(lock))
  13589. @@ -993,8 +1422,8 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
  13590. rt_mutex_dequeue_pi(owner, top_waiter);
  13591. rt_mutex_enqueue_pi(owner, waiter);
  13592. - __rt_mutex_adjust_prio(owner);
  13593. - if (owner->pi_blocked_on)
  13594. + rt_mutex_adjust_prio(owner);
  13595. + if (rt_mutex_real_waiter(owner->pi_blocked_on))
  13596. chain_walk = 1;
  13597. } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
  13598. chain_walk = 1;
  13599. @@ -1036,6 +1465,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
  13600. * Called with lock->wait_lock held and interrupts disabled.
  13601. */
  13602. static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
  13603. + struct wake_q_head *wake_sleeper_q,
  13604. struct rt_mutex *lock)
  13605. {
  13606. struct rt_mutex_waiter *waiter;
  13607. @@ -1045,12 +1475,14 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
  13608. waiter = rt_mutex_top_waiter(lock);
  13609. /*
  13610. - * Remove it from current->pi_waiters. We do not adjust a
  13611. - * possible priority boost right now. We execute wakeup in the
  13612. - * boosted mode and go back to normal after releasing
  13613. - * lock->wait_lock.
  13614. + * Remove it from current->pi_waiters and deboost.
  13615. + *
  13616. + * We must in fact deboost here in order to ensure we call
  13617. + * rt_mutex_setprio() to update p->pi_top_task before the
  13618. + * task unblocks.
  13619. */
  13620. rt_mutex_dequeue_pi(current, waiter);
  13621. + rt_mutex_adjust_prio(current);
  13622. /*
  13623. * As we are waking up the top waiter, and the waiter stays
  13624. @@ -1062,9 +1494,22 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
  13625. */
  13626. lock->owner = (void *) RT_MUTEX_HAS_WAITERS;
  13627. + /*
  13628. + * We deboosted before waking the top waiter task such that we don't
  13629. + * run two tasks with the 'same' priority (and ensure the
  13630. + * p->pi_top_task pointer points to a blocked task). This however can
  13631. + * lead to priority inversion if we would get preempted after the
  13632. + * deboost but before waking our donor task, hence the preempt_disable()
  13633. + * before unlock.
  13634. + *
  13635. + * Pairs with preempt_enable() in rt_mutex_postunlock();
  13636. + */
  13637. + preempt_disable();
  13638. + if (waiter->savestate)
  13639. + wake_q_add(wake_sleeper_q, waiter->task);
  13640. + else
  13641. + wake_q_add(wake_q, waiter->task);
  13642. raw_spin_unlock(&current->pi_lock);
  13643. -
  13644. - wake_q_add(wake_q, waiter->task);
  13645. }
  13646. /*
  13647. @@ -1078,7 +1523,9 @@ static void remove_waiter(struct rt_mutex *lock,
  13648. {
  13649. bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
  13650. struct task_struct *owner = rt_mutex_owner(lock);
  13651. - struct rt_mutex *next_lock;
  13652. + struct rt_mutex *next_lock = NULL;
  13653. +
  13654. + lockdep_assert_held(&lock->wait_lock);
  13655. raw_spin_lock(&current->pi_lock);
  13656. rt_mutex_dequeue(lock, waiter);
  13657. @@ -1099,10 +1546,11 @@ static void remove_waiter(struct rt_mutex *lock,
  13658. if (rt_mutex_has_waiters(lock))
  13659. rt_mutex_enqueue_pi(owner, rt_mutex_top_waiter(lock));
  13660. - __rt_mutex_adjust_prio(owner);
  13661. + rt_mutex_adjust_prio(owner);
  13662. /* Store the lock on which owner is blocked or NULL */
  13663. - next_lock = task_blocked_on_lock(owner);
  13664. + if (rt_mutex_real_waiter(owner->pi_blocked_on))
  13665. + next_lock = task_blocked_on_lock(owner);
  13666. raw_spin_unlock(&owner->pi_lock);
  13667. @@ -1138,21 +1586,30 @@ void rt_mutex_adjust_pi(struct task_struct *task)
  13668. raw_spin_lock_irqsave(&task->pi_lock, flags);
  13669. waiter = task->pi_blocked_on;
  13670. - if (!waiter || (waiter->prio == task->prio &&
  13671. - !dl_prio(task->prio))) {
  13672. + if (!rt_mutex_real_waiter(waiter) ||
  13673. + rt_mutex_waiter_equal(waiter, task_to_waiter(task))) {
  13674. raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  13675. return;
  13676. }
  13677. next_lock = waiter->lock;
  13678. - raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  13679. /* gets dropped in rt_mutex_adjust_prio_chain()! */
  13680. get_task_struct(task);
  13681. + raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  13682. rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
  13683. next_lock, NULL, task);
  13684. }
  13685. +void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savestate)
  13686. +{
  13687. + debug_rt_mutex_init_waiter(waiter);
  13688. + RB_CLEAR_NODE(&waiter->pi_tree_entry);
  13689. + RB_CLEAR_NODE(&waiter->tree_entry);
  13690. + waiter->task = NULL;
  13691. + waiter->savestate = savestate;
  13692. +}
  13693. +
  13694. /**
  13695. * __rt_mutex_slowlock() - Perform the wait-wake-try-to-take loop
  13696. * @lock: the rt_mutex to take
  13697. @@ -1166,7 +1623,8 @@ void rt_mutex_adjust_pi(struct task_struct *task)
  13698. static int __sched
  13699. __rt_mutex_slowlock(struct rt_mutex *lock, int state,
  13700. struct hrtimer_sleeper *timeout,
  13701. - struct rt_mutex_waiter *waiter)
  13702. + struct rt_mutex_waiter *waiter,
  13703. + struct ww_acquire_ctx *ww_ctx)
  13704. {
  13705. int ret = 0;
  13706. @@ -1175,16 +1633,17 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
  13707. if (try_to_take_rt_mutex(lock, current, waiter))
  13708. break;
  13709. - /*
  13710. - * TASK_INTERRUPTIBLE checks for signals and
  13711. - * timeout. Ignored otherwise.
  13712. - */
  13713. - if (unlikely(state == TASK_INTERRUPTIBLE)) {
  13714. - /* Signal pending? */
  13715. - if (signal_pending(current))
  13716. - ret = -EINTR;
  13717. - if (timeout && !timeout->task)
  13718. - ret = -ETIMEDOUT;
  13719. + if (timeout && !timeout->task) {
  13720. + ret = -ETIMEDOUT;
  13721. + break;
  13722. + }
  13723. + if (signal_pending_state(state, current)) {
  13724. + ret = -EINTR;
  13725. + break;
  13726. + }
  13727. +
  13728. + if (ww_ctx && ww_ctx->acquired > 0) {
  13729. + ret = __mutex_lock_check_stamp(lock, ww_ctx);
  13730. if (ret)
  13731. break;
  13732. }
  13733. @@ -1223,21 +1682,148 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
  13734. }
  13735. }
  13736. +static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
  13737. + struct ww_acquire_ctx *ww_ctx)
  13738. +{
  13739. +#ifdef CONFIG_DEBUG_MUTEXES
  13740. + /*
  13741. + * If this WARN_ON triggers, you used ww_mutex_lock to acquire,
  13742. + * but released with a normal mutex_unlock in this call.
  13743. + *
  13744. + * This should never happen, always use ww_mutex_unlock.
  13745. + */
  13746. + DEBUG_LOCKS_WARN_ON(ww->ctx);
  13747. +
  13748. + /*
  13749. + * Not quite done after calling ww_acquire_done() ?
  13750. + */
  13751. + DEBUG_LOCKS_WARN_ON(ww_ctx->done_acquire);
  13752. +
  13753. + if (ww_ctx->contending_lock) {
  13754. + /*
  13755. + * After -EDEADLK you tried to
  13756. + * acquire a different ww_mutex? Bad!
  13757. + */
  13758. + DEBUG_LOCKS_WARN_ON(ww_ctx->contending_lock != ww);
  13759. +
  13760. + /*
  13761. + * You called ww_mutex_lock after receiving -EDEADLK,
  13762. + * but 'forgot' to unlock everything else first?
  13763. + */
  13764. + DEBUG_LOCKS_WARN_ON(ww_ctx->acquired > 0);
  13765. + ww_ctx->contending_lock = NULL;
  13766. + }
  13767. +
  13768. + /*
  13769. + * Naughty, using a different class will lead to undefined behavior!
  13770. + */
  13771. + DEBUG_LOCKS_WARN_ON(ww_ctx->ww_class != ww->ww_class);
  13772. +#endif
  13773. + ww_ctx->acquired++;
  13774. +}
  13775. +
  13776. +#ifdef CONFIG_PREEMPT_RT_FULL
  13777. +static void ww_mutex_account_lock(struct rt_mutex *lock,
  13778. + struct ww_acquire_ctx *ww_ctx)
  13779. +{
  13780. + struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
  13781. + struct rt_mutex_waiter *waiter, *n;
  13782. +
  13783. + /*
  13784. + * This branch gets optimized out for the common case,
  13785. + * and is only important for ww_mutex_lock.
  13786. + */
  13787. + ww_mutex_lock_acquired(ww, ww_ctx);
  13788. + ww->ctx = ww_ctx;
  13789. +
  13790. + /*
  13791. + * Give any possible sleeping processes the chance to wake up,
  13792. + * so they can recheck if they have to back off.
  13793. + */
  13794. + rbtree_postorder_for_each_entry_safe(waiter, n, &lock->waiters,
  13795. + tree_entry) {
  13796. + /* XXX debug rt mutex waiter wakeup */
  13797. +
  13798. + BUG_ON(waiter->lock != lock);
  13799. + rt_mutex_wake_waiter(waiter);
  13800. + }
  13801. +}
  13802. +
  13803. +#else
  13804. +
  13805. +static void ww_mutex_account_lock(struct rt_mutex *lock,
  13806. + struct ww_acquire_ctx *ww_ctx)
  13807. +{
  13808. + BUG();
  13809. +}
  13810. +#endif
  13811. +
  13812. +int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
  13813. + struct hrtimer_sleeper *timeout,
  13814. + enum rtmutex_chainwalk chwalk,
  13815. + struct ww_acquire_ctx *ww_ctx,
  13816. + struct rt_mutex_waiter *waiter)
  13817. +{
  13818. + int ret;
  13819. +
  13820. + /* Try to acquire the lock again: */
  13821. + if (try_to_take_rt_mutex(lock, current, NULL)) {
  13822. + if (ww_ctx)
  13823. + ww_mutex_account_lock(lock, ww_ctx);
  13824. + return 0;
  13825. + }
  13826. +
  13827. + set_current_state(state);
  13828. +
  13829. + /* Setup the timer, when timeout != NULL */
  13830. + if (unlikely(timeout))
  13831. + hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
  13832. +
  13833. + ret = task_blocks_on_rt_mutex(lock, waiter, current, chwalk);
  13834. +
  13835. + if (likely(!ret)) {
  13836. + /* sleep on the mutex */
  13837. + ret = __rt_mutex_slowlock(lock, state, timeout, waiter,
  13838. + ww_ctx);
  13839. + } else if (ww_ctx) {
  13840. + /* ww_mutex received EDEADLK, let it become EALREADY */
  13841. + ret = __mutex_lock_check_stamp(lock, ww_ctx);
  13842. + BUG_ON(!ret);
  13843. + }
  13844. +
  13845. + if (unlikely(ret)) {
  13846. + __set_current_state(TASK_RUNNING);
  13847. + if (rt_mutex_has_waiters(lock))
  13848. + remove_waiter(lock, waiter);
  13849. + /* ww_mutex want to report EDEADLK/EALREADY, let them */
  13850. + if (!ww_ctx)
  13851. + rt_mutex_handle_deadlock(ret, chwalk, waiter);
  13852. + } else if (ww_ctx) {
  13853. + ww_mutex_account_lock(lock, ww_ctx);
  13854. + }
  13855. +
  13856. + /*
  13857. + * try_to_take_rt_mutex() sets the waiter bit
  13858. + * unconditionally. We might have to fix that up.
  13859. + */
  13860. + fixup_rt_mutex_waiters(lock);
  13861. + return ret;
  13862. +}
  13863. +
  13864. /*
  13865. * Slow path lock function:
  13866. */
  13867. static int __sched
  13868. rt_mutex_slowlock(struct rt_mutex *lock, int state,
  13869. struct hrtimer_sleeper *timeout,
  13870. - enum rtmutex_chainwalk chwalk)
  13871. + enum rtmutex_chainwalk chwalk,
  13872. + struct ww_acquire_ctx *ww_ctx)
  13873. {
  13874. struct rt_mutex_waiter waiter;
  13875. unsigned long flags;
  13876. int ret = 0;
  13877. - debug_rt_mutex_init_waiter(&waiter);
  13878. - RB_CLEAR_NODE(&waiter.pi_tree_entry);
  13879. - RB_CLEAR_NODE(&waiter.tree_entry);
  13880. + rt_mutex_init_waiter(&waiter, false);
  13881. /*
  13882. * Technically we could use raw_spin_[un]lock_irq() here, but this can
  13883. @@ -1249,36 +1835,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
  13884. */
  13885. raw_spin_lock_irqsave(&lock->wait_lock, flags);
  13886. - /* Try to acquire the lock again: */
  13887. - if (try_to_take_rt_mutex(lock, current, NULL)) {
  13888. - raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13889. - return 0;
  13890. - }
  13891. -
  13892. - set_current_state(state);
  13893. -
  13894. - /* Setup the timer, when timeout != NULL */
  13895. - if (unlikely(timeout))
  13896. - hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
  13897. -
  13898. - ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk);
  13899. -
  13900. - if (likely(!ret))
  13901. - /* sleep on the mutex */
  13902. - ret = __rt_mutex_slowlock(lock, state, timeout, &waiter);
  13903. -
  13904. - if (unlikely(ret)) {
  13905. - __set_current_state(TASK_RUNNING);
  13906. - if (rt_mutex_has_waiters(lock))
  13907. - remove_waiter(lock, &waiter);
  13908. - rt_mutex_handle_deadlock(ret, chwalk, &waiter);
  13909. - }
  13910. -
  13911. - /*
  13912. - * try_to_take_rt_mutex() sets the waiter bit
  13913. - * unconditionally. We might have to fix that up.
  13914. - */
  13915. - fixup_rt_mutex_waiters(lock);
  13916. + ret = rt_mutex_slowlock_locked(lock, state, timeout, chwalk, ww_ctx,
  13917. + &waiter);
  13918. raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13919. @@ -1328,10 +1886,12 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
  13920. /*
  13921. * Slow path to release a rt-mutex.
  13922. - * Return whether the current task needs to undo a potential priority boosting.
  13923. + *
  13924. + * Return whether the current task needs to call rt_mutex_postunlock().
  13925. */
  13926. static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
  13927. - struct wake_q_head *wake_q)
  13928. + struct wake_q_head *wake_q,
  13929. + struct wake_q_head *wake_sleeper_q)
  13930. {
  13931. unsigned long flags;
  13932. @@ -1340,8 +1900,6 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
  13933. debug_rt_mutex_unlock(lock);
  13934. - rt_mutex_deadlock_account_unlock(current);
  13935. -
  13936. /*
  13937. * We must be careful here if the fast path is enabled. If we
  13938. * have no waiters queued we cannot set owner to NULL here
  13939. @@ -1387,12 +1945,10 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
  13940. *
  13941. * Queue the next waiter for wakeup once we release the wait_lock.
  13942. */
  13943. - mark_wakeup_next_waiter(wake_q, lock);
  13944. -
  13945. + mark_wakeup_next_waiter(wake_q, wake_sleeper_q, lock);
  13946. raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  13947. - /* check PI boosting */
  13948. - return true;
  13949. + return true; /* call rt_mutex_postunlock() */
  13950. }
  13951. /*
  13952. @@ -1403,63 +1959,85 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
  13953. */
  13954. static inline int
  13955. rt_mutex_fastlock(struct rt_mutex *lock, int state,
  13956. + struct ww_acquire_ctx *ww_ctx,
  13957. int (*slowfn)(struct rt_mutex *lock, int state,
  13958. struct hrtimer_sleeper *timeout,
  13959. - enum rtmutex_chainwalk chwalk))
  13960. + enum rtmutex_chainwalk chwalk,
  13961. + struct ww_acquire_ctx *ww_ctx))
  13962. {
  13963. - if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {
  13964. - rt_mutex_deadlock_account_lock(lock, current);
  13965. + if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
  13966. return 0;
  13967. - } else
  13968. - return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);
  13969. +
  13970. + return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK, ww_ctx);
  13971. }
  13972. static inline int
  13973. rt_mutex_timed_fastlock(struct rt_mutex *lock, int state,
  13974. struct hrtimer_sleeper *timeout,
  13975. enum rtmutex_chainwalk chwalk,
  13976. + struct ww_acquire_ctx *ww_ctx,
  13977. int (*slowfn)(struct rt_mutex *lock, int state,
  13978. struct hrtimer_sleeper *timeout,
  13979. - enum rtmutex_chainwalk chwalk))
  13980. + enum rtmutex_chainwalk chwalk,
  13981. + struct ww_acquire_ctx *ww_ctx))
  13982. {
  13983. if (chwalk == RT_MUTEX_MIN_CHAINWALK &&
  13984. - likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {
  13985. - rt_mutex_deadlock_account_lock(lock, current);
  13986. + likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
  13987. return 0;
  13988. - } else
  13989. - return slowfn(lock, state, timeout, chwalk);
  13990. +
  13991. + return slowfn(lock, state, timeout, chwalk, ww_ctx);
  13992. }
  13993. static inline int
  13994. rt_mutex_fasttrylock(struct rt_mutex *lock,
  13995. int (*slowfn)(struct rt_mutex *lock))
  13996. {
  13997. - if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {
  13998. - rt_mutex_deadlock_account_lock(lock, current);
  13999. + if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
  14000. return 1;
  14001. - }
  14002. +
  14003. return slowfn(lock);
  14004. }
  14005. +/*
  14006. + * Performs the wakeup of the the top-waiter and re-enables preemption.
  14007. + */
  14008. +void rt_mutex_postunlock(struct wake_q_head *wake_q,
  14009. + struct wake_q_head *wq_sleeper)
  14010. +{
  14011. + wake_up_q(wake_q);
  14012. + wake_up_q_sleeper(wq_sleeper);
  14013. +
  14014. + /* Pairs with preempt_disable() in rt_mutex_slowunlock() */
  14015. + preempt_enable();
  14016. +}
  14017. +
  14018. static inline void
  14019. rt_mutex_fastunlock(struct rt_mutex *lock,
  14020. bool (*slowfn)(struct rt_mutex *lock,
  14021. - struct wake_q_head *wqh))
  14022. + struct wake_q_head *wqh,
  14023. + struct wake_q_head *wq_sleeper))
  14024. {
  14025. WAKE_Q(wake_q);
  14026. + WAKE_Q(wake_sleeper_q);
  14027. - if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
  14028. - rt_mutex_deadlock_account_unlock(current);
  14029. + if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
  14030. + return;
  14031. - } else {
  14032. - bool deboost = slowfn(lock, &wake_q);
  14033. + if (slowfn(lock, &wake_q, &wake_sleeper_q))
  14034. + rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
  14035. +}
  14036. - wake_up_q(&wake_q);
  14037. +/**
  14038. + * rt_mutex_lock_state - lock a rt_mutex with a given state
  14039. + *
  14040. + * @lock: The rt_mutex to be locked
  14041. + * @state: The state to set when blocking on the rt_mutex
  14042. + */
  14043. +int __sched rt_mutex_lock_state(struct rt_mutex *lock, int state)
  14044. +{
  14045. + might_sleep();
  14046. - /* Undo pi boosting if necessary: */
  14047. - if (deboost)
  14048. - rt_mutex_adjust_prio(current);
  14049. - }
  14050. + return rt_mutex_fastlock(lock, state, NULL, rt_mutex_slowlock);
  14051. }
  14052. /**
  14053. @@ -1469,15 +2047,13 @@ rt_mutex_fastunlock(struct rt_mutex *lock,
  14054. */
  14055. void __sched rt_mutex_lock(struct rt_mutex *lock)
  14056. {
  14057. - might_sleep();
  14058. -
  14059. - rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, rt_mutex_slowlock);
  14060. + rt_mutex_lock_state(lock, TASK_UNINTERRUPTIBLE);
  14061. }
  14062. EXPORT_SYMBOL_GPL(rt_mutex_lock);
  14063. /**
  14064. * rt_mutex_lock_interruptible - lock a rt_mutex interruptible
  14065. - *
  14066. + **
  14067. * @lock: the rt_mutex to be locked
  14068. *
  14069. * Returns:
  14070. @@ -1486,23 +2062,32 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
  14071. */
  14072. int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
  14073. {
  14074. - might_sleep();
  14075. -
  14076. - return rt_mutex_fastlock(lock, TASK_INTERRUPTIBLE, rt_mutex_slowlock);
  14077. + return rt_mutex_lock_state(lock, TASK_INTERRUPTIBLE);
  14078. }
  14079. EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
  14080. -/*
  14081. - * Futex variant with full deadlock detection.
  14082. +/**
  14083. + * rt_mutex_lock_killable - lock a rt_mutex killable
  14084. + *
  14085. + * @lock: the rt_mutex to be locked
  14086. + * @detect_deadlock: deadlock detection on/off
  14087. + *
  14088. + * Returns:
  14089. + * 0 on success
  14090. + * -EINTR when interrupted by a signal
  14091. */
  14092. -int rt_mutex_timed_futex_lock(struct rt_mutex *lock,
  14093. - struct hrtimer_sleeper *timeout)
  14094. +int __sched rt_mutex_lock_killable(struct rt_mutex *lock)
  14095. {
  14096. - might_sleep();
  14097. + return rt_mutex_lock_state(lock, TASK_KILLABLE);
  14098. +}
  14099. +EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
  14100. - return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
  14101. - RT_MUTEX_FULL_CHAINWALK,
  14102. - rt_mutex_slowlock);
  14103. +/*
  14104. + * Futex variant, must not use fastpath.
  14105. + */
  14106. +int __sched rt_mutex_futex_trylock(struct rt_mutex *lock)
  14107. +{
  14108. + return rt_mutex_slowtrylock(lock);
  14109. }
  14110. /**
  14111. @@ -1525,6 +2110,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
  14112. return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
  14113. RT_MUTEX_MIN_CHAINWALK,
  14114. + NULL,
  14115. rt_mutex_slowlock);
  14116. }
  14117. EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
  14118. @@ -1542,7 +2128,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
  14119. */
  14120. int __sched rt_mutex_trylock(struct rt_mutex *lock)
  14121. {
  14122. +#ifdef CONFIG_PREEMPT_RT_FULL
  14123. + if (WARN_ON_ONCE(in_irq() || in_nmi()))
  14124. +#else
  14125. if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
  14126. +#endif
  14127. return 0;
  14128. return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
  14129. @@ -1560,21 +2150,53 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock)
  14130. }
  14131. EXPORT_SYMBOL_GPL(rt_mutex_unlock);
  14132. -/**
  14133. - * rt_mutex_futex_unlock - Futex variant of rt_mutex_unlock
  14134. - * @lock: the rt_mutex to be unlocked
  14135. - *
  14136. - * Returns: true/false indicating whether priority adjustment is
  14137. - * required or not.
  14138. - */
  14139. -bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
  14140. - struct wake_q_head *wqh)
  14141. +static bool __sched __rt_mutex_unlock_common(struct rt_mutex *lock,
  14142. + struct wake_q_head *wake_q,
  14143. + struct wake_q_head *wq_sleeper)
  14144. {
  14145. - if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
  14146. - rt_mutex_deadlock_account_unlock(current);
  14147. - return false;
  14148. + lockdep_assert_held(&lock->wait_lock);
  14149. +
  14150. + debug_rt_mutex_unlock(lock);
  14151. +
  14152. + if (!rt_mutex_has_waiters(lock)) {
  14153. + lock->owner = NULL;
  14154. + return false; /* done */
  14155. }
  14156. - return rt_mutex_slowunlock(lock, wqh);
  14157. +
  14158. + /*
  14159. + * We've already deboosted, mark_wakeup_next_waiter() will
  14160. + * retain preempt_disabled when we drop the wait_lock, to
  14161. + * avoid inversion prior to the wakeup. preempt_disable()
  14162. + * therein pairs with rt_mutex_postunlock().
  14163. + */
  14164. + mark_wakeup_next_waiter(wake_q, wq_sleeper, lock);
  14165. +
  14166. + return true; /* call postunlock() */
  14167. +}
  14168. +
  14169. +/**
  14170. + * Futex variant, that since futex variants do not use the fast-path, can be
  14171. + * simple and will not need to retry.
  14172. + */
  14173. +bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
  14174. + struct wake_q_head *wake_q,
  14175. + struct wake_q_head *wq_sleeper)
  14176. +{
  14177. + return __rt_mutex_unlock_common(lock, wake_q, wq_sleeper);
  14178. +}
  14179. +
  14180. +void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
  14181. +{
  14182. + WAKE_Q(wake_q);
  14183. + WAKE_Q(wake_sleeper_q);
  14184. + bool postunlock;
  14185. +
  14186. + raw_spin_lock_irq(&lock->wait_lock);
  14187. + postunlock = __rt_mutex_futex_unlock(lock, &wake_q, &wake_sleeper_q);
  14188. + raw_spin_unlock_irq(&lock->wait_lock);
  14189. +
  14190. + if (postunlock)
  14191. + rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
  14192. }
  14193. /**
  14194. @@ -1607,13 +2229,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
  14195. void __rt_mutex_init(struct rt_mutex *lock, const char *name)
  14196. {
  14197. lock->owner = NULL;
  14198. - raw_spin_lock_init(&lock->wait_lock);
  14199. lock->waiters = RB_ROOT;
  14200. lock->waiters_leftmost = NULL;
  14201. debug_rt_mutex_init(lock, name);
  14202. }
  14203. -EXPORT_SYMBOL_GPL(__rt_mutex_init);
  14204. +EXPORT_SYMBOL(__rt_mutex_init);
  14205. /**
  14206. * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
  14207. @@ -1628,10 +2249,9 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init);
  14208. void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
  14209. struct task_struct *proxy_owner)
  14210. {
  14211. - __rt_mutex_init(lock, NULL);
  14212. + rt_mutex_init(lock);
  14213. debug_rt_mutex_proxy_lock(lock, proxy_owner);
  14214. rt_mutex_set_owner(lock, proxy_owner);
  14215. - rt_mutex_deadlock_account_lock(lock, proxy_owner);
  14216. }
  14217. /**
  14218. @@ -1647,7 +2267,66 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock,
  14219. {
  14220. debug_rt_mutex_proxy_unlock(lock);
  14221. rt_mutex_set_owner(lock, NULL);
  14222. - rt_mutex_deadlock_account_unlock(proxy_owner);
  14223. +}
  14224. +
  14225. +int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
  14226. + struct rt_mutex_waiter *waiter,
  14227. + struct task_struct *task)
  14228. +{
  14229. + int ret;
  14230. +
  14231. + if (try_to_take_rt_mutex(lock, task, NULL))
  14232. + return 1;
  14233. +
  14234. +#ifdef CONFIG_PREEMPT_RT_FULL
  14235. + /*
  14236. + * In PREEMPT_RT there's an added race.
  14237. + * If the task, that we are about to requeue, times out,
  14238. + * it can set the PI_WAKEUP_INPROGRESS. This tells the requeue
  14239. + * to skip this task. But right after the task sets
  14240. + * its pi_blocked_on to PI_WAKEUP_INPROGRESS it can then
  14241. + * block on the spin_lock(&hb->lock), which in RT is an rtmutex.
  14242. + * This will replace the PI_WAKEUP_INPROGRESS with the actual
  14243. + * lock that it blocks on. We *must not* place this task
  14244. + * on this proxy lock in that case.
  14245. + *
  14246. + * To prevent this race, we first take the task's pi_lock
  14247. + * and check if it has updated its pi_blocked_on. If it has,
  14248. + * we assume that it woke up and we return -EAGAIN.
  14249. + * Otherwise, we set the task's pi_blocked_on to
  14250. + * PI_REQUEUE_INPROGRESS, so that if the task is waking up
  14251. + * it will know that we are in the process of requeuing it.
  14252. + */
  14253. + raw_spin_lock(&task->pi_lock);
  14254. + if (task->pi_blocked_on) {
  14255. + raw_spin_unlock(&task->pi_lock);
  14256. + raw_spin_unlock_irq(&lock->wait_lock);
  14257. + return -EAGAIN;
  14258. + }
  14259. + task->pi_blocked_on = PI_REQUEUE_INPROGRESS;
  14260. + raw_spin_unlock(&task->pi_lock);
  14261. +#endif
  14262. +
  14263. + /* We enforce deadlock detection for futexes */
  14264. + ret = task_blocks_on_rt_mutex(lock, waiter, task,
  14265. + RT_MUTEX_FULL_CHAINWALK);
  14266. +
  14267. + if (ret && !rt_mutex_owner(lock)) {
  14268. + /*
  14269. + * Reset the return value. We might have
  14270. + * returned with -EDEADLK and the owner
  14271. + * released the lock while we were walking the
  14272. + * pi chain. Let the waiter sort it out.
  14273. + */
  14274. + ret = 0;
  14275. + }
  14276. +
  14277. + if (ret && rt_mutex_has_waiters(lock))
  14278. + remove_waiter(lock, waiter);
  14279. +
  14280. + debug_rt_mutex_print_deadlock(waiter);
  14281. +
  14282. + return ret;
  14283. }
  14284. /**
  14285. @@ -1670,33 +2349,9 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
  14286. int ret;
  14287. raw_spin_lock_irq(&lock->wait_lock);
  14288. -
  14289. - if (try_to_take_rt_mutex(lock, task, NULL)) {
  14290. - raw_spin_unlock_irq(&lock->wait_lock);
  14291. - return 1;
  14292. - }
  14293. -
  14294. - /* We enforce deadlock detection for futexes */
  14295. - ret = task_blocks_on_rt_mutex(lock, waiter, task,
  14296. - RT_MUTEX_FULL_CHAINWALK);
  14297. -
  14298. - if (ret && !rt_mutex_owner(lock)) {
  14299. - /*
  14300. - * Reset the return value. We might have
  14301. - * returned with -EDEADLK and the owner
  14302. - * released the lock while we were walking the
  14303. - * pi chain. Let the waiter sort it out.
  14304. - */
  14305. - ret = 0;
  14306. - }
  14307. -
  14308. - if (unlikely(ret))
  14309. - remove_waiter(lock, waiter);
  14310. -
  14311. + ret = __rt_mutex_start_proxy_lock(lock, waiter, task);
  14312. raw_spin_unlock_irq(&lock->wait_lock);
  14313. - debug_rt_mutex_print_deadlock(waiter);
  14314. -
  14315. return ret;
  14316. }
  14317. @@ -1721,36 +2376,106 @@ struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock)
  14318. }
  14319. /**
  14320. - * rt_mutex_finish_proxy_lock() - Complete lock acquisition
  14321. + * rt_mutex_wait_proxy_lock() - Wait for lock acquisition
  14322. * @lock: the rt_mutex we were woken on
  14323. * @to: the timeout, null if none. hrtimer should already have
  14324. * been started.
  14325. * @waiter: the pre-initialized rt_mutex_waiter
  14326. *
  14327. - * Complete the lock acquisition started our behalf by another thread.
  14328. + * Wait for the the lock acquisition started on our behalf by
  14329. + * rt_mutex_start_proxy_lock(). Upon failure, the caller must call
  14330. + * rt_mutex_cleanup_proxy_lock().
  14331. *
  14332. * Returns:
  14333. * 0 - success
  14334. * <0 - error, one of -EINTR, -ETIMEDOUT
  14335. *
  14336. - * Special API call for PI-futex requeue support
  14337. + * Special API call for PI-futex support
  14338. */
  14339. -int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
  14340. +int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,
  14341. struct hrtimer_sleeper *to,
  14342. struct rt_mutex_waiter *waiter)
  14343. {
  14344. + struct task_struct *tsk = current;
  14345. int ret;
  14346. raw_spin_lock_irq(&lock->wait_lock);
  14347. -
  14348. - set_current_state(TASK_INTERRUPTIBLE);
  14349. -
  14350. /* sleep on the mutex */
  14351. - ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter);
  14352. + set_current_state(TASK_INTERRUPTIBLE);
  14353. + ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter, NULL);
  14354. + /*
  14355. + * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
  14356. + * have to fix that up.
  14357. + */
  14358. + fixup_rt_mutex_waiters(lock);
  14359. - if (unlikely(ret))
  14360. + /*
  14361. + * RT has a problem here when the wait got interrupted by a timeout
  14362. + * or a signal. task->pi_blocked_on is still set. The task must
  14363. + * acquire the hash bucket lock when returning from this function.
  14364. + *
  14365. + * If the hash bucket lock is contended then the
  14366. + * BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on)) in
  14367. + * task_blocks_on_rt_mutex() will trigger. This can be avoided by
  14368. + * clearing task->pi_blocked_on which removes the task from the
  14369. + * boosting chain of the rtmutex. That's correct because the task
  14370. + * is not longer blocked on it.
  14371. + */
  14372. + if (ret) {
  14373. + raw_spin_lock(&tsk->pi_lock);
  14374. + tsk->pi_blocked_on = NULL;
  14375. + raw_spin_unlock(&tsk->pi_lock);
  14376. + }
  14377. + raw_spin_unlock_irq(&lock->wait_lock);
  14378. +
  14379. + return ret;
  14380. +}
  14381. +
  14382. +/**
  14383. + * rt_mutex_cleanup_proxy_lock() - Cleanup failed lock acquisition
  14384. + * @lock: the rt_mutex we were woken on
  14385. + * @waiter: the pre-initialized rt_mutex_waiter
  14386. + *
  14387. + * Attempt to clean up after a failed rt_mutex_wait_proxy_lock().
  14388. + *
  14389. + * Unless we acquired the lock; we're still enqueued on the wait-list and can
  14390. + * in fact still be granted ownership until we're removed. Therefore we can
  14391. + * find we are in fact the owner and must disregard the
  14392. + * rt_mutex_wait_proxy_lock() failure.
  14393. + *
  14394. + * Returns:
  14395. + * true - did the cleanup, we done.
  14396. + * false - we acquired the lock after rt_mutex_wait_proxy_lock() returned,
  14397. + * caller should disregards its return value.
  14398. + *
  14399. + * Special API call for PI-futex support
  14400. + */
  14401. +bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,
  14402. + struct rt_mutex_waiter *waiter)
  14403. +{
  14404. + bool cleanup = false;
  14405. +
  14406. + raw_spin_lock_irq(&lock->wait_lock);
  14407. + /*
  14408. + * Do an unconditional try-lock, this deals with the lock stealing
  14409. + * state where __rt_mutex_futex_unlock() -> mark_wakeup_next_waiter()
  14410. + * sets a NULL owner.
  14411. + *
  14412. + * We're not interested in the return value, because the subsequent
  14413. + * test on rt_mutex_owner() will infer that. If the trylock succeeded,
  14414. + * we will own the lock and it will have removed the waiter. If we
  14415. + * failed the trylock, we're still not owner and we need to remove
  14416. + * ourselves.
  14417. + */
  14418. + try_to_take_rt_mutex(lock, current, waiter);
  14419. + /*
  14420. + * Unless we're the owner; we're still enqueued on the wait_list.
  14421. + * So check if we became owner, if not, take us off the wait_list.
  14422. + */
  14423. + if (rt_mutex_owner(lock) != current) {
  14424. remove_waiter(lock, waiter);
  14425. -
  14426. + cleanup = true;
  14427. + }
  14428. /*
  14429. * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
  14430. * have to fix that up.
  14431. @@ -1759,5 +2484,91 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
  14432. raw_spin_unlock_irq(&lock->wait_lock);
  14433. + return cleanup;
  14434. +}
  14435. +
  14436. +static inline int
  14437. +ww_mutex_deadlock_injection(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
  14438. +{
  14439. +#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH
  14440. + unsigned tmp;
  14441. +
  14442. + if (ctx->deadlock_inject_countdown-- == 0) {
  14443. + tmp = ctx->deadlock_inject_interval;
  14444. + if (tmp > UINT_MAX/4)
  14445. + tmp = UINT_MAX;
  14446. + else
  14447. + tmp = tmp*2 + tmp + tmp/2;
  14448. +
  14449. + ctx->deadlock_inject_interval = tmp;
  14450. + ctx->deadlock_inject_countdown = tmp;
  14451. + ctx->contending_lock = lock;
  14452. +
  14453. + ww_mutex_unlock(lock);
  14454. +
  14455. + return -EDEADLK;
  14456. + }
  14457. +#endif
  14458. +
  14459. + return 0;
  14460. +}
  14461. +
  14462. +#ifdef CONFIG_PREEMPT_RT_FULL
  14463. +int __sched
  14464. +__ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx)
  14465. +{
  14466. + int ret;
  14467. +
  14468. + might_sleep();
  14469. +
  14470. + mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
  14471. + ret = rt_mutex_slowlock(&lock->base.lock, TASK_INTERRUPTIBLE, NULL, 0, ww_ctx);
  14472. + if (ret)
  14473. + mutex_release(&lock->base.dep_map, 1, _RET_IP_);
  14474. + else if (!ret && ww_ctx->acquired > 1)
  14475. + return ww_mutex_deadlock_injection(lock, ww_ctx);
  14476. +
  14477. return ret;
  14478. }
  14479. +EXPORT_SYMBOL_GPL(__ww_mutex_lock_interruptible);
  14480. +
  14481. +int __sched
  14482. +__ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx)
  14483. +{
  14484. + int ret;
  14485. +
  14486. + might_sleep();
  14487. +
  14488. + mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
  14489. + ret = rt_mutex_slowlock(&lock->base.lock, TASK_UNINTERRUPTIBLE, NULL, 0, ww_ctx);
  14490. + if (ret)
  14491. + mutex_release(&lock->base.dep_map, 1, _RET_IP_);
  14492. + else if (!ret && ww_ctx->acquired > 1)
  14493. + return ww_mutex_deadlock_injection(lock, ww_ctx);
  14494. +
  14495. + return ret;
  14496. +}
  14497. +EXPORT_SYMBOL_GPL(__ww_mutex_lock);
  14498. +
  14499. +void __sched ww_mutex_unlock(struct ww_mutex *lock)
  14500. +{
  14501. + int nest = !!lock->ctx;
  14502. +
  14503. + /*
  14504. + * The unlocking fastpath is the 0->1 transition from 'locked'
  14505. + * into 'unlocked' state:
  14506. + */
  14507. + if (nest) {
  14508. +#ifdef CONFIG_DEBUG_MUTEXES
  14509. + DEBUG_LOCKS_WARN_ON(!lock->ctx->acquired);
  14510. +#endif
  14511. + if (lock->ctx->acquired > 0)
  14512. + lock->ctx->acquired--;
  14513. + lock->ctx = NULL;
  14514. + }
  14515. +
  14516. + mutex_release(&lock->base.dep_map, nest, _RET_IP_);
  14517. + rt_mutex_unlock(&lock->base.lock);
  14518. +}
  14519. +EXPORT_SYMBOL(ww_mutex_unlock);
  14520. +#endif
  14521. diff --git a/kernel/locking/rtmutex.h b/kernel/locking/rtmutex.h
  14522. index c4060584c407..6607802efa8b 100644
  14523. --- a/kernel/locking/rtmutex.h
  14524. +++ b/kernel/locking/rtmutex.h
  14525. @@ -11,8 +11,6 @@
  14526. */
  14527. #define rt_mutex_deadlock_check(l) (0)
  14528. -#define rt_mutex_deadlock_account_lock(m, t) do { } while (0)
  14529. -#define rt_mutex_deadlock_account_unlock(l) do { } while (0)
  14530. #define debug_rt_mutex_init_waiter(w) do { } while (0)
  14531. #define debug_rt_mutex_free_waiter(w) do { } while (0)
  14532. #define debug_rt_mutex_lock(l) do { } while (0)
  14533. diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
  14534. index e317e1cbb3eb..64d89d780059 100644
  14535. --- a/kernel/locking/rtmutex_common.h
  14536. +++ b/kernel/locking/rtmutex_common.h
  14537. @@ -27,12 +27,14 @@ struct rt_mutex_waiter {
  14538. struct rb_node pi_tree_entry;
  14539. struct task_struct *task;
  14540. struct rt_mutex *lock;
  14541. + bool savestate;
  14542. #ifdef CONFIG_DEBUG_RT_MUTEXES
  14543. unsigned long ip;
  14544. struct pid *deadlock_task_pid;
  14545. struct rt_mutex *deadlock_lock;
  14546. #endif
  14547. int prio;
  14548. + u64 deadline;
  14549. };
  14550. /*
  14551. @@ -98,21 +100,45 @@ enum rtmutex_chainwalk {
  14552. /*
  14553. * PI-futex support (proxy locking functions, etc.):
  14554. */
  14555. +#define PI_WAKEUP_INPROGRESS ((struct rt_mutex_waiter *) 1)
  14556. +#define PI_REQUEUE_INPROGRESS ((struct rt_mutex_waiter *) 2)
  14557. +
  14558. extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
  14559. extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
  14560. struct task_struct *proxy_owner);
  14561. extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
  14562. struct task_struct *proxy_owner);
  14563. +extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savetate);
  14564. +extern int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
  14565. + struct rt_mutex_waiter *waiter,
  14566. + struct task_struct *task);
  14567. extern int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
  14568. struct rt_mutex_waiter *waiter,
  14569. struct task_struct *task);
  14570. -extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
  14571. - struct hrtimer_sleeper *to,
  14572. - struct rt_mutex_waiter *waiter);
  14573. -extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to);
  14574. -extern bool rt_mutex_futex_unlock(struct rt_mutex *lock,
  14575. - struct wake_q_head *wqh);
  14576. -extern void rt_mutex_adjust_prio(struct task_struct *task);
  14577. +extern int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,
  14578. + struct hrtimer_sleeper *to,
  14579. + struct rt_mutex_waiter *waiter);
  14580. +extern bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,
  14581. + struct rt_mutex_waiter *waiter);
  14582. +
  14583. +extern int rt_mutex_futex_trylock(struct rt_mutex *l);
  14584. +
  14585. +extern void rt_mutex_futex_unlock(struct rt_mutex *lock);
  14586. +extern bool __rt_mutex_futex_unlock(struct rt_mutex *lock,
  14587. + struct wake_q_head *wqh,
  14588. + struct wake_q_head *wq_sleeper);
  14589. +
  14590. +extern void rt_mutex_postunlock(struct wake_q_head *wake_q,
  14591. + struct wake_q_head *wq_sleeper);
  14592. +
  14593. +/* RW semaphore special interface */
  14594. +struct ww_acquire_ctx;
  14595. +
  14596. +int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
  14597. + struct hrtimer_sleeper *timeout,
  14598. + enum rtmutex_chainwalk chwalk,
  14599. + struct ww_acquire_ctx *ww_ctx,
  14600. + struct rt_mutex_waiter *waiter);
  14601. #ifdef CONFIG_DEBUG_RT_MUTEXES
  14602. # include "rtmutex-debug.h"
  14603. diff --git a/kernel/locking/rwsem-rt.c b/kernel/locking/rwsem-rt.c
  14604. new file mode 100644
  14605. index 000000000000..4a708ffcded6
  14606. --- /dev/null
  14607. +++ b/kernel/locking/rwsem-rt.c
  14608. @@ -0,0 +1,268 @@
  14609. +/*
  14610. + */
  14611. +#include <linux/rwsem.h>
  14612. +#include <linux/sched.h>
  14613. +#include <linux/export.h>
  14614. +
  14615. +#include "rtmutex_common.h"
  14616. +
  14617. +/*
  14618. + * RT-specific reader/writer semaphores
  14619. + *
  14620. + * down_write()
  14621. + * 1) Lock sem->rtmutex
  14622. + * 2) Remove the reader BIAS to force readers into the slow path
  14623. + * 3) Wait until all readers have left the critical region
  14624. + * 4) Mark it write locked
  14625. + *
  14626. + * up_write()
  14627. + * 1) Remove the write locked marker
  14628. + * 2) Set the reader BIAS so readers can use the fast path again
  14629. + * 3) Unlock sem->rtmutex to release blocked readers
  14630. + *
  14631. + * down_read()
  14632. + * 1) Try fast path acquisition (reader BIAS is set)
  14633. + * 2) Take sem->rtmutex.wait_lock which protects the writelocked flag
  14634. + * 3) If !writelocked, acquire it for read
  14635. + * 4) If writelocked, block on sem->rtmutex
  14636. + * 5) unlock sem->rtmutex, goto 1)
  14637. + *
  14638. + * up_read()
  14639. + * 1) Try fast path release (reader count != 1)
  14640. + * 2) Wake the writer waiting in down_write()#3
  14641. + *
  14642. + * down_read()#3 has the consequence, that rw semaphores on RT are not writer
  14643. + * fair, but writers, which should be avoided in RT tasks (think mmap_sem),
  14644. + * are subject to the rtmutex priority/DL inheritance mechanism.
  14645. + *
  14646. + * It's possible to make the rw semaphores writer fair by keeping a list of
  14647. + * active readers. A blocked writer would force all newly incoming readers to
  14648. + * block on the rtmutex, but the rtmutex would have to be proxy locked for one
  14649. + * reader after the other. We can't use multi-reader inheritance because there
  14650. + * is no way to support that with SCHED_DEADLINE. Implementing the one by one
  14651. + * reader boosting/handover mechanism is a major surgery for a very dubious
  14652. + * value.
  14653. + *
  14654. + * The risk of writer starvation is there, but the pathological use cases
  14655. + * which trigger it are not necessarily the typical RT workloads.
  14656. + */
  14657. +
  14658. +void __rwsem_init(struct rw_semaphore *sem, const char *name,
  14659. + struct lock_class_key *key)
  14660. +{
  14661. +#ifdef CONFIG_DEBUG_LOCK_ALLOC
  14662. + /*
  14663. + * Make sure we are not reinitializing a held semaphore:
  14664. + */
  14665. + debug_check_no_locks_freed((void *)sem, sizeof(*sem));
  14666. + lockdep_init_map(&sem->dep_map, name, key, 0);
  14667. +#endif
  14668. + atomic_set(&sem->readers, READER_BIAS);
  14669. +}
  14670. +EXPORT_SYMBOL(__rwsem_init);
  14671. +
  14672. +int __down_read_trylock(struct rw_semaphore *sem)
  14673. +{
  14674. + int r, old;
  14675. +
  14676. + /*
  14677. + * Increment reader count, if sem->readers < 0, i.e. READER_BIAS is
  14678. + * set.
  14679. + */
  14680. + for (r = atomic_read(&sem->readers); r < 0;) {
  14681. + old = atomic_cmpxchg(&sem->readers, r, r + 1);
  14682. + if (likely(old == r))
  14683. + return 1;
  14684. + r = old;
  14685. + }
  14686. + return 0;
  14687. +}
  14688. +
  14689. +void __sched __down_read(struct rw_semaphore *sem)
  14690. +{
  14691. + struct rt_mutex *m = &sem->rtmutex;
  14692. + struct rt_mutex_waiter waiter;
  14693. +
  14694. + if (__down_read_trylock(sem))
  14695. + return;
  14696. +
  14697. + might_sleep();
  14698. + raw_spin_lock_irq(&m->wait_lock);
  14699. + /*
  14700. + * Allow readers as long as the writer has not completely
  14701. + * acquired the semaphore for write.
  14702. + */
  14703. + if (atomic_read(&sem->readers) != WRITER_BIAS) {
  14704. + atomic_inc(&sem->readers);
  14705. + raw_spin_unlock_irq(&m->wait_lock);
  14706. + return;
  14707. + }
  14708. +
  14709. + /*
  14710. + * Call into the slow lock path with the rtmutex->wait_lock
  14711. + * held, so this can't result in the following race:
  14712. + *
  14713. + * Reader1 Reader2 Writer
  14714. + * down_read()
  14715. + * down_write()
  14716. + * rtmutex_lock(m)
  14717. + * swait()
  14718. + * down_read()
  14719. + * unlock(m->wait_lock)
  14720. + * up_read()
  14721. + * swake()
  14722. + * lock(m->wait_lock)
  14723. + * sem->writelocked=true
  14724. + * unlock(m->wait_lock)
  14725. + *
  14726. + * up_write()
  14727. + * sem->writelocked=false
  14728. + * rtmutex_unlock(m)
  14729. + * down_read()
  14730. + * down_write()
  14731. + * rtmutex_lock(m)
  14732. + * swait()
  14733. + * rtmutex_lock(m)
  14734. + *
  14735. + * That would put Reader1 behind the writer waiting on
  14736. + * Reader2 to call up_read() which might be unbound.
  14737. + */
  14738. + rt_mutex_init_waiter(&waiter, false);
  14739. + rt_mutex_slowlock_locked(m, TASK_UNINTERRUPTIBLE, NULL,
  14740. + RT_MUTEX_MIN_CHAINWALK, NULL,
  14741. + &waiter);
  14742. + /*
  14743. + * The slowlock() above is guaranteed to return with the rtmutex is
  14744. + * now held, so there can't be a writer active. Increment the reader
  14745. + * count and immediately drop the rtmutex again.
  14746. + */
  14747. + atomic_inc(&sem->readers);
  14748. + raw_spin_unlock_irq(&m->wait_lock);
  14749. + rt_mutex_unlock(m);
  14750. +
  14751. + debug_rt_mutex_free_waiter(&waiter);
  14752. +}
  14753. +
  14754. +void __up_read(struct rw_semaphore *sem)
  14755. +{
  14756. + struct rt_mutex *m = &sem->rtmutex;
  14757. + struct task_struct *tsk;
  14758. +
  14759. + /*
  14760. + * sem->readers can only hit 0 when a writer is waiting for the
  14761. + * active readers to leave the critical region.
  14762. + */
  14763. + if (!atomic_dec_and_test(&sem->readers))
  14764. + return;
  14765. +
  14766. + might_sleep();
  14767. + raw_spin_lock_irq(&m->wait_lock);
  14768. + /*
  14769. + * Wake the writer, i.e. the rtmutex owner. It might release the
  14770. + * rtmutex concurrently in the fast path (due to a signal), but to
  14771. + * clean up the rwsem it needs to acquire m->wait_lock. The worst
  14772. + * case which can happen is a spurious wakeup.
  14773. + */
  14774. + tsk = rt_mutex_owner(m);
  14775. + if (tsk)
  14776. + wake_up_process(tsk);
  14777. +
  14778. + raw_spin_unlock_irq(&m->wait_lock);
  14779. +}
  14780. +
  14781. +static void __up_write_unlock(struct rw_semaphore *sem, int bias,
  14782. + unsigned long flags)
  14783. +{
  14784. + struct rt_mutex *m = &sem->rtmutex;
  14785. +
  14786. + atomic_add(READER_BIAS - bias, &sem->readers);
  14787. + raw_spin_unlock_irqrestore(&m->wait_lock, flags);
  14788. + rt_mutex_unlock(m);
  14789. +}
  14790. +
  14791. +static int __sched __down_write_common(struct rw_semaphore *sem, int state)
  14792. +{
  14793. + struct rt_mutex *m = &sem->rtmutex;
  14794. + unsigned long flags;
  14795. +
  14796. + /* Take the rtmutex as a first step */
  14797. + if (rt_mutex_lock_state(m, state))
  14798. + return -EINTR;
  14799. +
  14800. + /* Force readers into slow path */
  14801. + atomic_sub(READER_BIAS, &sem->readers);
  14802. + might_sleep();
  14803. +
  14804. + set_current_state(state);
  14805. + for (;;) {
  14806. + raw_spin_lock_irqsave(&m->wait_lock, flags);
  14807. + /* Have all readers left the critical region? */
  14808. + if (!atomic_read(&sem->readers)) {
  14809. + atomic_set(&sem->readers, WRITER_BIAS);
  14810. + __set_current_state(TASK_RUNNING);
  14811. + raw_spin_unlock_irqrestore(&m->wait_lock, flags);
  14812. + return 0;
  14813. + }
  14814. +
  14815. + if (signal_pending_state(state, current)) {
  14816. + __set_current_state(TASK_RUNNING);
  14817. + __up_write_unlock(sem, 0, flags);
  14818. + return -EINTR;
  14819. + }
  14820. + raw_spin_unlock_irqrestore(&m->wait_lock, flags);
  14821. +
  14822. + if (atomic_read(&sem->readers) != 0) {
  14823. + schedule();
  14824. + set_current_state(state);
  14825. + }
  14826. + }
  14827. +}
  14828. +
  14829. +void __sched __down_write(struct rw_semaphore *sem)
  14830. +{
  14831. + __down_write_common(sem, TASK_UNINTERRUPTIBLE);
  14832. +}
  14833. +
  14834. +int __sched __down_write_killable(struct rw_semaphore *sem)
  14835. +{
  14836. + return __down_write_common(sem, TASK_KILLABLE);
  14837. +}
  14838. +
  14839. +int __down_write_trylock(struct rw_semaphore *sem)
  14840. +{
  14841. + struct rt_mutex *m = &sem->rtmutex;
  14842. + unsigned long flags;
  14843. +
  14844. + if (!rt_mutex_trylock(m))
  14845. + return 0;
  14846. +
  14847. + atomic_sub(READER_BIAS, &sem->readers);
  14848. +
  14849. + raw_spin_lock_irqsave(&m->wait_lock, flags);
  14850. + if (!atomic_read(&sem->readers)) {
  14851. + atomic_set(&sem->readers, WRITER_BIAS);
  14852. + raw_spin_unlock_irqrestore(&m->wait_lock, flags);
  14853. + return 1;
  14854. + }
  14855. + __up_write_unlock(sem, 0, flags);
  14856. + return 0;
  14857. +}
  14858. +
  14859. +void __up_write(struct rw_semaphore *sem)
  14860. +{
  14861. + struct rt_mutex *m = &sem->rtmutex;
  14862. + unsigned long flags;
  14863. +
  14864. + raw_spin_lock_irqsave(&m->wait_lock, flags);
  14865. + __up_write_unlock(sem, WRITER_BIAS, flags);
  14866. +}
  14867. +
  14868. +void __downgrade_write(struct rw_semaphore *sem)
  14869. +{
  14870. + struct rt_mutex *m = &sem->rtmutex;
  14871. + unsigned long flags;
  14872. +
  14873. + raw_spin_lock_irqsave(&m->wait_lock, flags);
  14874. + /* Release it and account current as reader */
  14875. + __up_write_unlock(sem, WRITER_BIAS - 1, flags);
  14876. +}
  14877. diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
  14878. index db3ccb1dd614..909779647bd1 100644
  14879. --- a/kernel/locking/spinlock.c
  14880. +++ b/kernel/locking/spinlock.c
  14881. @@ -124,8 +124,11 @@ void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
  14882. * __[spin|read|write]_lock_bh()
  14883. */
  14884. BUILD_LOCK_OPS(spin, raw_spinlock);
  14885. +
  14886. +#ifndef CONFIG_PREEMPT_RT_FULL
  14887. BUILD_LOCK_OPS(read, rwlock);
  14888. BUILD_LOCK_OPS(write, rwlock);
  14889. +#endif
  14890. #endif
  14891. @@ -209,6 +212,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
  14892. EXPORT_SYMBOL(_raw_spin_unlock_bh);
  14893. #endif
  14894. +#ifndef CONFIG_PREEMPT_RT_FULL
  14895. +
  14896. #ifndef CONFIG_INLINE_READ_TRYLOCK
  14897. int __lockfunc _raw_read_trylock(rwlock_t *lock)
  14898. {
  14899. @@ -353,6 +358,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
  14900. EXPORT_SYMBOL(_raw_write_unlock_bh);
  14901. #endif
  14902. +#endif /* !PREEMPT_RT_FULL */
  14903. +
  14904. #ifdef CONFIG_DEBUG_LOCK_ALLOC
  14905. void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
  14906. diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c
  14907. index 0374a596cffa..94970338d518 100644
  14908. --- a/kernel/locking/spinlock_debug.c
  14909. +++ b/kernel/locking/spinlock_debug.c
  14910. @@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
  14911. EXPORT_SYMBOL(__raw_spin_lock_init);
  14912. +#ifndef CONFIG_PREEMPT_RT_FULL
  14913. void __rwlock_init(rwlock_t *lock, const char *name,
  14914. struct lock_class_key *key)
  14915. {
  14916. @@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
  14917. }
  14918. EXPORT_SYMBOL(__rwlock_init);
  14919. +#endif
  14920. static void spin_dump(raw_spinlock_t *lock, const char *msg)
  14921. {
  14922. @@ -159,6 +161,7 @@ void do_raw_spin_unlock(raw_spinlock_t *lock)
  14923. arch_spin_unlock(&lock->raw_lock);
  14924. }
  14925. +#ifndef CONFIG_PREEMPT_RT_FULL
  14926. static void rwlock_bug(rwlock_t *lock, const char *msg)
  14927. {
  14928. if (!debug_locks_off())
  14929. @@ -300,3 +303,5 @@ void do_raw_write_unlock(rwlock_t *lock)
  14930. debug_write_unlock(lock);
  14931. arch_write_unlock(&lock->raw_lock);
  14932. }
  14933. +
  14934. +#endif
  14935. diff --git a/kernel/module.c b/kernel/module.c
  14936. index 0e54d5bf0097..f27764fbfa24 100644
  14937. --- a/kernel/module.c
  14938. +++ b/kernel/module.c
  14939. @@ -660,16 +660,7 @@ static void percpu_modcopy(struct module *mod,
  14940. memcpy(per_cpu_ptr(mod->percpu, cpu), from, size);
  14941. }
  14942. -/**
  14943. - * is_module_percpu_address - test whether address is from module static percpu
  14944. - * @addr: address to test
  14945. - *
  14946. - * Test whether @addr belongs to module static percpu area.
  14947. - *
  14948. - * RETURNS:
  14949. - * %true if @addr is from module static percpu area
  14950. - */
  14951. -bool is_module_percpu_address(unsigned long addr)
  14952. +bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
  14953. {
  14954. struct module *mod;
  14955. unsigned int cpu;
  14956. @@ -683,9 +674,15 @@ bool is_module_percpu_address(unsigned long addr)
  14957. continue;
  14958. for_each_possible_cpu(cpu) {
  14959. void *start = per_cpu_ptr(mod->percpu, cpu);
  14960. + void *va = (void *)addr;
  14961. - if ((void *)addr >= start &&
  14962. - (void *)addr < start + mod->percpu_size) {
  14963. + if (va >= start && va < start + mod->percpu_size) {
  14964. + if (can_addr) {
  14965. + *can_addr = (unsigned long) (va - start);
  14966. + *can_addr += (unsigned long)
  14967. + per_cpu_ptr(mod->percpu,
  14968. + get_boot_cpu_id());
  14969. + }
  14970. preempt_enable();
  14971. return true;
  14972. }
  14973. @@ -696,6 +693,20 @@ bool is_module_percpu_address(unsigned long addr)
  14974. return false;
  14975. }
  14976. +/**
  14977. + * is_module_percpu_address - test whether address is from module static percpu
  14978. + * @addr: address to test
  14979. + *
  14980. + * Test whether @addr belongs to module static percpu area.
  14981. + *
  14982. + * RETURNS:
  14983. + * %true if @addr is from module static percpu area
  14984. + */
  14985. +bool is_module_percpu_address(unsigned long addr)
  14986. +{
  14987. + return __is_module_percpu_address(addr, NULL);
  14988. +}
  14989. +
  14990. #else /* ... !CONFIG_SMP */
  14991. static inline void __percpu *mod_percpu(struct module *mod)
  14992. @@ -727,6 +738,11 @@ bool is_module_percpu_address(unsigned long addr)
  14993. return false;
  14994. }
  14995. +bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
  14996. +{
  14997. + return false;
  14998. +}
  14999. +
  15000. #endif /* CONFIG_SMP */
  15001. #define MODINFO_ATTR(field) \
  15002. diff --git a/kernel/panic.c b/kernel/panic.c
  15003. index e6480e20379e..7e9c1918a94e 100644
  15004. --- a/kernel/panic.c
  15005. +++ b/kernel/panic.c
  15006. @@ -482,9 +482,11 @@ static u64 oops_id;
  15007. static int init_oops_id(void)
  15008. {
  15009. +#ifndef CONFIG_PREEMPT_RT_FULL
  15010. if (!oops_id)
  15011. get_random_bytes(&oops_id, sizeof(oops_id));
  15012. else
  15013. +#endif
  15014. oops_id++;
  15015. return 0;
  15016. diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
  15017. index b26dbc48c75b..968255f27a33 100644
  15018. --- a/kernel/power/hibernate.c
  15019. +++ b/kernel/power/hibernate.c
  15020. @@ -286,6 +286,8 @@ static int create_image(int platform_mode)
  15021. local_irq_disable();
  15022. + system_state = SYSTEM_SUSPEND;
  15023. +
  15024. error = syscore_suspend();
  15025. if (error) {
  15026. printk(KERN_ERR "PM: Some system devices failed to power down, "
  15027. @@ -317,6 +319,7 @@ static int create_image(int platform_mode)
  15028. syscore_resume();
  15029. Enable_irqs:
  15030. + system_state = SYSTEM_RUNNING;
  15031. local_irq_enable();
  15032. Enable_cpus:
  15033. @@ -446,6 +449,7 @@ static int resume_target_kernel(bool platform_mode)
  15034. goto Enable_cpus;
  15035. local_irq_disable();
  15036. + system_state = SYSTEM_SUSPEND;
  15037. error = syscore_suspend();
  15038. if (error)
  15039. @@ -479,6 +483,7 @@ static int resume_target_kernel(bool platform_mode)
  15040. syscore_resume();
  15041. Enable_irqs:
  15042. + system_state = SYSTEM_RUNNING;
  15043. local_irq_enable();
  15044. Enable_cpus:
  15045. @@ -564,6 +569,7 @@ int hibernation_platform_enter(void)
  15046. goto Enable_cpus;
  15047. local_irq_disable();
  15048. + system_state = SYSTEM_SUSPEND;
  15049. syscore_suspend();
  15050. if (pm_wakeup_pending()) {
  15051. error = -EAGAIN;
  15052. @@ -576,6 +582,7 @@ int hibernation_platform_enter(void)
  15053. Power_up:
  15054. syscore_resume();
  15055. + system_state = SYSTEM_RUNNING;
  15056. local_irq_enable();
  15057. Enable_cpus:
  15058. @@ -676,6 +683,10 @@ static int load_image_and_restore(void)
  15059. return error;
  15060. }
  15061. +#ifndef CONFIG_SUSPEND
  15062. +bool pm_in_action;
  15063. +#endif
  15064. +
  15065. /**
  15066. * hibernate - Carry out system hibernation, including saving the image.
  15067. */
  15068. @@ -689,6 +700,8 @@ int hibernate(void)
  15069. return -EPERM;
  15070. }
  15071. + pm_in_action = true;
  15072. +
  15073. lock_system_sleep();
  15074. /* The snapshot device should not be opened while we're running */
  15075. if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
  15076. @@ -766,6 +779,7 @@ int hibernate(void)
  15077. atomic_inc(&snapshot_device_available);
  15078. Unlock:
  15079. unlock_system_sleep();
  15080. + pm_in_action = false;
  15081. return error;
  15082. }
  15083. diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
  15084. index 6ccb08f57fcb..c8cbb5ed2fe3 100644
  15085. --- a/kernel/power/suspend.c
  15086. +++ b/kernel/power/suspend.c
  15087. @@ -369,6 +369,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
  15088. arch_suspend_disable_irqs();
  15089. BUG_ON(!irqs_disabled());
  15090. + system_state = SYSTEM_SUSPEND;
  15091. +
  15092. error = syscore_suspend();
  15093. if (!error) {
  15094. *wakeup = pm_wakeup_pending();
  15095. @@ -385,6 +387,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
  15096. syscore_resume();
  15097. }
  15098. + system_state = SYSTEM_RUNNING;
  15099. +
  15100. arch_suspend_enable_irqs();
  15101. BUG_ON(irqs_disabled());
  15102. @@ -527,6 +531,8 @@ static int enter_state(suspend_state_t state)
  15103. return error;
  15104. }
  15105. +bool pm_in_action;
  15106. +
  15107. /**
  15108. * pm_suspend - Externally visible function for suspending the system.
  15109. * @state: System sleep state to enter.
  15110. @@ -541,6 +547,8 @@ int pm_suspend(suspend_state_t state)
  15111. if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
  15112. return -EINVAL;
  15113. + pm_in_action = true;
  15114. +
  15115. error = enter_state(state);
  15116. if (error) {
  15117. suspend_stats.fail++;
  15118. @@ -548,6 +556,7 @@ int pm_suspend(suspend_state_t state)
  15119. } else {
  15120. suspend_stats.success++;
  15121. }
  15122. + pm_in_action = false;
  15123. return error;
  15124. }
  15125. EXPORT_SYMBOL(pm_suspend);
  15126. diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
  15127. index 9c5b231684d0..cf15bdb6855b 100644
  15128. --- a/kernel/printk/printk.c
  15129. +++ b/kernel/printk/printk.c
  15130. @@ -351,6 +351,65 @@ __packed __aligned(4)
  15131. */
  15132. DEFINE_RAW_SPINLOCK(logbuf_lock);
  15133. +#ifdef CONFIG_EARLY_PRINTK
  15134. +struct console *early_console;
  15135. +
  15136. +static void early_vprintk(const char *fmt, va_list ap)
  15137. +{
  15138. + if (early_console) {
  15139. + char buf[512];
  15140. + int n = vscnprintf(buf, sizeof(buf), fmt, ap);
  15141. +
  15142. + early_console->write(early_console, buf, n);
  15143. + }
  15144. +}
  15145. +
  15146. +asmlinkage void early_printk(const char *fmt, ...)
  15147. +{
  15148. + va_list ap;
  15149. +
  15150. + va_start(ap, fmt);
  15151. + early_vprintk(fmt, ap);
  15152. + va_end(ap);
  15153. +}
  15154. +
  15155. +/*
  15156. + * This is independent of any log levels - a global
  15157. + * kill switch that turns off all of printk.
  15158. + *
  15159. + * Used by the NMI watchdog if early-printk is enabled.
  15160. + */
  15161. +static bool __read_mostly printk_killswitch;
  15162. +
  15163. +static int __init force_early_printk_setup(char *str)
  15164. +{
  15165. + printk_killswitch = true;
  15166. + return 0;
  15167. +}
  15168. +early_param("force_early_printk", force_early_printk_setup);
  15169. +
  15170. +void printk_kill(void)
  15171. +{
  15172. + printk_killswitch = true;
  15173. +}
  15174. +
  15175. +#ifdef CONFIG_PRINTK
  15176. +static int forced_early_printk(const char *fmt, va_list ap)
  15177. +{
  15178. + if (!printk_killswitch)
  15179. + return 0;
  15180. + early_vprintk(fmt, ap);
  15181. + return 1;
  15182. +}
  15183. +#endif
  15184. +
  15185. +#else
  15186. +static inline int forced_early_printk(const char *fmt, va_list ap)
  15187. +{
  15188. + return 0;
  15189. +}
  15190. +#endif
  15191. +
  15192. #ifdef CONFIG_PRINTK
  15193. DECLARE_WAIT_QUEUE_HEAD(log_wait);
  15194. /* the next printk record to read by syslog(READ) or /proc/kmsg */
  15195. @@ -1337,6 +1396,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
  15196. {
  15197. char *text;
  15198. int len = 0;
  15199. + int attempts = 0;
  15200. text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
  15201. if (!text)
  15202. @@ -1348,6 +1408,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
  15203. u64 seq;
  15204. u32 idx;
  15205. enum log_flags prev;
  15206. + int num_msg;
  15207. +try_again:
  15208. + attempts++;
  15209. + if (attempts > 10) {
  15210. + len = -EBUSY;
  15211. + goto out;
  15212. + }
  15213. + num_msg = 0;
  15214. /*
  15215. * Find first record that fits, including all following records,
  15216. @@ -1363,6 +1431,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
  15217. prev = msg->flags;
  15218. idx = log_next(idx);
  15219. seq++;
  15220. + num_msg++;
  15221. + if (num_msg > 5) {
  15222. + num_msg = 0;
  15223. + raw_spin_unlock_irq(&logbuf_lock);
  15224. + raw_spin_lock_irq(&logbuf_lock);
  15225. + if (clear_seq < log_first_seq)
  15226. + goto try_again;
  15227. + }
  15228. }
  15229. /* move first record forward until length fits into the buffer */
  15230. @@ -1376,6 +1452,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
  15231. prev = msg->flags;
  15232. idx = log_next(idx);
  15233. seq++;
  15234. + num_msg++;
  15235. + if (num_msg > 5) {
  15236. + num_msg = 0;
  15237. + raw_spin_unlock_irq(&logbuf_lock);
  15238. + raw_spin_lock_irq(&logbuf_lock);
  15239. + if (clear_seq < log_first_seq)
  15240. + goto try_again;
  15241. + }
  15242. }
  15243. /* last message fitting into this dump */
  15244. @@ -1416,6 +1500,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
  15245. clear_seq = log_next_seq;
  15246. clear_idx = log_next_idx;
  15247. }
  15248. +out:
  15249. raw_spin_unlock_irq(&logbuf_lock);
  15250. kfree(text);
  15251. @@ -1569,6 +1654,12 @@ static void call_console_drivers(int level,
  15252. if (!console_drivers)
  15253. return;
  15254. + if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
  15255. + if (in_irq() || in_nmi())
  15256. + return;
  15257. + }
  15258. +
  15259. + migrate_disable();
  15260. for_each_console(con) {
  15261. if (exclusive_console && con != exclusive_console)
  15262. continue;
  15263. @@ -1584,6 +1675,7 @@ static void call_console_drivers(int level,
  15264. else
  15265. con->write(con, text, len);
  15266. }
  15267. + migrate_enable();
  15268. }
  15269. /*
  15270. @@ -1781,6 +1873,13 @@ asmlinkage int vprintk_emit(int facility, int level,
  15271. /* cpu currently holding logbuf_lock in this function */
  15272. static unsigned int logbuf_cpu = UINT_MAX;
  15273. + /*
  15274. + * Fall back to early_printk if a debugging subsystem has
  15275. + * killed printk output
  15276. + */
  15277. + if (unlikely(forced_early_printk(fmt, args)))
  15278. + return 1;
  15279. +
  15280. if (level == LOGLEVEL_SCHED) {
  15281. level = LOGLEVEL_DEFAULT;
  15282. in_sched = true;
  15283. @@ -1885,13 +1984,23 @@ asmlinkage int vprintk_emit(int facility, int level,
  15284. /* If called from the scheduler, we can not call up(). */
  15285. if (!in_sched) {
  15286. + int may_trylock = 1;
  15287. +
  15288. lockdep_off();
  15289. +#ifdef CONFIG_PREEMPT_RT_FULL
  15290. + /*
  15291. + * we can't take a sleeping lock with IRQs or preeption disabled
  15292. + * so we can't print in these contexts
  15293. + */
  15294. + if (!(preempt_count() == 0 && !irqs_disabled()))
  15295. + may_trylock = 0;
  15296. +#endif
  15297. /*
  15298. * Try to acquire and then immediately release the console
  15299. * semaphore. The release will print out buffers and wake up
  15300. * /dev/kmsg and syslog() users.
  15301. */
  15302. - if (console_trylock())
  15303. + if (may_trylock && console_trylock())
  15304. console_unlock();
  15305. lockdep_on();
  15306. }
  15307. @@ -2014,26 +2123,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
  15308. #endif /* CONFIG_PRINTK */
  15309. -#ifdef CONFIG_EARLY_PRINTK
  15310. -struct console *early_console;
  15311. -
  15312. -asmlinkage __visible void early_printk(const char *fmt, ...)
  15313. -{
  15314. - va_list ap;
  15315. - char buf[512];
  15316. - int n;
  15317. -
  15318. - if (!early_console)
  15319. - return;
  15320. -
  15321. - va_start(ap, fmt);
  15322. - n = vscnprintf(buf, sizeof(buf), fmt, ap);
  15323. - va_end(ap);
  15324. -
  15325. - early_console->write(early_console, buf, n);
  15326. -}
  15327. -#endif
  15328. -
  15329. static int __add_preferred_console(char *name, int idx, char *options,
  15330. char *brl_options)
  15331. {
  15332. @@ -2303,11 +2392,16 @@ static void console_cont_flush(char *text, size_t size)
  15333. goto out;
  15334. len = cont_print_text(text, size);
  15335. +#ifdef CONFIG_PREEMPT_RT_FULL
  15336. + raw_spin_unlock_irqrestore(&logbuf_lock, flags);
  15337. + call_console_drivers(cont.level, NULL, 0, text, len);
  15338. +#else
  15339. raw_spin_unlock(&logbuf_lock);
  15340. stop_critical_timings();
  15341. call_console_drivers(cont.level, NULL, 0, text, len);
  15342. start_critical_timings();
  15343. local_irq_restore(flags);
  15344. +#endif
  15345. return;
  15346. out:
  15347. raw_spin_unlock_irqrestore(&logbuf_lock, flags);
  15348. @@ -2431,13 +2525,17 @@ void console_unlock(void)
  15349. console_idx = log_next(console_idx);
  15350. console_seq++;
  15351. console_prev = msg->flags;
  15352. +#ifdef CONFIG_PREEMPT_RT_FULL
  15353. + raw_spin_unlock_irqrestore(&logbuf_lock, flags);
  15354. + call_console_drivers(level, ext_text, ext_len, text, len);
  15355. +#else
  15356. raw_spin_unlock(&logbuf_lock);
  15357. stop_critical_timings(); /* don't trace print latency */
  15358. call_console_drivers(level, ext_text, ext_len, text, len);
  15359. start_critical_timings();
  15360. local_irq_restore(flags);
  15361. -
  15362. +#endif
  15363. if (do_cond_resched)
  15364. cond_resched();
  15365. }
  15366. @@ -2489,6 +2587,11 @@ void console_unblank(void)
  15367. {
  15368. struct console *c;
  15369. + if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
  15370. + if (in_irq() || in_nmi())
  15371. + return;
  15372. + }
  15373. +
  15374. /*
  15375. * console_unblank can no longer be called in interrupt context unless
  15376. * oops_in_progress is set to 1..
  15377. diff --git a/kernel/ptrace.c b/kernel/ptrace.c
  15378. index a5caecef88be..61e7c5e2183c 100644
  15379. --- a/kernel/ptrace.c
  15380. +++ b/kernel/ptrace.c
  15381. @@ -166,7 +166,14 @@ static bool ptrace_freeze_traced(struct task_struct *task)
  15382. spin_lock_irq(&task->sighand->siglock);
  15383. if (task_is_traced(task) && !__fatal_signal_pending(task)) {
  15384. - task->state = __TASK_TRACED;
  15385. + unsigned long flags;
  15386. +
  15387. + raw_spin_lock_irqsave(&task->pi_lock, flags);
  15388. + if (task->state & __TASK_TRACED)
  15389. + task->state = __TASK_TRACED;
  15390. + else
  15391. + task->saved_state = __TASK_TRACED;
  15392. + raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  15393. ret = true;
  15394. }
  15395. spin_unlock_irq(&task->sighand->siglock);
  15396. diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
  15397. index bf08fee53dc7..eeb8ce4ad7b6 100644
  15398. --- a/kernel/rcu/rcutorture.c
  15399. +++ b/kernel/rcu/rcutorture.c
  15400. @@ -404,6 +404,7 @@ static struct rcu_torture_ops rcu_ops = {
  15401. .name = "rcu"
  15402. };
  15403. +#ifndef CONFIG_PREEMPT_RT_FULL
  15404. /*
  15405. * Definitions for rcu_bh torture testing.
  15406. */
  15407. @@ -443,6 +444,12 @@ static struct rcu_torture_ops rcu_bh_ops = {
  15408. .name = "rcu_bh"
  15409. };
  15410. +#else
  15411. +static struct rcu_torture_ops rcu_bh_ops = {
  15412. + .ttype = INVALID_RCU_FLAVOR,
  15413. +};
  15414. +#endif
  15415. +
  15416. /*
  15417. * Don't even think about trying any of these in real life!!!
  15418. * The names includes "busted", and they really means it!
  15419. diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
  15420. index 10f62c6f48e7..dbee19478f09 100644
  15421. --- a/kernel/rcu/tree.c
  15422. +++ b/kernel/rcu/tree.c
  15423. @@ -55,6 +55,11 @@
  15424. #include <linux/random.h>
  15425. #include <linux/trace_events.h>
  15426. #include <linux/suspend.h>
  15427. +#include <linux/delay.h>
  15428. +#include <linux/gfp.h>
  15429. +#include <linux/oom.h>
  15430. +#include <linux/smpboot.h>
  15431. +#include "../time/tick-internal.h"
  15432. #include "tree.h"
  15433. #include "rcu.h"
  15434. @@ -260,6 +265,19 @@ void rcu_sched_qs(void)
  15435. this_cpu_ptr(&rcu_sched_data), true);
  15436. }
  15437. +#ifdef CONFIG_PREEMPT_RT_FULL
  15438. +static void rcu_preempt_qs(void);
  15439. +
  15440. +void rcu_bh_qs(void)
  15441. +{
  15442. + unsigned long flags;
  15443. +
  15444. + /* Callers to this function, rcu_preempt_qs(), must disable irqs. */
  15445. + local_irq_save(flags);
  15446. + rcu_preempt_qs();
  15447. + local_irq_restore(flags);
  15448. +}
  15449. +#else
  15450. void rcu_bh_qs(void)
  15451. {
  15452. if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) {
  15453. @@ -269,6 +287,7 @@ void rcu_bh_qs(void)
  15454. __this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
  15455. }
  15456. }
  15457. +#endif
  15458. static DEFINE_PER_CPU(int, rcu_sched_qs_mask);
  15459. @@ -449,11 +468,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
  15460. /*
  15461. * Return the number of RCU BH batches started thus far for debug & stats.
  15462. */
  15463. +#ifndef CONFIG_PREEMPT_RT_FULL
  15464. unsigned long rcu_batches_started_bh(void)
  15465. {
  15466. return rcu_bh_state.gpnum;
  15467. }
  15468. EXPORT_SYMBOL_GPL(rcu_batches_started_bh);
  15469. +#endif
  15470. /*
  15471. * Return the number of RCU batches completed thus far for debug & stats.
  15472. @@ -473,6 +494,7 @@ unsigned long rcu_batches_completed_sched(void)
  15473. }
  15474. EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
  15475. +#ifndef CONFIG_PREEMPT_RT_FULL
  15476. /*
  15477. * Return the number of RCU BH batches completed thus far for debug & stats.
  15478. */
  15479. @@ -481,6 +503,7 @@ unsigned long rcu_batches_completed_bh(void)
  15480. return rcu_bh_state.completed;
  15481. }
  15482. EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
  15483. +#endif
  15484. /*
  15485. * Return the number of RCU expedited batches completed thus far for
  15486. @@ -504,6 +527,7 @@ unsigned long rcu_exp_batches_completed_sched(void)
  15487. }
  15488. EXPORT_SYMBOL_GPL(rcu_exp_batches_completed_sched);
  15489. +#ifndef CONFIG_PREEMPT_RT_FULL
  15490. /*
  15491. * Force a quiescent state.
  15492. */
  15493. @@ -522,6 +546,13 @@ void rcu_bh_force_quiescent_state(void)
  15494. }
  15495. EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
  15496. +#else
  15497. +void rcu_force_quiescent_state(void)
  15498. +{
  15499. +}
  15500. +EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);
  15501. +#endif
  15502. +
  15503. /*
  15504. * Force a quiescent state for RCU-sched.
  15505. */
  15506. @@ -572,9 +603,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
  15507. case RCU_FLAVOR:
  15508. rsp = rcu_state_p;
  15509. break;
  15510. +#ifndef CONFIG_PREEMPT_RT_FULL
  15511. case RCU_BH_FLAVOR:
  15512. rsp = &rcu_bh_state;
  15513. break;
  15514. +#endif
  15515. case RCU_SCHED_FLAVOR:
  15516. rsp = &rcu_sched_state;
  15517. break;
  15518. @@ -3016,18 +3049,17 @@ __rcu_process_callbacks(struct rcu_state *rsp)
  15519. /*
  15520. * Do RCU core processing for the current CPU.
  15521. */
  15522. -static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
  15523. +static __latent_entropy void rcu_process_callbacks(void)
  15524. {
  15525. struct rcu_state *rsp;
  15526. if (cpu_is_offline(smp_processor_id()))
  15527. return;
  15528. - trace_rcu_utilization(TPS("Start RCU core"));
  15529. for_each_rcu_flavor(rsp)
  15530. __rcu_process_callbacks(rsp);
  15531. - trace_rcu_utilization(TPS("End RCU core"));
  15532. }
  15533. +static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
  15534. /*
  15535. * Schedule RCU callback invocation. If the specified type of RCU
  15536. * does not support RCU priority boosting, just do a direct call,
  15537. @@ -3039,19 +3071,106 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
  15538. {
  15539. if (unlikely(!READ_ONCE(rcu_scheduler_fully_active)))
  15540. return;
  15541. - if (likely(!rsp->boost)) {
  15542. - rcu_do_batch(rsp, rdp);
  15543. - return;
  15544. - }
  15545. - invoke_rcu_callbacks_kthread();
  15546. + rcu_do_batch(rsp, rdp);
  15547. }
  15548. +static void rcu_wake_cond(struct task_struct *t, int status)
  15549. +{
  15550. + /*
  15551. + * If the thread is yielding, only wake it when this
  15552. + * is invoked from idle
  15553. + */
  15554. + if (t && (status != RCU_KTHREAD_YIELDING || is_idle_task(current)))
  15555. + wake_up_process(t);
  15556. +}
  15557. +
  15558. +/*
  15559. + * Wake up this CPU's rcuc kthread to do RCU core processing.
  15560. + */
  15561. static void invoke_rcu_core(void)
  15562. {
  15563. - if (cpu_online(smp_processor_id()))
  15564. - raise_softirq(RCU_SOFTIRQ);
  15565. + unsigned long flags;
  15566. + struct task_struct *t;
  15567. +
  15568. + if (!cpu_online(smp_processor_id()))
  15569. + return;
  15570. + local_irq_save(flags);
  15571. + __this_cpu_write(rcu_cpu_has_work, 1);
  15572. + t = __this_cpu_read(rcu_cpu_kthread_task);
  15573. + if (t != NULL && current != t)
  15574. + rcu_wake_cond(t, __this_cpu_read(rcu_cpu_kthread_status));
  15575. + local_irq_restore(flags);
  15576. }
  15577. +static void rcu_cpu_kthread_park(unsigned int cpu)
  15578. +{
  15579. + per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
  15580. +}
  15581. +
  15582. +static int rcu_cpu_kthread_should_run(unsigned int cpu)
  15583. +{
  15584. + return __this_cpu_read(rcu_cpu_has_work);
  15585. +}
  15586. +
  15587. +/*
  15588. + * Per-CPU kernel thread that invokes RCU callbacks. This replaces the
  15589. + * RCU softirq used in flavors and configurations of RCU that do not
  15590. + * support RCU priority boosting.
  15591. + */
  15592. +static void rcu_cpu_kthread(unsigned int cpu)
  15593. +{
  15594. + unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
  15595. + char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
  15596. + int spincnt;
  15597. +
  15598. + for (spincnt = 0; spincnt < 10; spincnt++) {
  15599. + trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
  15600. + local_bh_disable();
  15601. + *statusp = RCU_KTHREAD_RUNNING;
  15602. + this_cpu_inc(rcu_cpu_kthread_loops);
  15603. + local_irq_disable();
  15604. + work = *workp;
  15605. + *workp = 0;
  15606. + local_irq_enable();
  15607. + if (work)
  15608. + rcu_process_callbacks();
  15609. + local_bh_enable();
  15610. + if (*workp == 0) {
  15611. + trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
  15612. + *statusp = RCU_KTHREAD_WAITING;
  15613. + return;
  15614. + }
  15615. + }
  15616. + *statusp = RCU_KTHREAD_YIELDING;
  15617. + trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
  15618. + schedule_timeout_interruptible(2);
  15619. + trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
  15620. + *statusp = RCU_KTHREAD_WAITING;
  15621. +}
  15622. +
  15623. +static struct smp_hotplug_thread rcu_cpu_thread_spec = {
  15624. + .store = &rcu_cpu_kthread_task,
  15625. + .thread_should_run = rcu_cpu_kthread_should_run,
  15626. + .thread_fn = rcu_cpu_kthread,
  15627. + .thread_comm = "rcuc/%u",
  15628. + .setup = rcu_cpu_kthread_setup,
  15629. + .park = rcu_cpu_kthread_park,
  15630. +};
  15631. +
  15632. +/*
  15633. + * Spawn per-CPU RCU core processing kthreads.
  15634. + */
  15635. +static int __init rcu_spawn_core_kthreads(void)
  15636. +{
  15637. + int cpu;
  15638. +
  15639. + for_each_possible_cpu(cpu)
  15640. + per_cpu(rcu_cpu_has_work, cpu) = 0;
  15641. + BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
  15642. + return 0;
  15643. +}
  15644. +early_initcall(rcu_spawn_core_kthreads);
  15645. +
  15646. /*
  15647. * Handle any core-RCU processing required by a call_rcu() invocation.
  15648. */
  15649. @@ -3195,6 +3314,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func)
  15650. }
  15651. EXPORT_SYMBOL_GPL(call_rcu_sched);
  15652. +#ifndef CONFIG_PREEMPT_RT_FULL
  15653. /*
  15654. * Queue an RCU callback for invocation after a quicker grace period.
  15655. */
  15656. @@ -3203,6 +3323,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func)
  15657. __call_rcu(head, func, &rcu_bh_state, -1, 0);
  15658. }
  15659. EXPORT_SYMBOL_GPL(call_rcu_bh);
  15660. +#endif
  15661. /*
  15662. * Queue an RCU callback for lazy invocation after a grace period.
  15663. @@ -3294,6 +3415,7 @@ void synchronize_sched(void)
  15664. }
  15665. EXPORT_SYMBOL_GPL(synchronize_sched);
  15666. +#ifndef CONFIG_PREEMPT_RT_FULL
  15667. /**
  15668. * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
  15669. *
  15670. @@ -3320,6 +3442,7 @@ void synchronize_rcu_bh(void)
  15671. wait_rcu_gp(call_rcu_bh);
  15672. }
  15673. EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
  15674. +#endif
  15675. /**
  15676. * get_state_synchronize_rcu - Snapshot current RCU state
  15677. @@ -3698,6 +3821,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
  15678. mutex_unlock(&rsp->barrier_mutex);
  15679. }
  15680. +#ifndef CONFIG_PREEMPT_RT_FULL
  15681. /**
  15682. * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
  15683. */
  15684. @@ -3706,6 +3830,7 @@ void rcu_barrier_bh(void)
  15685. _rcu_barrier(&rcu_bh_state);
  15686. }
  15687. EXPORT_SYMBOL_GPL(rcu_barrier_bh);
  15688. +#endif
  15689. /**
  15690. * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
  15691. @@ -4227,12 +4352,13 @@ void __init rcu_init(void)
  15692. rcu_bootup_announce();
  15693. rcu_init_geometry();
  15694. +#ifndef CONFIG_PREEMPT_RT_FULL
  15695. rcu_init_one(&rcu_bh_state);
  15696. +#endif
  15697. rcu_init_one(&rcu_sched_state);
  15698. if (dump_tree)
  15699. rcu_dump_rcu_node_tree(&rcu_sched_state);
  15700. __rcu_init_preempt();
  15701. - open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
  15702. /*
  15703. * We don't need protection against CPU-hotplug here because
  15704. diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
  15705. index e99a5234d9ed..958ac107062c 100644
  15706. --- a/kernel/rcu/tree.h
  15707. +++ b/kernel/rcu/tree.h
  15708. @@ -588,18 +588,18 @@ extern struct list_head rcu_struct_flavors;
  15709. */
  15710. extern struct rcu_state rcu_sched_state;
  15711. +#ifndef CONFIG_PREEMPT_RT_FULL
  15712. extern struct rcu_state rcu_bh_state;
  15713. +#endif
  15714. #ifdef CONFIG_PREEMPT_RCU
  15715. extern struct rcu_state rcu_preempt_state;
  15716. #endif /* #ifdef CONFIG_PREEMPT_RCU */
  15717. -#ifdef CONFIG_RCU_BOOST
  15718. DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
  15719. DECLARE_PER_CPU(int, rcu_cpu_kthread_cpu);
  15720. DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
  15721. DECLARE_PER_CPU(char, rcu_cpu_has_work);
  15722. -#endif /* #ifdef CONFIG_RCU_BOOST */
  15723. #ifndef RCU_TREE_NONCORE
  15724. @@ -619,10 +619,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func);
  15725. static void __init __rcu_init_preempt(void);
  15726. static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
  15727. static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
  15728. -static void invoke_rcu_callbacks_kthread(void);
  15729. static bool rcu_is_callbacks_kthread(void);
  15730. +static void rcu_cpu_kthread_setup(unsigned int cpu);
  15731. #ifdef CONFIG_RCU_BOOST
  15732. -static void rcu_preempt_do_callbacks(void);
  15733. static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
  15734. struct rcu_node *rnp);
  15735. #endif /* #ifdef CONFIG_RCU_BOOST */
  15736. diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
  15737. index 56583e764ebf..7c656f8e192f 100644
  15738. --- a/kernel/rcu/tree_plugin.h
  15739. +++ b/kernel/rcu/tree_plugin.h
  15740. @@ -24,25 +24,10 @@
  15741. * Paul E. McKenney <paulmck@linux.vnet.ibm.com>
  15742. */
  15743. -#include <linux/delay.h>
  15744. -#include <linux/gfp.h>
  15745. -#include <linux/oom.h>
  15746. -#include <linux/smpboot.h>
  15747. -#include "../time/tick-internal.h"
  15748. -
  15749. #ifdef CONFIG_RCU_BOOST
  15750. #include "../locking/rtmutex_common.h"
  15751. -/*
  15752. - * Control variables for per-CPU and per-rcu_node kthreads. These
  15753. - * handle all flavors of RCU.
  15754. - */
  15755. -static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
  15756. -DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
  15757. -DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
  15758. -DEFINE_PER_CPU(char, rcu_cpu_has_work);
  15759. -
  15760. #else /* #ifdef CONFIG_RCU_BOOST */
  15761. /*
  15762. @@ -55,6 +40,14 @@ DEFINE_PER_CPU(char, rcu_cpu_has_work);
  15763. #endif /* #else #ifdef CONFIG_RCU_BOOST */
  15764. +/*
  15765. + * Control variables for per-CPU and per-rcu_node kthreads. These
  15766. + * handle all flavors of RCU.
  15767. + */
  15768. +DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
  15769. +DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
  15770. +DEFINE_PER_CPU(char, rcu_cpu_has_work);
  15771. +
  15772. #ifdef CONFIG_RCU_NOCB_CPU
  15773. static cpumask_var_t rcu_nocb_mask; /* CPUs to have callbacks offloaded. */
  15774. static bool have_rcu_nocb_mask; /* Was rcu_nocb_mask allocated? */
  15775. @@ -426,7 +419,7 @@ void rcu_read_unlock_special(struct task_struct *t)
  15776. }
  15777. /* Hardware IRQ handlers cannot block, complain if they get here. */
  15778. - if (in_irq() || in_serving_softirq()) {
  15779. + if (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_OFFSET)) {
  15780. lockdep_rcu_suspicious(__FILE__, __LINE__,
  15781. "rcu_read_unlock() from irq or softirq with blocking in critical section!!!\n");
  15782. pr_alert("->rcu_read_unlock_special: %#x (b: %d, enq: %d nq: %d)\n",
  15783. @@ -632,15 +625,6 @@ static void rcu_preempt_check_callbacks(void)
  15784. t->rcu_read_unlock_special.b.need_qs = true;
  15785. }
  15786. -#ifdef CONFIG_RCU_BOOST
  15787. -
  15788. -static void rcu_preempt_do_callbacks(void)
  15789. -{
  15790. - rcu_do_batch(rcu_state_p, this_cpu_ptr(rcu_data_p));
  15791. -}
  15792. -
  15793. -#endif /* #ifdef CONFIG_RCU_BOOST */
  15794. -
  15795. /*
  15796. * Queue a preemptible-RCU callback for invocation after a grace period.
  15797. */
  15798. @@ -829,6 +813,19 @@ void exit_rcu(void)
  15799. #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  15800. +/*
  15801. + * If boosting, set rcuc kthreads to realtime priority.
  15802. + */
  15803. +static void rcu_cpu_kthread_setup(unsigned int cpu)
  15804. +{
  15805. +#ifdef CONFIG_RCU_BOOST
  15806. + struct sched_param sp;
  15807. +
  15808. + sp.sched_priority = kthread_prio;
  15809. + sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
  15810. +#endif /* #ifdef CONFIG_RCU_BOOST */
  15811. +}
  15812. +
  15813. #ifdef CONFIG_RCU_BOOST
  15814. #include "../locking/rtmutex_common.h"
  15815. @@ -860,16 +857,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp)
  15816. #endif /* #else #ifdef CONFIG_RCU_TRACE */
  15817. -static void rcu_wake_cond(struct task_struct *t, int status)
  15818. -{
  15819. - /*
  15820. - * If the thread is yielding, only wake it when this
  15821. - * is invoked from idle
  15822. - */
  15823. - if (status != RCU_KTHREAD_YIELDING || is_idle_task(current))
  15824. - wake_up_process(t);
  15825. -}
  15826. -
  15827. /*
  15828. * Carry out RCU priority boosting on the task indicated by ->exp_tasks
  15829. * or ->boost_tasks, advancing the pointer to the next task in the
  15830. @@ -1013,23 +1000,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
  15831. }
  15832. /*
  15833. - * Wake up the per-CPU kthread to invoke RCU callbacks.
  15834. - */
  15835. -static void invoke_rcu_callbacks_kthread(void)
  15836. -{
  15837. - unsigned long flags;
  15838. -
  15839. - local_irq_save(flags);
  15840. - __this_cpu_write(rcu_cpu_has_work, 1);
  15841. - if (__this_cpu_read(rcu_cpu_kthread_task) != NULL &&
  15842. - current != __this_cpu_read(rcu_cpu_kthread_task)) {
  15843. - rcu_wake_cond(__this_cpu_read(rcu_cpu_kthread_task),
  15844. - __this_cpu_read(rcu_cpu_kthread_status));
  15845. - }
  15846. - local_irq_restore(flags);
  15847. -}
  15848. -
  15849. -/*
  15850. * Is the current CPU running the RCU-callbacks kthread?
  15851. * Caller must have preemption disabled.
  15852. */
  15853. @@ -1083,67 +1053,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
  15854. return 0;
  15855. }
  15856. -static void rcu_kthread_do_work(void)
  15857. -{
  15858. - rcu_do_batch(&rcu_sched_state, this_cpu_ptr(&rcu_sched_data));
  15859. - rcu_do_batch(&rcu_bh_state, this_cpu_ptr(&rcu_bh_data));
  15860. - rcu_preempt_do_callbacks();
  15861. -}
  15862. -
  15863. -static void rcu_cpu_kthread_setup(unsigned int cpu)
  15864. -{
  15865. - struct sched_param sp;
  15866. -
  15867. - sp.sched_priority = kthread_prio;
  15868. - sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
  15869. -}
  15870. -
  15871. -static void rcu_cpu_kthread_park(unsigned int cpu)
  15872. -{
  15873. - per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
  15874. -}
  15875. -
  15876. -static int rcu_cpu_kthread_should_run(unsigned int cpu)
  15877. -{
  15878. - return __this_cpu_read(rcu_cpu_has_work);
  15879. -}
  15880. -
  15881. -/*
  15882. - * Per-CPU kernel thread that invokes RCU callbacks. This replaces the
  15883. - * RCU softirq used in flavors and configurations of RCU that do not
  15884. - * support RCU priority boosting.
  15885. - */
  15886. -static void rcu_cpu_kthread(unsigned int cpu)
  15887. -{
  15888. - unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
  15889. - char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
  15890. - int spincnt;
  15891. -
  15892. - for (spincnt = 0; spincnt < 10; spincnt++) {
  15893. - trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
  15894. - local_bh_disable();
  15895. - *statusp = RCU_KTHREAD_RUNNING;
  15896. - this_cpu_inc(rcu_cpu_kthread_loops);
  15897. - local_irq_disable();
  15898. - work = *workp;
  15899. - *workp = 0;
  15900. - local_irq_enable();
  15901. - if (work)
  15902. - rcu_kthread_do_work();
  15903. - local_bh_enable();
  15904. - if (*workp == 0) {
  15905. - trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
  15906. - *statusp = RCU_KTHREAD_WAITING;
  15907. - return;
  15908. - }
  15909. - }
  15910. - *statusp = RCU_KTHREAD_YIELDING;
  15911. - trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
  15912. - schedule_timeout_interruptible(2);
  15913. - trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
  15914. - *statusp = RCU_KTHREAD_WAITING;
  15915. -}
  15916. -
  15917. /*
  15918. * Set the per-rcu_node kthread's affinity to cover all CPUs that are
  15919. * served by the rcu_node in question. The CPU hotplug lock is still
  15920. @@ -1174,26 +1083,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
  15921. free_cpumask_var(cm);
  15922. }
  15923. -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
  15924. - .store = &rcu_cpu_kthread_task,
  15925. - .thread_should_run = rcu_cpu_kthread_should_run,
  15926. - .thread_fn = rcu_cpu_kthread,
  15927. - .thread_comm = "rcuc/%u",
  15928. - .setup = rcu_cpu_kthread_setup,
  15929. - .park = rcu_cpu_kthread_park,
  15930. -};
  15931. -
  15932. /*
  15933. * Spawn boost kthreads -- called as soon as the scheduler is running.
  15934. */
  15935. static void __init rcu_spawn_boost_kthreads(void)
  15936. {
  15937. struct rcu_node *rnp;
  15938. - int cpu;
  15939. -
  15940. - for_each_possible_cpu(cpu)
  15941. - per_cpu(rcu_cpu_has_work, cpu) = 0;
  15942. - BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
  15943. rcu_for_each_leaf_node(rcu_state_p, rnp)
  15944. (void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
  15945. }
  15946. @@ -1216,11 +1111,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
  15947. raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
  15948. }
  15949. -static void invoke_rcu_callbacks_kthread(void)
  15950. -{
  15951. - WARN_ON_ONCE(1);
  15952. -}
  15953. -
  15954. static bool rcu_is_callbacks_kthread(void)
  15955. {
  15956. return false;
  15957. @@ -1244,7 +1134,7 @@ static void rcu_prepare_kthreads(int cpu)
  15958. #endif /* #else #ifdef CONFIG_RCU_BOOST */
  15959. -#if !defined(CONFIG_RCU_FAST_NO_HZ)
  15960. +#if !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL)
  15961. /*
  15962. * Check to see if any future RCU-related work will need to be done
  15963. @@ -1261,7 +1151,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
  15964. return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL)
  15965. ? 0 : rcu_cpu_has_callbacks(NULL);
  15966. }
  15967. +#endif /* !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL) */
  15968. +#if !defined(CONFIG_RCU_FAST_NO_HZ)
  15969. /*
  15970. * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
  15971. * after it.
  15972. @@ -1357,6 +1249,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void)
  15973. return cbs_ready;
  15974. }
  15975. +#ifndef CONFIG_PREEMPT_RT_FULL
  15976. +
  15977. /*
  15978. * Allow the CPU to enter dyntick-idle mode unless it has callbacks ready
  15979. * to invoke. If the CPU has callbacks, try to advance them. Tell the
  15980. @@ -1402,6 +1296,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
  15981. *nextevt = basemono + dj * TICK_NSEC;
  15982. return 0;
  15983. }
  15984. +#endif /* #ifndef CONFIG_PREEMPT_RT_FULL */
  15985. /*
  15986. * Prepare a CPU for idle from an RCU perspective. The first major task
  15987. diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
  15988. index 4f6db7e6a117..ee02e1e1b3e5 100644
  15989. --- a/kernel/rcu/update.c
  15990. +++ b/kernel/rcu/update.c
  15991. @@ -62,7 +62,7 @@
  15992. #ifndef CONFIG_TINY_RCU
  15993. module_param(rcu_expedited, int, 0);
  15994. module_param(rcu_normal, int, 0);
  15995. -static int rcu_normal_after_boot;
  15996. +static int rcu_normal_after_boot = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
  15997. module_param(rcu_normal_after_boot, int, 0);
  15998. #endif /* #ifndef CONFIG_TINY_RCU */
  15999. @@ -132,8 +132,7 @@ bool rcu_gp_is_normal(void)
  16000. }
  16001. EXPORT_SYMBOL_GPL(rcu_gp_is_normal);
  16002. -static atomic_t rcu_expedited_nesting =
  16003. - ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);
  16004. +static atomic_t rcu_expedited_nesting = ATOMIC_INIT(1);
  16005. /*
  16006. * Should normal grace-period primitives be expedited? Intended for
  16007. @@ -182,8 +181,7 @@ EXPORT_SYMBOL_GPL(rcu_unexpedite_gp);
  16008. */
  16009. void rcu_end_inkernel_boot(void)
  16010. {
  16011. - if (IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT))
  16012. - rcu_unexpedite_gp();
  16013. + rcu_unexpedite_gp();
  16014. if (rcu_normal_after_boot)
  16015. WRITE_ONCE(rcu_normal, 1);
  16016. }
  16017. @@ -298,6 +296,7 @@ int rcu_read_lock_held(void)
  16018. }
  16019. EXPORT_SYMBOL_GPL(rcu_read_lock_held);
  16020. +#ifndef CONFIG_PREEMPT_RT_FULL
  16021. /**
  16022. * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
  16023. *
  16024. @@ -324,6 +323,7 @@ int rcu_read_lock_bh_held(void)
  16025. return in_softirq() || irqs_disabled();
  16026. }
  16027. EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
  16028. +#endif
  16029. #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
  16030. diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
  16031. index 5e59b832ae2b..7337a7f60e3f 100644
  16032. --- a/kernel/sched/Makefile
  16033. +++ b/kernel/sched/Makefile
  16034. @@ -17,7 +17,7 @@ endif
  16035. obj-y += core.o loadavg.o clock.o cputime.o
  16036. obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
  16037. -obj-y += wait.o swait.o completion.o idle.o
  16038. +obj-y += wait.o swait.o swork.o completion.o idle.o
  16039. obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
  16040. obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
  16041. obj-$(CONFIG_SCHEDSTATS) += stats.o
  16042. diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
  16043. index 8d0f35debf35..b62cf6400fe0 100644
  16044. --- a/kernel/sched/completion.c
  16045. +++ b/kernel/sched/completion.c
  16046. @@ -30,10 +30,10 @@ void complete(struct completion *x)
  16047. {
  16048. unsigned long flags;
  16049. - spin_lock_irqsave(&x->wait.lock, flags);
  16050. + raw_spin_lock_irqsave(&x->wait.lock, flags);
  16051. x->done++;
  16052. - __wake_up_locked(&x->wait, TASK_NORMAL, 1);
  16053. - spin_unlock_irqrestore(&x->wait.lock, flags);
  16054. + swake_up_locked(&x->wait);
  16055. + raw_spin_unlock_irqrestore(&x->wait.lock, flags);
  16056. }
  16057. EXPORT_SYMBOL(complete);
  16058. @@ -50,10 +50,10 @@ void complete_all(struct completion *x)
  16059. {
  16060. unsigned long flags;
  16061. - spin_lock_irqsave(&x->wait.lock, flags);
  16062. + raw_spin_lock_irqsave(&x->wait.lock, flags);
  16063. x->done += UINT_MAX/2;
  16064. - __wake_up_locked(&x->wait, TASK_NORMAL, 0);
  16065. - spin_unlock_irqrestore(&x->wait.lock, flags);
  16066. + swake_up_all_locked(&x->wait);
  16067. + raw_spin_unlock_irqrestore(&x->wait.lock, flags);
  16068. }
  16069. EXPORT_SYMBOL(complete_all);
  16070. @@ -62,20 +62,20 @@ do_wait_for_common(struct completion *x,
  16071. long (*action)(long), long timeout, int state)
  16072. {
  16073. if (!x->done) {
  16074. - DECLARE_WAITQUEUE(wait, current);
  16075. + DECLARE_SWAITQUEUE(wait);
  16076. - __add_wait_queue_tail_exclusive(&x->wait, &wait);
  16077. + __prepare_to_swait(&x->wait, &wait);
  16078. do {
  16079. if (signal_pending_state(state, current)) {
  16080. timeout = -ERESTARTSYS;
  16081. break;
  16082. }
  16083. __set_current_state(state);
  16084. - spin_unlock_irq(&x->wait.lock);
  16085. + raw_spin_unlock_irq(&x->wait.lock);
  16086. timeout = action(timeout);
  16087. - spin_lock_irq(&x->wait.lock);
  16088. + raw_spin_lock_irq(&x->wait.lock);
  16089. } while (!x->done && timeout);
  16090. - __remove_wait_queue(&x->wait, &wait);
  16091. + __finish_swait(&x->wait, &wait);
  16092. if (!x->done)
  16093. return timeout;
  16094. }
  16095. @@ -89,9 +89,9 @@ __wait_for_common(struct completion *x,
  16096. {
  16097. might_sleep();
  16098. - spin_lock_irq(&x->wait.lock);
  16099. + raw_spin_lock_irq(&x->wait.lock);
  16100. timeout = do_wait_for_common(x, action, timeout, state);
  16101. - spin_unlock_irq(&x->wait.lock);
  16102. + raw_spin_unlock_irq(&x->wait.lock);
  16103. return timeout;
  16104. }
  16105. @@ -277,12 +277,12 @@ bool try_wait_for_completion(struct completion *x)
  16106. if (!READ_ONCE(x->done))
  16107. return 0;
  16108. - spin_lock_irqsave(&x->wait.lock, flags);
  16109. + raw_spin_lock_irqsave(&x->wait.lock, flags);
  16110. if (!x->done)
  16111. ret = 0;
  16112. else
  16113. x->done--;
  16114. - spin_unlock_irqrestore(&x->wait.lock, flags);
  16115. + raw_spin_unlock_irqrestore(&x->wait.lock, flags);
  16116. return ret;
  16117. }
  16118. EXPORT_SYMBOL(try_wait_for_completion);
  16119. @@ -311,7 +311,7 @@ bool completion_done(struct completion *x)
  16120. * after it's acquired the lock.
  16121. */
  16122. smp_rmb();
  16123. - spin_unlock_wait(&x->wait.lock);
  16124. + raw_spin_unlock_wait(&x->wait.lock);
  16125. return true;
  16126. }
  16127. EXPORT_SYMBOL(completion_done);
  16128. diff --git a/kernel/sched/core.c b/kernel/sched/core.c
  16129. index 154fd689fe02..10e832da70b6 100644
  16130. --- a/kernel/sched/core.c
  16131. +++ b/kernel/sched/core.c
  16132. @@ -129,7 +129,11 @@ const_debug unsigned int sysctl_sched_features =
  16133. * Number of tasks to iterate in a single balance run.
  16134. * Limited because this is done with IRQs disabled.
  16135. */
  16136. +#ifndef CONFIG_PREEMPT_RT_FULL
  16137. const_debug unsigned int sysctl_sched_nr_migrate = 32;
  16138. +#else
  16139. +const_debug unsigned int sysctl_sched_nr_migrate = 8;
  16140. +#endif
  16141. /*
  16142. * period over which we average the RT time consumption, measured
  16143. @@ -345,6 +349,7 @@ static void init_rq_hrtick(struct rq *rq)
  16144. hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  16145. rq->hrtick_timer.function = hrtick;
  16146. + rq->hrtick_timer.irqsafe = 1;
  16147. }
  16148. #else /* CONFIG_SCHED_HRTICK */
  16149. static inline void hrtick_clear(struct rq *rq)
  16150. @@ -449,7 +454,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task)
  16151. head->lastp = &node->next;
  16152. }
  16153. -void wake_up_q(struct wake_q_head *head)
  16154. +void __wake_up_q(struct wake_q_head *head, bool sleeper)
  16155. {
  16156. struct wake_q_node *node = head->first;
  16157. @@ -466,7 +471,10 @@ void wake_up_q(struct wake_q_head *head)
  16158. * wake_up_process() implies a wmb() to pair with the queueing
  16159. * in wake_q_add() so as not to miss wakeups.
  16160. */
  16161. - wake_up_process(task);
  16162. + if (sleeper)
  16163. + wake_up_lock_sleeper(task);
  16164. + else
  16165. + wake_up_process(task);
  16166. put_task_struct(task);
  16167. }
  16168. }
  16169. @@ -502,6 +510,38 @@ void resched_curr(struct rq *rq)
  16170. trace_sched_wake_idle_without_ipi(cpu);
  16171. }
  16172. +#ifdef CONFIG_PREEMPT_LAZY
  16173. +void resched_curr_lazy(struct rq *rq)
  16174. +{
  16175. + struct task_struct *curr = rq->curr;
  16176. + int cpu;
  16177. +
  16178. + if (!sched_feat(PREEMPT_LAZY)) {
  16179. + resched_curr(rq);
  16180. + return;
  16181. + }
  16182. +
  16183. + lockdep_assert_held(&rq->lock);
  16184. +
  16185. + if (test_tsk_need_resched(curr))
  16186. + return;
  16187. +
  16188. + if (test_tsk_need_resched_lazy(curr))
  16189. + return;
  16190. +
  16191. + set_tsk_need_resched_lazy(curr);
  16192. +
  16193. + cpu = cpu_of(rq);
  16194. + if (cpu == smp_processor_id())
  16195. + return;
  16196. +
  16197. + /* NEED_RESCHED_LAZY must be visible before we test polling */
  16198. + smp_mb();
  16199. + if (!tsk_is_polling(curr))
  16200. + smp_send_reschedule(cpu);
  16201. +}
  16202. +#endif
  16203. +
  16204. void resched_cpu(int cpu)
  16205. {
  16206. struct rq *rq = cpu_rq(cpu);
  16207. @@ -525,11 +565,14 @@ void resched_cpu(int cpu)
  16208. */
  16209. int get_nohz_timer_target(void)
  16210. {
  16211. - int i, cpu = smp_processor_id();
  16212. + int i, cpu;
  16213. struct sched_domain *sd;
  16214. + preempt_disable_rt();
  16215. + cpu = smp_processor_id();
  16216. +
  16217. if (!idle_cpu(cpu) && is_housekeeping_cpu(cpu))
  16218. - return cpu;
  16219. + goto preempt_en_rt;
  16220. rcu_read_lock();
  16221. for_each_domain(cpu, sd) {
  16222. @@ -548,6 +591,8 @@ int get_nohz_timer_target(void)
  16223. cpu = housekeeping_any_cpu();
  16224. unlock:
  16225. rcu_read_unlock();
  16226. +preempt_en_rt:
  16227. + preempt_enable_rt();
  16228. return cpu;
  16229. }
  16230. /*
  16231. @@ -1100,6 +1145,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
  16232. lockdep_assert_held(&p->pi_lock);
  16233. + if (__migrate_disabled(p)) {
  16234. + cpumask_copy(&p->cpus_allowed, new_mask);
  16235. + return;
  16236. + }
  16237. +
  16238. queued = task_on_rq_queued(p);
  16239. running = task_current(rq, p);
  16240. @@ -1122,6 +1172,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
  16241. set_curr_task(rq, p);
  16242. }
  16243. +static DEFINE_PER_CPU(struct cpumask, sched_cpumasks);
  16244. +static DEFINE_MUTEX(sched_down_mutex);
  16245. +static cpumask_t sched_down_cpumask;
  16246. +
  16247. +void tell_sched_cpu_down_begin(int cpu)
  16248. +{
  16249. + mutex_lock(&sched_down_mutex);
  16250. + cpumask_set_cpu(cpu, &sched_down_cpumask);
  16251. + mutex_unlock(&sched_down_mutex);
  16252. +}
  16253. +
  16254. +void tell_sched_cpu_down_done(int cpu)
  16255. +{
  16256. + mutex_lock(&sched_down_mutex);
  16257. + cpumask_clear_cpu(cpu, &sched_down_cpumask);
  16258. + mutex_unlock(&sched_down_mutex);
  16259. +}
  16260. +
  16261. +/**
  16262. + * migrate_me - try to move the current task off this cpu
  16263. + *
  16264. + * Used by the pin_current_cpu() code to try to get tasks
  16265. + * to move off the current CPU as it is going down.
  16266. + * It will only move the task if the task isn't pinned to
  16267. + * the CPU (with migrate_disable, affinity or NO_SETAFFINITY)
  16268. + * and the task has to be in a RUNNING state. Otherwise the
  16269. + * movement of the task will wake it up (change its state
  16270. + * to running) when the task did not expect it.
  16271. + *
  16272. + * Returns 1 if it succeeded in moving the current task
  16273. + * 0 otherwise.
  16274. + */
  16275. +int migrate_me(void)
  16276. +{
  16277. + struct task_struct *p = current;
  16278. + struct migration_arg arg;
  16279. + struct cpumask *cpumask;
  16280. + struct cpumask *mask;
  16281. + unsigned int dest_cpu;
  16282. + struct rq_flags rf;
  16283. + struct rq *rq;
  16284. +
  16285. + /*
  16286. + * We can not migrate tasks bounded to a CPU or tasks not
  16287. + * running. The movement of the task will wake it up.
  16288. + */
  16289. + if (p->flags & PF_NO_SETAFFINITY || p->state)
  16290. + return 0;
  16291. +
  16292. + mutex_lock(&sched_down_mutex);
  16293. + rq = task_rq_lock(p, &rf);
  16294. +
  16295. + cpumask = this_cpu_ptr(&sched_cpumasks);
  16296. + mask = &p->cpus_allowed;
  16297. +
  16298. + cpumask_andnot(cpumask, mask, &sched_down_cpumask);
  16299. +
  16300. + if (!cpumask_weight(cpumask)) {
  16301. + /* It's only on this CPU? */
  16302. + task_rq_unlock(rq, p, &rf);
  16303. + mutex_unlock(&sched_down_mutex);
  16304. + return 0;
  16305. + }
  16306. +
  16307. + dest_cpu = cpumask_any_and(cpu_active_mask, cpumask);
  16308. +
  16309. + arg.task = p;
  16310. + arg.dest_cpu = dest_cpu;
  16311. +
  16312. + task_rq_unlock(rq, p, &rf);
  16313. +
  16314. + stop_one_cpu(cpu_of(rq), migration_cpu_stop, &arg);
  16315. + tlb_migrate_finish(p->mm);
  16316. + mutex_unlock(&sched_down_mutex);
  16317. +
  16318. + return 1;
  16319. +}
  16320. +
  16321. /*
  16322. * Change a given task's CPU affinity. Migrate the thread to a
  16323. * proper CPU and schedule it away if the CPU it's executing on
  16324. @@ -1179,7 +1307,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
  16325. }
  16326. /* Can the task run on the task's current CPU? If so, we're done */
  16327. - if (cpumask_test_cpu(task_cpu(p), new_mask))
  16328. + if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p))
  16329. goto out;
  16330. dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
  16331. @@ -1366,6 +1494,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)
  16332. return ret;
  16333. }
  16334. +static bool check_task_state(struct task_struct *p, long match_state)
  16335. +{
  16336. + bool match = false;
  16337. +
  16338. + raw_spin_lock_irq(&p->pi_lock);
  16339. + if (p->state == match_state || p->saved_state == match_state)
  16340. + match = true;
  16341. + raw_spin_unlock_irq(&p->pi_lock);
  16342. +
  16343. + return match;
  16344. +}
  16345. +
  16346. /*
  16347. * wait_task_inactive - wait for a thread to unschedule.
  16348. *
  16349. @@ -1410,7 +1550,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
  16350. * is actually now running somewhere else!
  16351. */
  16352. while (task_running(rq, p)) {
  16353. - if (match_state && unlikely(p->state != match_state))
  16354. + if (match_state && !check_task_state(p, match_state))
  16355. return 0;
  16356. cpu_relax();
  16357. }
  16358. @@ -1425,7 +1565,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
  16359. running = task_running(rq, p);
  16360. queued = task_on_rq_queued(p);
  16361. ncsw = 0;
  16362. - if (!match_state || p->state == match_state)
  16363. + if (!match_state || p->state == match_state ||
  16364. + p->saved_state == match_state)
  16365. ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
  16366. task_rq_unlock(rq, p, &rf);
  16367. @@ -1680,10 +1821,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl
  16368. {
  16369. activate_task(rq, p, en_flags);
  16370. p->on_rq = TASK_ON_RQ_QUEUED;
  16371. -
  16372. - /* if a worker is waking up, notify workqueue */
  16373. - if (p->flags & PF_WQ_WORKER)
  16374. - wq_worker_waking_up(p, cpu_of(rq));
  16375. }
  16376. /*
  16377. @@ -2018,8 +2155,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
  16378. */
  16379. smp_mb__before_spinlock();
  16380. raw_spin_lock_irqsave(&p->pi_lock, flags);
  16381. - if (!(p->state & state))
  16382. + if (!(p->state & state)) {
  16383. + /*
  16384. + * The task might be running due to a spinlock sleeper
  16385. + * wakeup. Check the saved state and set it to running
  16386. + * if the wakeup condition is true.
  16387. + */
  16388. + if (!(wake_flags & WF_LOCK_SLEEPER)) {
  16389. + if (p->saved_state & state) {
  16390. + p->saved_state = TASK_RUNNING;
  16391. + success = 1;
  16392. + }
  16393. + }
  16394. goto out;
  16395. + }
  16396. +
  16397. + /*
  16398. + * If this is a regular wakeup, then we can unconditionally
  16399. + * clear the saved state of a "lock sleeper".
  16400. + */
  16401. + if (!(wake_flags & WF_LOCK_SLEEPER))
  16402. + p->saved_state = TASK_RUNNING;
  16403. trace_sched_waking(p);
  16404. @@ -2102,53 +2258,6 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
  16405. }
  16406. /**
  16407. - * try_to_wake_up_local - try to wake up a local task with rq lock held
  16408. - * @p: the thread to be awakened
  16409. - * @cookie: context's cookie for pinning
  16410. - *
  16411. - * Put @p on the run-queue if it's not already there. The caller must
  16412. - * ensure that this_rq() is locked, @p is bound to this_rq() and not
  16413. - * the current task.
  16414. - */
  16415. -static void try_to_wake_up_local(struct task_struct *p, struct pin_cookie cookie)
  16416. -{
  16417. - struct rq *rq = task_rq(p);
  16418. -
  16419. - if (WARN_ON_ONCE(rq != this_rq()) ||
  16420. - WARN_ON_ONCE(p == current))
  16421. - return;
  16422. -
  16423. - lockdep_assert_held(&rq->lock);
  16424. -
  16425. - if (!raw_spin_trylock(&p->pi_lock)) {
  16426. - /*
  16427. - * This is OK, because current is on_cpu, which avoids it being
  16428. - * picked for load-balance and preemption/IRQs are still
  16429. - * disabled avoiding further scheduler activity on it and we've
  16430. - * not yet picked a replacement task.
  16431. - */
  16432. - lockdep_unpin_lock(&rq->lock, cookie);
  16433. - raw_spin_unlock(&rq->lock);
  16434. - raw_spin_lock(&p->pi_lock);
  16435. - raw_spin_lock(&rq->lock);
  16436. - lockdep_repin_lock(&rq->lock, cookie);
  16437. - }
  16438. -
  16439. - if (!(p->state & TASK_NORMAL))
  16440. - goto out;
  16441. -
  16442. - trace_sched_waking(p);
  16443. -
  16444. - if (!task_on_rq_queued(p))
  16445. - ttwu_activate(rq, p, ENQUEUE_WAKEUP);
  16446. -
  16447. - ttwu_do_wakeup(rq, p, 0, cookie);
  16448. - ttwu_stat(p, smp_processor_id(), 0);
  16449. -out:
  16450. - raw_spin_unlock(&p->pi_lock);
  16451. -}
  16452. -
  16453. -/**
  16454. * wake_up_process - Wake up a specific process
  16455. * @p: The process to be woken up.
  16456. *
  16457. @@ -2166,6 +2275,18 @@ int wake_up_process(struct task_struct *p)
  16458. }
  16459. EXPORT_SYMBOL(wake_up_process);
  16460. +/**
  16461. + * wake_up_lock_sleeper - Wake up a specific process blocked on a "sleeping lock"
  16462. + * @p: The process to be woken up.
  16463. + *
  16464. + * Same as wake_up_process() above, but wake_flags=WF_LOCK_SLEEPER to indicate
  16465. + * the nature of the wakeup.
  16466. + */
  16467. +int wake_up_lock_sleeper(struct task_struct *p)
  16468. +{
  16469. + return try_to_wake_up(p, TASK_UNINTERRUPTIBLE, WF_LOCK_SLEEPER);
  16470. +}
  16471. +
  16472. int wake_up_state(struct task_struct *p, unsigned int state)
  16473. {
  16474. return try_to_wake_up(p, state, 0);
  16475. @@ -2442,6 +2563,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
  16476. p->on_cpu = 0;
  16477. #endif
  16478. init_task_preempt_count(p);
  16479. +#ifdef CONFIG_HAVE_PREEMPT_LAZY
  16480. + task_thread_info(p)->preempt_lazy_count = 0;
  16481. +#endif
  16482. #ifdef CONFIG_SMP
  16483. plist_node_init(&p->pushable_tasks, MAX_PRIO);
  16484. RB_CLEAR_NODE(&p->pushable_dl_tasks);
  16485. @@ -2770,21 +2894,16 @@ static struct rq *finish_task_switch(struct task_struct *prev)
  16486. finish_arch_post_lock_switch();
  16487. fire_sched_in_preempt_notifiers(current);
  16488. + /*
  16489. + * We use mmdrop_delayed() here so we don't have to do the
  16490. + * full __mmdrop() when we are the last user.
  16491. + */
  16492. if (mm)
  16493. - mmdrop(mm);
  16494. + mmdrop_delayed(mm);
  16495. if (unlikely(prev_state == TASK_DEAD)) {
  16496. if (prev->sched_class->task_dead)
  16497. prev->sched_class->task_dead(prev);
  16498. - /*
  16499. - * Remove function-return probe instances associated with this
  16500. - * task and put them back on the free list.
  16501. - */
  16502. - kprobe_flush_task(prev);
  16503. -
  16504. - /* Task is done with its stack. */
  16505. - put_task_stack(prev);
  16506. -
  16507. put_task_struct(prev);
  16508. }
  16509. @@ -3252,6 +3371,77 @@ static inline void schedule_debug(struct task_struct *prev)
  16510. schedstat_inc(this_rq()->sched_count);
  16511. }
  16512. +#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_SMP)
  16513. +
  16514. +void migrate_disable(void)
  16515. +{
  16516. + struct task_struct *p = current;
  16517. +
  16518. + if (in_atomic() || irqs_disabled()) {
  16519. +#ifdef CONFIG_SCHED_DEBUG
  16520. + p->migrate_disable_atomic++;
  16521. +#endif
  16522. + return;
  16523. + }
  16524. +
  16525. +#ifdef CONFIG_SCHED_DEBUG
  16526. + if (unlikely(p->migrate_disable_atomic)) {
  16527. + tracing_off();
  16528. + WARN_ON_ONCE(1);
  16529. + }
  16530. +#endif
  16531. +
  16532. + if (p->migrate_disable) {
  16533. + p->migrate_disable++;
  16534. + return;
  16535. + }
  16536. +
  16537. + preempt_disable();
  16538. + preempt_lazy_disable();
  16539. + pin_current_cpu();
  16540. + p->migrate_disable = 1;
  16541. + preempt_enable();
  16542. +}
  16543. +EXPORT_SYMBOL(migrate_disable);
  16544. +
  16545. +void migrate_enable(void)
  16546. +{
  16547. + struct task_struct *p = current;
  16548. +
  16549. + if (in_atomic() || irqs_disabled()) {
  16550. +#ifdef CONFIG_SCHED_DEBUG
  16551. + p->migrate_disable_atomic--;
  16552. +#endif
  16553. + return;
  16554. + }
  16555. +
  16556. +#ifdef CONFIG_SCHED_DEBUG
  16557. + if (unlikely(p->migrate_disable_atomic)) {
  16558. + tracing_off();
  16559. + WARN_ON_ONCE(1);
  16560. + }
  16561. +#endif
  16562. + WARN_ON_ONCE(p->migrate_disable <= 0);
  16563. +
  16564. + if (p->migrate_disable > 1) {
  16565. + p->migrate_disable--;
  16566. + return;
  16567. + }
  16568. +
  16569. + preempt_disable();
  16570. + /*
  16571. + * Clearing migrate_disable causes tsk_cpus_allowed to
  16572. + * show the tasks original cpu affinity.
  16573. + */
  16574. + p->migrate_disable = 0;
  16575. +
  16576. + unpin_current_cpu();
  16577. + preempt_enable();
  16578. + preempt_lazy_enable();
  16579. +}
  16580. +EXPORT_SYMBOL(migrate_enable);
  16581. +#endif
  16582. +
  16583. /*
  16584. * Pick up the highest-prio task:
  16585. */
  16586. @@ -3368,19 +3558,6 @@ static void __sched notrace __schedule(bool preempt)
  16587. } else {
  16588. deactivate_task(rq, prev, DEQUEUE_SLEEP);
  16589. prev->on_rq = 0;
  16590. -
  16591. - /*
  16592. - * If a worker went to sleep, notify and ask workqueue
  16593. - * whether it wants to wake up a task to maintain
  16594. - * concurrency.
  16595. - */
  16596. - if (prev->flags & PF_WQ_WORKER) {
  16597. - struct task_struct *to_wakeup;
  16598. -
  16599. - to_wakeup = wq_worker_sleeping(prev);
  16600. - if (to_wakeup)
  16601. - try_to_wake_up_local(to_wakeup, cookie);
  16602. - }
  16603. }
  16604. switch_count = &prev->nvcsw;
  16605. }
  16606. @@ -3390,6 +3567,7 @@ static void __sched notrace __schedule(bool preempt)
  16607. next = pick_next_task(rq, prev, cookie);
  16608. clear_tsk_need_resched(prev);
  16609. + clear_tsk_need_resched_lazy(prev);
  16610. clear_preempt_need_resched();
  16611. rq->clock_skip_update = 0;
  16612. @@ -3437,9 +3615,20 @@ void __noreturn do_task_dead(void)
  16613. static inline void sched_submit_work(struct task_struct *tsk)
  16614. {
  16615. - if (!tsk->state || tsk_is_pi_blocked(tsk))
  16616. + if (!tsk->state)
  16617. return;
  16618. /*
  16619. + * If a worker went to sleep, notify and ask workqueue whether
  16620. + * it wants to wake up a task to maintain concurrency.
  16621. + */
  16622. + if (tsk->flags & PF_WQ_WORKER)
  16623. + wq_worker_sleeping(tsk);
  16624. +
  16625. +
  16626. + if (tsk_is_pi_blocked(tsk))
  16627. + return;
  16628. +
  16629. + /*
  16630. * If we are going to sleep and we have plugged IO queued,
  16631. * make sure to submit it to avoid deadlocks.
  16632. */
  16633. @@ -3447,6 +3636,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
  16634. blk_schedule_flush_plug(tsk);
  16635. }
  16636. +static void sched_update_worker(struct task_struct *tsk)
  16637. +{
  16638. + if (tsk->flags & PF_WQ_WORKER)
  16639. + wq_worker_running(tsk);
  16640. +}
  16641. +
  16642. asmlinkage __visible void __sched schedule(void)
  16643. {
  16644. struct task_struct *tsk = current;
  16645. @@ -3457,6 +3652,7 @@ asmlinkage __visible void __sched schedule(void)
  16646. __schedule(false);
  16647. sched_preempt_enable_no_resched();
  16648. } while (need_resched());
  16649. + sched_update_worker(tsk);
  16650. }
  16651. EXPORT_SYMBOL(schedule);
  16652. @@ -3520,6 +3716,30 @@ static void __sched notrace preempt_schedule_common(void)
  16653. } while (need_resched());
  16654. }
  16655. +#ifdef CONFIG_PREEMPT_LAZY
  16656. +/*
  16657. + * If TIF_NEED_RESCHED is then we allow to be scheduled away since this is
  16658. + * set by a RT task. Oterwise we try to avoid beeing scheduled out as long as
  16659. + * preempt_lazy_count counter >0.
  16660. + */
  16661. +static __always_inline int preemptible_lazy(void)
  16662. +{
  16663. + if (test_thread_flag(TIF_NEED_RESCHED))
  16664. + return 1;
  16665. + if (current_thread_info()->preempt_lazy_count)
  16666. + return 0;
  16667. + return 1;
  16668. +}
  16669. +
  16670. +#else
  16671. +
  16672. +static inline int preemptible_lazy(void)
  16673. +{
  16674. + return 1;
  16675. +}
  16676. +
  16677. +#endif
  16678. +
  16679. #ifdef CONFIG_PREEMPT
  16680. /*
  16681. * this is the entry point to schedule() from in-kernel preemption
  16682. @@ -3534,7 +3754,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
  16683. */
  16684. if (likely(!preemptible()))
  16685. return;
  16686. -
  16687. + if (!preemptible_lazy())
  16688. + return;
  16689. preempt_schedule_common();
  16690. }
  16691. NOKPROBE_SYMBOL(preempt_schedule);
  16692. @@ -3561,6 +3782,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
  16693. if (likely(!preemptible()))
  16694. return;
  16695. + if (!preemptible_lazy())
  16696. + return;
  16697. +
  16698. do {
  16699. /*
  16700. * Because the function tracer can trace preempt_count_sub()
  16701. @@ -3583,7 +3807,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
  16702. * an infinite recursion.
  16703. */
  16704. prev_ctx = exception_enter();
  16705. + /*
  16706. + * The add/subtract must not be traced by the function
  16707. + * tracer. But we still want to account for the
  16708. + * preempt off latency tracer. Since the _notrace versions
  16709. + * of add/subtract skip the accounting for latency tracer
  16710. + * we must force it manually.
  16711. + */
  16712. + start_critical_timings();
  16713. __schedule(true);
  16714. + stop_critical_timings();
  16715. exception_exit(prev_ctx);
  16716. preempt_latency_stop(1);
  16717. @@ -3629,10 +3862,25 @@ EXPORT_SYMBOL(default_wake_function);
  16718. #ifdef CONFIG_RT_MUTEXES
  16719. +static inline int __rt_effective_prio(struct task_struct *pi_task, int prio)
  16720. +{
  16721. + if (pi_task)
  16722. + prio = min(prio, pi_task->prio);
  16723. +
  16724. + return prio;
  16725. +}
  16726. +
  16727. +static inline int rt_effective_prio(struct task_struct *p, int prio)
  16728. +{
  16729. + struct task_struct *pi_task = rt_mutex_get_top_task(p);
  16730. +
  16731. + return __rt_effective_prio(pi_task, prio);
  16732. +}
  16733. +
  16734. /*
  16735. * rt_mutex_setprio - set the current priority of a task
  16736. - * @p: task
  16737. - * @prio: prio value (kernel-internal form)
  16738. + * @p: task to boost
  16739. + * @pi_task: donor task
  16740. *
  16741. * This function changes the 'effective' priority of a task. It does
  16742. * not touch ->normal_prio like __setscheduler().
  16743. @@ -3640,16 +3888,40 @@ EXPORT_SYMBOL(default_wake_function);
  16744. * Used by the rt_mutex code to implement priority inheritance
  16745. * logic. Call site only calls if the priority of the task changed.
  16746. */
  16747. -void rt_mutex_setprio(struct task_struct *p, int prio)
  16748. +void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task)
  16749. {
  16750. - int oldprio, queued, running, queue_flag = DEQUEUE_SAVE | DEQUEUE_MOVE;
  16751. + int prio, oldprio, queued, running, queue_flag = DEQUEUE_SAVE | DEQUEUE_MOVE;
  16752. const struct sched_class *prev_class;
  16753. struct rq_flags rf;
  16754. struct rq *rq;
  16755. - BUG_ON(prio > MAX_PRIO);
  16756. + /* XXX used to be waiter->prio, not waiter->task->prio */
  16757. + prio = __rt_effective_prio(pi_task, p->normal_prio);
  16758. +
  16759. + /*
  16760. + * If nothing changed; bail early.
  16761. + */
  16762. + if (p->pi_top_task == pi_task && prio == p->prio && !dl_prio(prio))
  16763. + return;
  16764. rq = __task_rq_lock(p, &rf);
  16765. + /*
  16766. + * Set under pi_lock && rq->lock, such that the value can be used under
  16767. + * either lock.
  16768. + *
  16769. + * Note that there is loads of tricky to make this pointer cache work
  16770. + * right. rt_mutex_slowunlock()+rt_mutex_postunlock() work together to
  16771. + * ensure a task is de-boosted (pi_task is set to NULL) before the
  16772. + * task is allowed to run again (and can exit). This ensures the pointer
  16773. + * points to a blocked task -- which guaratees the task is present.
  16774. + */
  16775. + p->pi_top_task = pi_task;
  16776. +
  16777. + /*
  16778. + * For FIFO/RR we only need to set prio, if that matches we're done.
  16779. + */
  16780. + if (prio == p->prio && !dl_prio(prio))
  16781. + goto out_unlock;
  16782. /*
  16783. * Idle task boosting is a nono in general. There is one
  16784. @@ -3669,7 +3941,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
  16785. goto out_unlock;
  16786. }
  16787. - trace_sched_pi_setprio(p, prio);
  16788. + trace_sched_pi_setprio(p, pi_task);
  16789. oldprio = p->prio;
  16790. if (oldprio == prio)
  16791. @@ -3693,7 +3965,6 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
  16792. * running task
  16793. */
  16794. if (dl_prio(prio)) {
  16795. - struct task_struct *pi_task = rt_mutex_get_top_task(p);
  16796. if (!dl_prio(p->normal_prio) ||
  16797. (pi_task && dl_entity_preempt(&pi_task->dl, &p->dl))) {
  16798. p->dl.dl_boosted = 1;
  16799. @@ -3730,6 +4001,11 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
  16800. balance_callback(rq);
  16801. preempt_enable();
  16802. }
  16803. +#else
  16804. +static inline int rt_effective_prio(struct task_struct *p, int prio)
  16805. +{
  16806. + return prio;
  16807. +}
  16808. #endif
  16809. void set_user_nice(struct task_struct *p, long nice)
  16810. @@ -3974,10 +4250,9 @@ static void __setscheduler(struct rq *rq, struct task_struct *p,
  16811. * Keep a potential priority boosting if called from
  16812. * sched_setscheduler().
  16813. */
  16814. + p->prio = normal_prio(p);
  16815. if (keep_boost)
  16816. - p->prio = rt_mutex_get_effective_prio(p, normal_prio(p));
  16817. - else
  16818. - p->prio = normal_prio(p);
  16819. + p->prio = rt_effective_prio(p, p->prio);
  16820. if (dl_prio(p->prio))
  16821. p->sched_class = &dl_sched_class;
  16822. @@ -4264,7 +4539,7 @@ static int __sched_setscheduler(struct task_struct *p,
  16823. * the runqueue. This will be done when the task deboost
  16824. * itself.
  16825. */
  16826. - new_effective_prio = rt_mutex_get_effective_prio(p, newprio);
  16827. + new_effective_prio = rt_effective_prio(p, newprio);
  16828. if (new_effective_prio == oldprio)
  16829. queue_flags &= ~DEQUEUE_MOVE;
  16830. }
  16831. @@ -4939,6 +5214,7 @@ int __cond_resched_lock(spinlock_t *lock)
  16832. }
  16833. EXPORT_SYMBOL(__cond_resched_lock);
  16834. +#ifndef CONFIG_PREEMPT_RT_FULL
  16835. int __sched __cond_resched_softirq(void)
  16836. {
  16837. BUG_ON(!in_softirq());
  16838. @@ -4952,6 +5228,7 @@ int __sched __cond_resched_softirq(void)
  16839. return 0;
  16840. }
  16841. EXPORT_SYMBOL(__cond_resched_softirq);
  16842. +#endif
  16843. /**
  16844. * yield - yield the current processor to other threads.
  16845. @@ -5315,7 +5592,9 @@ void init_idle(struct task_struct *idle, int cpu)
  16846. /* Set the preempt count _outside_ the spinlocks! */
  16847. init_idle_preempt_count(idle, cpu);
  16848. -
  16849. +#ifdef CONFIG_HAVE_PREEMPT_LAZY
  16850. + task_thread_info(idle)->preempt_lazy_count = 0;
  16851. +#endif
  16852. /*
  16853. * The idle tasks have their own, simple scheduling class:
  16854. */
  16855. @@ -5458,6 +5737,8 @@ void sched_setnuma(struct task_struct *p, int nid)
  16856. #endif /* CONFIG_NUMA_BALANCING */
  16857. #ifdef CONFIG_HOTPLUG_CPU
  16858. +static DEFINE_PER_CPU(struct mm_struct *, idle_last_mm);
  16859. +
  16860. /*
  16861. * Ensures that the idle task is using init_mm right before its cpu goes
  16862. * offline.
  16863. @@ -5472,7 +5753,12 @@ void idle_task_exit(void)
  16864. switch_mm_irqs_off(mm, &init_mm, current);
  16865. finish_arch_post_lock_switch();
  16866. }
  16867. - mmdrop(mm);
  16868. + /*
  16869. + * Defer the cleanup to an alive cpu. On RT we can neither
  16870. + * call mmdrop() nor mmdrop_delayed() from here.
  16871. + */
  16872. + per_cpu(idle_last_mm, smp_processor_id()) = mm;
  16873. +
  16874. }
  16875. /*
  16876. @@ -7418,6 +7704,10 @@ int sched_cpu_dying(unsigned int cpu)
  16877. update_max_interval();
  16878. nohz_balance_exit_idle(cpu);
  16879. hrtick_clear(rq);
  16880. + if (per_cpu(idle_last_mm, cpu)) {
  16881. + mmdrop_delayed(per_cpu(idle_last_mm, cpu));
  16882. + per_cpu(idle_last_mm, cpu) = NULL;
  16883. + }
  16884. return 0;
  16885. }
  16886. #endif
  16887. @@ -7698,7 +7988,7 @@ void __init sched_init(void)
  16888. #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
  16889. static inline int preempt_count_equals(int preempt_offset)
  16890. {
  16891. - int nested = preempt_count() + rcu_preempt_depth();
  16892. + int nested = preempt_count() + sched_rcu_preempt_depth();
  16893. return (nested == preempt_offset);
  16894. }
  16895. diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
  16896. index c95c5122b105..e00accf92a4b 100644
  16897. --- a/kernel/sched/deadline.c
  16898. +++ b/kernel/sched/deadline.c
  16899. @@ -687,6 +687,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se)
  16900. hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  16901. timer->function = dl_task_timer;
  16902. + timer->irqsafe = 1;
  16903. }
  16904. static
  16905. diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
  16906. index fa178b62ea79..935224123441 100644
  16907. --- a/kernel/sched/debug.c
  16908. +++ b/kernel/sched/debug.c
  16909. @@ -558,6 +558,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
  16910. P(rt_throttled);
  16911. PN(rt_time);
  16912. PN(rt_runtime);
  16913. +#ifdef CONFIG_SMP
  16914. + P(rt_nr_migratory);
  16915. +#endif
  16916. #undef PN
  16917. #undef P
  16918. @@ -953,6 +956,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
  16919. #endif
  16920. P(policy);
  16921. P(prio);
  16922. +#ifdef CONFIG_PREEMPT_RT_FULL
  16923. + P(migrate_disable);
  16924. +#endif
  16925. + P(nr_cpus_allowed);
  16926. #undef PN_SCHEDSTAT
  16927. #undef PN
  16928. #undef __PN
  16929. diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
  16930. index c242944f5cbd..4aeb2e2e41bc 100644
  16931. --- a/kernel/sched/fair.c
  16932. +++ b/kernel/sched/fair.c
  16933. @@ -3518,7 +3518,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
  16934. ideal_runtime = sched_slice(cfs_rq, curr);
  16935. delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
  16936. if (delta_exec > ideal_runtime) {
  16937. - resched_curr(rq_of(cfs_rq));
  16938. + resched_curr_lazy(rq_of(cfs_rq));
  16939. /*
  16940. * The current task ran long enough, ensure it doesn't get
  16941. * re-elected due to buddy favours.
  16942. @@ -3542,7 +3542,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
  16943. return;
  16944. if (delta > ideal_runtime)
  16945. - resched_curr(rq_of(cfs_rq));
  16946. + resched_curr_lazy(rq_of(cfs_rq));
  16947. }
  16948. static void
  16949. @@ -3684,7 +3684,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
  16950. * validating it and just reschedule.
  16951. */
  16952. if (queued) {
  16953. - resched_curr(rq_of(cfs_rq));
  16954. + resched_curr_lazy(rq_of(cfs_rq));
  16955. return;
  16956. }
  16957. /*
  16958. @@ -3866,7 +3866,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
  16959. * hierarchy can be throttled
  16960. */
  16961. if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
  16962. - resched_curr(rq_of(cfs_rq));
  16963. + resched_curr_lazy(rq_of(cfs_rq));
  16964. }
  16965. static __always_inline
  16966. @@ -4494,7 +4494,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
  16967. if (delta < 0) {
  16968. if (rq->curr == p)
  16969. - resched_curr(rq);
  16970. + resched_curr_lazy(rq);
  16971. return;
  16972. }
  16973. hrtick_start(rq, delta);
  16974. @@ -5905,7 +5905,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
  16975. return;
  16976. preempt:
  16977. - resched_curr(rq);
  16978. + resched_curr_lazy(rq);
  16979. /*
  16980. * Only set the backward buddy when the current task is still
  16981. * on the rq. This can happen when a wakeup gets interleaved
  16982. @@ -8631,7 +8631,7 @@ static void task_fork_fair(struct task_struct *p)
  16983. * 'current' within the tree based on its new key value.
  16984. */
  16985. swap(curr->vruntime, se->vruntime);
  16986. - resched_curr(rq);
  16987. + resched_curr_lazy(rq);
  16988. }
  16989. se->vruntime -= cfs_rq->min_vruntime;
  16990. @@ -8655,7 +8655,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
  16991. */
  16992. if (rq->curr == p) {
  16993. if (p->prio > oldprio)
  16994. - resched_curr(rq);
  16995. + resched_curr_lazy(rq);
  16996. } else
  16997. check_preempt_curr(rq, p, 0);
  16998. }
  16999. diff --git a/kernel/sched/features.h b/kernel/sched/features.h
  17000. index 69631fa46c2f..6d28fcd08872 100644
  17001. --- a/kernel/sched/features.h
  17002. +++ b/kernel/sched/features.h
  17003. @@ -45,11 +45,19 @@ SCHED_FEAT(LB_BIAS, true)
  17004. */
  17005. SCHED_FEAT(NONTASK_CAPACITY, true)
  17006. +#ifdef CONFIG_PREEMPT_RT_FULL
  17007. +SCHED_FEAT(TTWU_QUEUE, false)
  17008. +# ifdef CONFIG_PREEMPT_LAZY
  17009. +SCHED_FEAT(PREEMPT_LAZY, true)
  17010. +# endif
  17011. +#else
  17012. +
  17013. /*
  17014. * Queue remote wakeups on the target CPU and process them
  17015. * using the scheduler IPI. Reduces rq->lock contention/bounces.
  17016. */
  17017. SCHED_FEAT(TTWU_QUEUE, true)
  17018. +#endif
  17019. #ifdef HAVE_RT_PUSH_IPI
  17020. /*
  17021. diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
  17022. index f139f22ce30d..b0691f4e7d49 100644
  17023. --- a/kernel/sched/rt.c
  17024. +++ b/kernel/sched/rt.c
  17025. @@ -47,6 +47,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime)
  17026. hrtimer_init(&rt_b->rt_period_timer,
  17027. CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  17028. + rt_b->rt_period_timer.irqsafe = 1;
  17029. rt_b->rt_period_timer.function = sched_rt_period_timer;
  17030. }
  17031. @@ -101,6 +102,7 @@ void init_rt_rq(struct rt_rq *rt_rq)
  17032. rt_rq->push_cpu = nr_cpu_ids;
  17033. raw_spin_lock_init(&rt_rq->push_lock);
  17034. init_irq_work(&rt_rq->push_work, push_irq_work_func);
  17035. + rt_rq->push_work.flags |= IRQ_WORK_HARD_IRQ;
  17036. #endif
  17037. #endif /* CONFIG_SMP */
  17038. /* We start is dequeued state, because no RT tasks are queued */
  17039. diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
  17040. index 055f935d4421..19324ac27026 100644
  17041. --- a/kernel/sched/sched.h
  17042. +++ b/kernel/sched/sched.h
  17043. @@ -1163,6 +1163,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
  17044. #define WF_SYNC 0x01 /* waker goes to sleep after wakeup */
  17045. #define WF_FORK 0x02 /* child wakeup after fork */
  17046. #define WF_MIGRATED 0x4 /* internal use, task got migrated */
  17047. +#define WF_LOCK_SLEEPER 0x08 /* wakeup spinlock "sleeper" */
  17048. /*
  17049. * To aid in avoiding the subversion of "niceness" due to uneven distribution
  17050. @@ -1346,6 +1347,15 @@ extern void init_sched_fair_class(void);
  17051. extern void resched_curr(struct rq *rq);
  17052. extern void resched_cpu(int cpu);
  17053. +#ifdef CONFIG_PREEMPT_LAZY
  17054. +extern void resched_curr_lazy(struct rq *rq);
  17055. +#else
  17056. +static inline void resched_curr_lazy(struct rq *rq)
  17057. +{
  17058. + resched_curr(rq);
  17059. +}
  17060. +#endif
  17061. +
  17062. extern struct rt_bandwidth def_rt_bandwidth;
  17063. extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
  17064. diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
  17065. index 82f0dff90030..ef027ff3250a 100644
  17066. --- a/kernel/sched/swait.c
  17067. +++ b/kernel/sched/swait.c
  17068. @@ -1,5 +1,6 @@
  17069. #include <linux/sched.h>
  17070. #include <linux/swait.h>
  17071. +#include <linux/suspend.h>
  17072. void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
  17073. struct lock_class_key *key)
  17074. @@ -29,6 +30,25 @@ void swake_up_locked(struct swait_queue_head *q)
  17075. }
  17076. EXPORT_SYMBOL(swake_up_locked);
  17077. +void swake_up_all_locked(struct swait_queue_head *q)
  17078. +{
  17079. + struct swait_queue *curr;
  17080. + int wakes = 0;
  17081. +
  17082. + while (!list_empty(&q->task_list)) {
  17083. +
  17084. + curr = list_first_entry(&q->task_list, typeof(*curr),
  17085. + task_list);
  17086. + wake_up_process(curr->task);
  17087. + list_del_init(&curr->task_list);
  17088. + wakes++;
  17089. + }
  17090. + if (pm_in_action)
  17091. + return;
  17092. + WARN(wakes > 2, "complete_all() with %d waiters\n", wakes);
  17093. +}
  17094. +EXPORT_SYMBOL(swake_up_all_locked);
  17095. +
  17096. void swake_up(struct swait_queue_head *q)
  17097. {
  17098. unsigned long flags;
  17099. @@ -54,6 +74,7 @@ void swake_up_all(struct swait_queue_head *q)
  17100. if (!swait_active(q))
  17101. return;
  17102. + WARN_ON(irqs_disabled());
  17103. raw_spin_lock_irq(&q->lock);
  17104. list_splice_init(&q->task_list, &tmp);
  17105. while (!list_empty(&tmp)) {
  17106. diff --git a/kernel/sched/swork.c b/kernel/sched/swork.c
  17107. new file mode 100644
  17108. index 000000000000..1950f40ca725
  17109. --- /dev/null
  17110. +++ b/kernel/sched/swork.c
  17111. @@ -0,0 +1,173 @@
  17112. +/*
  17113. + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
  17114. + *
  17115. + * Provides a framework for enqueuing callbacks from irq context
  17116. + * PREEMPT_RT_FULL safe. The callbacks are executed in kthread context.
  17117. + */
  17118. +
  17119. +#include <linux/swait.h>
  17120. +#include <linux/swork.h>
  17121. +#include <linux/kthread.h>
  17122. +#include <linux/slab.h>
  17123. +#include <linux/spinlock.h>
  17124. +#include <linux/export.h>
  17125. +
  17126. +#define SWORK_EVENT_PENDING (1 << 0)
  17127. +
  17128. +static DEFINE_MUTEX(worker_mutex);
  17129. +static struct sworker *glob_worker;
  17130. +
  17131. +struct sworker {
  17132. + struct list_head events;
  17133. + struct swait_queue_head wq;
  17134. +
  17135. + raw_spinlock_t lock;
  17136. +
  17137. + struct task_struct *task;
  17138. + int refs;
  17139. +};
  17140. +
  17141. +static bool swork_readable(struct sworker *worker)
  17142. +{
  17143. + bool r;
  17144. +
  17145. + if (kthread_should_stop())
  17146. + return true;
  17147. +
  17148. + raw_spin_lock_irq(&worker->lock);
  17149. + r = !list_empty(&worker->events);
  17150. + raw_spin_unlock_irq(&worker->lock);
  17151. +
  17152. + return r;
  17153. +}
  17154. +
  17155. +static int swork_kthread(void *arg)
  17156. +{
  17157. + struct sworker *worker = arg;
  17158. +
  17159. + for (;;) {
  17160. + swait_event_interruptible(worker->wq,
  17161. + swork_readable(worker));
  17162. + if (kthread_should_stop())
  17163. + break;
  17164. +
  17165. + raw_spin_lock_irq(&worker->lock);
  17166. + while (!list_empty(&worker->events)) {
  17167. + struct swork_event *sev;
  17168. +
  17169. + sev = list_first_entry(&worker->events,
  17170. + struct swork_event, item);
  17171. + list_del(&sev->item);
  17172. + raw_spin_unlock_irq(&worker->lock);
  17173. +
  17174. + WARN_ON_ONCE(!test_and_clear_bit(SWORK_EVENT_PENDING,
  17175. + &sev->flags));
  17176. + sev->func(sev);
  17177. + raw_spin_lock_irq(&worker->lock);
  17178. + }
  17179. + raw_spin_unlock_irq(&worker->lock);
  17180. + }
  17181. + return 0;
  17182. +}
  17183. +
  17184. +static struct sworker *swork_create(void)
  17185. +{
  17186. + struct sworker *worker;
  17187. +
  17188. + worker = kzalloc(sizeof(*worker), GFP_KERNEL);
  17189. + if (!worker)
  17190. + return ERR_PTR(-ENOMEM);
  17191. +
  17192. + INIT_LIST_HEAD(&worker->events);
  17193. + raw_spin_lock_init(&worker->lock);
  17194. + init_swait_queue_head(&worker->wq);
  17195. +
  17196. + worker->task = kthread_run(swork_kthread, worker, "kswork");
  17197. + if (IS_ERR(worker->task)) {
  17198. + kfree(worker);
  17199. + return ERR_PTR(-ENOMEM);
  17200. + }
  17201. +
  17202. + return worker;
  17203. +}
  17204. +
  17205. +static void swork_destroy(struct sworker *worker)
  17206. +{
  17207. + kthread_stop(worker->task);
  17208. +
  17209. + WARN_ON(!list_empty(&worker->events));
  17210. + kfree(worker);
  17211. +}
  17212. +
  17213. +/**
  17214. + * swork_queue - queue swork
  17215. + *
  17216. + * Returns %false if @work was already on a queue, %true otherwise.
  17217. + *
  17218. + * The work is queued and processed on a random CPU
  17219. + */
  17220. +bool swork_queue(struct swork_event *sev)
  17221. +{
  17222. + unsigned long flags;
  17223. +
  17224. + if (test_and_set_bit(SWORK_EVENT_PENDING, &sev->flags))
  17225. + return false;
  17226. +
  17227. + raw_spin_lock_irqsave(&glob_worker->lock, flags);
  17228. + list_add_tail(&sev->item, &glob_worker->events);
  17229. + raw_spin_unlock_irqrestore(&glob_worker->lock, flags);
  17230. +
  17231. + swake_up(&glob_worker->wq);
  17232. + return true;
  17233. +}
  17234. +EXPORT_SYMBOL_GPL(swork_queue);
  17235. +
  17236. +/**
  17237. + * swork_get - get an instance of the sworker
  17238. + *
  17239. + * Returns an negative error code if the initialization if the worker did not
  17240. + * work, %0 otherwise.
  17241. + *
  17242. + */
  17243. +int swork_get(void)
  17244. +{
  17245. + struct sworker *worker;
  17246. +
  17247. + mutex_lock(&worker_mutex);
  17248. + if (!glob_worker) {
  17249. + worker = swork_create();
  17250. + if (IS_ERR(worker)) {
  17251. + mutex_unlock(&worker_mutex);
  17252. + return -ENOMEM;
  17253. + }
  17254. +
  17255. + glob_worker = worker;
  17256. + }
  17257. +
  17258. + glob_worker->refs++;
  17259. + mutex_unlock(&worker_mutex);
  17260. +
  17261. + return 0;
  17262. +}
  17263. +EXPORT_SYMBOL_GPL(swork_get);
  17264. +
  17265. +/**
  17266. + * swork_put - puts an instance of the sworker
  17267. + *
  17268. + * Will destroy the sworker thread. This function must not be called until all
  17269. + * queued events have been completed.
  17270. + */
  17271. +void swork_put(void)
  17272. +{
  17273. + mutex_lock(&worker_mutex);
  17274. +
  17275. + glob_worker->refs--;
  17276. + if (glob_worker->refs > 0)
  17277. + goto out;
  17278. +
  17279. + swork_destroy(glob_worker);
  17280. + glob_worker = NULL;
  17281. +out:
  17282. + mutex_unlock(&worker_mutex);
  17283. +}
  17284. +EXPORT_SYMBOL_GPL(swork_put);
  17285. diff --git a/kernel/signal.c b/kernel/signal.c
  17286. index 0b1415720a15..c884647951f7 100644
  17287. --- a/kernel/signal.c
  17288. +++ b/kernel/signal.c
  17289. @@ -14,6 +14,7 @@
  17290. #include <linux/export.h>
  17291. #include <linux/init.h>
  17292. #include <linux/sched.h>
  17293. +#include <linux/sched/rt.h>
  17294. #include <linux/fs.h>
  17295. #include <linux/tty.h>
  17296. #include <linux/binfmts.h>
  17297. @@ -352,13 +353,30 @@ static bool task_participate_group_stop(struct task_struct *task)
  17298. return false;
  17299. }
  17300. +static inline struct sigqueue *get_task_cache(struct task_struct *t)
  17301. +{
  17302. + struct sigqueue *q = t->sigqueue_cache;
  17303. +
  17304. + if (cmpxchg(&t->sigqueue_cache, q, NULL) != q)
  17305. + return NULL;
  17306. + return q;
  17307. +}
  17308. +
  17309. +static inline int put_task_cache(struct task_struct *t, struct sigqueue *q)
  17310. +{
  17311. + if (cmpxchg(&t->sigqueue_cache, NULL, q) == NULL)
  17312. + return 0;
  17313. + return 1;
  17314. +}
  17315. +
  17316. /*
  17317. * allocate a new signal queue record
  17318. * - this may be called without locks if and only if t == current, otherwise an
  17319. * appropriate lock must be held to stop the target task from exiting
  17320. */
  17321. static struct sigqueue *
  17322. -__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimit)
  17323. +__sigqueue_do_alloc(int sig, struct task_struct *t, gfp_t flags,
  17324. + int override_rlimit, int fromslab)
  17325. {
  17326. struct sigqueue *q = NULL;
  17327. struct user_struct *user;
  17328. @@ -375,7 +393,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
  17329. if (override_rlimit ||
  17330. atomic_read(&user->sigpending) <=
  17331. task_rlimit(t, RLIMIT_SIGPENDING)) {
  17332. - q = kmem_cache_alloc(sigqueue_cachep, flags);
  17333. + if (!fromslab)
  17334. + q = get_task_cache(t);
  17335. + if (!q)
  17336. + q = kmem_cache_alloc(sigqueue_cachep, flags);
  17337. } else {
  17338. print_dropped_signal(sig);
  17339. }
  17340. @@ -392,6 +413,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
  17341. return q;
  17342. }
  17343. +static struct sigqueue *
  17344. +__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags,
  17345. + int override_rlimit)
  17346. +{
  17347. + return __sigqueue_do_alloc(sig, t, flags, override_rlimit, 0);
  17348. +}
  17349. +
  17350. static void __sigqueue_free(struct sigqueue *q)
  17351. {
  17352. if (q->flags & SIGQUEUE_PREALLOC)
  17353. @@ -401,6 +429,21 @@ static void __sigqueue_free(struct sigqueue *q)
  17354. kmem_cache_free(sigqueue_cachep, q);
  17355. }
  17356. +static void sigqueue_free_current(struct sigqueue *q)
  17357. +{
  17358. + struct user_struct *up;
  17359. +
  17360. + if (q->flags & SIGQUEUE_PREALLOC)
  17361. + return;
  17362. +
  17363. + up = q->user;
  17364. + if (rt_prio(current->normal_prio) && !put_task_cache(current, q)) {
  17365. + atomic_dec(&up->sigpending);
  17366. + free_uid(up);
  17367. + } else
  17368. + __sigqueue_free(q);
  17369. +}
  17370. +
  17371. void flush_sigqueue(struct sigpending *queue)
  17372. {
  17373. struct sigqueue *q;
  17374. @@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue)
  17375. }
  17376. /*
  17377. + * Called from __exit_signal. Flush tsk->pending and
  17378. + * tsk->sigqueue_cache
  17379. + */
  17380. +void flush_task_sigqueue(struct task_struct *tsk)
  17381. +{
  17382. + struct sigqueue *q;
  17383. +
  17384. + flush_sigqueue(&tsk->pending);
  17385. +
  17386. + q = get_task_cache(tsk);
  17387. + if (q)
  17388. + kmem_cache_free(sigqueue_cachep, q);
  17389. +}
  17390. +
  17391. +/*
  17392. * Flush all pending signals for this kthread.
  17393. */
  17394. void flush_signals(struct task_struct *t)
  17395. @@ -525,7 +583,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
  17396. still_pending:
  17397. list_del_init(&first->list);
  17398. copy_siginfo(info, &first->info);
  17399. - __sigqueue_free(first);
  17400. + sigqueue_free_current(first);
  17401. } else {
  17402. /*
  17403. * Ok, it wasn't in the queue. This must be
  17404. @@ -560,6 +618,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
  17405. {
  17406. int signr;
  17407. + WARN_ON_ONCE(tsk != current);
  17408. +
  17409. /* We only dequeue private signals from ourselves, we don't let
  17410. * signalfd steal them
  17411. */
  17412. @@ -1156,8 +1216,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
  17413. * We don't want to have recursive SIGSEGV's etc, for example,
  17414. * that is why we also clear SIGNAL_UNKILLABLE.
  17415. */
  17416. -int
  17417. -force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  17418. +static int
  17419. +do_force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  17420. {
  17421. unsigned long int flags;
  17422. int ret, blocked, ignored;
  17423. @@ -1182,6 +1242,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  17424. return ret;
  17425. }
  17426. +int force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  17427. +{
  17428. +/*
  17429. + * On some archs, PREEMPT_RT has to delay sending a signal from a trap
  17430. + * since it can not enable preemption, and the signal code's spin_locks
  17431. + * turn into mutexes. Instead, it must set TIF_NOTIFY_RESUME which will
  17432. + * send the signal on exit of the trap.
  17433. + */
  17434. +#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
  17435. + if (in_atomic()) {
  17436. + if (WARN_ON_ONCE(t != current))
  17437. + return 0;
  17438. + if (WARN_ON_ONCE(t->forced_info.si_signo))
  17439. + return 0;
  17440. +
  17441. + if (is_si_special(info)) {
  17442. + WARN_ON_ONCE(info != SEND_SIG_PRIV);
  17443. + t->forced_info.si_signo = sig;
  17444. + t->forced_info.si_errno = 0;
  17445. + t->forced_info.si_code = SI_KERNEL;
  17446. + t->forced_info.si_pid = 0;
  17447. + t->forced_info.si_uid = 0;
  17448. + } else {
  17449. + t->forced_info = *info;
  17450. + }
  17451. +
  17452. + set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
  17453. + return 0;
  17454. + }
  17455. +#endif
  17456. + return do_force_sig_info(sig, info, t);
  17457. +}
  17458. +
  17459. /*
  17460. * Nuke all other threads in the group.
  17461. */
  17462. @@ -1216,12 +1309,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
  17463. * Disable interrupts early to avoid deadlocks.
  17464. * See rcu_read_unlock() comment header for details.
  17465. */
  17466. - local_irq_save(*flags);
  17467. + local_irq_save_nort(*flags);
  17468. rcu_read_lock();
  17469. sighand = rcu_dereference(tsk->sighand);
  17470. if (unlikely(sighand == NULL)) {
  17471. rcu_read_unlock();
  17472. - local_irq_restore(*flags);
  17473. + local_irq_restore_nort(*flags);
  17474. break;
  17475. }
  17476. /*
  17477. @@ -1242,7 +1335,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
  17478. }
  17479. spin_unlock(&sighand->siglock);
  17480. rcu_read_unlock();
  17481. - local_irq_restore(*flags);
  17482. + local_irq_restore_nort(*flags);
  17483. }
  17484. return sighand;
  17485. @@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid);
  17486. */
  17487. struct sigqueue *sigqueue_alloc(void)
  17488. {
  17489. - struct sigqueue *q = __sigqueue_alloc(-1, current, GFP_KERNEL, 0);
  17490. + /* Preallocated sigqueue objects always from the slabcache ! */
  17491. + struct sigqueue *q = __sigqueue_do_alloc(-1, current, GFP_KERNEL, 0, 1);
  17492. if (q)
  17493. q->flags |= SIGQUEUE_PREALLOC;
  17494. @@ -1846,15 +1940,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
  17495. if (gstop_done && ptrace_reparented(current))
  17496. do_notify_parent_cldstop(current, false, why);
  17497. - /*
  17498. - * Don't want to allow preemption here, because
  17499. - * sys_ptrace() needs this task to be inactive.
  17500. - *
  17501. - * XXX: implement read_unlock_no_resched().
  17502. - */
  17503. - preempt_disable();
  17504. read_unlock(&tasklist_lock);
  17505. - preempt_enable_no_resched();
  17506. freezable_schedule();
  17507. } else {
  17508. /*
  17509. diff --git a/kernel/softirq.c b/kernel/softirq.c
  17510. index 744fa611cae0..819bd7cf5ad0 100644
  17511. --- a/kernel/softirq.c
  17512. +++ b/kernel/softirq.c
  17513. @@ -21,10 +21,12 @@
  17514. #include <linux/freezer.h>
  17515. #include <linux/kthread.h>
  17516. #include <linux/rcupdate.h>
  17517. +#include <linux/delay.h>
  17518. #include <linux/ftrace.h>
  17519. #include <linux/smp.h>
  17520. #include <linux/smpboot.h>
  17521. #include <linux/tick.h>
  17522. +#include <linux/locallock.h>
  17523. #include <linux/irq.h>
  17524. #define CREATE_TRACE_POINTS
  17525. @@ -56,12 +58,108 @@ EXPORT_SYMBOL(irq_stat);
  17526. static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
  17527. DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
  17528. +#ifdef CONFIG_PREEMPT_RT_FULL
  17529. +#define TIMER_SOFTIRQS ((1 << TIMER_SOFTIRQ) | (1 << HRTIMER_SOFTIRQ))
  17530. +DEFINE_PER_CPU(struct task_struct *, ktimer_softirqd);
  17531. +#endif
  17532. const char * const softirq_to_name[NR_SOFTIRQS] = {
  17533. "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "IRQ_POLL",
  17534. "TASKLET", "SCHED", "HRTIMER", "RCU"
  17535. };
  17536. +#ifdef CONFIG_NO_HZ_COMMON
  17537. +# ifdef CONFIG_PREEMPT_RT_FULL
  17538. +
  17539. +struct softirq_runner {
  17540. + struct task_struct *runner[NR_SOFTIRQS];
  17541. +};
  17542. +
  17543. +static DEFINE_PER_CPU(struct softirq_runner, softirq_runners);
  17544. +
  17545. +static inline void softirq_set_runner(unsigned int sirq)
  17546. +{
  17547. + struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
  17548. +
  17549. + sr->runner[sirq] = current;
  17550. +}
  17551. +
  17552. +static inline void softirq_clr_runner(unsigned int sirq)
  17553. +{
  17554. + struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
  17555. +
  17556. + sr->runner[sirq] = NULL;
  17557. +}
  17558. +
  17559. +/*
  17560. + * On preempt-rt a softirq running context might be blocked on a
  17561. + * lock. There might be no other runnable task on this CPU because the
  17562. + * lock owner runs on some other CPU. So we have to go into idle with
  17563. + * the pending bit set. Therefor we need to check this otherwise we
  17564. + * warn about false positives which confuses users and defeats the
  17565. + * whole purpose of this test.
  17566. + *
  17567. + * This code is called with interrupts disabled.
  17568. + */
  17569. +void softirq_check_pending_idle(void)
  17570. +{
  17571. + static int rate_limit;
  17572. + struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
  17573. + u32 warnpending;
  17574. + int i;
  17575. +
  17576. + if (rate_limit >= 10)
  17577. + return;
  17578. +
  17579. + warnpending = local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK;
  17580. + for (i = 0; i < NR_SOFTIRQS; i++) {
  17581. + struct task_struct *tsk = sr->runner[i];
  17582. +
  17583. + /*
  17584. + * The wakeup code in rtmutex.c wakes up the task
  17585. + * _before_ it sets pi_blocked_on to NULL under
  17586. + * tsk->pi_lock. So we need to check for both: state
  17587. + * and pi_blocked_on.
  17588. + */
  17589. + if (tsk) {
  17590. + raw_spin_lock(&tsk->pi_lock);
  17591. + if (tsk->pi_blocked_on || tsk->state == TASK_RUNNING) {
  17592. + /* Clear all bits pending in that task */
  17593. + warnpending &= ~(tsk->softirqs_raised);
  17594. + warnpending &= ~(1 << i);
  17595. + }
  17596. + raw_spin_unlock(&tsk->pi_lock);
  17597. + }
  17598. + }
  17599. +
  17600. + if (warnpending) {
  17601. + printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
  17602. + warnpending);
  17603. + rate_limit++;
  17604. + }
  17605. +}
  17606. +# else
  17607. +/*
  17608. + * On !PREEMPT_RT we just printk rate limited:
  17609. + */
  17610. +void softirq_check_pending_idle(void)
  17611. +{
  17612. + static int rate_limit;
  17613. +
  17614. + if (rate_limit < 10 &&
  17615. + (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
  17616. + printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
  17617. + local_softirq_pending());
  17618. + rate_limit++;
  17619. + }
  17620. +}
  17621. +# endif
  17622. +
  17623. +#else /* !CONFIG_NO_HZ_COMMON */
  17624. +static inline void softirq_set_runner(unsigned int sirq) { }
  17625. +static inline void softirq_clr_runner(unsigned int sirq) { }
  17626. +#endif
  17627. +
  17628. /*
  17629. * we cannot loop indefinitely here to avoid userspace starvation,
  17630. * but we also don't want to introduce a worst case 1/HZ latency
  17631. @@ -77,6 +175,38 @@ static void wakeup_softirqd(void)
  17632. wake_up_process(tsk);
  17633. }
  17634. +#ifdef CONFIG_PREEMPT_RT_FULL
  17635. +static void wakeup_timer_softirqd(void)
  17636. +{
  17637. + /* Interrupts are disabled: no need to stop preemption */
  17638. + struct task_struct *tsk = __this_cpu_read(ktimer_softirqd);
  17639. +
  17640. + if (tsk && tsk->state != TASK_RUNNING)
  17641. + wake_up_process(tsk);
  17642. +}
  17643. +#endif
  17644. +
  17645. +static void handle_softirq(unsigned int vec_nr)
  17646. +{
  17647. + struct softirq_action *h = softirq_vec + vec_nr;
  17648. + int prev_count;
  17649. +
  17650. + prev_count = preempt_count();
  17651. +
  17652. + kstat_incr_softirqs_this_cpu(vec_nr);
  17653. +
  17654. + trace_softirq_entry(vec_nr);
  17655. + h->action(h);
  17656. + trace_softirq_exit(vec_nr);
  17657. + if (unlikely(prev_count != preempt_count())) {
  17658. + pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
  17659. + vec_nr, softirq_to_name[vec_nr], h->action,
  17660. + prev_count, preempt_count());
  17661. + preempt_count_set(prev_count);
  17662. + }
  17663. +}
  17664. +
  17665. +#ifndef CONFIG_PREEMPT_RT_FULL
  17666. /*
  17667. * If ksoftirqd is scheduled, we do not want to process pending softirqs
  17668. * right now. Let ksoftirqd handle this at its own rate, to get fairness.
  17669. @@ -88,6 +218,47 @@ static bool ksoftirqd_running(void)
  17670. return tsk && (tsk->state == TASK_RUNNING);
  17671. }
  17672. +static inline int ksoftirqd_softirq_pending(void)
  17673. +{
  17674. + return local_softirq_pending();
  17675. +}
  17676. +
  17677. +static void handle_pending_softirqs(u32 pending)
  17678. +{
  17679. + struct softirq_action *h = softirq_vec;
  17680. + int softirq_bit;
  17681. +
  17682. + local_irq_enable();
  17683. +
  17684. + h = softirq_vec;
  17685. +
  17686. + while ((softirq_bit = ffs(pending))) {
  17687. + unsigned int vec_nr;
  17688. +
  17689. + h += softirq_bit - 1;
  17690. + vec_nr = h - softirq_vec;
  17691. + handle_softirq(vec_nr);
  17692. +
  17693. + h++;
  17694. + pending >>= softirq_bit;
  17695. + }
  17696. +
  17697. + rcu_bh_qs();
  17698. + local_irq_disable();
  17699. +}
  17700. +
  17701. +static void run_ksoftirqd(unsigned int cpu)
  17702. +{
  17703. + local_irq_disable();
  17704. + if (ksoftirqd_softirq_pending()) {
  17705. + __do_softirq();
  17706. + local_irq_enable();
  17707. + cond_resched_rcu_qs();
  17708. + return;
  17709. + }
  17710. + local_irq_enable();
  17711. +}
  17712. +
  17713. /*
  17714. * preempt_count and SOFTIRQ_OFFSET usage:
  17715. * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
  17716. @@ -243,10 +414,8 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
  17717. unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
  17718. unsigned long old_flags = current->flags;
  17719. int max_restart = MAX_SOFTIRQ_RESTART;
  17720. - struct softirq_action *h;
  17721. bool in_hardirq;
  17722. __u32 pending;
  17723. - int softirq_bit;
  17724. /*
  17725. * Mask out PF_MEMALLOC s current task context is borrowed for the
  17726. @@ -265,36 +434,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
  17727. /* Reset the pending bitmask before enabling irqs */
  17728. set_softirq_pending(0);
  17729. - local_irq_enable();
  17730. -
  17731. - h = softirq_vec;
  17732. -
  17733. - while ((softirq_bit = ffs(pending))) {
  17734. - unsigned int vec_nr;
  17735. - int prev_count;
  17736. -
  17737. - h += softirq_bit - 1;
  17738. -
  17739. - vec_nr = h - softirq_vec;
  17740. - prev_count = preempt_count();
  17741. -
  17742. - kstat_incr_softirqs_this_cpu(vec_nr);
  17743. -
  17744. - trace_softirq_entry(vec_nr);
  17745. - h->action(h);
  17746. - trace_softirq_exit(vec_nr);
  17747. - if (unlikely(prev_count != preempt_count())) {
  17748. - pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
  17749. - vec_nr, softirq_to_name[vec_nr], h->action,
  17750. - prev_count, preempt_count());
  17751. - preempt_count_set(prev_count);
  17752. - }
  17753. - h++;
  17754. - pending >>= softirq_bit;
  17755. - }
  17756. -
  17757. - rcu_bh_qs();
  17758. - local_irq_disable();
  17759. + handle_pending_softirqs(pending);
  17760. pending = local_softirq_pending();
  17761. if (pending) {
  17762. @@ -331,6 +471,309 @@ asmlinkage __visible void do_softirq(void)
  17763. }
  17764. /*
  17765. + * This function must run with irqs disabled!
  17766. + */
  17767. +void raise_softirq_irqoff(unsigned int nr)
  17768. +{
  17769. + __raise_softirq_irqoff(nr);
  17770. +
  17771. + /*
  17772. + * If we're in an interrupt or softirq, we're done
  17773. + * (this also catches softirq-disabled code). We will
  17774. + * actually run the softirq once we return from
  17775. + * the irq or softirq.
  17776. + *
  17777. + * Otherwise we wake up ksoftirqd to make sure we
  17778. + * schedule the softirq soon.
  17779. + */
  17780. + if (!in_interrupt())
  17781. + wakeup_softirqd();
  17782. +}
  17783. +
  17784. +void __raise_softirq_irqoff(unsigned int nr)
  17785. +{
  17786. + trace_softirq_raise(nr);
  17787. + or_softirq_pending(1UL << nr);
  17788. +}
  17789. +
  17790. +static inline void local_bh_disable_nort(void) { local_bh_disable(); }
  17791. +static inline void _local_bh_enable_nort(void) { _local_bh_enable(); }
  17792. +static void ksoftirqd_set_sched_params(unsigned int cpu) { }
  17793. +
  17794. +#else /* !PREEMPT_RT_FULL */
  17795. +
  17796. +/*
  17797. + * On RT we serialize softirq execution with a cpu local lock per softirq
  17798. + */
  17799. +static DEFINE_PER_CPU(struct local_irq_lock [NR_SOFTIRQS], local_softirq_locks);
  17800. +
  17801. +void __init softirq_early_init(void)
  17802. +{
  17803. + int i;
  17804. +
  17805. + for (i = 0; i < NR_SOFTIRQS; i++)
  17806. + local_irq_lock_init(local_softirq_locks[i]);
  17807. +}
  17808. +
  17809. +static void lock_softirq(int which)
  17810. +{
  17811. + local_lock(local_softirq_locks[which]);
  17812. +}
  17813. +
  17814. +static void unlock_softirq(int which)
  17815. +{
  17816. + local_unlock(local_softirq_locks[which]);
  17817. +}
  17818. +
  17819. +static void do_single_softirq(int which)
  17820. +{
  17821. + unsigned long old_flags = current->flags;
  17822. +
  17823. + current->flags &= ~PF_MEMALLOC;
  17824. + vtime_account_irq_enter(current);
  17825. + current->flags |= PF_IN_SOFTIRQ;
  17826. + lockdep_softirq_enter();
  17827. + local_irq_enable();
  17828. + handle_softirq(which);
  17829. + local_irq_disable();
  17830. + lockdep_softirq_exit();
  17831. + current->flags &= ~PF_IN_SOFTIRQ;
  17832. + vtime_account_irq_enter(current);
  17833. + tsk_restore_flags(current, old_flags, PF_MEMALLOC);
  17834. +}
  17835. +
  17836. +/*
  17837. + * Called with interrupts disabled. Process softirqs which were raised
  17838. + * in current context (or on behalf of ksoftirqd).
  17839. + */
  17840. +static void do_current_softirqs(void)
  17841. +{
  17842. + while (current->softirqs_raised) {
  17843. + int i = __ffs(current->softirqs_raised);
  17844. + unsigned int pending, mask = (1U << i);
  17845. +
  17846. + current->softirqs_raised &= ~mask;
  17847. + local_irq_enable();
  17848. +
  17849. + /*
  17850. + * If the lock is contended, we boost the owner to
  17851. + * process the softirq or leave the critical section
  17852. + * now.
  17853. + */
  17854. + lock_softirq(i);
  17855. + local_irq_disable();
  17856. + softirq_set_runner(i);
  17857. + /*
  17858. + * Check with the local_softirq_pending() bits,
  17859. + * whether we need to process this still or if someone
  17860. + * else took care of it.
  17861. + */
  17862. + pending = local_softirq_pending();
  17863. + if (pending & mask) {
  17864. + set_softirq_pending(pending & ~mask);
  17865. + do_single_softirq(i);
  17866. + }
  17867. + softirq_clr_runner(i);
  17868. + WARN_ON(current->softirq_nestcnt != 1);
  17869. + local_irq_enable();
  17870. + unlock_softirq(i);
  17871. + local_irq_disable();
  17872. + }
  17873. +}
  17874. +
  17875. +void __local_bh_disable(void)
  17876. +{
  17877. + if (++current->softirq_nestcnt == 1)
  17878. + migrate_disable();
  17879. +}
  17880. +EXPORT_SYMBOL(__local_bh_disable);
  17881. +
  17882. +void __local_bh_enable(void)
  17883. +{
  17884. + if (WARN_ON(current->softirq_nestcnt == 0))
  17885. + return;
  17886. +
  17887. + local_irq_disable();
  17888. + if (current->softirq_nestcnt == 1 && current->softirqs_raised)
  17889. + do_current_softirqs();
  17890. + local_irq_enable();
  17891. +
  17892. + if (--current->softirq_nestcnt == 0)
  17893. + migrate_enable();
  17894. +}
  17895. +EXPORT_SYMBOL(__local_bh_enable);
  17896. +
  17897. +void _local_bh_enable(void)
  17898. +{
  17899. + if (WARN_ON(current->softirq_nestcnt == 0))
  17900. + return;
  17901. + if (--current->softirq_nestcnt == 0)
  17902. + migrate_enable();
  17903. +}
  17904. +EXPORT_SYMBOL(_local_bh_enable);
  17905. +
  17906. +int in_serving_softirq(void)
  17907. +{
  17908. + return current->flags & PF_IN_SOFTIRQ;
  17909. +}
  17910. +EXPORT_SYMBOL(in_serving_softirq);
  17911. +
  17912. +/* Called with preemption disabled */
  17913. +static void run_ksoftirqd(unsigned int cpu)
  17914. +{
  17915. + local_irq_disable();
  17916. + current->softirq_nestcnt++;
  17917. +
  17918. + do_current_softirqs();
  17919. + current->softirq_nestcnt--;
  17920. + local_irq_enable();
  17921. + cond_resched_rcu_qs();
  17922. +}
  17923. +
  17924. +/*
  17925. + * Called from netif_rx_ni(). Preemption enabled, but migration
  17926. + * disabled. So the cpu can't go away under us.
  17927. + */
  17928. +void thread_do_softirq(void)
  17929. +{
  17930. + if (!in_serving_softirq() && current->softirqs_raised) {
  17931. + current->softirq_nestcnt++;
  17932. + do_current_softirqs();
  17933. + current->softirq_nestcnt--;
  17934. + }
  17935. +}
  17936. +
  17937. +static void do_raise_softirq_irqoff(unsigned int nr)
  17938. +{
  17939. + unsigned int mask;
  17940. +
  17941. + mask = 1UL << nr;
  17942. +
  17943. + trace_softirq_raise(nr);
  17944. + or_softirq_pending(mask);
  17945. +
  17946. + /*
  17947. + * If we are not in a hard interrupt and inside a bh disabled
  17948. + * region, we simply raise the flag on current. local_bh_enable()
  17949. + * will make sure that the softirq is executed. Otherwise we
  17950. + * delegate it to ksoftirqd.
  17951. + */
  17952. + if (!in_irq() && current->softirq_nestcnt)
  17953. + current->softirqs_raised |= mask;
  17954. + else if (!__this_cpu_read(ksoftirqd) || !__this_cpu_read(ktimer_softirqd))
  17955. + return;
  17956. +
  17957. + if (mask & TIMER_SOFTIRQS)
  17958. + __this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
  17959. + else
  17960. + __this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
  17961. +}
  17962. +
  17963. +static void wakeup_proper_softirq(unsigned int nr)
  17964. +{
  17965. + if ((1UL << nr) & TIMER_SOFTIRQS)
  17966. + wakeup_timer_softirqd();
  17967. + else
  17968. + wakeup_softirqd();
  17969. +}
  17970. +
  17971. +void __raise_softirq_irqoff(unsigned int nr)
  17972. +{
  17973. + do_raise_softirq_irqoff(nr);
  17974. + if (!in_irq() && !current->softirq_nestcnt)
  17975. + wakeup_proper_softirq(nr);
  17976. +}
  17977. +
  17978. +/*
  17979. + * Same as __raise_softirq_irqoff() but will process them in ksoftirqd
  17980. + */
  17981. +void __raise_softirq_irqoff_ksoft(unsigned int nr)
  17982. +{
  17983. + unsigned int mask;
  17984. +
  17985. + if (WARN_ON_ONCE(!__this_cpu_read(ksoftirqd) ||
  17986. + !__this_cpu_read(ktimer_softirqd)))
  17987. + return;
  17988. + mask = 1UL << nr;
  17989. +
  17990. + trace_softirq_raise(nr);
  17991. + or_softirq_pending(mask);
  17992. + if (mask & TIMER_SOFTIRQS)
  17993. + __this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
  17994. + else
  17995. + __this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
  17996. + wakeup_proper_softirq(nr);
  17997. +}
  17998. +
  17999. +/*
  18000. + * This function must run with irqs disabled!
  18001. + */
  18002. +void raise_softirq_irqoff(unsigned int nr)
  18003. +{
  18004. + do_raise_softirq_irqoff(nr);
  18005. +
  18006. + /*
  18007. + * If we're in an hard interrupt we let irq return code deal
  18008. + * with the wakeup of ksoftirqd.
  18009. + */
  18010. + if (in_irq())
  18011. + return;
  18012. + /*
  18013. + * If we are in thread context but outside of a bh disabled
  18014. + * region, we need to wake ksoftirqd as well.
  18015. + *
  18016. + * CHECKME: Some of the places which do that could be wrapped
  18017. + * into local_bh_disable/enable pairs. Though it's unclear
  18018. + * whether this is worth the effort. To find those places just
  18019. + * raise a WARN() if the condition is met.
  18020. + */
  18021. + if (!current->softirq_nestcnt)
  18022. + wakeup_proper_softirq(nr);
  18023. +}
  18024. +
  18025. +static inline int ksoftirqd_softirq_pending(void)
  18026. +{
  18027. + return current->softirqs_raised;
  18028. +}
  18029. +
  18030. +static inline void local_bh_disable_nort(void) { }
  18031. +static inline void _local_bh_enable_nort(void) { }
  18032. +
  18033. +static inline void ksoftirqd_set_sched_params(unsigned int cpu)
  18034. +{
  18035. + /* Take over all but timer pending softirqs when starting */
  18036. + local_irq_disable();
  18037. + current->softirqs_raised = local_softirq_pending() & ~TIMER_SOFTIRQS;
  18038. + local_irq_enable();
  18039. +}
  18040. +
  18041. +static inline void ktimer_softirqd_set_sched_params(unsigned int cpu)
  18042. +{
  18043. + struct sched_param param = { .sched_priority = 1 };
  18044. +
  18045. + sched_setscheduler(current, SCHED_FIFO, &param);
  18046. +
  18047. + /* Take over timer pending softirqs when starting */
  18048. + local_irq_disable();
  18049. + current->softirqs_raised = local_softirq_pending() & TIMER_SOFTIRQS;
  18050. + local_irq_enable();
  18051. +}
  18052. +
  18053. +static inline void ktimer_softirqd_clr_sched_params(unsigned int cpu,
  18054. + bool online)
  18055. +{
  18056. + struct sched_param param = { .sched_priority = 0 };
  18057. +
  18058. + sched_setscheduler(current, SCHED_NORMAL, &param);
  18059. +}
  18060. +
  18061. +static int ktimer_softirqd_should_run(unsigned int cpu)
  18062. +{
  18063. + return current->softirqs_raised;
  18064. +}
  18065. +
  18066. +#endif /* PREEMPT_RT_FULL */
  18067. +/*
  18068. * Enter an interrupt context.
  18069. */
  18070. void irq_enter(void)
  18071. @@ -341,9 +784,9 @@ void irq_enter(void)
  18072. * Prevent raise_softirq from needlessly waking up ksoftirqd
  18073. * here, as softirq will be serviced on return from interrupt.
  18074. */
  18075. - local_bh_disable();
  18076. + local_bh_disable_nort();
  18077. tick_irq_enter();
  18078. - _local_bh_enable();
  18079. + _local_bh_enable_nort();
  18080. }
  18081. __irq_enter();
  18082. @@ -351,6 +794,7 @@ void irq_enter(void)
  18083. static inline void invoke_softirq(void)
  18084. {
  18085. +#ifndef CONFIG_PREEMPT_RT_FULL
  18086. if (ksoftirqd_running())
  18087. return;
  18088. @@ -373,6 +817,18 @@ static inline void invoke_softirq(void)
  18089. } else {
  18090. wakeup_softirqd();
  18091. }
  18092. +#else /* PREEMPT_RT_FULL */
  18093. + unsigned long flags;
  18094. +
  18095. + local_irq_save(flags);
  18096. + if (__this_cpu_read(ksoftirqd) &&
  18097. + __this_cpu_read(ksoftirqd)->softirqs_raised)
  18098. + wakeup_softirqd();
  18099. + if (__this_cpu_read(ktimer_softirqd) &&
  18100. + __this_cpu_read(ktimer_softirqd)->softirqs_raised)
  18101. + wakeup_timer_softirqd();
  18102. + local_irq_restore(flags);
  18103. +#endif
  18104. }
  18105. static inline void tick_irq_exit(void)
  18106. @@ -409,26 +865,6 @@ void irq_exit(void)
  18107. trace_hardirq_exit(); /* must be last! */
  18108. }
  18109. -/*
  18110. - * This function must run with irqs disabled!
  18111. - */
  18112. -inline void raise_softirq_irqoff(unsigned int nr)
  18113. -{
  18114. - __raise_softirq_irqoff(nr);
  18115. -
  18116. - /*
  18117. - * If we're in an interrupt or softirq, we're done
  18118. - * (this also catches softirq-disabled code). We will
  18119. - * actually run the softirq once we return from
  18120. - * the irq or softirq.
  18121. - *
  18122. - * Otherwise we wake up ksoftirqd to make sure we
  18123. - * schedule the softirq soon.
  18124. - */
  18125. - if (!in_interrupt())
  18126. - wakeup_softirqd();
  18127. -}
  18128. -
  18129. void raise_softirq(unsigned int nr)
  18130. {
  18131. unsigned long flags;
  18132. @@ -438,12 +874,6 @@ void raise_softirq(unsigned int nr)
  18133. local_irq_restore(flags);
  18134. }
  18135. -void __raise_softirq_irqoff(unsigned int nr)
  18136. -{
  18137. - trace_softirq_raise(nr);
  18138. - or_softirq_pending(1UL << nr);
  18139. -}
  18140. -
  18141. void open_softirq(int nr, void (*action)(struct softirq_action *))
  18142. {
  18143. softirq_vec[nr].action = action;
  18144. @@ -460,15 +890,45 @@ struct tasklet_head {
  18145. static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
  18146. static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
  18147. +static void inline
  18148. +__tasklet_common_schedule(struct tasklet_struct *t, struct tasklet_head *head, unsigned int nr)
  18149. +{
  18150. + if (tasklet_trylock(t)) {
  18151. +again:
  18152. + /* We may have been preempted before tasklet_trylock
  18153. + * and __tasklet_action may have already run.
  18154. + * So double check the sched bit while the takslet
  18155. + * is locked before adding it to the list.
  18156. + */
  18157. + if (test_bit(TASKLET_STATE_SCHED, &t->state)) {
  18158. + t->next = NULL;
  18159. + *head->tail = t;
  18160. + head->tail = &(t->next);
  18161. + raise_softirq_irqoff(nr);
  18162. + tasklet_unlock(t);
  18163. + } else {
  18164. + /* This is subtle. If we hit the corner case above
  18165. + * It is possible that we get preempted right here,
  18166. + * and another task has successfully called
  18167. + * tasklet_schedule(), then this function, and
  18168. + * failed on the trylock. Thus we must be sure
  18169. + * before releasing the tasklet lock, that the
  18170. + * SCHED_BIT is clear. Otherwise the tasklet
  18171. + * may get its SCHED_BIT set, but not added to the
  18172. + * list
  18173. + */
  18174. + if (!tasklet_tryunlock(t))
  18175. + goto again;
  18176. + }
  18177. + }
  18178. +}
  18179. +
  18180. void __tasklet_schedule(struct tasklet_struct *t)
  18181. {
  18182. unsigned long flags;
  18183. local_irq_save(flags);
  18184. - t->next = NULL;
  18185. - *__this_cpu_read(tasklet_vec.tail) = t;
  18186. - __this_cpu_write(tasklet_vec.tail, &(t->next));
  18187. - raise_softirq_irqoff(TASKLET_SOFTIRQ);
  18188. + __tasklet_common_schedule(t, this_cpu_ptr(&tasklet_vec), TASKLET_SOFTIRQ);
  18189. local_irq_restore(flags);
  18190. }
  18191. EXPORT_SYMBOL(__tasklet_schedule);
  18192. @@ -478,10 +938,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
  18193. unsigned long flags;
  18194. local_irq_save(flags);
  18195. - t->next = NULL;
  18196. - *__this_cpu_read(tasklet_hi_vec.tail) = t;
  18197. - __this_cpu_write(tasklet_hi_vec.tail, &(t->next));
  18198. - raise_softirq_irqoff(HI_SOFTIRQ);
  18199. + __tasklet_common_schedule(t, this_cpu_ptr(&tasklet_hi_vec), HI_SOFTIRQ);
  18200. local_irq_restore(flags);
  18201. }
  18202. EXPORT_SYMBOL(__tasklet_hi_schedule);
  18203. @@ -490,82 +947,122 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
  18204. {
  18205. BUG_ON(!irqs_disabled());
  18206. - t->next = __this_cpu_read(tasklet_hi_vec.head);
  18207. - __this_cpu_write(tasklet_hi_vec.head, t);
  18208. - __raise_softirq_irqoff(HI_SOFTIRQ);
  18209. + __tasklet_hi_schedule(t);
  18210. }
  18211. EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  18212. -static __latent_entropy void tasklet_action(struct softirq_action *a)
  18213. +void tasklet_enable(struct tasklet_struct *t)
  18214. {
  18215. - struct tasklet_struct *list;
  18216. + if (!atomic_dec_and_test(&t->count))
  18217. + return;
  18218. + if (test_and_clear_bit(TASKLET_STATE_PENDING, &t->state))
  18219. + tasklet_schedule(t);
  18220. +}
  18221. +EXPORT_SYMBOL(tasklet_enable);
  18222. - local_irq_disable();
  18223. - list = __this_cpu_read(tasklet_vec.head);
  18224. - __this_cpu_write(tasklet_vec.head, NULL);
  18225. - __this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
  18226. - local_irq_enable();
  18227. +static void __tasklet_action(struct softirq_action *a,
  18228. + struct tasklet_struct *list)
  18229. +{
  18230. + int loops = 1000000;
  18231. while (list) {
  18232. struct tasklet_struct *t = list;
  18233. list = list->next;
  18234. - if (tasklet_trylock(t)) {
  18235. - if (!atomic_read(&t->count)) {
  18236. - if (!test_and_clear_bit(TASKLET_STATE_SCHED,
  18237. - &t->state))
  18238. - BUG();
  18239. - t->func(t->data);
  18240. - tasklet_unlock(t);
  18241. - continue;
  18242. - }
  18243. - tasklet_unlock(t);
  18244. + /*
  18245. + * Should always succeed - after a tasklist got on the
  18246. + * list (after getting the SCHED bit set from 0 to 1),
  18247. + * nothing but the tasklet softirq it got queued to can
  18248. + * lock it:
  18249. + */
  18250. + if (!tasklet_trylock(t)) {
  18251. + WARN_ON(1);
  18252. + continue;
  18253. }
  18254. - local_irq_disable();
  18255. t->next = NULL;
  18256. - *__this_cpu_read(tasklet_vec.tail) = t;
  18257. - __this_cpu_write(tasklet_vec.tail, &(t->next));
  18258. - __raise_softirq_irqoff(TASKLET_SOFTIRQ);
  18259. - local_irq_enable();
  18260. +
  18261. + /*
  18262. + * If we cannot handle the tasklet because it's disabled,
  18263. + * mark it as pending. tasklet_enable() will later
  18264. + * re-schedule the tasklet.
  18265. + */
  18266. + if (unlikely(atomic_read(&t->count))) {
  18267. +out_disabled:
  18268. + /* implicit unlock: */
  18269. + wmb();
  18270. + t->state = TASKLET_STATEF_PENDING;
  18271. + continue;
  18272. + }
  18273. +
  18274. + /*
  18275. + * After this point on the tasklet might be rescheduled
  18276. + * on another CPU, but it can only be added to another
  18277. + * CPU's tasklet list if we unlock the tasklet (which we
  18278. + * dont do yet).
  18279. + */
  18280. + if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
  18281. + WARN_ON(1);
  18282. +
  18283. +again:
  18284. + t->func(t->data);
  18285. +
  18286. + /*
  18287. + * Try to unlock the tasklet. We must use cmpxchg, because
  18288. + * another CPU might have scheduled or disabled the tasklet.
  18289. + * We only allow the STATE_RUN -> 0 transition here.
  18290. + */
  18291. + while (!tasklet_tryunlock(t)) {
  18292. + /*
  18293. + * If it got disabled meanwhile, bail out:
  18294. + */
  18295. + if (atomic_read(&t->count))
  18296. + goto out_disabled;
  18297. + /*
  18298. + * If it got scheduled meanwhile, re-execute
  18299. + * the tasklet function:
  18300. + */
  18301. + if (test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
  18302. + goto again;
  18303. + if (!--loops) {
  18304. + printk("hm, tasklet state: %08lx\n", t->state);
  18305. + WARN_ON(1);
  18306. + tasklet_unlock(t);
  18307. + break;
  18308. + }
  18309. + }
  18310. }
  18311. }
  18312. +static void tasklet_action(struct softirq_action *a)
  18313. +{
  18314. + struct tasklet_struct *list;
  18315. +
  18316. + local_irq_disable();
  18317. +
  18318. + list = __this_cpu_read(tasklet_vec.head);
  18319. + __this_cpu_write(tasklet_vec.head, NULL);
  18320. + __this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
  18321. +
  18322. + local_irq_enable();
  18323. +
  18324. + __tasklet_action(a, list);
  18325. +}
  18326. +
  18327. static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
  18328. {
  18329. struct tasklet_struct *list;
  18330. local_irq_disable();
  18331. +
  18332. list = __this_cpu_read(tasklet_hi_vec.head);
  18333. __this_cpu_write(tasklet_hi_vec.head, NULL);
  18334. __this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head));
  18335. +
  18336. local_irq_enable();
  18337. - while (list) {
  18338. - struct tasklet_struct *t = list;
  18339. -
  18340. - list = list->next;
  18341. -
  18342. - if (tasklet_trylock(t)) {
  18343. - if (!atomic_read(&t->count)) {
  18344. - if (!test_and_clear_bit(TASKLET_STATE_SCHED,
  18345. - &t->state))
  18346. - BUG();
  18347. - t->func(t->data);
  18348. - tasklet_unlock(t);
  18349. - continue;
  18350. - }
  18351. - tasklet_unlock(t);
  18352. - }
  18353. -
  18354. - local_irq_disable();
  18355. - t->next = NULL;
  18356. - *__this_cpu_read(tasklet_hi_vec.tail) = t;
  18357. - __this_cpu_write(tasklet_hi_vec.tail, &(t->next));
  18358. - __raise_softirq_irqoff(HI_SOFTIRQ);
  18359. - local_irq_enable();
  18360. - }
  18361. + __tasklet_action(a, list);
  18362. }
  18363. void tasklet_init(struct tasklet_struct *t,
  18364. @@ -586,7 +1083,7 @@ void tasklet_kill(struct tasklet_struct *t)
  18365. while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
  18366. do {
  18367. - yield();
  18368. + msleep(1);
  18369. } while (test_bit(TASKLET_STATE_SCHED, &t->state));
  18370. }
  18371. tasklet_unlock_wait(t);
  18372. @@ -660,25 +1157,26 @@ void __init softirq_init(void)
  18373. open_softirq(HI_SOFTIRQ, tasklet_hi_action);
  18374. }
  18375. +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
  18376. +void tasklet_unlock_wait(struct tasklet_struct *t)
  18377. +{
  18378. + while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
  18379. + /*
  18380. + * Hack for now to avoid this busy-loop:
  18381. + */
  18382. +#ifdef CONFIG_PREEMPT_RT_FULL
  18383. + msleep(1);
  18384. +#else
  18385. + barrier();
  18386. +#endif
  18387. + }
  18388. +}
  18389. +EXPORT_SYMBOL(tasklet_unlock_wait);
  18390. +#endif
  18391. +
  18392. static int ksoftirqd_should_run(unsigned int cpu)
  18393. {
  18394. - return local_softirq_pending();
  18395. -}
  18396. -
  18397. -static void run_ksoftirqd(unsigned int cpu)
  18398. -{
  18399. - local_irq_disable();
  18400. - if (local_softirq_pending()) {
  18401. - /*
  18402. - * We can safely run softirq on inline stack, as we are not deep
  18403. - * in the task stack here.
  18404. - */
  18405. - __do_softirq();
  18406. - local_irq_enable();
  18407. - cond_resched_rcu_qs();
  18408. - return;
  18409. - }
  18410. - local_irq_enable();
  18411. + return ksoftirqd_softirq_pending();
  18412. }
  18413. #ifdef CONFIG_HOTPLUG_CPU
  18414. @@ -745,17 +1243,31 @@ static int takeover_tasklets(unsigned int cpu)
  18415. static struct smp_hotplug_thread softirq_threads = {
  18416. .store = &ksoftirqd,
  18417. + .setup = ksoftirqd_set_sched_params,
  18418. .thread_should_run = ksoftirqd_should_run,
  18419. .thread_fn = run_ksoftirqd,
  18420. .thread_comm = "ksoftirqd/%u",
  18421. };
  18422. +#ifdef CONFIG_PREEMPT_RT_FULL
  18423. +static struct smp_hotplug_thread softirq_timer_threads = {
  18424. + .store = &ktimer_softirqd,
  18425. + .setup = ktimer_softirqd_set_sched_params,
  18426. + .cleanup = ktimer_softirqd_clr_sched_params,
  18427. + .thread_should_run = ktimer_softirqd_should_run,
  18428. + .thread_fn = run_ksoftirqd,
  18429. + .thread_comm = "ktimersoftd/%u",
  18430. +};
  18431. +#endif
  18432. +
  18433. static __init int spawn_ksoftirqd(void)
  18434. {
  18435. cpuhp_setup_state_nocalls(CPUHP_SOFTIRQ_DEAD, "softirq:dead", NULL,
  18436. takeover_tasklets);
  18437. BUG_ON(smpboot_register_percpu_thread(&softirq_threads));
  18438. -
  18439. +#ifdef CONFIG_PREEMPT_RT_FULL
  18440. + BUG_ON(smpboot_register_percpu_thread(&softirq_timer_threads));
  18441. +#endif
  18442. return 0;
  18443. }
  18444. early_initcall(spawn_ksoftirqd);
  18445. diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
  18446. index ec9ab2f01489..8b89dbedeaff 100644
  18447. --- a/kernel/stop_machine.c
  18448. +++ b/kernel/stop_machine.c
  18449. @@ -36,7 +36,7 @@ struct cpu_stop_done {
  18450. struct cpu_stopper {
  18451. struct task_struct *thread;
  18452. - spinlock_t lock;
  18453. + raw_spinlock_t lock;
  18454. bool enabled; /* is this stopper enabled? */
  18455. struct list_head works; /* list of pending works */
  18456. @@ -78,14 +78,14 @@ static bool cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work)
  18457. unsigned long flags;
  18458. bool enabled;
  18459. - spin_lock_irqsave(&stopper->lock, flags);
  18460. + raw_spin_lock_irqsave(&stopper->lock, flags);
  18461. enabled = stopper->enabled;
  18462. if (enabled)
  18463. __cpu_stop_queue_work(stopper, work);
  18464. else if (work->done)
  18465. cpu_stop_signal_done(work->done);
  18466. - spin_unlock_irqrestore(&stopper->lock, flags);
  18467. + raw_spin_unlock_irqrestore(&stopper->lock, flags);
  18468. return enabled;
  18469. }
  18470. @@ -231,8 +231,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
  18471. struct cpu_stopper *stopper2 = per_cpu_ptr(&cpu_stopper, cpu2);
  18472. int err;
  18473. retry:
  18474. - spin_lock_irq(&stopper1->lock);
  18475. - spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
  18476. + raw_spin_lock_irq(&stopper1->lock);
  18477. + raw_spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
  18478. err = -ENOENT;
  18479. if (!stopper1->enabled || !stopper2->enabled)
  18480. @@ -255,8 +255,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
  18481. __cpu_stop_queue_work(stopper1, work1);
  18482. __cpu_stop_queue_work(stopper2, work2);
  18483. unlock:
  18484. - spin_unlock(&stopper2->lock);
  18485. - spin_unlock_irq(&stopper1->lock);
  18486. + raw_spin_unlock(&stopper2->lock);
  18487. + raw_spin_unlock_irq(&stopper1->lock);
  18488. if (unlikely(err == -EDEADLK)) {
  18489. while (stop_cpus_in_progress)
  18490. @@ -448,9 +448,9 @@ static int cpu_stop_should_run(unsigned int cpu)
  18491. unsigned long flags;
  18492. int run;
  18493. - spin_lock_irqsave(&stopper->lock, flags);
  18494. + raw_spin_lock_irqsave(&stopper->lock, flags);
  18495. run = !list_empty(&stopper->works);
  18496. - spin_unlock_irqrestore(&stopper->lock, flags);
  18497. + raw_spin_unlock_irqrestore(&stopper->lock, flags);
  18498. return run;
  18499. }
  18500. @@ -461,13 +461,13 @@ static void cpu_stopper_thread(unsigned int cpu)
  18501. repeat:
  18502. work = NULL;
  18503. - spin_lock_irq(&stopper->lock);
  18504. + raw_spin_lock_irq(&stopper->lock);
  18505. if (!list_empty(&stopper->works)) {
  18506. work = list_first_entry(&stopper->works,
  18507. struct cpu_stop_work, list);
  18508. list_del_init(&work->list);
  18509. }
  18510. - spin_unlock_irq(&stopper->lock);
  18511. + raw_spin_unlock_irq(&stopper->lock);
  18512. if (work) {
  18513. cpu_stop_fn_t fn = work->fn;
  18514. @@ -475,6 +475,8 @@ static void cpu_stopper_thread(unsigned int cpu)
  18515. struct cpu_stop_done *done = work->done;
  18516. int ret;
  18517. + /* XXX */
  18518. +
  18519. /* cpu stop callbacks must not sleep, make in_atomic() == T */
  18520. preempt_count_inc();
  18521. ret = fn(arg);
  18522. @@ -541,7 +543,7 @@ static int __init cpu_stop_init(void)
  18523. for_each_possible_cpu(cpu) {
  18524. struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
  18525. - spin_lock_init(&stopper->lock);
  18526. + raw_spin_lock_init(&stopper->lock);
  18527. INIT_LIST_HEAD(&stopper->works);
  18528. }
  18529. diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
  18530. index bb5ec425dfe0..8338b14ed3a3 100644
  18531. --- a/kernel/time/hrtimer.c
  18532. +++ b/kernel/time/hrtimer.c
  18533. @@ -53,6 +53,7 @@
  18534. #include <asm/uaccess.h>
  18535. #include <trace/events/timer.h>
  18536. +#include <trace/events/hist.h>
  18537. #include "tick-internal.h"
  18538. @@ -695,6 +696,29 @@ static void hrtimer_switch_to_hres(void)
  18539. retrigger_next_event(NULL);
  18540. }
  18541. +#ifdef CONFIG_PREEMPT_RT_FULL
  18542. +
  18543. +static struct swork_event clock_set_delay_work;
  18544. +
  18545. +static void run_clock_set_delay(struct swork_event *event)
  18546. +{
  18547. + clock_was_set();
  18548. +}
  18549. +
  18550. +void clock_was_set_delayed(void)
  18551. +{
  18552. + swork_queue(&clock_set_delay_work);
  18553. +}
  18554. +
  18555. +static __init int create_clock_set_delay_thread(void)
  18556. +{
  18557. + WARN_ON(swork_get());
  18558. + INIT_SWORK(&clock_set_delay_work, run_clock_set_delay);
  18559. + return 0;
  18560. +}
  18561. +early_initcall(create_clock_set_delay_thread);
  18562. +#else /* PREEMPT_RT_FULL */
  18563. +
  18564. static void clock_was_set_work(struct work_struct *work)
  18565. {
  18566. clock_was_set();
  18567. @@ -710,6 +734,7 @@ void clock_was_set_delayed(void)
  18568. {
  18569. schedule_work(&hrtimer_work);
  18570. }
  18571. +#endif
  18572. #else
  18573. @@ -719,11 +744,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; }
  18574. static inline void hrtimer_switch_to_hres(void) { }
  18575. static inline void
  18576. hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
  18577. -static inline int hrtimer_reprogram(struct hrtimer *timer,
  18578. - struct hrtimer_clock_base *base)
  18579. -{
  18580. - return 0;
  18581. -}
  18582. +static inline void hrtimer_reprogram(struct hrtimer *timer,
  18583. + struct hrtimer_clock_base *base) { }
  18584. static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
  18585. static inline void retrigger_next_event(void *arg) { }
  18586. @@ -855,6 +877,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
  18587. }
  18588. EXPORT_SYMBOL_GPL(hrtimer_forward);
  18589. +#ifdef CONFIG_PREEMPT_RT_BASE
  18590. +# define wake_up_timer_waiters(b) wake_up(&(b)->wait)
  18591. +
  18592. +/**
  18593. + * hrtimer_wait_for_timer - Wait for a running timer
  18594. + *
  18595. + * @timer: timer to wait for
  18596. + *
  18597. + * The function waits in case the timers callback function is
  18598. + * currently executed on the waitqueue of the timer base. The
  18599. + * waitqueue is woken up after the timer callback function has
  18600. + * finished execution.
  18601. + */
  18602. +void hrtimer_wait_for_timer(const struct hrtimer *timer)
  18603. +{
  18604. + struct hrtimer_clock_base *base = timer->base;
  18605. +
  18606. + if (base && base->cpu_base && !timer->irqsafe)
  18607. + wait_event(base->cpu_base->wait,
  18608. + !(hrtimer_callback_running(timer)));
  18609. +}
  18610. +
  18611. +#else
  18612. +# define wake_up_timer_waiters(b) do { } while (0)
  18613. +#endif
  18614. +
  18615. /*
  18616. * enqueue_hrtimer - internal function to (re)start a timer
  18617. *
  18618. @@ -896,6 +944,11 @@ static void __remove_hrtimer(struct hrtimer *timer,
  18619. if (!(state & HRTIMER_STATE_ENQUEUED))
  18620. return;
  18621. + if (unlikely(!list_empty(&timer->cb_entry))) {
  18622. + list_del_init(&timer->cb_entry);
  18623. + return;
  18624. + }
  18625. +
  18626. if (!timerqueue_del(&base->active, &timer->node))
  18627. cpu_base->active_bases &= ~(1 << base->index);
  18628. @@ -991,7 +1044,16 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
  18629. new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
  18630. timer_stats_hrtimer_set_start_info(timer);
  18631. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  18632. + {
  18633. + ktime_t now = new_base->get_time();
  18634. + if (ktime_to_ns(tim) < ktime_to_ns(now))
  18635. + timer->praecox = now;
  18636. + else
  18637. + timer->praecox = ktime_set(0, 0);
  18638. + }
  18639. +#endif
  18640. leftmost = enqueue_hrtimer(timer, new_base);
  18641. if (!leftmost)
  18642. goto unlock;
  18643. @@ -1063,7 +1125,7 @@ int hrtimer_cancel(struct hrtimer *timer)
  18644. if (ret >= 0)
  18645. return ret;
  18646. - cpu_relax();
  18647. + hrtimer_wait_for_timer(timer);
  18648. }
  18649. }
  18650. EXPORT_SYMBOL_GPL(hrtimer_cancel);
  18651. @@ -1127,6 +1189,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
  18652. base = hrtimer_clockid_to_base(clock_id);
  18653. timer->base = &cpu_base->clock_base[base];
  18654. + INIT_LIST_HEAD(&timer->cb_entry);
  18655. timerqueue_init(&timer->node);
  18656. #ifdef CONFIG_TIMER_STATS
  18657. @@ -1167,6 +1230,7 @@ bool hrtimer_active(const struct hrtimer *timer)
  18658. seq = raw_read_seqcount_begin(&cpu_base->seq);
  18659. if (timer->state != HRTIMER_STATE_INACTIVE ||
  18660. + cpu_base->running_soft == timer ||
  18661. cpu_base->running == timer)
  18662. return true;
  18663. @@ -1265,10 +1329,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
  18664. cpu_base->running = NULL;
  18665. }
  18666. +#ifdef CONFIG_PREEMPT_RT_BASE
  18667. +static void hrtimer_rt_reprogram(int restart, struct hrtimer *timer,
  18668. + struct hrtimer_clock_base *base)
  18669. +{
  18670. + int leftmost;
  18671. +
  18672. + if (restart != HRTIMER_NORESTART &&
  18673. + !(timer->state & HRTIMER_STATE_ENQUEUED)) {
  18674. +
  18675. + leftmost = enqueue_hrtimer(timer, base);
  18676. + if (!leftmost)
  18677. + return;
  18678. +#ifdef CONFIG_HIGH_RES_TIMERS
  18679. + if (!hrtimer_is_hres_active(timer)) {
  18680. + /*
  18681. + * Kick to reschedule the next tick to handle the new timer
  18682. + * on dynticks target.
  18683. + */
  18684. + if (base->cpu_base->nohz_active)
  18685. + wake_up_nohz_cpu(base->cpu_base->cpu);
  18686. + } else {
  18687. +
  18688. + hrtimer_reprogram(timer, base);
  18689. + }
  18690. +#endif
  18691. + }
  18692. +}
  18693. +
  18694. +/*
  18695. + * The changes in mainline which removed the callback modes from
  18696. + * hrtimer are not yet working with -rt. The non wakeup_process()
  18697. + * based callbacks which involve sleeping locks need to be treated
  18698. + * seperately.
  18699. + */
  18700. +static void hrtimer_rt_run_pending(void)
  18701. +{
  18702. + enum hrtimer_restart (*fn)(struct hrtimer *);
  18703. + struct hrtimer_cpu_base *cpu_base;
  18704. + struct hrtimer_clock_base *base;
  18705. + struct hrtimer *timer;
  18706. + int index, restart;
  18707. +
  18708. + local_irq_disable();
  18709. + cpu_base = &per_cpu(hrtimer_bases, smp_processor_id());
  18710. +
  18711. + raw_spin_lock(&cpu_base->lock);
  18712. +
  18713. + for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) {
  18714. + base = &cpu_base->clock_base[index];
  18715. +
  18716. + while (!list_empty(&base->expired)) {
  18717. + timer = list_first_entry(&base->expired,
  18718. + struct hrtimer, cb_entry);
  18719. +
  18720. + /*
  18721. + * Same as the above __run_hrtimer function
  18722. + * just we run with interrupts enabled.
  18723. + */
  18724. + debug_deactivate(timer);
  18725. + cpu_base->running_soft = timer;
  18726. + raw_write_seqcount_barrier(&cpu_base->seq);
  18727. +
  18728. + __remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE, 0);
  18729. + timer_stats_account_hrtimer(timer);
  18730. + fn = timer->function;
  18731. +
  18732. + raw_spin_unlock_irq(&cpu_base->lock);
  18733. + restart = fn(timer);
  18734. + raw_spin_lock_irq(&cpu_base->lock);
  18735. +
  18736. + hrtimer_rt_reprogram(restart, timer, base);
  18737. + raw_write_seqcount_barrier(&cpu_base->seq);
  18738. +
  18739. + WARN_ON_ONCE(cpu_base->running_soft != timer);
  18740. + cpu_base->running_soft = NULL;
  18741. + }
  18742. + }
  18743. +
  18744. + raw_spin_unlock_irq(&cpu_base->lock);
  18745. +
  18746. + wake_up_timer_waiters(cpu_base);
  18747. +}
  18748. +
  18749. +static int hrtimer_rt_defer(struct hrtimer *timer)
  18750. +{
  18751. + if (timer->irqsafe)
  18752. + return 0;
  18753. +
  18754. + __remove_hrtimer(timer, timer->base, timer->state, 0);
  18755. + list_add_tail(&timer->cb_entry, &timer->base->expired);
  18756. + return 1;
  18757. +}
  18758. +
  18759. +#else
  18760. +
  18761. +static inline int hrtimer_rt_defer(struct hrtimer *timer) { return 0; }
  18762. +
  18763. +#endif
  18764. +
  18765. +static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer);
  18766. +
  18767. static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
  18768. {
  18769. struct hrtimer_clock_base *base = cpu_base->clock_base;
  18770. unsigned int active = cpu_base->active_bases;
  18771. + int raise = 0;
  18772. for (; active; base++, active >>= 1) {
  18773. struct timerqueue_node *node;
  18774. @@ -1284,6 +1450,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
  18775. timer = container_of(node, struct hrtimer, node);
  18776. + trace_hrtimer_interrupt(raw_smp_processor_id(),
  18777. + ktime_to_ns(ktime_sub(ktime_to_ns(timer->praecox) ?
  18778. + timer->praecox : hrtimer_get_expires(timer),
  18779. + basenow)),
  18780. + current,
  18781. + timer->function == hrtimer_wakeup ?
  18782. + container_of(timer, struct hrtimer_sleeper,
  18783. + timer)->task : NULL);
  18784. +
  18785. /*
  18786. * The immediate goal for using the softexpires is
  18787. * minimizing wakeups, not running timers at the
  18788. @@ -1299,9 +1474,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
  18789. if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer))
  18790. break;
  18791. - __run_hrtimer(cpu_base, base, timer, &basenow);
  18792. + if (!hrtimer_rt_defer(timer))
  18793. + __run_hrtimer(cpu_base, base, timer, &basenow);
  18794. + else
  18795. + raise = 1;
  18796. }
  18797. }
  18798. + if (raise)
  18799. + raise_softirq_irqoff(HRTIMER_SOFTIRQ);
  18800. }
  18801. #ifdef CONFIG_HIGH_RES_TIMERS
  18802. @@ -1464,16 +1644,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
  18803. void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
  18804. {
  18805. sl->timer.function = hrtimer_wakeup;
  18806. + sl->timer.irqsafe = 1;
  18807. sl->task = task;
  18808. }
  18809. EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
  18810. -static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
  18811. +static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode,
  18812. + unsigned long state)
  18813. {
  18814. hrtimer_init_sleeper(t, current);
  18815. do {
  18816. - set_current_state(TASK_INTERRUPTIBLE);
  18817. + set_current_state(state);
  18818. hrtimer_start_expires(&t->timer, mode);
  18819. if (likely(t->task))
  18820. @@ -1515,7 +1697,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
  18821. HRTIMER_MODE_ABS);
  18822. hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
  18823. - if (do_nanosleep(&t, HRTIMER_MODE_ABS))
  18824. + /* cpu_chill() does not care about restart state. */
  18825. + if (do_nanosleep(&t, HRTIMER_MODE_ABS, TASK_INTERRUPTIBLE))
  18826. goto out;
  18827. rmtp = restart->nanosleep.rmtp;
  18828. @@ -1532,8 +1715,10 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
  18829. return ret;
  18830. }
  18831. -long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
  18832. - const enum hrtimer_mode mode, const clockid_t clockid)
  18833. +static long
  18834. +__hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
  18835. + const enum hrtimer_mode mode, const clockid_t clockid,
  18836. + unsigned long state)
  18837. {
  18838. struct restart_block *restart;
  18839. struct hrtimer_sleeper t;
  18840. @@ -1546,7 +1731,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
  18841. hrtimer_init_on_stack(&t.timer, clockid, mode);
  18842. hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
  18843. - if (do_nanosleep(&t, mode))
  18844. + if (do_nanosleep(&t, mode, state))
  18845. goto out;
  18846. /* Absolute timers do not update the rmtp value and restart: */
  18847. @@ -1573,6 +1758,12 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
  18848. return ret;
  18849. }
  18850. +long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
  18851. + const enum hrtimer_mode mode, const clockid_t clockid)
  18852. +{
  18853. + return __hrtimer_nanosleep(rqtp, rmtp, mode, clockid, TASK_INTERRUPTIBLE);
  18854. +}
  18855. +
  18856. SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
  18857. struct timespec __user *, rmtp)
  18858. {
  18859. @@ -1587,6 +1778,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
  18860. return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
  18861. }
  18862. +#ifdef CONFIG_PREEMPT_RT_FULL
  18863. +/*
  18864. + * Sleep for 1 ms in hope whoever holds what we want will let it go.
  18865. + */
  18866. +void cpu_chill(void)
  18867. +{
  18868. + struct timespec tu = {
  18869. + .tv_nsec = NSEC_PER_MSEC,
  18870. + };
  18871. + unsigned int freeze_flag = current->flags & PF_NOFREEZE;
  18872. +
  18873. + current->flags |= PF_NOFREEZE;
  18874. + __hrtimer_nanosleep(&tu, NULL, HRTIMER_MODE_REL, CLOCK_MONOTONIC,
  18875. + TASK_UNINTERRUPTIBLE);
  18876. + if (!freeze_flag)
  18877. + current->flags &= ~PF_NOFREEZE;
  18878. +}
  18879. +EXPORT_SYMBOL(cpu_chill);
  18880. +#endif
  18881. +
  18882. /*
  18883. * Functions related to boot-time initialization:
  18884. */
  18885. @@ -1598,10 +1809,14 @@ int hrtimers_prepare_cpu(unsigned int cpu)
  18886. for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
  18887. cpu_base->clock_base[i].cpu_base = cpu_base;
  18888. timerqueue_init_head(&cpu_base->clock_base[i].active);
  18889. + INIT_LIST_HEAD(&cpu_base->clock_base[i].expired);
  18890. }
  18891. cpu_base->cpu = cpu;
  18892. hrtimer_init_hres(cpu_base);
  18893. +#ifdef CONFIG_PREEMPT_RT_BASE
  18894. + init_waitqueue_head(&cpu_base->wait);
  18895. +#endif
  18896. return 0;
  18897. }
  18898. @@ -1671,9 +1886,26 @@ int hrtimers_dead_cpu(unsigned int scpu)
  18899. #endif /* CONFIG_HOTPLUG_CPU */
  18900. +#ifdef CONFIG_PREEMPT_RT_BASE
  18901. +
  18902. +static void run_hrtimer_softirq(struct softirq_action *h)
  18903. +{
  18904. + hrtimer_rt_run_pending();
  18905. +}
  18906. +
  18907. +static void hrtimers_open_softirq(void)
  18908. +{
  18909. + open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq);
  18910. +}
  18911. +
  18912. +#else
  18913. +static void hrtimers_open_softirq(void) { }
  18914. +#endif
  18915. +
  18916. void __init hrtimers_init(void)
  18917. {
  18918. hrtimers_prepare_cpu(smp_processor_id());
  18919. + hrtimers_open_softirq();
  18920. }
  18921. /**
  18922. diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
  18923. index 1d5c7204ddc9..184de6751180 100644
  18924. --- a/kernel/time/itimer.c
  18925. +++ b/kernel/time/itimer.c
  18926. @@ -213,6 +213,7 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
  18927. /* We are sharing ->siglock with it_real_fn() */
  18928. if (hrtimer_try_to_cancel(timer) < 0) {
  18929. spin_unlock_irq(&tsk->sighand->siglock);
  18930. + hrtimer_wait_for_timer(&tsk->signal->real_timer);
  18931. goto again;
  18932. }
  18933. expires = timeval_to_ktime(value->it_value);
  18934. diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
  18935. index 555e21f7b966..a5d6435fabbb 100644
  18936. --- a/kernel/time/jiffies.c
  18937. +++ b/kernel/time/jiffies.c
  18938. @@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = {
  18939. .max_cycles = 10,
  18940. };
  18941. -__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock);
  18942. +__cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(jiffies_lock);
  18943. +__cacheline_aligned_in_smp seqcount_t jiffies_seq;
  18944. #if (BITS_PER_LONG < 64)
  18945. u64 get_jiffies_64(void)
  18946. @@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
  18947. u64 ret;
  18948. do {
  18949. - seq = read_seqbegin(&jiffies_lock);
  18950. + seq = read_seqcount_begin(&jiffies_seq);
  18951. ret = jiffies_64;
  18952. - } while (read_seqretry(&jiffies_lock, seq));
  18953. + } while (read_seqcount_retry(&jiffies_seq, seq));
  18954. return ret;
  18955. }
  18956. EXPORT_SYMBOL(get_jiffies_64);
  18957. diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
  18958. index 6df8927c58a5..05b7391bf9bd 100644
  18959. --- a/kernel/time/ntp.c
  18960. +++ b/kernel/time/ntp.c
  18961. @@ -17,6 +17,7 @@
  18962. #include <linux/module.h>
  18963. #include <linux/rtc.h>
  18964. #include <linux/math64.h>
  18965. +#include <linux/swork.h>
  18966. #include "ntp_internal.h"
  18967. #include "timekeeping_internal.h"
  18968. @@ -568,10 +569,35 @@ static void sync_cmos_clock(struct work_struct *work)
  18969. &sync_cmos_work, timespec64_to_jiffies(&next));
  18970. }
  18971. +#ifdef CONFIG_PREEMPT_RT_FULL
  18972. +
  18973. +static void run_clock_set_delay(struct swork_event *event)
  18974. +{
  18975. + queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
  18976. +}
  18977. +
  18978. +static struct swork_event ntp_cmos_swork;
  18979. +
  18980. +void ntp_notify_cmos_timer(void)
  18981. +{
  18982. + swork_queue(&ntp_cmos_swork);
  18983. +}
  18984. +
  18985. +static __init int create_cmos_delay_thread(void)
  18986. +{
  18987. + WARN_ON(swork_get());
  18988. + INIT_SWORK(&ntp_cmos_swork, run_clock_set_delay);
  18989. + return 0;
  18990. +}
  18991. +early_initcall(create_cmos_delay_thread);
  18992. +
  18993. +#else
  18994. +
  18995. void ntp_notify_cmos_timer(void)
  18996. {
  18997. queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
  18998. }
  18999. +#endif /* CONFIG_PREEMPT_RT_FULL */
  19000. #else
  19001. void ntp_notify_cmos_timer(void) { }
  19002. diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
  19003. index 39008d78927a..633f4eaca9e7 100644
  19004. --- a/kernel/time/posix-cpu-timers.c
  19005. +++ b/kernel/time/posix-cpu-timers.c
  19006. @@ -3,6 +3,7 @@
  19007. */
  19008. #include <linux/sched.h>
  19009. +#include <linux/sched/rt.h>
  19010. #include <linux/posix-timers.h>
  19011. #include <linux/errno.h>
  19012. #include <linux/math64.h>
  19013. @@ -620,7 +621,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
  19014. /*
  19015. * Disarm any old timer after extracting its expiry time.
  19016. */
  19017. - WARN_ON_ONCE(!irqs_disabled());
  19018. + WARN_ON_ONCE_NONRT(!irqs_disabled());
  19019. ret = 0;
  19020. old_incr = timer->it.cpu.incr;
  19021. @@ -1064,7 +1065,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
  19022. /*
  19023. * Now re-arm for the new expiry time.
  19024. */
  19025. - WARN_ON_ONCE(!irqs_disabled());
  19026. + WARN_ON_ONCE_NONRT(!irqs_disabled());
  19027. arm_timer(timer);
  19028. unlock_task_sighand(p, &flags);
  19029. @@ -1153,13 +1154,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
  19030. * already updated our counts. We need to check if any timers fire now.
  19031. * Interrupts are disabled.
  19032. */
  19033. -void run_posix_cpu_timers(struct task_struct *tsk)
  19034. +static void __run_posix_cpu_timers(struct task_struct *tsk)
  19035. {
  19036. LIST_HEAD(firing);
  19037. struct k_itimer *timer, *next;
  19038. unsigned long flags;
  19039. - WARN_ON_ONCE(!irqs_disabled());
  19040. + WARN_ON_ONCE_NONRT(!irqs_disabled());
  19041. /*
  19042. * The fast path checks that there are no expired thread or thread
  19043. @@ -1213,6 +1214,190 @@ void run_posix_cpu_timers(struct task_struct *tsk)
  19044. }
  19045. }
  19046. +#ifdef CONFIG_PREEMPT_RT_BASE
  19047. +#include <linux/kthread.h>
  19048. +#include <linux/cpu.h>
  19049. +DEFINE_PER_CPU(struct task_struct *, posix_timer_task);
  19050. +DEFINE_PER_CPU(struct task_struct *, posix_timer_tasklist);
  19051. +
  19052. +static int posix_cpu_timers_thread(void *data)
  19053. +{
  19054. + int cpu = (long)data;
  19055. +
  19056. + BUG_ON(per_cpu(posix_timer_task,cpu) != current);
  19057. +
  19058. + while (!kthread_should_stop()) {
  19059. + struct task_struct *tsk = NULL;
  19060. + struct task_struct *next = NULL;
  19061. +
  19062. + if (cpu_is_offline(cpu))
  19063. + goto wait_to_die;
  19064. +
  19065. + /* grab task list */
  19066. + raw_local_irq_disable();
  19067. + tsk = per_cpu(posix_timer_tasklist, cpu);
  19068. + per_cpu(posix_timer_tasklist, cpu) = NULL;
  19069. + raw_local_irq_enable();
  19070. +
  19071. + /* its possible the list is empty, just return */
  19072. + if (!tsk) {
  19073. + set_current_state(TASK_INTERRUPTIBLE);
  19074. + schedule();
  19075. + __set_current_state(TASK_RUNNING);
  19076. + continue;
  19077. + }
  19078. +
  19079. + /* Process task list */
  19080. + while (1) {
  19081. + /* save next */
  19082. + next = tsk->posix_timer_list;
  19083. +
  19084. + /* run the task timers, clear its ptr and
  19085. + * unreference it
  19086. + */
  19087. + __run_posix_cpu_timers(tsk);
  19088. + tsk->posix_timer_list = NULL;
  19089. + put_task_struct(tsk);
  19090. +
  19091. + /* check if this is the last on the list */
  19092. + if (next == tsk)
  19093. + break;
  19094. + tsk = next;
  19095. + }
  19096. + }
  19097. + return 0;
  19098. +
  19099. +wait_to_die:
  19100. + /* Wait for kthread_stop */
  19101. + set_current_state(TASK_INTERRUPTIBLE);
  19102. + while (!kthread_should_stop()) {
  19103. + schedule();
  19104. + set_current_state(TASK_INTERRUPTIBLE);
  19105. + }
  19106. + __set_current_state(TASK_RUNNING);
  19107. + return 0;
  19108. +}
  19109. +
  19110. +static inline int __fastpath_timer_check(struct task_struct *tsk)
  19111. +{
  19112. + /* tsk == current, ensure it is safe to use ->signal/sighand */
  19113. + if (unlikely(tsk->exit_state))
  19114. + return 0;
  19115. +
  19116. + if (!task_cputime_zero(&tsk->cputime_expires))
  19117. + return 1;
  19118. +
  19119. + if (!task_cputime_zero(&tsk->signal->cputime_expires))
  19120. + return 1;
  19121. +
  19122. + return 0;
  19123. +}
  19124. +
  19125. +void run_posix_cpu_timers(struct task_struct *tsk)
  19126. +{
  19127. + unsigned long cpu = smp_processor_id();
  19128. + struct task_struct *tasklist;
  19129. +
  19130. + BUG_ON(!irqs_disabled());
  19131. + if(!per_cpu(posix_timer_task, cpu))
  19132. + return;
  19133. + /* get per-cpu references */
  19134. + tasklist = per_cpu(posix_timer_tasklist, cpu);
  19135. +
  19136. + /* check to see if we're already queued */
  19137. + if (!tsk->posix_timer_list && __fastpath_timer_check(tsk)) {
  19138. + get_task_struct(tsk);
  19139. + if (tasklist) {
  19140. + tsk->posix_timer_list = tasklist;
  19141. + } else {
  19142. + /*
  19143. + * The list is terminated by a self-pointing
  19144. + * task_struct
  19145. + */
  19146. + tsk->posix_timer_list = tsk;
  19147. + }
  19148. + per_cpu(posix_timer_tasklist, cpu) = tsk;
  19149. +
  19150. + wake_up_process(per_cpu(posix_timer_task, cpu));
  19151. + }
  19152. +}
  19153. +
  19154. +/*
  19155. + * posix_cpu_thread_call - callback that gets triggered when a CPU is added.
  19156. + * Here we can start up the necessary migration thread for the new CPU.
  19157. + */
  19158. +static int posix_cpu_thread_call(struct notifier_block *nfb,
  19159. + unsigned long action, void *hcpu)
  19160. +{
  19161. + int cpu = (long)hcpu;
  19162. + struct task_struct *p;
  19163. + struct sched_param param;
  19164. +
  19165. + switch (action) {
  19166. + case CPU_UP_PREPARE:
  19167. + p = kthread_create(posix_cpu_timers_thread, hcpu,
  19168. + "posixcputmr/%d",cpu);
  19169. + if (IS_ERR(p))
  19170. + return NOTIFY_BAD;
  19171. + p->flags |= PF_NOFREEZE;
  19172. + kthread_bind(p, cpu);
  19173. + /* Must be high prio to avoid getting starved */
  19174. + param.sched_priority = MAX_RT_PRIO-1;
  19175. + sched_setscheduler(p, SCHED_FIFO, &param);
  19176. + per_cpu(posix_timer_task,cpu) = p;
  19177. + break;
  19178. + case CPU_ONLINE:
  19179. + /* Strictly unneccessary, as first user will wake it. */
  19180. + wake_up_process(per_cpu(posix_timer_task,cpu));
  19181. + break;
  19182. +#ifdef CONFIG_HOTPLUG_CPU
  19183. + case CPU_UP_CANCELED:
  19184. + /* Unbind it from offline cpu so it can run. Fall thru. */
  19185. + kthread_bind(per_cpu(posix_timer_task, cpu),
  19186. + cpumask_any(cpu_online_mask));
  19187. + kthread_stop(per_cpu(posix_timer_task,cpu));
  19188. + per_cpu(posix_timer_task,cpu) = NULL;
  19189. + break;
  19190. + case CPU_DEAD:
  19191. + kthread_stop(per_cpu(posix_timer_task,cpu));
  19192. + per_cpu(posix_timer_task,cpu) = NULL;
  19193. + break;
  19194. +#endif
  19195. + }
  19196. + return NOTIFY_OK;
  19197. +}
  19198. +
  19199. +/* Register at highest priority so that task migration (migrate_all_tasks)
  19200. + * happens before everything else.
  19201. + */
  19202. +static struct notifier_block posix_cpu_thread_notifier = {
  19203. + .notifier_call = posix_cpu_thread_call,
  19204. + .priority = 10
  19205. +};
  19206. +
  19207. +static int __init posix_cpu_thread_init(void)
  19208. +{
  19209. + void *hcpu = (void *)(long)smp_processor_id();
  19210. + /* Start one for boot CPU. */
  19211. + unsigned long cpu;
  19212. +
  19213. + /* init the per-cpu posix_timer_tasklets */
  19214. + for_each_possible_cpu(cpu)
  19215. + per_cpu(posix_timer_tasklist, cpu) = NULL;
  19216. +
  19217. + posix_cpu_thread_call(&posix_cpu_thread_notifier, CPU_UP_PREPARE, hcpu);
  19218. + posix_cpu_thread_call(&posix_cpu_thread_notifier, CPU_ONLINE, hcpu);
  19219. + register_cpu_notifier(&posix_cpu_thread_notifier);
  19220. + return 0;
  19221. +}
  19222. +early_initcall(posix_cpu_thread_init);
  19223. +#else /* CONFIG_PREEMPT_RT_BASE */
  19224. +void run_posix_cpu_timers(struct task_struct *tsk)
  19225. +{
  19226. + __run_posix_cpu_timers(tsk);
  19227. +}
  19228. +#endif /* CONFIG_PREEMPT_RT_BASE */
  19229. +
  19230. /*
  19231. * Set one of the process-wide special case CPU timers or RLIMIT_CPU.
  19232. * The tsk->sighand->siglock must be held by the caller.
  19233. diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
  19234. index f2826c35e918..464a98155a0e 100644
  19235. --- a/kernel/time/posix-timers.c
  19236. +++ b/kernel/time/posix-timers.c
  19237. @@ -506,6 +506,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
  19238. static struct pid *good_sigevent(sigevent_t * event)
  19239. {
  19240. struct task_struct *rtn = current->group_leader;
  19241. + int sig = event->sigev_signo;
  19242. if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
  19243. (!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) ||
  19244. @@ -514,7 +515,8 @@ static struct pid *good_sigevent(sigevent_t * event)
  19245. return NULL;
  19246. if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) &&
  19247. - ((event->sigev_signo <= 0) || (event->sigev_signo > SIGRTMAX)))
  19248. + (sig <= 0 || sig > SIGRTMAX || sig_kernel_only(sig) ||
  19249. + sig_kernel_coredump(sig)))
  19250. return NULL;
  19251. return task_pid(rtn);
  19252. @@ -826,6 +828,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
  19253. return overrun;
  19254. }
  19255. +/*
  19256. + * Protected by RCU!
  19257. + */
  19258. +static void timer_wait_for_callback(struct k_clock *kc, struct k_itimer *timr)
  19259. +{
  19260. +#ifdef CONFIG_PREEMPT_RT_FULL
  19261. + if (kc->timer_set == common_timer_set)
  19262. + hrtimer_wait_for_timer(&timr->it.real.timer);
  19263. + else
  19264. + /* FIXME: Whacky hack for posix-cpu-timers */
  19265. + schedule_timeout(1);
  19266. +#endif
  19267. +}
  19268. +
  19269. /* Set a POSIX.1b interval timer. */
  19270. /* timr->it_lock is taken. */
  19271. static int
  19272. @@ -903,6 +919,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
  19273. if (!timr)
  19274. return -EINVAL;
  19275. + rcu_read_lock();
  19276. kc = clockid_to_kclock(timr->it_clock);
  19277. if (WARN_ON_ONCE(!kc || !kc->timer_set))
  19278. error = -EINVAL;
  19279. @@ -911,9 +928,12 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
  19280. unlock_timer(timr, flag);
  19281. if (error == TIMER_RETRY) {
  19282. + timer_wait_for_callback(kc, timr);
  19283. rtn = NULL; // We already got the old time...
  19284. + rcu_read_unlock();
  19285. goto retry;
  19286. }
  19287. + rcu_read_unlock();
  19288. if (old_setting && !error &&
  19289. copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
  19290. @@ -951,10 +971,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, timer_id)
  19291. if (!timer)
  19292. return -EINVAL;
  19293. + rcu_read_lock();
  19294. if (timer_delete_hook(timer) == TIMER_RETRY) {
  19295. unlock_timer(timer, flags);
  19296. + timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
  19297. + timer);
  19298. + rcu_read_unlock();
  19299. goto retry_delete;
  19300. }
  19301. + rcu_read_unlock();
  19302. spin_lock(&current->sighand->siglock);
  19303. list_del(&timer->list);
  19304. @@ -980,8 +1005,18 @@ static void itimer_delete(struct k_itimer *timer)
  19305. retry_delete:
  19306. spin_lock_irqsave(&timer->it_lock, flags);
  19307. - if (timer_delete_hook(timer) == TIMER_RETRY) {
  19308. + /* On RT we can race with a deletion */
  19309. + if (!timer->it_signal) {
  19310. unlock_timer(timer, flags);
  19311. + return;
  19312. + }
  19313. +
  19314. + if (timer_delete_hook(timer) == TIMER_RETRY) {
  19315. + rcu_read_lock();
  19316. + unlock_timer(timer, flags);
  19317. + timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
  19318. + timer);
  19319. + rcu_read_unlock();
  19320. goto retry_delete;
  19321. }
  19322. list_del(&timer->list);
  19323. diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
  19324. index 690b797f522e..fe8ba1619879 100644
  19325. --- a/kernel/time/tick-broadcast-hrtimer.c
  19326. +++ b/kernel/time/tick-broadcast-hrtimer.c
  19327. @@ -107,5 +107,6 @@ void tick_setup_hrtimer_broadcast(void)
  19328. {
  19329. hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
  19330. bctimer.function = bc_handler;
  19331. + bctimer.irqsafe = true;
  19332. clockevents_register_device(&ce_broadcast_hrtimer);
  19333. }
  19334. diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
  19335. index 4fcd99e12aa0..5a47f2e98faf 100644
  19336. --- a/kernel/time/tick-common.c
  19337. +++ b/kernel/time/tick-common.c
  19338. @@ -79,13 +79,15 @@ int tick_is_oneshot_available(void)
  19339. static void tick_periodic(int cpu)
  19340. {
  19341. if (tick_do_timer_cpu == cpu) {
  19342. - write_seqlock(&jiffies_lock);
  19343. + raw_spin_lock(&jiffies_lock);
  19344. + write_seqcount_begin(&jiffies_seq);
  19345. /* Keep track of the next tick event */
  19346. tick_next_period = ktime_add(tick_next_period, tick_period);
  19347. do_timer(1);
  19348. - write_sequnlock(&jiffies_lock);
  19349. + write_seqcount_end(&jiffies_seq);
  19350. + raw_spin_unlock(&jiffies_lock);
  19351. update_wall_time();
  19352. }
  19353. @@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
  19354. ktime_t next;
  19355. do {
  19356. - seq = read_seqbegin(&jiffies_lock);
  19357. + seq = read_seqcount_begin(&jiffies_seq);
  19358. next = tick_next_period;
  19359. - } while (read_seqretry(&jiffies_lock, seq));
  19360. + } while (read_seqcount_retry(&jiffies_seq, seq));
  19361. clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
  19362. diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
  19363. index 3bcb61b52f6c..66d85482a96e 100644
  19364. --- a/kernel/time/tick-sched.c
  19365. +++ b/kernel/time/tick-sched.c
  19366. @@ -62,7 +62,8 @@ static void tick_do_update_jiffies64(ktime_t now)
  19367. return;
  19368. /* Reevaluate with jiffies_lock held */
  19369. - write_seqlock(&jiffies_lock);
  19370. + raw_spin_lock(&jiffies_lock);
  19371. + write_seqcount_begin(&jiffies_seq);
  19372. delta = ktime_sub(now, last_jiffies_update);
  19373. if (delta.tv64 >= tick_period.tv64) {
  19374. @@ -85,10 +86,12 @@ static void tick_do_update_jiffies64(ktime_t now)
  19375. /* Keep the tick_next_period variable up to date */
  19376. tick_next_period = ktime_add(last_jiffies_update, tick_period);
  19377. } else {
  19378. - write_sequnlock(&jiffies_lock);
  19379. + write_seqcount_end(&jiffies_seq);
  19380. + raw_spin_unlock(&jiffies_lock);
  19381. return;
  19382. }
  19383. - write_sequnlock(&jiffies_lock);
  19384. + write_seqcount_end(&jiffies_seq);
  19385. + raw_spin_unlock(&jiffies_lock);
  19386. update_wall_time();
  19387. }
  19388. @@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void)
  19389. {
  19390. ktime_t period;
  19391. - write_seqlock(&jiffies_lock);
  19392. + raw_spin_lock(&jiffies_lock);
  19393. + write_seqcount_begin(&jiffies_seq);
  19394. /* Did we start the jiffies update yet ? */
  19395. if (last_jiffies_update.tv64 == 0)
  19396. last_jiffies_update = tick_next_period;
  19397. period = last_jiffies_update;
  19398. - write_sequnlock(&jiffies_lock);
  19399. + write_seqcount_end(&jiffies_seq);
  19400. + raw_spin_unlock(&jiffies_lock);
  19401. return period;
  19402. }
  19403. @@ -215,6 +220,7 @@ static void nohz_full_kick_func(struct irq_work *work)
  19404. static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
  19405. .func = nohz_full_kick_func,
  19406. + .flags = IRQ_WORK_HARD_IRQ,
  19407. };
  19408. /*
  19409. @@ -673,10 +679,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
  19410. /* Read jiffies and the time when jiffies were updated last */
  19411. do {
  19412. - seq = read_seqbegin(&jiffies_lock);
  19413. + seq = read_seqcount_begin(&jiffies_seq);
  19414. basemono = last_jiffies_update.tv64;
  19415. basejiff = jiffies;
  19416. - } while (read_seqretry(&jiffies_lock, seq));
  19417. + } while (read_seqcount_retry(&jiffies_seq, seq));
  19418. ts->last_jiffies = basejiff;
  19419. if (rcu_needs_cpu(basemono, &next_rcu) ||
  19420. @@ -877,14 +883,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
  19421. return false;
  19422. if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
  19423. - static int ratelimit;
  19424. -
  19425. - if (ratelimit < 10 &&
  19426. - (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
  19427. - pr_warn("NOHZ: local_softirq_pending %02x\n",
  19428. - (unsigned int) local_softirq_pending());
  19429. - ratelimit++;
  19430. - }
  19431. + softirq_check_pending_idle();
  19432. return false;
  19433. }
  19434. @@ -1193,6 +1192,7 @@ void tick_setup_sched_timer(void)
  19435. * Emulate tick processing via per-CPU hrtimers:
  19436. */
  19437. hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
  19438. + ts->sched_timer.irqsafe = 1;
  19439. ts->sched_timer.function = tick_sched_timer;
  19440. /* Get the next period (per-CPU) */
  19441. diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
  19442. index 46e312e9be38..fa75cf5d9253 100644
  19443. --- a/kernel/time/timekeeping.c
  19444. +++ b/kernel/time/timekeeping.c
  19445. @@ -2328,8 +2328,10 @@ EXPORT_SYMBOL(hardpps);
  19446. */
  19447. void xtime_update(unsigned long ticks)
  19448. {
  19449. - write_seqlock(&jiffies_lock);
  19450. + raw_spin_lock(&jiffies_lock);
  19451. + write_seqcount_begin(&jiffies_seq);
  19452. do_timer(ticks);
  19453. - write_sequnlock(&jiffies_lock);
  19454. + write_seqcount_end(&jiffies_seq);
  19455. + raw_spin_unlock(&jiffies_lock);
  19456. update_wall_time();
  19457. }
  19458. diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
  19459. index 704f595ce83f..763a3e5121ff 100644
  19460. --- a/kernel/time/timekeeping.h
  19461. +++ b/kernel/time/timekeeping.h
  19462. @@ -19,7 +19,8 @@ extern void timekeeping_resume(void);
  19463. extern void do_timer(unsigned long ticks);
  19464. extern void update_wall_time(void);
  19465. -extern seqlock_t jiffies_lock;
  19466. +extern raw_spinlock_t jiffies_lock;
  19467. +extern seqcount_t jiffies_seq;
  19468. #define CS_NAME_LEN 32
  19469. diff --git a/kernel/time/timer.c b/kernel/time/timer.c
  19470. index c611c47de884..08a5ab762495 100644
  19471. --- a/kernel/time/timer.c
  19472. +++ b/kernel/time/timer.c
  19473. @@ -193,8 +193,11 @@ EXPORT_SYMBOL(jiffies_64);
  19474. #endif
  19475. struct timer_base {
  19476. - spinlock_t lock;
  19477. + raw_spinlock_t lock;
  19478. struct timer_list *running_timer;
  19479. +#ifdef CONFIG_PREEMPT_RT_FULL
  19480. + struct swait_queue_head wait_for_running_timer;
  19481. +#endif
  19482. unsigned long clk;
  19483. unsigned long next_expiry;
  19484. unsigned int cpu;
  19485. @@ -948,10 +951,10 @@ static struct timer_base *lock_timer_base(struct timer_list *timer,
  19486. if (!(tf & TIMER_MIGRATING)) {
  19487. base = get_timer_base(tf);
  19488. - spin_lock_irqsave(&base->lock, *flags);
  19489. + raw_spin_lock_irqsave(&base->lock, *flags);
  19490. if (timer->flags == tf)
  19491. return base;
  19492. - spin_unlock_irqrestore(&base->lock, *flags);
  19493. + raw_spin_unlock_irqrestore(&base->lock, *flags);
  19494. }
  19495. cpu_relax();
  19496. }
  19497. @@ -1023,9 +1026,9 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
  19498. /* See the comment in lock_timer_base() */
  19499. timer->flags |= TIMER_MIGRATING;
  19500. - spin_unlock(&base->lock);
  19501. + raw_spin_unlock(&base->lock);
  19502. base = new_base;
  19503. - spin_lock(&base->lock);
  19504. + raw_spin_lock(&base->lock);
  19505. WRITE_ONCE(timer->flags,
  19506. (timer->flags & ~TIMER_BASEMASK) | base->cpu);
  19507. }
  19508. @@ -1050,7 +1053,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
  19509. }
  19510. out_unlock:
  19511. - spin_unlock_irqrestore(&base->lock, flags);
  19512. + raw_spin_unlock_irqrestore(&base->lock, flags);
  19513. return ret;
  19514. }
  19515. @@ -1144,19 +1147,46 @@ void add_timer_on(struct timer_list *timer, int cpu)
  19516. if (base != new_base) {
  19517. timer->flags |= TIMER_MIGRATING;
  19518. - spin_unlock(&base->lock);
  19519. + raw_spin_unlock(&base->lock);
  19520. base = new_base;
  19521. - spin_lock(&base->lock);
  19522. + raw_spin_lock(&base->lock);
  19523. WRITE_ONCE(timer->flags,
  19524. (timer->flags & ~TIMER_BASEMASK) | cpu);
  19525. }
  19526. debug_activate(timer, timer->expires);
  19527. internal_add_timer(base, timer);
  19528. - spin_unlock_irqrestore(&base->lock, flags);
  19529. + raw_spin_unlock_irqrestore(&base->lock, flags);
  19530. }
  19531. EXPORT_SYMBOL_GPL(add_timer_on);
  19532. +#ifdef CONFIG_PREEMPT_RT_FULL
  19533. +/*
  19534. + * Wait for a running timer
  19535. + */
  19536. +static void wait_for_running_timer(struct timer_list *timer)
  19537. +{
  19538. + struct timer_base *base;
  19539. + u32 tf = timer->flags;
  19540. +
  19541. + if (tf & TIMER_MIGRATING)
  19542. + return;
  19543. +
  19544. + base = get_timer_base(tf);
  19545. + swait_event(base->wait_for_running_timer,
  19546. + base->running_timer != timer);
  19547. +}
  19548. +
  19549. +# define wakeup_timer_waiters(b) swake_up_all(&(b)->wait_for_running_timer)
  19550. +#else
  19551. +static inline void wait_for_running_timer(struct timer_list *timer)
  19552. +{
  19553. + cpu_relax();
  19554. +}
  19555. +
  19556. +# define wakeup_timer_waiters(b) do { } while (0)
  19557. +#endif
  19558. +
  19559. /**
  19560. * del_timer - deactive a timer.
  19561. * @timer: the timer to be deactivated
  19562. @@ -1180,7 +1210,7 @@ int del_timer(struct timer_list *timer)
  19563. if (timer_pending(timer)) {
  19564. base = lock_timer_base(timer, &flags);
  19565. ret = detach_if_pending(timer, base, true);
  19566. - spin_unlock_irqrestore(&base->lock, flags);
  19567. + raw_spin_unlock_irqrestore(&base->lock, flags);
  19568. }
  19569. return ret;
  19570. @@ -1208,13 +1238,13 @@ int try_to_del_timer_sync(struct timer_list *timer)
  19571. timer_stats_timer_clear_start_info(timer);
  19572. ret = detach_if_pending(timer, base, true);
  19573. }
  19574. - spin_unlock_irqrestore(&base->lock, flags);
  19575. + raw_spin_unlock_irqrestore(&base->lock, flags);
  19576. return ret;
  19577. }
  19578. EXPORT_SYMBOL(try_to_del_timer_sync);
  19579. -#ifdef CONFIG_SMP
  19580. +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
  19581. /**
  19582. * del_timer_sync - deactivate a timer and wait for the handler to finish.
  19583. * @timer: the timer to be deactivated
  19584. @@ -1274,7 +1304,7 @@ int del_timer_sync(struct timer_list *timer)
  19585. int ret = try_to_del_timer_sync(timer);
  19586. if (ret >= 0)
  19587. return ret;
  19588. - cpu_relax();
  19589. + wait_for_running_timer(timer);
  19590. }
  19591. }
  19592. EXPORT_SYMBOL(del_timer_sync);
  19593. @@ -1339,14 +1369,17 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
  19594. fn = timer->function;
  19595. data = timer->data;
  19596. - if (timer->flags & TIMER_IRQSAFE) {
  19597. - spin_unlock(&base->lock);
  19598. + if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
  19599. + timer->flags & TIMER_IRQSAFE) {
  19600. + raw_spin_unlock(&base->lock);
  19601. call_timer_fn(timer, fn, data);
  19602. - spin_lock(&base->lock);
  19603. + base->running_timer = NULL;
  19604. + raw_spin_lock(&base->lock);
  19605. } else {
  19606. - spin_unlock_irq(&base->lock);
  19607. + raw_spin_unlock_irq(&base->lock);
  19608. call_timer_fn(timer, fn, data);
  19609. - spin_lock_irq(&base->lock);
  19610. + base->running_timer = NULL;
  19611. + raw_spin_lock_irq(&base->lock);
  19612. }
  19613. }
  19614. }
  19615. @@ -1515,7 +1548,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
  19616. if (cpu_is_offline(smp_processor_id()))
  19617. return expires;
  19618. - spin_lock(&base->lock);
  19619. + raw_spin_lock(&base->lock);
  19620. nextevt = __next_timer_interrupt(base);
  19621. is_max_delta = (nextevt == base->clk + NEXT_TIMER_MAX_DELTA);
  19622. base->next_expiry = nextevt;
  19623. @@ -1543,7 +1576,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
  19624. if ((expires - basem) > TICK_NSEC)
  19625. base->is_idle = true;
  19626. }
  19627. - spin_unlock(&base->lock);
  19628. + raw_spin_unlock(&base->lock);
  19629. return cmp_next_hrtimer_event(basem, expires);
  19630. }
  19631. @@ -1608,13 +1641,13 @@ void update_process_times(int user_tick)
  19632. /* Note: this timer irq context must be accounted for as well. */
  19633. account_process_tick(p, user_tick);
  19634. + scheduler_tick();
  19635. run_local_timers();
  19636. rcu_check_callbacks(user_tick);
  19637. -#ifdef CONFIG_IRQ_WORK
  19638. +#if defined(CONFIG_IRQ_WORK)
  19639. if (in_irq())
  19640. irq_work_tick();
  19641. #endif
  19642. - scheduler_tick();
  19643. run_posix_cpu_timers(p);
  19644. }
  19645. @@ -1630,7 +1663,7 @@ static inline void __run_timers(struct timer_base *base)
  19646. if (!time_after_eq(jiffies, base->clk))
  19647. return;
  19648. - spin_lock_irq(&base->lock);
  19649. + raw_spin_lock_irq(&base->lock);
  19650. while (time_after_eq(jiffies, base->clk)) {
  19651. @@ -1640,8 +1673,8 @@ static inline void __run_timers(struct timer_base *base)
  19652. while (levels--)
  19653. expire_timers(base, heads + levels);
  19654. }
  19655. - base->running_timer = NULL;
  19656. - spin_unlock_irq(&base->lock);
  19657. + raw_spin_unlock_irq(&base->lock);
  19658. + wakeup_timer_waiters(base);
  19659. }
  19660. /*
  19661. @@ -1651,6 +1684,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
  19662. {
  19663. struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
  19664. + irq_work_tick_soft();
  19665. +
  19666. __run_timers(base);
  19667. if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
  19668. __run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
  19669. @@ -1836,16 +1871,16 @@ int timers_dead_cpu(unsigned int cpu)
  19670. * The caller is globally serialized and nobody else
  19671. * takes two locks at once, deadlock is not possible.
  19672. */
  19673. - spin_lock_irq(&new_base->lock);
  19674. - spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
  19675. + raw_spin_lock_irq(&new_base->lock);
  19676. + raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
  19677. BUG_ON(old_base->running_timer);
  19678. for (i = 0; i < WHEEL_SIZE; i++)
  19679. migrate_timer_list(new_base, old_base->vectors + i);
  19680. - spin_unlock(&old_base->lock);
  19681. - spin_unlock_irq(&new_base->lock);
  19682. + raw_spin_unlock(&old_base->lock);
  19683. + raw_spin_unlock_irq(&new_base->lock);
  19684. put_cpu_ptr(&timer_bases);
  19685. }
  19686. return 0;
  19687. @@ -1861,8 +1896,11 @@ static void __init init_timer_cpu(int cpu)
  19688. for (i = 0; i < NR_BASES; i++) {
  19689. base = per_cpu_ptr(&timer_bases[i], cpu);
  19690. base->cpu = cpu;
  19691. - spin_lock_init(&base->lock);
  19692. + raw_spin_lock_init(&base->lock);
  19693. base->clk = jiffies;
  19694. +#ifdef CONFIG_PREEMPT_RT_FULL
  19695. + init_swait_queue_head(&base->wait_for_running_timer);
  19696. +#endif
  19697. }
  19698. }
  19699. diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
  19700. index 2a96b063d659..812e37237eb8 100644
  19701. --- a/kernel/trace/Kconfig
  19702. +++ b/kernel/trace/Kconfig
  19703. @@ -182,6 +182,24 @@ config IRQSOFF_TRACER
  19704. enabled. This option and the preempt-off timing option can be
  19705. used together or separately.)
  19706. +config INTERRUPT_OFF_HIST
  19707. + bool "Interrupts-off Latency Histogram"
  19708. + depends on IRQSOFF_TRACER
  19709. + help
  19710. + This option generates continuously updated histograms (one per cpu)
  19711. + of the duration of time periods with interrupts disabled. The
  19712. + histograms are disabled by default. To enable them, write a non-zero
  19713. + number to
  19714. +
  19715. + /sys/kernel/debug/tracing/latency_hist/enable/preemptirqsoff
  19716. +
  19717. + If PREEMPT_OFF_HIST is also selected, additional histograms (one
  19718. + per cpu) are generated that accumulate the duration of time periods
  19719. + when both interrupts and preemption are disabled. The histogram data
  19720. + will be located in the debug file system at
  19721. +
  19722. + /sys/kernel/debug/tracing/latency_hist/irqsoff
  19723. +
  19724. config PREEMPT_TRACER
  19725. bool "Preemption-off Latency Tracer"
  19726. default n
  19727. @@ -206,6 +224,24 @@ config PREEMPT_TRACER
  19728. enabled. This option and the irqs-off timing option can be
  19729. used together or separately.)
  19730. +config PREEMPT_OFF_HIST
  19731. + bool "Preemption-off Latency Histogram"
  19732. + depends on PREEMPT_TRACER
  19733. + help
  19734. + This option generates continuously updated histograms (one per cpu)
  19735. + of the duration of time periods with preemption disabled. The
  19736. + histograms are disabled by default. To enable them, write a non-zero
  19737. + number to
  19738. +
  19739. + /sys/kernel/debug/tracing/latency_hist/enable/preemptirqsoff
  19740. +
  19741. + If INTERRUPT_OFF_HIST is also selected, additional histograms (one
  19742. + per cpu) are generated that accumulate the duration of time periods
  19743. + when both interrupts and preemption are disabled. The histogram data
  19744. + will be located in the debug file system at
  19745. +
  19746. + /sys/kernel/debug/tracing/latency_hist/preemptoff
  19747. +
  19748. config SCHED_TRACER
  19749. bool "Scheduling Latency Tracer"
  19750. select GENERIC_TRACER
  19751. @@ -251,6 +287,74 @@ config HWLAT_TRACER
  19752. file. Every time a latency is greater than tracing_thresh, it will
  19753. be recorded into the ring buffer.
  19754. +config WAKEUP_LATENCY_HIST
  19755. + bool "Scheduling Latency Histogram"
  19756. + depends on SCHED_TRACER
  19757. + help
  19758. + This option generates continuously updated histograms (one per cpu)
  19759. + of the scheduling latency of the highest priority task.
  19760. + The histograms are disabled by default. To enable them, write a
  19761. + non-zero number to
  19762. +
  19763. + /sys/kernel/debug/tracing/latency_hist/enable/wakeup
  19764. +
  19765. + Two different algorithms are used, one to determine the latency of
  19766. + processes that exclusively use the highest priority of the system and
  19767. + another one to determine the latency of processes that share the
  19768. + highest system priority with other processes. The former is used to
  19769. + improve hardware and system software, the latter to optimize the
  19770. + priority design of a given system. The histogram data will be
  19771. + located in the debug file system at
  19772. +
  19773. + /sys/kernel/debug/tracing/latency_hist/wakeup
  19774. +
  19775. + and
  19776. +
  19777. + /sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio
  19778. +
  19779. + If both Scheduling Latency Histogram and Missed Timer Offsets
  19780. + Histogram are selected, additional histogram data will be collected
  19781. + that contain, in addition to the wakeup latency, the timer latency, in
  19782. + case the wakeup was triggered by an expired timer. These histograms
  19783. + are available in the
  19784. +
  19785. + /sys/kernel/debug/tracing/latency_hist/timerandwakeup
  19786. +
  19787. + directory. They reflect the apparent interrupt and scheduling latency
  19788. + and are best suitable to determine the worst-case latency of a given
  19789. + system. To enable these histograms, write a non-zero number to
  19790. +
  19791. + /sys/kernel/debug/tracing/latency_hist/enable/timerandwakeup
  19792. +
  19793. +config MISSED_TIMER_OFFSETS_HIST
  19794. + depends on HIGH_RES_TIMERS
  19795. + select GENERIC_TRACER
  19796. + bool "Missed Timer Offsets Histogram"
  19797. + help
  19798. + Generate a histogram of missed timer offsets in microseconds. The
  19799. + histograms are disabled by default. To enable them, write a non-zero
  19800. + number to
  19801. +
  19802. + /sys/kernel/debug/tracing/latency_hist/enable/missed_timer_offsets
  19803. +
  19804. + The histogram data will be located in the debug file system at
  19805. +
  19806. + /sys/kernel/debug/tracing/latency_hist/missed_timer_offsets
  19807. +
  19808. + If both Scheduling Latency Histogram and Missed Timer Offsets
  19809. + Histogram are selected, additional histogram data will be collected
  19810. + that contain, in addition to the wakeup latency, the timer latency, in
  19811. + case the wakeup was triggered by an expired timer. These histograms
  19812. + are available in the
  19813. +
  19814. + /sys/kernel/debug/tracing/latency_hist/timerandwakeup
  19815. +
  19816. + directory. They reflect the apparent interrupt and scheduling latency
  19817. + and are best suitable to determine the worst-case latency of a given
  19818. + system. To enable these histograms, write a non-zero number to
  19819. +
  19820. + /sys/kernel/debug/tracing/latency_hist/enable/timerandwakeup
  19821. +
  19822. config ENABLE_DEFAULT_TRACERS
  19823. bool "Trace process context switches and events"
  19824. depends on !GENERIC_TRACER
  19825. diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
  19826. index e57980845549..83af000b783c 100644
  19827. --- a/kernel/trace/Makefile
  19828. +++ b/kernel/trace/Makefile
  19829. @@ -38,6 +38,10 @@ obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
  19830. obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
  19831. obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
  19832. obj-$(CONFIG_HWLAT_TRACER) += trace_hwlat.o
  19833. +obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
  19834. +obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
  19835. +obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
  19836. +obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
  19837. obj-$(CONFIG_NOP_TRACER) += trace_nop.o
  19838. obj-$(CONFIG_STACK_TRACER) += trace_stack.o
  19839. obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
  19840. diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c
  19841. new file mode 100644
  19842. index 000000000000..7f6ee70dea41
  19843. --- /dev/null
  19844. +++ b/kernel/trace/latency_hist.c
  19845. @@ -0,0 +1,1178 @@
  19846. +/*
  19847. + * kernel/trace/latency_hist.c
  19848. + *
  19849. + * Add support for histograms of preemption-off latency and
  19850. + * interrupt-off latency and wakeup latency, it depends on
  19851. + * Real-Time Preemption Support.
  19852. + *
  19853. + * Copyright (C) 2005 MontaVista Software, Inc.
  19854. + * Yi Yang <yyang@ch.mvista.com>
  19855. + *
  19856. + * Converted to work with the new latency tracer.
  19857. + * Copyright (C) 2008 Red Hat, Inc.
  19858. + * Steven Rostedt <srostedt@redhat.com>
  19859. + *
  19860. + */
  19861. +#include <linux/module.h>
  19862. +#include <linux/debugfs.h>
  19863. +#include <linux/seq_file.h>
  19864. +#include <linux/percpu.h>
  19865. +#include <linux/kallsyms.h>
  19866. +#include <linux/uaccess.h>
  19867. +#include <linux/sched.h>
  19868. +#include <linux/sched/rt.h>
  19869. +#include <linux/slab.h>
  19870. +#include <linux/atomic.h>
  19871. +#include <asm/div64.h>
  19872. +
  19873. +#include "trace.h"
  19874. +#include <trace/events/sched.h>
  19875. +
  19876. +#define NSECS_PER_USECS 1000L
  19877. +
  19878. +#define CREATE_TRACE_POINTS
  19879. +#include <trace/events/hist.h>
  19880. +
  19881. +enum {
  19882. + IRQSOFF_LATENCY = 0,
  19883. + PREEMPTOFF_LATENCY,
  19884. + PREEMPTIRQSOFF_LATENCY,
  19885. + WAKEUP_LATENCY,
  19886. + WAKEUP_LATENCY_SHAREDPRIO,
  19887. + MISSED_TIMER_OFFSETS,
  19888. + TIMERANDWAKEUP_LATENCY,
  19889. + MAX_LATENCY_TYPE,
  19890. +};
  19891. +
  19892. +#define MAX_ENTRY_NUM 10240
  19893. +
  19894. +struct hist_data {
  19895. + atomic_t hist_mode; /* 0 log, 1 don't log */
  19896. + long offset; /* set it to MAX_ENTRY_NUM/2 for a bipolar scale */
  19897. + long min_lat;
  19898. + long max_lat;
  19899. + unsigned long long below_hist_bound_samples;
  19900. + unsigned long long above_hist_bound_samples;
  19901. + long long accumulate_lat;
  19902. + unsigned long long total_samples;
  19903. + unsigned long long hist_array[MAX_ENTRY_NUM];
  19904. +};
  19905. +
  19906. +struct enable_data {
  19907. + int latency_type;
  19908. + int enabled;
  19909. +};
  19910. +
  19911. +static char *latency_hist_dir_root = "latency_hist";
  19912. +
  19913. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  19914. +static DEFINE_PER_CPU(struct hist_data, irqsoff_hist);
  19915. +static char *irqsoff_hist_dir = "irqsoff";
  19916. +static DEFINE_PER_CPU(cycles_t, hist_irqsoff_start);
  19917. +static DEFINE_PER_CPU(int, hist_irqsoff_counting);
  19918. +#endif
  19919. +
  19920. +#ifdef CONFIG_PREEMPT_OFF_HIST
  19921. +static DEFINE_PER_CPU(struct hist_data, preemptoff_hist);
  19922. +static char *preemptoff_hist_dir = "preemptoff";
  19923. +static DEFINE_PER_CPU(cycles_t, hist_preemptoff_start);
  19924. +static DEFINE_PER_CPU(int, hist_preemptoff_counting);
  19925. +#endif
  19926. +
  19927. +#if defined(CONFIG_PREEMPT_OFF_HIST) && defined(CONFIG_INTERRUPT_OFF_HIST)
  19928. +static DEFINE_PER_CPU(struct hist_data, preemptirqsoff_hist);
  19929. +static char *preemptirqsoff_hist_dir = "preemptirqsoff";
  19930. +static DEFINE_PER_CPU(cycles_t, hist_preemptirqsoff_start);
  19931. +static DEFINE_PER_CPU(int, hist_preemptirqsoff_counting);
  19932. +#endif
  19933. +
  19934. +#if defined(CONFIG_PREEMPT_OFF_HIST) || defined(CONFIG_INTERRUPT_OFF_HIST)
  19935. +static notrace void probe_preemptirqsoff_hist(void *v, int reason, int start);
  19936. +static struct enable_data preemptirqsoff_enabled_data = {
  19937. + .latency_type = PREEMPTIRQSOFF_LATENCY,
  19938. + .enabled = 0,
  19939. +};
  19940. +#endif
  19941. +
  19942. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  19943. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  19944. +struct maxlatproc_data {
  19945. + char comm[FIELD_SIZEOF(struct task_struct, comm)];
  19946. + char current_comm[FIELD_SIZEOF(struct task_struct, comm)];
  19947. + int pid;
  19948. + int current_pid;
  19949. + int prio;
  19950. + int current_prio;
  19951. + long latency;
  19952. + long timeroffset;
  19953. + cycle_t timestamp;
  19954. +};
  19955. +#endif
  19956. +
  19957. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  19958. +static DEFINE_PER_CPU(struct hist_data, wakeup_latency_hist);
  19959. +static DEFINE_PER_CPU(struct hist_data, wakeup_latency_hist_sharedprio);
  19960. +static char *wakeup_latency_hist_dir = "wakeup";
  19961. +static char *wakeup_latency_hist_dir_sharedprio = "sharedprio";
  19962. +static notrace void probe_wakeup_latency_hist_start(void *v,
  19963. + struct task_struct *p);
  19964. +static notrace void probe_wakeup_latency_hist_stop(void *v,
  19965. + bool preempt, struct task_struct *prev, struct task_struct *next);
  19966. +static notrace void probe_sched_migrate_task(void *,
  19967. + struct task_struct *task, int cpu);
  19968. +static struct enable_data wakeup_latency_enabled_data = {
  19969. + .latency_type = WAKEUP_LATENCY,
  19970. + .enabled = 0,
  19971. +};
  19972. +static DEFINE_PER_CPU(struct maxlatproc_data, wakeup_maxlatproc);
  19973. +static DEFINE_PER_CPU(struct maxlatproc_data, wakeup_maxlatproc_sharedprio);
  19974. +static DEFINE_PER_CPU(struct task_struct *, wakeup_task);
  19975. +static DEFINE_PER_CPU(int, wakeup_sharedprio);
  19976. +static unsigned long wakeup_pid;
  19977. +#endif
  19978. +
  19979. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  19980. +static DEFINE_PER_CPU(struct hist_data, missed_timer_offsets);
  19981. +static char *missed_timer_offsets_dir = "missed_timer_offsets";
  19982. +static notrace void probe_hrtimer_interrupt(void *v, int cpu,
  19983. + long long offset, struct task_struct *curr, struct task_struct *task);
  19984. +static struct enable_data missed_timer_offsets_enabled_data = {
  19985. + .latency_type = MISSED_TIMER_OFFSETS,
  19986. + .enabled = 0,
  19987. +};
  19988. +static DEFINE_PER_CPU(struct maxlatproc_data, missed_timer_offsets_maxlatproc);
  19989. +static unsigned long missed_timer_offsets_pid;
  19990. +#endif
  19991. +
  19992. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
  19993. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  19994. +static DEFINE_PER_CPU(struct hist_data, timerandwakeup_latency_hist);
  19995. +static char *timerandwakeup_latency_hist_dir = "timerandwakeup";
  19996. +static struct enable_data timerandwakeup_enabled_data = {
  19997. + .latency_type = TIMERANDWAKEUP_LATENCY,
  19998. + .enabled = 0,
  19999. +};
  20000. +static DEFINE_PER_CPU(struct maxlatproc_data, timerandwakeup_maxlatproc);
  20001. +#endif
  20002. +
  20003. +void notrace latency_hist(int latency_type, int cpu, long latency,
  20004. + long timeroffset, cycle_t stop,
  20005. + struct task_struct *p)
  20006. +{
  20007. + struct hist_data *my_hist;
  20008. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20009. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20010. + struct maxlatproc_data *mp = NULL;
  20011. +#endif
  20012. +
  20013. + if (!cpu_possible(cpu) || latency_type < 0 ||
  20014. + latency_type >= MAX_LATENCY_TYPE)
  20015. + return;
  20016. +
  20017. + switch (latency_type) {
  20018. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20019. + case IRQSOFF_LATENCY:
  20020. + my_hist = &per_cpu(irqsoff_hist, cpu);
  20021. + break;
  20022. +#endif
  20023. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20024. + case PREEMPTOFF_LATENCY:
  20025. + my_hist = &per_cpu(preemptoff_hist, cpu);
  20026. + break;
  20027. +#endif
  20028. +#if defined(CONFIG_PREEMPT_OFF_HIST) && defined(CONFIG_INTERRUPT_OFF_HIST)
  20029. + case PREEMPTIRQSOFF_LATENCY:
  20030. + my_hist = &per_cpu(preemptirqsoff_hist, cpu);
  20031. + break;
  20032. +#endif
  20033. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20034. + case WAKEUP_LATENCY:
  20035. + my_hist = &per_cpu(wakeup_latency_hist, cpu);
  20036. + mp = &per_cpu(wakeup_maxlatproc, cpu);
  20037. + break;
  20038. + case WAKEUP_LATENCY_SHAREDPRIO:
  20039. + my_hist = &per_cpu(wakeup_latency_hist_sharedprio, cpu);
  20040. + mp = &per_cpu(wakeup_maxlatproc_sharedprio, cpu);
  20041. + break;
  20042. +#endif
  20043. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20044. + case MISSED_TIMER_OFFSETS:
  20045. + my_hist = &per_cpu(missed_timer_offsets, cpu);
  20046. + mp = &per_cpu(missed_timer_offsets_maxlatproc, cpu);
  20047. + break;
  20048. +#endif
  20049. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
  20050. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20051. + case TIMERANDWAKEUP_LATENCY:
  20052. + my_hist = &per_cpu(timerandwakeup_latency_hist, cpu);
  20053. + mp = &per_cpu(timerandwakeup_maxlatproc, cpu);
  20054. + break;
  20055. +#endif
  20056. +
  20057. + default:
  20058. + return;
  20059. + }
  20060. +
  20061. + latency += my_hist->offset;
  20062. +
  20063. + if (atomic_read(&my_hist->hist_mode) == 0)
  20064. + return;
  20065. +
  20066. + if (latency < 0 || latency >= MAX_ENTRY_NUM) {
  20067. + if (latency < 0)
  20068. + my_hist->below_hist_bound_samples++;
  20069. + else
  20070. + my_hist->above_hist_bound_samples++;
  20071. + } else
  20072. + my_hist->hist_array[latency]++;
  20073. +
  20074. + if (unlikely(latency > my_hist->max_lat ||
  20075. + my_hist->min_lat == LONG_MAX)) {
  20076. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20077. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20078. + if (latency_type == WAKEUP_LATENCY ||
  20079. + latency_type == WAKEUP_LATENCY_SHAREDPRIO ||
  20080. + latency_type == MISSED_TIMER_OFFSETS ||
  20081. + latency_type == TIMERANDWAKEUP_LATENCY) {
  20082. + strncpy(mp->comm, p->comm, sizeof(mp->comm));
  20083. + strncpy(mp->current_comm, current->comm,
  20084. + sizeof(mp->current_comm));
  20085. + mp->pid = task_pid_nr(p);
  20086. + mp->current_pid = task_pid_nr(current);
  20087. + mp->prio = p->prio;
  20088. + mp->current_prio = current->prio;
  20089. + mp->latency = latency;
  20090. + mp->timeroffset = timeroffset;
  20091. + mp->timestamp = stop;
  20092. + }
  20093. +#endif
  20094. + my_hist->max_lat = latency;
  20095. + }
  20096. + if (unlikely(latency < my_hist->min_lat))
  20097. + my_hist->min_lat = latency;
  20098. + my_hist->total_samples++;
  20099. + my_hist->accumulate_lat += latency;
  20100. +}
  20101. +
  20102. +static void *l_start(struct seq_file *m, loff_t *pos)
  20103. +{
  20104. + loff_t *index_ptr = NULL;
  20105. + loff_t index = *pos;
  20106. + struct hist_data *my_hist = m->private;
  20107. +
  20108. + if (index == 0) {
  20109. + char minstr[32], avgstr[32], maxstr[32];
  20110. +
  20111. + atomic_dec(&my_hist->hist_mode);
  20112. +
  20113. + if (likely(my_hist->total_samples)) {
  20114. + long avg = (long) div64_s64(my_hist->accumulate_lat,
  20115. + my_hist->total_samples);
  20116. + snprintf(minstr, sizeof(minstr), "%ld",
  20117. + my_hist->min_lat - my_hist->offset);
  20118. + snprintf(avgstr, sizeof(avgstr), "%ld",
  20119. + avg - my_hist->offset);
  20120. + snprintf(maxstr, sizeof(maxstr), "%ld",
  20121. + my_hist->max_lat - my_hist->offset);
  20122. + } else {
  20123. + strcpy(minstr, "<undef>");
  20124. + strcpy(avgstr, minstr);
  20125. + strcpy(maxstr, minstr);
  20126. + }
  20127. +
  20128. + seq_printf(m, "#Minimum latency: %s microseconds\n"
  20129. + "#Average latency: %s microseconds\n"
  20130. + "#Maximum latency: %s microseconds\n"
  20131. + "#Total samples: %llu\n"
  20132. + "#There are %llu samples lower than %ld"
  20133. + " microseconds.\n"
  20134. + "#There are %llu samples greater or equal"
  20135. + " than %ld microseconds.\n"
  20136. + "#usecs\t%16s\n",
  20137. + minstr, avgstr, maxstr,
  20138. + my_hist->total_samples,
  20139. + my_hist->below_hist_bound_samples,
  20140. + -my_hist->offset,
  20141. + my_hist->above_hist_bound_samples,
  20142. + MAX_ENTRY_NUM - my_hist->offset,
  20143. + "samples");
  20144. + }
  20145. + if (index < MAX_ENTRY_NUM) {
  20146. + index_ptr = kmalloc(sizeof(loff_t), GFP_KERNEL);
  20147. + if (index_ptr)
  20148. + *index_ptr = index;
  20149. + }
  20150. +
  20151. + return index_ptr;
  20152. +}
  20153. +
  20154. +static void *l_next(struct seq_file *m, void *p, loff_t *pos)
  20155. +{
  20156. + loff_t *index_ptr = p;
  20157. + struct hist_data *my_hist = m->private;
  20158. +
  20159. + if (++*pos >= MAX_ENTRY_NUM) {
  20160. + atomic_inc(&my_hist->hist_mode);
  20161. + return NULL;
  20162. + }
  20163. + *index_ptr = *pos;
  20164. + return index_ptr;
  20165. +}
  20166. +
  20167. +static void l_stop(struct seq_file *m, void *p)
  20168. +{
  20169. + kfree(p);
  20170. +}
  20171. +
  20172. +static int l_show(struct seq_file *m, void *p)
  20173. +{
  20174. + int index = *(loff_t *) p;
  20175. + struct hist_data *my_hist = m->private;
  20176. +
  20177. + seq_printf(m, "%6ld\t%16llu\n", index - my_hist->offset,
  20178. + my_hist->hist_array[index]);
  20179. + return 0;
  20180. +}
  20181. +
  20182. +static const struct seq_operations latency_hist_seq_op = {
  20183. + .start = l_start,
  20184. + .next = l_next,
  20185. + .stop = l_stop,
  20186. + .show = l_show
  20187. +};
  20188. +
  20189. +static int latency_hist_open(struct inode *inode, struct file *file)
  20190. +{
  20191. + int ret;
  20192. +
  20193. + ret = seq_open(file, &latency_hist_seq_op);
  20194. + if (!ret) {
  20195. + struct seq_file *seq = file->private_data;
  20196. + seq->private = inode->i_private;
  20197. + }
  20198. + return ret;
  20199. +}
  20200. +
  20201. +static const struct file_operations latency_hist_fops = {
  20202. + .open = latency_hist_open,
  20203. + .read = seq_read,
  20204. + .llseek = seq_lseek,
  20205. + .release = seq_release,
  20206. +};
  20207. +
  20208. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20209. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20210. +static void clear_maxlatprocdata(struct maxlatproc_data *mp)
  20211. +{
  20212. + mp->comm[0] = mp->current_comm[0] = '\0';
  20213. + mp->prio = mp->current_prio = mp->pid = mp->current_pid =
  20214. + mp->latency = mp->timeroffset = -1;
  20215. + mp->timestamp = 0;
  20216. +}
  20217. +#endif
  20218. +
  20219. +static void hist_reset(struct hist_data *hist)
  20220. +{
  20221. + atomic_dec(&hist->hist_mode);
  20222. +
  20223. + memset(hist->hist_array, 0, sizeof(hist->hist_array));
  20224. + hist->below_hist_bound_samples = 0ULL;
  20225. + hist->above_hist_bound_samples = 0ULL;
  20226. + hist->min_lat = LONG_MAX;
  20227. + hist->max_lat = LONG_MIN;
  20228. + hist->total_samples = 0ULL;
  20229. + hist->accumulate_lat = 0LL;
  20230. +
  20231. + atomic_inc(&hist->hist_mode);
  20232. +}
  20233. +
  20234. +static ssize_t
  20235. +latency_hist_reset(struct file *file, const char __user *a,
  20236. + size_t size, loff_t *off)
  20237. +{
  20238. + int cpu;
  20239. + struct hist_data *hist = NULL;
  20240. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20241. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20242. + struct maxlatproc_data *mp = NULL;
  20243. +#endif
  20244. + off_t latency_type = (off_t) file->private_data;
  20245. +
  20246. + for_each_online_cpu(cpu) {
  20247. +
  20248. + switch (latency_type) {
  20249. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20250. + case PREEMPTOFF_LATENCY:
  20251. + hist = &per_cpu(preemptoff_hist, cpu);
  20252. + break;
  20253. +#endif
  20254. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20255. + case IRQSOFF_LATENCY:
  20256. + hist = &per_cpu(irqsoff_hist, cpu);
  20257. + break;
  20258. +#endif
  20259. +#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
  20260. + case PREEMPTIRQSOFF_LATENCY:
  20261. + hist = &per_cpu(preemptirqsoff_hist, cpu);
  20262. + break;
  20263. +#endif
  20264. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20265. + case WAKEUP_LATENCY:
  20266. + hist = &per_cpu(wakeup_latency_hist, cpu);
  20267. + mp = &per_cpu(wakeup_maxlatproc, cpu);
  20268. + break;
  20269. + case WAKEUP_LATENCY_SHAREDPRIO:
  20270. + hist = &per_cpu(wakeup_latency_hist_sharedprio, cpu);
  20271. + mp = &per_cpu(wakeup_maxlatproc_sharedprio, cpu);
  20272. + break;
  20273. +#endif
  20274. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20275. + case MISSED_TIMER_OFFSETS:
  20276. + hist = &per_cpu(missed_timer_offsets, cpu);
  20277. + mp = &per_cpu(missed_timer_offsets_maxlatproc, cpu);
  20278. + break;
  20279. +#endif
  20280. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
  20281. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20282. + case TIMERANDWAKEUP_LATENCY:
  20283. + hist = &per_cpu(timerandwakeup_latency_hist, cpu);
  20284. + mp = &per_cpu(timerandwakeup_maxlatproc, cpu);
  20285. + break;
  20286. +#endif
  20287. + }
  20288. +
  20289. + hist_reset(hist);
  20290. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20291. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20292. + if (latency_type == WAKEUP_LATENCY ||
  20293. + latency_type == WAKEUP_LATENCY_SHAREDPRIO ||
  20294. + latency_type == MISSED_TIMER_OFFSETS ||
  20295. + latency_type == TIMERANDWAKEUP_LATENCY)
  20296. + clear_maxlatprocdata(mp);
  20297. +#endif
  20298. + }
  20299. +
  20300. + return size;
  20301. +}
  20302. +
  20303. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20304. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20305. +static ssize_t
  20306. +show_pid(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
  20307. +{
  20308. + char buf[64];
  20309. + int r;
  20310. + unsigned long *this_pid = file->private_data;
  20311. +
  20312. + r = snprintf(buf, sizeof(buf), "%lu\n", *this_pid);
  20313. + return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
  20314. +}
  20315. +
  20316. +static ssize_t do_pid(struct file *file, const char __user *ubuf,
  20317. + size_t cnt, loff_t *ppos)
  20318. +{
  20319. + char buf[64];
  20320. + unsigned long pid;
  20321. + unsigned long *this_pid = file->private_data;
  20322. +
  20323. + if (cnt >= sizeof(buf))
  20324. + return -EINVAL;
  20325. +
  20326. + if (copy_from_user(&buf, ubuf, cnt))
  20327. + return -EFAULT;
  20328. +
  20329. + buf[cnt] = '\0';
  20330. +
  20331. + if (kstrtoul(buf, 10, &pid))
  20332. + return -EINVAL;
  20333. +
  20334. + *this_pid = pid;
  20335. +
  20336. + return cnt;
  20337. +}
  20338. +#endif
  20339. +
  20340. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20341. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20342. +static ssize_t
  20343. +show_maxlatproc(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
  20344. +{
  20345. + int r;
  20346. + struct maxlatproc_data *mp = file->private_data;
  20347. + int strmaxlen = (TASK_COMM_LEN * 2) + (8 * 8);
  20348. + unsigned long long t;
  20349. + unsigned long usecs, secs;
  20350. + char *buf;
  20351. +
  20352. + if (mp->pid == -1 || mp->current_pid == -1) {
  20353. + buf = "(none)\n";
  20354. + return simple_read_from_buffer(ubuf, cnt, ppos, buf,
  20355. + strlen(buf));
  20356. + }
  20357. +
  20358. + buf = kmalloc(strmaxlen, GFP_KERNEL);
  20359. + if (buf == NULL)
  20360. + return -ENOMEM;
  20361. +
  20362. + t = ns2usecs(mp->timestamp);
  20363. + usecs = do_div(t, USEC_PER_SEC);
  20364. + secs = (unsigned long) t;
  20365. + r = snprintf(buf, strmaxlen,
  20366. + "%d %d %ld (%ld) %s <- %d %d %s %lu.%06lu\n", mp->pid,
  20367. + MAX_RT_PRIO-1 - mp->prio, mp->latency, mp->timeroffset, mp->comm,
  20368. + mp->current_pid, MAX_RT_PRIO-1 - mp->current_prio, mp->current_comm,
  20369. + secs, usecs);
  20370. + r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
  20371. + kfree(buf);
  20372. + return r;
  20373. +}
  20374. +#endif
  20375. +
  20376. +static ssize_t
  20377. +show_enable(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
  20378. +{
  20379. + char buf[64];
  20380. + struct enable_data *ed = file->private_data;
  20381. + int r;
  20382. +
  20383. + r = snprintf(buf, sizeof(buf), "%d\n", ed->enabled);
  20384. + return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
  20385. +}
  20386. +
  20387. +static ssize_t
  20388. +do_enable(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos)
  20389. +{
  20390. + char buf[64];
  20391. + long enable;
  20392. + struct enable_data *ed = file->private_data;
  20393. +
  20394. + if (cnt >= sizeof(buf))
  20395. + return -EINVAL;
  20396. +
  20397. + if (copy_from_user(&buf, ubuf, cnt))
  20398. + return -EFAULT;
  20399. +
  20400. + buf[cnt] = 0;
  20401. +
  20402. + if (kstrtoul(buf, 10, &enable))
  20403. + return -EINVAL;
  20404. +
  20405. + if ((enable && ed->enabled) || (!enable && !ed->enabled))
  20406. + return cnt;
  20407. +
  20408. + if (enable) {
  20409. + int ret;
  20410. +
  20411. + switch (ed->latency_type) {
  20412. +#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
  20413. + case PREEMPTIRQSOFF_LATENCY:
  20414. + ret = register_trace_preemptirqsoff_hist(
  20415. + probe_preemptirqsoff_hist, NULL);
  20416. + if (ret) {
  20417. + pr_info("wakeup trace: Couldn't assign "
  20418. + "probe_preemptirqsoff_hist "
  20419. + "to trace_preemptirqsoff_hist\n");
  20420. + return ret;
  20421. + }
  20422. + break;
  20423. +#endif
  20424. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20425. + case WAKEUP_LATENCY:
  20426. + ret = register_trace_sched_wakeup(
  20427. + probe_wakeup_latency_hist_start, NULL);
  20428. + if (ret) {
  20429. + pr_info("wakeup trace: Couldn't assign "
  20430. + "probe_wakeup_latency_hist_start "
  20431. + "to trace_sched_wakeup\n");
  20432. + return ret;
  20433. + }
  20434. + ret = register_trace_sched_wakeup_new(
  20435. + probe_wakeup_latency_hist_start, NULL);
  20436. + if (ret) {
  20437. + pr_info("wakeup trace: Couldn't assign "
  20438. + "probe_wakeup_latency_hist_start "
  20439. + "to trace_sched_wakeup_new\n");
  20440. + unregister_trace_sched_wakeup(
  20441. + probe_wakeup_latency_hist_start, NULL);
  20442. + return ret;
  20443. + }
  20444. + ret = register_trace_sched_switch(
  20445. + probe_wakeup_latency_hist_stop, NULL);
  20446. + if (ret) {
  20447. + pr_info("wakeup trace: Couldn't assign "
  20448. + "probe_wakeup_latency_hist_stop "
  20449. + "to trace_sched_switch\n");
  20450. + unregister_trace_sched_wakeup(
  20451. + probe_wakeup_latency_hist_start, NULL);
  20452. + unregister_trace_sched_wakeup_new(
  20453. + probe_wakeup_latency_hist_start, NULL);
  20454. + return ret;
  20455. + }
  20456. + ret = register_trace_sched_migrate_task(
  20457. + probe_sched_migrate_task, NULL);
  20458. + if (ret) {
  20459. + pr_info("wakeup trace: Couldn't assign "
  20460. + "probe_sched_migrate_task "
  20461. + "to trace_sched_migrate_task\n");
  20462. + unregister_trace_sched_wakeup(
  20463. + probe_wakeup_latency_hist_start, NULL);
  20464. + unregister_trace_sched_wakeup_new(
  20465. + probe_wakeup_latency_hist_start, NULL);
  20466. + unregister_trace_sched_switch(
  20467. + probe_wakeup_latency_hist_stop, NULL);
  20468. + return ret;
  20469. + }
  20470. + break;
  20471. +#endif
  20472. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20473. + case MISSED_TIMER_OFFSETS:
  20474. + ret = register_trace_hrtimer_interrupt(
  20475. + probe_hrtimer_interrupt, NULL);
  20476. + if (ret) {
  20477. + pr_info("wakeup trace: Couldn't assign "
  20478. + "probe_hrtimer_interrupt "
  20479. + "to trace_hrtimer_interrupt\n");
  20480. + return ret;
  20481. + }
  20482. + break;
  20483. +#endif
  20484. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
  20485. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20486. + case TIMERANDWAKEUP_LATENCY:
  20487. + if (!wakeup_latency_enabled_data.enabled ||
  20488. + !missed_timer_offsets_enabled_data.enabled)
  20489. + return -EINVAL;
  20490. + break;
  20491. +#endif
  20492. + default:
  20493. + break;
  20494. + }
  20495. + } else {
  20496. + switch (ed->latency_type) {
  20497. +#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
  20498. + case PREEMPTIRQSOFF_LATENCY:
  20499. + {
  20500. + int cpu;
  20501. +
  20502. + unregister_trace_preemptirqsoff_hist(
  20503. + probe_preemptirqsoff_hist, NULL);
  20504. + for_each_online_cpu(cpu) {
  20505. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20506. + per_cpu(hist_irqsoff_counting,
  20507. + cpu) = 0;
  20508. +#endif
  20509. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20510. + per_cpu(hist_preemptoff_counting,
  20511. + cpu) = 0;
  20512. +#endif
  20513. +#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
  20514. + per_cpu(hist_preemptirqsoff_counting,
  20515. + cpu) = 0;
  20516. +#endif
  20517. + }
  20518. + }
  20519. + break;
  20520. +#endif
  20521. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20522. + case WAKEUP_LATENCY:
  20523. + {
  20524. + int cpu;
  20525. +
  20526. + unregister_trace_sched_wakeup(
  20527. + probe_wakeup_latency_hist_start, NULL);
  20528. + unregister_trace_sched_wakeup_new(
  20529. + probe_wakeup_latency_hist_start, NULL);
  20530. + unregister_trace_sched_switch(
  20531. + probe_wakeup_latency_hist_stop, NULL);
  20532. + unregister_trace_sched_migrate_task(
  20533. + probe_sched_migrate_task, NULL);
  20534. +
  20535. + for_each_online_cpu(cpu) {
  20536. + per_cpu(wakeup_task, cpu) = NULL;
  20537. + per_cpu(wakeup_sharedprio, cpu) = 0;
  20538. + }
  20539. + }
  20540. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20541. + timerandwakeup_enabled_data.enabled = 0;
  20542. +#endif
  20543. + break;
  20544. +#endif
  20545. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20546. + case MISSED_TIMER_OFFSETS:
  20547. + unregister_trace_hrtimer_interrupt(
  20548. + probe_hrtimer_interrupt, NULL);
  20549. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20550. + timerandwakeup_enabled_data.enabled = 0;
  20551. +#endif
  20552. + break;
  20553. +#endif
  20554. + default:
  20555. + break;
  20556. + }
  20557. + }
  20558. + ed->enabled = enable;
  20559. + return cnt;
  20560. +}
  20561. +
  20562. +static const struct file_operations latency_hist_reset_fops = {
  20563. + .open = tracing_open_generic,
  20564. + .write = latency_hist_reset,
  20565. +};
  20566. +
  20567. +static const struct file_operations enable_fops = {
  20568. + .open = tracing_open_generic,
  20569. + .read = show_enable,
  20570. + .write = do_enable,
  20571. +};
  20572. +
  20573. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20574. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20575. +static const struct file_operations pid_fops = {
  20576. + .open = tracing_open_generic,
  20577. + .read = show_pid,
  20578. + .write = do_pid,
  20579. +};
  20580. +
  20581. +static const struct file_operations maxlatproc_fops = {
  20582. + .open = tracing_open_generic,
  20583. + .read = show_maxlatproc,
  20584. +};
  20585. +#endif
  20586. +
  20587. +#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
  20588. +static notrace void probe_preemptirqsoff_hist(void *v, int reason,
  20589. + int starthist)
  20590. +{
  20591. + int cpu = raw_smp_processor_id();
  20592. + int time_set = 0;
  20593. +
  20594. + if (starthist) {
  20595. + cycle_t uninitialized_var(start);
  20596. +
  20597. + if (!preempt_count() && !irqs_disabled())
  20598. + return;
  20599. +
  20600. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20601. + if ((reason == IRQS_OFF || reason == TRACE_START) &&
  20602. + !per_cpu(hist_irqsoff_counting, cpu)) {
  20603. + per_cpu(hist_irqsoff_counting, cpu) = 1;
  20604. + start = ftrace_now(cpu);
  20605. + time_set++;
  20606. + per_cpu(hist_irqsoff_start, cpu) = start;
  20607. + }
  20608. +#endif
  20609. +
  20610. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20611. + if ((reason == PREEMPT_OFF || reason == TRACE_START) &&
  20612. + !per_cpu(hist_preemptoff_counting, cpu)) {
  20613. + per_cpu(hist_preemptoff_counting, cpu) = 1;
  20614. + if (!(time_set++))
  20615. + start = ftrace_now(cpu);
  20616. + per_cpu(hist_preemptoff_start, cpu) = start;
  20617. + }
  20618. +#endif
  20619. +
  20620. +#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
  20621. + if (per_cpu(hist_irqsoff_counting, cpu) &&
  20622. + per_cpu(hist_preemptoff_counting, cpu) &&
  20623. + !per_cpu(hist_preemptirqsoff_counting, cpu)) {
  20624. + per_cpu(hist_preemptirqsoff_counting, cpu) = 1;
  20625. + if (!time_set)
  20626. + start = ftrace_now(cpu);
  20627. + per_cpu(hist_preemptirqsoff_start, cpu) = start;
  20628. + }
  20629. +#endif
  20630. + } else {
  20631. + cycle_t uninitialized_var(stop);
  20632. +
  20633. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20634. + if ((reason == IRQS_ON || reason == TRACE_STOP) &&
  20635. + per_cpu(hist_irqsoff_counting, cpu)) {
  20636. + cycle_t start = per_cpu(hist_irqsoff_start, cpu);
  20637. +
  20638. + stop = ftrace_now(cpu);
  20639. + time_set++;
  20640. + if (start) {
  20641. + long latency = ((long) (stop - start)) /
  20642. + NSECS_PER_USECS;
  20643. +
  20644. + latency_hist(IRQSOFF_LATENCY, cpu, latency, 0,
  20645. + stop, NULL);
  20646. + }
  20647. + per_cpu(hist_irqsoff_counting, cpu) = 0;
  20648. + }
  20649. +#endif
  20650. +
  20651. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20652. + if ((reason == PREEMPT_ON || reason == TRACE_STOP) &&
  20653. + per_cpu(hist_preemptoff_counting, cpu)) {
  20654. + cycle_t start = per_cpu(hist_preemptoff_start, cpu);
  20655. +
  20656. + if (!(time_set++))
  20657. + stop = ftrace_now(cpu);
  20658. + if (start) {
  20659. + long latency = ((long) (stop - start)) /
  20660. + NSECS_PER_USECS;
  20661. +
  20662. + latency_hist(PREEMPTOFF_LATENCY, cpu, latency,
  20663. + 0, stop, NULL);
  20664. + }
  20665. + per_cpu(hist_preemptoff_counting, cpu) = 0;
  20666. + }
  20667. +#endif
  20668. +
  20669. +#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
  20670. + if ((!per_cpu(hist_irqsoff_counting, cpu) ||
  20671. + !per_cpu(hist_preemptoff_counting, cpu)) &&
  20672. + per_cpu(hist_preemptirqsoff_counting, cpu)) {
  20673. + cycle_t start = per_cpu(hist_preemptirqsoff_start, cpu);
  20674. +
  20675. + if (!time_set)
  20676. + stop = ftrace_now(cpu);
  20677. + if (start) {
  20678. + long latency = ((long) (stop - start)) /
  20679. + NSECS_PER_USECS;
  20680. +
  20681. + latency_hist(PREEMPTIRQSOFF_LATENCY, cpu,
  20682. + latency, 0, stop, NULL);
  20683. + }
  20684. + per_cpu(hist_preemptirqsoff_counting, cpu) = 0;
  20685. + }
  20686. +#endif
  20687. + }
  20688. +}
  20689. +#endif
  20690. +
  20691. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20692. +static DEFINE_RAW_SPINLOCK(wakeup_lock);
  20693. +static notrace void probe_sched_migrate_task(void *v, struct task_struct *task,
  20694. + int cpu)
  20695. +{
  20696. + int old_cpu = task_cpu(task);
  20697. +
  20698. + if (cpu != old_cpu) {
  20699. + unsigned long flags;
  20700. + struct task_struct *cpu_wakeup_task;
  20701. +
  20702. + raw_spin_lock_irqsave(&wakeup_lock, flags);
  20703. +
  20704. + cpu_wakeup_task = per_cpu(wakeup_task, old_cpu);
  20705. + if (task == cpu_wakeup_task) {
  20706. + put_task_struct(cpu_wakeup_task);
  20707. + per_cpu(wakeup_task, old_cpu) = NULL;
  20708. + cpu_wakeup_task = per_cpu(wakeup_task, cpu) = task;
  20709. + get_task_struct(cpu_wakeup_task);
  20710. + }
  20711. +
  20712. + raw_spin_unlock_irqrestore(&wakeup_lock, flags);
  20713. + }
  20714. +}
  20715. +
  20716. +static notrace void probe_wakeup_latency_hist_start(void *v,
  20717. + struct task_struct *p)
  20718. +{
  20719. + unsigned long flags;
  20720. + struct task_struct *curr = current;
  20721. + int cpu = task_cpu(p);
  20722. + struct task_struct *cpu_wakeup_task;
  20723. +
  20724. + raw_spin_lock_irqsave(&wakeup_lock, flags);
  20725. +
  20726. + cpu_wakeup_task = per_cpu(wakeup_task, cpu);
  20727. +
  20728. + if (wakeup_pid) {
  20729. + if ((cpu_wakeup_task && p->prio == cpu_wakeup_task->prio) ||
  20730. + p->prio == curr->prio)
  20731. + per_cpu(wakeup_sharedprio, cpu) = 1;
  20732. + if (likely(wakeup_pid != task_pid_nr(p)))
  20733. + goto out;
  20734. + } else {
  20735. + if (likely(!rt_task(p)) ||
  20736. + (cpu_wakeup_task && p->prio > cpu_wakeup_task->prio) ||
  20737. + p->prio > curr->prio)
  20738. + goto out;
  20739. + if ((cpu_wakeup_task && p->prio == cpu_wakeup_task->prio) ||
  20740. + p->prio == curr->prio)
  20741. + per_cpu(wakeup_sharedprio, cpu) = 1;
  20742. + }
  20743. +
  20744. + if (cpu_wakeup_task)
  20745. + put_task_struct(cpu_wakeup_task);
  20746. + cpu_wakeup_task = per_cpu(wakeup_task, cpu) = p;
  20747. + get_task_struct(cpu_wakeup_task);
  20748. + cpu_wakeup_task->preempt_timestamp_hist =
  20749. + ftrace_now(raw_smp_processor_id());
  20750. +out:
  20751. + raw_spin_unlock_irqrestore(&wakeup_lock, flags);
  20752. +}
  20753. +
  20754. +static notrace void probe_wakeup_latency_hist_stop(void *v,
  20755. + bool preempt, struct task_struct *prev, struct task_struct *next)
  20756. +{
  20757. + unsigned long flags;
  20758. + int cpu = task_cpu(next);
  20759. + long latency;
  20760. + cycle_t stop;
  20761. + struct task_struct *cpu_wakeup_task;
  20762. +
  20763. + raw_spin_lock_irqsave(&wakeup_lock, flags);
  20764. +
  20765. + cpu_wakeup_task = per_cpu(wakeup_task, cpu);
  20766. +
  20767. + if (cpu_wakeup_task == NULL)
  20768. + goto out;
  20769. +
  20770. + /* Already running? */
  20771. + if (unlikely(current == cpu_wakeup_task))
  20772. + goto out_reset;
  20773. +
  20774. + if (next != cpu_wakeup_task) {
  20775. + if (next->prio < cpu_wakeup_task->prio)
  20776. + goto out_reset;
  20777. +
  20778. + if (next->prio == cpu_wakeup_task->prio)
  20779. + per_cpu(wakeup_sharedprio, cpu) = 1;
  20780. +
  20781. + goto out;
  20782. + }
  20783. +
  20784. + if (current->prio == cpu_wakeup_task->prio)
  20785. + per_cpu(wakeup_sharedprio, cpu) = 1;
  20786. +
  20787. + /*
  20788. + * The task we are waiting for is about to be switched to.
  20789. + * Calculate latency and store it in histogram.
  20790. + */
  20791. + stop = ftrace_now(raw_smp_processor_id());
  20792. +
  20793. + latency = ((long) (stop - next->preempt_timestamp_hist)) /
  20794. + NSECS_PER_USECS;
  20795. +
  20796. + if (per_cpu(wakeup_sharedprio, cpu)) {
  20797. + latency_hist(WAKEUP_LATENCY_SHAREDPRIO, cpu, latency, 0, stop,
  20798. + next);
  20799. + per_cpu(wakeup_sharedprio, cpu) = 0;
  20800. + } else {
  20801. + latency_hist(WAKEUP_LATENCY, cpu, latency, 0, stop, next);
  20802. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20803. + if (timerandwakeup_enabled_data.enabled) {
  20804. + latency_hist(TIMERANDWAKEUP_LATENCY, cpu,
  20805. + next->timer_offset + latency, next->timer_offset,
  20806. + stop, next);
  20807. + }
  20808. +#endif
  20809. + }
  20810. +
  20811. +out_reset:
  20812. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20813. + next->timer_offset = 0;
  20814. +#endif
  20815. + put_task_struct(cpu_wakeup_task);
  20816. + per_cpu(wakeup_task, cpu) = NULL;
  20817. +out:
  20818. + raw_spin_unlock_irqrestore(&wakeup_lock, flags);
  20819. +}
  20820. +#endif
  20821. +
  20822. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20823. +static notrace void probe_hrtimer_interrupt(void *v, int cpu,
  20824. + long long latency_ns, struct task_struct *curr,
  20825. + struct task_struct *task)
  20826. +{
  20827. + if (latency_ns <= 0 && task != NULL && rt_task(task) &&
  20828. + (task->prio < curr->prio ||
  20829. + (task->prio == curr->prio &&
  20830. + !cpumask_test_cpu(cpu, &task->cpus_allowed)))) {
  20831. + long latency;
  20832. + cycle_t now;
  20833. +
  20834. + if (missed_timer_offsets_pid) {
  20835. + if (likely(missed_timer_offsets_pid !=
  20836. + task_pid_nr(task)))
  20837. + return;
  20838. + }
  20839. +
  20840. + now = ftrace_now(cpu);
  20841. + latency = (long) div_s64(-latency_ns, NSECS_PER_USECS);
  20842. + latency_hist(MISSED_TIMER_OFFSETS, cpu, latency, latency, now,
  20843. + task);
  20844. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20845. + task->timer_offset = latency;
  20846. +#endif
  20847. + }
  20848. +}
  20849. +#endif
  20850. +
  20851. +static __init int latency_hist_init(void)
  20852. +{
  20853. + struct dentry *latency_hist_root = NULL;
  20854. + struct dentry *dentry;
  20855. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20856. + struct dentry *dentry_sharedprio;
  20857. +#endif
  20858. + struct dentry *entry;
  20859. + struct dentry *enable_root;
  20860. + int i = 0;
  20861. + struct hist_data *my_hist;
  20862. + char name[64];
  20863. + char *cpufmt = "CPU%d";
  20864. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
  20865. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20866. + char *cpufmt_maxlatproc = "max_latency-CPU%d";
  20867. + struct maxlatproc_data *mp = NULL;
  20868. +#endif
  20869. +
  20870. + dentry = tracing_init_dentry();
  20871. + latency_hist_root = debugfs_create_dir(latency_hist_dir_root, dentry);
  20872. + enable_root = debugfs_create_dir("enable", latency_hist_root);
  20873. +
  20874. +#ifdef CONFIG_INTERRUPT_OFF_HIST
  20875. + dentry = debugfs_create_dir(irqsoff_hist_dir, latency_hist_root);
  20876. + for_each_possible_cpu(i) {
  20877. + sprintf(name, cpufmt, i);
  20878. + entry = debugfs_create_file(name, 0444, dentry,
  20879. + &per_cpu(irqsoff_hist, i), &latency_hist_fops);
  20880. + my_hist = &per_cpu(irqsoff_hist, i);
  20881. + atomic_set(&my_hist->hist_mode, 1);
  20882. + my_hist->min_lat = LONG_MAX;
  20883. + }
  20884. + entry = debugfs_create_file("reset", 0644, dentry,
  20885. + (void *)IRQSOFF_LATENCY, &latency_hist_reset_fops);
  20886. +#endif
  20887. +
  20888. +#ifdef CONFIG_PREEMPT_OFF_HIST
  20889. + dentry = debugfs_create_dir(preemptoff_hist_dir,
  20890. + latency_hist_root);
  20891. + for_each_possible_cpu(i) {
  20892. + sprintf(name, cpufmt, i);
  20893. + entry = debugfs_create_file(name, 0444, dentry,
  20894. + &per_cpu(preemptoff_hist, i), &latency_hist_fops);
  20895. + my_hist = &per_cpu(preemptoff_hist, i);
  20896. + atomic_set(&my_hist->hist_mode, 1);
  20897. + my_hist->min_lat = LONG_MAX;
  20898. + }
  20899. + entry = debugfs_create_file("reset", 0644, dentry,
  20900. + (void *)PREEMPTOFF_LATENCY, &latency_hist_reset_fops);
  20901. +#endif
  20902. +
  20903. +#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
  20904. + dentry = debugfs_create_dir(preemptirqsoff_hist_dir,
  20905. + latency_hist_root);
  20906. + for_each_possible_cpu(i) {
  20907. + sprintf(name, cpufmt, i);
  20908. + entry = debugfs_create_file(name, 0444, dentry,
  20909. + &per_cpu(preemptirqsoff_hist, i), &latency_hist_fops);
  20910. + my_hist = &per_cpu(preemptirqsoff_hist, i);
  20911. + atomic_set(&my_hist->hist_mode, 1);
  20912. + my_hist->min_lat = LONG_MAX;
  20913. + }
  20914. + entry = debugfs_create_file("reset", 0644, dentry,
  20915. + (void *)PREEMPTIRQSOFF_LATENCY, &latency_hist_reset_fops);
  20916. +#endif
  20917. +
  20918. +#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
  20919. + entry = debugfs_create_file("preemptirqsoff", 0644,
  20920. + enable_root, (void *)&preemptirqsoff_enabled_data,
  20921. + &enable_fops);
  20922. +#endif
  20923. +
  20924. +#ifdef CONFIG_WAKEUP_LATENCY_HIST
  20925. + dentry = debugfs_create_dir(wakeup_latency_hist_dir,
  20926. + latency_hist_root);
  20927. + dentry_sharedprio = debugfs_create_dir(
  20928. + wakeup_latency_hist_dir_sharedprio, dentry);
  20929. + for_each_possible_cpu(i) {
  20930. + sprintf(name, cpufmt, i);
  20931. +
  20932. + entry = debugfs_create_file(name, 0444, dentry,
  20933. + &per_cpu(wakeup_latency_hist, i),
  20934. + &latency_hist_fops);
  20935. + my_hist = &per_cpu(wakeup_latency_hist, i);
  20936. + atomic_set(&my_hist->hist_mode, 1);
  20937. + my_hist->min_lat = LONG_MAX;
  20938. +
  20939. + entry = debugfs_create_file(name, 0444, dentry_sharedprio,
  20940. + &per_cpu(wakeup_latency_hist_sharedprio, i),
  20941. + &latency_hist_fops);
  20942. + my_hist = &per_cpu(wakeup_latency_hist_sharedprio, i);
  20943. + atomic_set(&my_hist->hist_mode, 1);
  20944. + my_hist->min_lat = LONG_MAX;
  20945. +
  20946. + sprintf(name, cpufmt_maxlatproc, i);
  20947. +
  20948. + mp = &per_cpu(wakeup_maxlatproc, i);
  20949. + entry = debugfs_create_file(name, 0444, dentry, mp,
  20950. + &maxlatproc_fops);
  20951. + clear_maxlatprocdata(mp);
  20952. +
  20953. + mp = &per_cpu(wakeup_maxlatproc_sharedprio, i);
  20954. + entry = debugfs_create_file(name, 0444, dentry_sharedprio, mp,
  20955. + &maxlatproc_fops);
  20956. + clear_maxlatprocdata(mp);
  20957. + }
  20958. + entry = debugfs_create_file("pid", 0644, dentry,
  20959. + (void *)&wakeup_pid, &pid_fops);
  20960. + entry = debugfs_create_file("reset", 0644, dentry,
  20961. + (void *)WAKEUP_LATENCY, &latency_hist_reset_fops);
  20962. + entry = debugfs_create_file("reset", 0644, dentry_sharedprio,
  20963. + (void *)WAKEUP_LATENCY_SHAREDPRIO, &latency_hist_reset_fops);
  20964. + entry = debugfs_create_file("wakeup", 0644,
  20965. + enable_root, (void *)&wakeup_latency_enabled_data,
  20966. + &enable_fops);
  20967. +#endif
  20968. +
  20969. +#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
  20970. + dentry = debugfs_create_dir(missed_timer_offsets_dir,
  20971. + latency_hist_root);
  20972. + for_each_possible_cpu(i) {
  20973. + sprintf(name, cpufmt, i);
  20974. + entry = debugfs_create_file(name, 0444, dentry,
  20975. + &per_cpu(missed_timer_offsets, i), &latency_hist_fops);
  20976. + my_hist = &per_cpu(missed_timer_offsets, i);
  20977. + atomic_set(&my_hist->hist_mode, 1);
  20978. + my_hist->min_lat = LONG_MAX;
  20979. +
  20980. + sprintf(name, cpufmt_maxlatproc, i);
  20981. + mp = &per_cpu(missed_timer_offsets_maxlatproc, i);
  20982. + entry = debugfs_create_file(name, 0444, dentry, mp,
  20983. + &maxlatproc_fops);
  20984. + clear_maxlatprocdata(mp);
  20985. + }
  20986. + entry = debugfs_create_file("pid", 0644, dentry,
  20987. + (void *)&missed_timer_offsets_pid, &pid_fops);
  20988. + entry = debugfs_create_file("reset", 0644, dentry,
  20989. + (void *)MISSED_TIMER_OFFSETS, &latency_hist_reset_fops);
  20990. + entry = debugfs_create_file("missed_timer_offsets", 0644,
  20991. + enable_root, (void *)&missed_timer_offsets_enabled_data,
  20992. + &enable_fops);
  20993. +#endif
  20994. +
  20995. +#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
  20996. + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
  20997. + dentry = debugfs_create_dir(timerandwakeup_latency_hist_dir,
  20998. + latency_hist_root);
  20999. + for_each_possible_cpu(i) {
  21000. + sprintf(name, cpufmt, i);
  21001. + entry = debugfs_create_file(name, 0444, dentry,
  21002. + &per_cpu(timerandwakeup_latency_hist, i),
  21003. + &latency_hist_fops);
  21004. + my_hist = &per_cpu(timerandwakeup_latency_hist, i);
  21005. + atomic_set(&my_hist->hist_mode, 1);
  21006. + my_hist->min_lat = LONG_MAX;
  21007. +
  21008. + sprintf(name, cpufmt_maxlatproc, i);
  21009. + mp = &per_cpu(timerandwakeup_maxlatproc, i);
  21010. + entry = debugfs_create_file(name, 0444, dentry, mp,
  21011. + &maxlatproc_fops);
  21012. + clear_maxlatprocdata(mp);
  21013. + }
  21014. + entry = debugfs_create_file("reset", 0644, dentry,
  21015. + (void *)TIMERANDWAKEUP_LATENCY, &latency_hist_reset_fops);
  21016. + entry = debugfs_create_file("timerandwakeup", 0644,
  21017. + enable_root, (void *)&timerandwakeup_enabled_data,
  21018. + &enable_fops);
  21019. +#endif
  21020. + return 0;
  21021. +}
  21022. +
  21023. +device_initcall(latency_hist_init);
  21024. diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
  21025. index 83c60f9013cb..6fb207964a84 100644
  21026. --- a/kernel/trace/trace.c
  21027. +++ b/kernel/trace/trace.c
  21028. @@ -1897,6 +1897,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
  21029. struct task_struct *tsk = current;
  21030. entry->preempt_count = pc & 0xff;
  21031. + entry->preempt_lazy_count = preempt_lazy_count();
  21032. entry->pid = (tsk) ? tsk->pid : 0;
  21033. entry->flags =
  21034. #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
  21035. @@ -1907,8 +1908,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
  21036. ((pc & NMI_MASK ) ? TRACE_FLAG_NMI : 0) |
  21037. ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
  21038. ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
  21039. - (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) |
  21040. + (tif_need_resched_now() ? TRACE_FLAG_NEED_RESCHED : 0) |
  21041. + (need_resched_lazy() ? TRACE_FLAG_NEED_RESCHED_LAZY : 0) |
  21042. (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
  21043. +
  21044. + entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
  21045. }
  21046. EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
  21047. @@ -2892,14 +2896,17 @@ get_total_entries(struct trace_buffer *buf,
  21048. static void print_lat_help_header(struct seq_file *m)
  21049. {
  21050. - seq_puts(m, "# _------=> CPU# \n"
  21051. - "# / _-----=> irqs-off \n"
  21052. - "# | / _----=> need-resched \n"
  21053. - "# || / _---=> hardirq/softirq \n"
  21054. - "# ||| / _--=> preempt-depth \n"
  21055. - "# |||| / delay \n"
  21056. - "# cmd pid ||||| time | caller \n"
  21057. - "# \\ / ||||| \\ | / \n");
  21058. + seq_puts(m, "# _--------=> CPU# \n"
  21059. + "# / _-------=> irqs-off \n"
  21060. + "# | / _------=> need-resched \n"
  21061. + "# || / _-----=> need-resched_lazy \n"
  21062. + "# ||| / _----=> hardirq/softirq \n"
  21063. + "# |||| / _---=> preempt-depth \n"
  21064. + "# ||||| / _--=> preempt-lazy-depth\n"
  21065. + "# |||||| / _-=> migrate-disable \n"
  21066. + "# ||||||| / delay \n"
  21067. + "# cmd pid |||||||| time | caller \n"
  21068. + "# \\ / |||||||| \\ | / \n");
  21069. }
  21070. static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
  21071. @@ -2925,11 +2932,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
  21072. print_event_info(buf, m);
  21073. seq_puts(m, "# _-----=> irqs-off\n"
  21074. "# / _----=> need-resched\n"
  21075. - "# | / _---=> hardirq/softirq\n"
  21076. - "# || / _--=> preempt-depth\n"
  21077. - "# ||| / delay\n"
  21078. - "# TASK-PID CPU# |||| TIMESTAMP FUNCTION\n"
  21079. - "# | | | |||| | |\n");
  21080. + "# |/ _-----=> need-resched_lazy\n"
  21081. + "# || / _---=> hardirq/softirq\n"
  21082. + "# ||| / _--=> preempt-depth\n"
  21083. + "# |||| / _-=> preempt-lazy-depth\n"
  21084. + "# ||||| / _-=> migrate-disable \n"
  21085. + "# |||||| / delay\n"
  21086. + "# TASK-PID CPU# ||||||| TIMESTAMP FUNCTION\n"
  21087. + "# | | | ||||||| | |\n");
  21088. }
  21089. void
  21090. diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
  21091. index b0d8576c27ae..702b9376b278 100644
  21092. --- a/kernel/trace/trace.h
  21093. +++ b/kernel/trace/trace.h
  21094. @@ -124,6 +124,7 @@ struct kretprobe_trace_entry_head {
  21095. * NEED_RESCHED - reschedule is requested
  21096. * HARDIRQ - inside an interrupt handler
  21097. * SOFTIRQ - inside a softirq handler
  21098. + * NEED_RESCHED_LAZY - lazy reschedule is requested
  21099. */
  21100. enum trace_flag_type {
  21101. TRACE_FLAG_IRQS_OFF = 0x01,
  21102. @@ -133,6 +134,7 @@ enum trace_flag_type {
  21103. TRACE_FLAG_SOFTIRQ = 0x10,
  21104. TRACE_FLAG_PREEMPT_RESCHED = 0x20,
  21105. TRACE_FLAG_NMI = 0x40,
  21106. + TRACE_FLAG_NEED_RESCHED_LAZY = 0x80,
  21107. };
  21108. #define TRACE_BUF_SIZE 1024
  21109. diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
  21110. index 03c0a48c3ac4..0b85d516b491 100644
  21111. --- a/kernel/trace/trace_events.c
  21112. +++ b/kernel/trace/trace_events.c
  21113. @@ -187,6 +187,8 @@ static int trace_define_common_fields(void)
  21114. __common_field(unsigned char, flags);
  21115. __common_field(unsigned char, preempt_count);
  21116. __common_field(int, pid);
  21117. + __common_field(unsigned short, migrate_disable);
  21118. + __common_field(unsigned short, padding);
  21119. return ret;
  21120. }
  21121. diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
  21122. index 03cdff84d026..940bd10b4406 100644
  21123. --- a/kernel/trace/trace_irqsoff.c
  21124. +++ b/kernel/trace/trace_irqsoff.c
  21125. @@ -13,6 +13,7 @@
  21126. #include <linux/uaccess.h>
  21127. #include <linux/module.h>
  21128. #include <linux/ftrace.h>
  21129. +#include <trace/events/hist.h>
  21130. #include "trace.h"
  21131. @@ -424,11 +425,13 @@ void start_critical_timings(void)
  21132. {
  21133. if (preempt_trace() || irq_trace())
  21134. start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  21135. + trace_preemptirqsoff_hist_rcuidle(TRACE_START, 1);
  21136. }
  21137. EXPORT_SYMBOL_GPL(start_critical_timings);
  21138. void stop_critical_timings(void)
  21139. {
  21140. + trace_preemptirqsoff_hist_rcuidle(TRACE_STOP, 0);
  21141. if (preempt_trace() || irq_trace())
  21142. stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  21143. }
  21144. @@ -438,6 +441,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings);
  21145. #ifdef CONFIG_PROVE_LOCKING
  21146. void time_hardirqs_on(unsigned long a0, unsigned long a1)
  21147. {
  21148. + trace_preemptirqsoff_hist_rcuidle(IRQS_ON, 0);
  21149. if (!preempt_trace() && irq_trace())
  21150. stop_critical_timing(a0, a1);
  21151. }
  21152. @@ -446,6 +450,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1)
  21153. {
  21154. if (!preempt_trace() && irq_trace())
  21155. start_critical_timing(a0, a1);
  21156. + trace_preemptirqsoff_hist_rcuidle(IRQS_OFF, 1);
  21157. }
  21158. #else /* !CONFIG_PROVE_LOCKING */
  21159. @@ -471,6 +476,7 @@ inline void print_irqtrace_events(struct task_struct *curr)
  21160. */
  21161. void trace_hardirqs_on(void)
  21162. {
  21163. + trace_preemptirqsoff_hist(IRQS_ON, 0);
  21164. if (!preempt_trace() && irq_trace())
  21165. stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  21166. }
  21167. @@ -480,11 +486,13 @@ void trace_hardirqs_off(void)
  21168. {
  21169. if (!preempt_trace() && irq_trace())
  21170. start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  21171. + trace_preemptirqsoff_hist(IRQS_OFF, 1);
  21172. }
  21173. EXPORT_SYMBOL(trace_hardirqs_off);
  21174. __visible void trace_hardirqs_on_caller(unsigned long caller_addr)
  21175. {
  21176. + trace_preemptirqsoff_hist(IRQS_ON, 0);
  21177. if (!preempt_trace() && irq_trace())
  21178. stop_critical_timing(CALLER_ADDR0, caller_addr);
  21179. }
  21180. @@ -494,6 +502,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
  21181. {
  21182. if (!preempt_trace() && irq_trace())
  21183. start_critical_timing(CALLER_ADDR0, caller_addr);
  21184. + trace_preemptirqsoff_hist(IRQS_OFF, 1);
  21185. }
  21186. EXPORT_SYMBOL(trace_hardirqs_off_caller);
  21187. @@ -503,12 +512,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
  21188. #ifdef CONFIG_PREEMPT_TRACER
  21189. void trace_preempt_on(unsigned long a0, unsigned long a1)
  21190. {
  21191. + trace_preemptirqsoff_hist(PREEMPT_ON, 0);
  21192. if (preempt_trace() && !irq_trace())
  21193. stop_critical_timing(a0, a1);
  21194. }
  21195. void trace_preempt_off(unsigned long a0, unsigned long a1)
  21196. {
  21197. + trace_preemptirqsoff_hist(PREEMPT_ON, 1);
  21198. if (preempt_trace() && !irq_trace())
  21199. start_critical_timing(a0, a1);
  21200. }
  21201. diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
  21202. index 3fc20422c166..65a6dde71a7d 100644
  21203. --- a/kernel/trace/trace_output.c
  21204. +++ b/kernel/trace/trace_output.c
  21205. @@ -386,6 +386,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
  21206. {
  21207. char hardsoft_irq;
  21208. char need_resched;
  21209. + char need_resched_lazy;
  21210. char irqs_off;
  21211. int hardirq;
  21212. int softirq;
  21213. @@ -416,6 +417,9 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
  21214. break;
  21215. }
  21216. + need_resched_lazy =
  21217. + (entry->flags & TRACE_FLAG_NEED_RESCHED_LAZY) ? 'L' : '.';
  21218. +
  21219. hardsoft_irq =
  21220. (nmi && hardirq) ? 'Z' :
  21221. nmi ? 'z' :
  21222. @@ -424,14 +428,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
  21223. softirq ? 's' :
  21224. '.' ;
  21225. - trace_seq_printf(s, "%c%c%c",
  21226. - irqs_off, need_resched, hardsoft_irq);
  21227. + trace_seq_printf(s, "%c%c%c%c",
  21228. + irqs_off, need_resched, need_resched_lazy,
  21229. + hardsoft_irq);
  21230. if (entry->preempt_count)
  21231. trace_seq_printf(s, "%x", entry->preempt_count);
  21232. else
  21233. trace_seq_putc(s, '.');
  21234. + if (entry->preempt_lazy_count)
  21235. + trace_seq_printf(s, "%x", entry->preempt_lazy_count);
  21236. + else
  21237. + trace_seq_putc(s, '.');
  21238. +
  21239. + if (entry->migrate_disable)
  21240. + trace_seq_printf(s, "%x", entry->migrate_disable);
  21241. + else
  21242. + trace_seq_putc(s, '.');
  21243. +
  21244. return !trace_seq_has_overflowed(s);
  21245. }
  21246. diff --git a/kernel/user.c b/kernel/user.c
  21247. index b069ccbfb0b0..1a2e88e98b5e 100644
  21248. --- a/kernel/user.c
  21249. +++ b/kernel/user.c
  21250. @@ -161,11 +161,11 @@ void free_uid(struct user_struct *up)
  21251. if (!up)
  21252. return;
  21253. - local_irq_save(flags);
  21254. + local_irq_save_nort(flags);
  21255. if (atomic_dec_and_lock(&up->__count, &uidhash_lock))
  21256. free_user(up, flags);
  21257. else
  21258. - local_irq_restore(flags);
  21259. + local_irq_restore_nort(flags);
  21260. }
  21261. struct user_struct *alloc_uid(kuid_t uid)
  21262. diff --git a/kernel/watchdog.c b/kernel/watchdog.c
  21263. index 6d1020c03d41..70c6a2f79f7e 100644
  21264. --- a/kernel/watchdog.c
  21265. +++ b/kernel/watchdog.c
  21266. @@ -315,6 +315,8 @@ static int is_softlockup(unsigned long touch_ts)
  21267. #ifdef CONFIG_HARDLOCKUP_DETECTOR
  21268. +static DEFINE_RAW_SPINLOCK(watchdog_output_lock);
  21269. +
  21270. static struct perf_event_attr wd_hw_attr = {
  21271. .type = PERF_TYPE_HARDWARE,
  21272. .config = PERF_COUNT_HW_CPU_CYCLES,
  21273. @@ -348,6 +350,13 @@ static void watchdog_overflow_callback(struct perf_event *event,
  21274. /* only print hardlockups once */
  21275. if (__this_cpu_read(hard_watchdog_warn) == true)
  21276. return;
  21277. + /*
  21278. + * If early-printk is enabled then make sure we do not
  21279. + * lock up in printk() and kill console logging:
  21280. + */
  21281. + printk_kill();
  21282. +
  21283. + raw_spin_lock(&watchdog_output_lock);
  21284. pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
  21285. print_modules();
  21286. @@ -365,6 +374,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
  21287. !test_and_set_bit(0, &hardlockup_allcpu_dumped))
  21288. trigger_allbutself_cpu_backtrace();
  21289. + raw_spin_unlock(&watchdog_output_lock);
  21290. if (hardlockup_panic)
  21291. nmi_panic(regs, "Hard LOCKUP");
  21292. @@ -512,6 +522,7 @@ static void watchdog_enable(unsigned int cpu)
  21293. /* kick off the timer for the hardlockup detector */
  21294. hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  21295. hrtimer->function = watchdog_timer_fn;
  21296. + hrtimer->irqsafe = 1;
  21297. /* Enable the perf event */
  21298. watchdog_nmi_enable(cpu);
  21299. diff --git a/kernel/workqueue.c b/kernel/workqueue.c
  21300. index 479d840db286..24eba6620a45 100644
  21301. --- a/kernel/workqueue.c
  21302. +++ b/kernel/workqueue.c
  21303. @@ -48,6 +48,8 @@
  21304. #include <linux/nodemask.h>
  21305. #include <linux/moduleparam.h>
  21306. #include <linux/uaccess.h>
  21307. +#include <linux/locallock.h>
  21308. +#include <linux/delay.h>
  21309. #include "workqueue_internal.h"
  21310. @@ -121,11 +123,16 @@ enum {
  21311. * cpu or grabbing pool->lock is enough for read access. If
  21312. * POOL_DISASSOCIATED is set, it's identical to L.
  21313. *
  21314. + * On RT we need the extra protection via rt_lock_idle_list() for
  21315. + * the list manipulations against read access from
  21316. + * wq_worker_sleeping(). All other places are nicely serialized via
  21317. + * pool->lock.
  21318. + *
  21319. * A: pool->attach_mutex protected.
  21320. *
  21321. * PL: wq_pool_mutex protected.
  21322. *
  21323. - * PR: wq_pool_mutex protected for writes. Sched-RCU protected for reads.
  21324. + * PR: wq_pool_mutex protected for writes. RCU protected for reads.
  21325. *
  21326. * PW: wq_pool_mutex and wq->mutex protected for writes. Either for reads.
  21327. *
  21328. @@ -134,7 +141,7 @@ enum {
  21329. *
  21330. * WQ: wq->mutex protected.
  21331. *
  21332. - * WR: wq->mutex protected for writes. Sched-RCU protected for reads.
  21333. + * WR: wq->mutex protected for writes. RCU protected for reads.
  21334. *
  21335. * MD: wq_mayday_lock protected.
  21336. */
  21337. @@ -185,7 +192,7 @@ struct worker_pool {
  21338. atomic_t nr_running ____cacheline_aligned_in_smp;
  21339. /*
  21340. - * Destruction of pool is sched-RCU protected to allow dereferences
  21341. + * Destruction of pool is RCU protected to allow dereferences
  21342. * from get_work_pool().
  21343. */
  21344. struct rcu_head rcu;
  21345. @@ -214,7 +221,7 @@ struct pool_workqueue {
  21346. /*
  21347. * Release of unbound pwq is punted to system_wq. See put_pwq()
  21348. * and pwq_unbound_release_workfn() for details. pool_workqueue
  21349. - * itself is also sched-RCU protected so that the first pwq can be
  21350. + * itself is also RCU protected so that the first pwq can be
  21351. * determined without grabbing wq->mutex.
  21352. */
  21353. struct work_struct unbound_release_work;
  21354. @@ -348,6 +355,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq);
  21355. struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly;
  21356. EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq);
  21357. +static DEFINE_LOCAL_IRQ_LOCK(pendingb_lock);
  21358. +
  21359. static int worker_thread(void *__worker);
  21360. static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  21361. @@ -355,20 +364,20 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  21362. #include <trace/events/workqueue.h>
  21363. #define assert_rcu_or_pool_mutex() \
  21364. - RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
  21365. + RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
  21366. !lockdep_is_held(&wq_pool_mutex), \
  21367. - "sched RCU or wq_pool_mutex should be held")
  21368. + "RCU or wq_pool_mutex should be held")
  21369. #define assert_rcu_or_wq_mutex(wq) \
  21370. - RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
  21371. + RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
  21372. !lockdep_is_held(&wq->mutex), \
  21373. - "sched RCU or wq->mutex should be held")
  21374. + "RCU or wq->mutex should be held")
  21375. #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \
  21376. - RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
  21377. + RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
  21378. !lockdep_is_held(&wq->mutex) && \
  21379. !lockdep_is_held(&wq_pool_mutex), \
  21380. - "sched RCU, wq->mutex or wq_pool_mutex should be held")
  21381. + "RCU, wq->mutex or wq_pool_mutex should be held")
  21382. #define for_each_cpu_worker_pool(pool, cpu) \
  21383. for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0]; \
  21384. @@ -380,7 +389,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  21385. * @pool: iteration cursor
  21386. * @pi: integer used for iteration
  21387. *
  21388. - * This must be called either with wq_pool_mutex held or sched RCU read
  21389. + * This must be called either with wq_pool_mutex held or RCU read
  21390. * locked. If the pool needs to be used beyond the locking in effect, the
  21391. * caller is responsible for guaranteeing that the pool stays online.
  21392. *
  21393. @@ -412,7 +421,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  21394. * @pwq: iteration cursor
  21395. * @wq: the target workqueue
  21396. *
  21397. - * This must be called either with wq->mutex held or sched RCU read locked.
  21398. + * This must be called either with wq->mutex held or RCU read locked.
  21399. * If the pwq needs to be used beyond the locking in effect, the caller is
  21400. * responsible for guaranteeing that the pwq stays online.
  21401. *
  21402. @@ -424,6 +433,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  21403. if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \
  21404. else
  21405. +#ifdef CONFIG_PREEMPT_RT_BASE
  21406. +static inline void rt_lock_idle_list(struct worker_pool *pool)
  21407. +{
  21408. + preempt_disable();
  21409. +}
  21410. +static inline void rt_unlock_idle_list(struct worker_pool *pool)
  21411. +{
  21412. + preempt_enable();
  21413. +}
  21414. +static inline void sched_lock_idle_list(struct worker_pool *pool) { }
  21415. +static inline void sched_unlock_idle_list(struct worker_pool *pool) { }
  21416. +#else
  21417. +static inline void rt_lock_idle_list(struct worker_pool *pool) { }
  21418. +static inline void rt_unlock_idle_list(struct worker_pool *pool) { }
  21419. +static inline void sched_lock_idle_list(struct worker_pool *pool)
  21420. +{
  21421. + spin_lock_irq(&pool->lock);
  21422. +}
  21423. +static inline void sched_unlock_idle_list(struct worker_pool *pool)
  21424. +{
  21425. + spin_unlock_irq(&pool->lock);
  21426. +}
  21427. +#endif
  21428. +
  21429. +
  21430. #ifdef CONFIG_DEBUG_OBJECTS_WORK
  21431. static struct debug_obj_descr work_debug_descr;
  21432. @@ -548,7 +582,7 @@ static int worker_pool_assign_id(struct worker_pool *pool)
  21433. * @wq: the target workqueue
  21434. * @node: the node ID
  21435. *
  21436. - * This must be called with any of wq_pool_mutex, wq->mutex or sched RCU
  21437. + * This must be called with any of wq_pool_mutex, wq->mutex or RCU
  21438. * read locked.
  21439. * If the pwq needs to be used beyond the locking in effect, the caller is
  21440. * responsible for guaranteeing that the pwq stays online.
  21441. @@ -692,8 +726,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
  21442. * @work: the work item of interest
  21443. *
  21444. * Pools are created and destroyed under wq_pool_mutex, and allows read
  21445. - * access under sched-RCU read lock. As such, this function should be
  21446. - * called under wq_pool_mutex or with preemption disabled.
  21447. + * access under RCU read lock. As such, this function should be
  21448. + * called under wq_pool_mutex or inside of a rcu_read_lock() region.
  21449. *
  21450. * All fields of the returned pool are accessible as long as the above
  21451. * mentioned locking is in effect. If the returned pool needs to be used
  21452. @@ -830,50 +864,45 @@ static struct worker *first_idle_worker(struct worker_pool *pool)
  21453. */
  21454. static void wake_up_worker(struct worker_pool *pool)
  21455. {
  21456. - struct worker *worker = first_idle_worker(pool);
  21457. + struct worker *worker;
  21458. +
  21459. + rt_lock_idle_list(pool);
  21460. +
  21461. + worker = first_idle_worker(pool);
  21462. if (likely(worker))
  21463. wake_up_process(worker->task);
  21464. +
  21465. + rt_unlock_idle_list(pool);
  21466. }
  21467. /**
  21468. - * wq_worker_waking_up - a worker is waking up
  21469. + * wq_worker_running - a worker is running again
  21470. * @task: task waking up
  21471. - * @cpu: CPU @task is waking up to
  21472. *
  21473. - * This function is called during try_to_wake_up() when a worker is
  21474. - * being awoken.
  21475. - *
  21476. - * CONTEXT:
  21477. - * spin_lock_irq(rq->lock)
  21478. + * This function is called when a worker returns from schedule()
  21479. */
  21480. -void wq_worker_waking_up(struct task_struct *task, int cpu)
  21481. +void wq_worker_running(struct task_struct *task)
  21482. {
  21483. struct worker *worker = kthread_data(task);
  21484. - if (!(worker->flags & WORKER_NOT_RUNNING)) {
  21485. - WARN_ON_ONCE(worker->pool->cpu != cpu);
  21486. + if (!worker->sleeping)
  21487. + return;
  21488. + if (!(worker->flags & WORKER_NOT_RUNNING))
  21489. atomic_inc(&worker->pool->nr_running);
  21490. - }
  21491. + worker->sleeping = 0;
  21492. }
  21493. /**
  21494. * wq_worker_sleeping - a worker is going to sleep
  21495. * @task: task going to sleep
  21496. *
  21497. - * This function is called during schedule() when a busy worker is
  21498. - * going to sleep. Worker on the same cpu can be woken up by
  21499. - * returning pointer to its task.
  21500. - *
  21501. - * CONTEXT:
  21502. - * spin_lock_irq(rq->lock)
  21503. - *
  21504. - * Return:
  21505. - * Worker task on @cpu to wake up, %NULL if none.
  21506. + * This function is called from schedule() when a busy worker is
  21507. + * going to sleep.
  21508. */
  21509. -struct task_struct *wq_worker_sleeping(struct task_struct *task)
  21510. +void wq_worker_sleeping(struct task_struct *task)
  21511. {
  21512. - struct worker *worker = kthread_data(task), *to_wakeup = NULL;
  21513. + struct worker *worker = kthread_data(task);
  21514. struct worker_pool *pool;
  21515. /*
  21516. @@ -882,29 +911,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
  21517. * checking NOT_RUNNING.
  21518. */
  21519. if (worker->flags & WORKER_NOT_RUNNING)
  21520. - return NULL;
  21521. + return;
  21522. pool = worker->pool;
  21523. - /* this can only happen on the local cpu */
  21524. - if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id()))
  21525. - return NULL;
  21526. + if (WARN_ON_ONCE(worker->sleeping))
  21527. + return;
  21528. +
  21529. + worker->sleeping = 1;
  21530. /*
  21531. * The counterpart of the following dec_and_test, implied mb,
  21532. * worklist not empty test sequence is in insert_work().
  21533. * Please read comment there.
  21534. - *
  21535. - * NOT_RUNNING is clear. This means that we're bound to and
  21536. - * running on the local cpu w/ rq lock held and preemption
  21537. - * disabled, which in turn means that none else could be
  21538. - * manipulating idle_list, so dereferencing idle_list without pool
  21539. - * lock is safe.
  21540. */
  21541. if (atomic_dec_and_test(&pool->nr_running) &&
  21542. - !list_empty(&pool->worklist))
  21543. - to_wakeup = first_idle_worker(pool);
  21544. - return to_wakeup ? to_wakeup->task : NULL;
  21545. + !list_empty(&pool->worklist)) {
  21546. + sched_lock_idle_list(pool);
  21547. + wake_up_worker(pool);
  21548. + sched_unlock_idle_list(pool);
  21549. + }
  21550. }
  21551. /**
  21552. @@ -1098,12 +1124,14 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq)
  21553. {
  21554. if (pwq) {
  21555. /*
  21556. - * As both pwqs and pools are sched-RCU protected, the
  21557. + * As both pwqs and pools are RCU protected, the
  21558. * following lock operations are safe.
  21559. */
  21560. - spin_lock_irq(&pwq->pool->lock);
  21561. + rcu_read_lock();
  21562. + local_spin_lock_irq(pendingb_lock, &pwq->pool->lock);
  21563. put_pwq(pwq);
  21564. - spin_unlock_irq(&pwq->pool->lock);
  21565. + local_spin_unlock_irq(pendingb_lock, &pwq->pool->lock);
  21566. + rcu_read_unlock();
  21567. }
  21568. }
  21569. @@ -1207,7 +1235,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
  21570. struct worker_pool *pool;
  21571. struct pool_workqueue *pwq;
  21572. - local_irq_save(*flags);
  21573. + local_lock_irqsave(pendingb_lock, *flags);
  21574. /* try to steal the timer if it exists */
  21575. if (is_dwork) {
  21576. @@ -1226,6 +1254,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
  21577. if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
  21578. return 0;
  21579. + rcu_read_lock();
  21580. /*
  21581. * The queueing is in progress, or it is already queued. Try to
  21582. * steal it from ->worklist without clearing WORK_STRUCT_PENDING.
  21583. @@ -1264,14 +1293,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
  21584. set_work_pool_and_keep_pending(work, pool->id);
  21585. spin_unlock(&pool->lock);
  21586. + rcu_read_unlock();
  21587. return 1;
  21588. }
  21589. spin_unlock(&pool->lock);
  21590. fail:
  21591. - local_irq_restore(*flags);
  21592. + rcu_read_unlock();
  21593. + local_unlock_irqrestore(pendingb_lock, *flags);
  21594. if (work_is_canceling(work))
  21595. return -ENOENT;
  21596. - cpu_relax();
  21597. + cpu_chill();
  21598. return -EAGAIN;
  21599. }
  21600. @@ -1373,7 +1404,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
  21601. * queued or lose PENDING. Grabbing PENDING and queueing should
  21602. * happen with IRQ disabled.
  21603. */
  21604. - WARN_ON_ONCE(!irqs_disabled());
  21605. + WARN_ON_ONCE_NONRT(!irqs_disabled());
  21606. debug_work_activate(work);
  21607. @@ -1381,6 +1412,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
  21608. if (unlikely(wq->flags & __WQ_DRAINING) &&
  21609. WARN_ON_ONCE(!is_chained_work(wq)))
  21610. return;
  21611. + rcu_read_lock();
  21612. retry:
  21613. if (req_cpu == WORK_CPU_UNBOUND)
  21614. cpu = wq_select_unbound_cpu(raw_smp_processor_id());
  21615. @@ -1437,10 +1469,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
  21616. /* pwq determined, queue */
  21617. trace_workqueue_queue_work(req_cpu, pwq, work);
  21618. - if (WARN_ON(!list_empty(&work->entry))) {
  21619. - spin_unlock(&pwq->pool->lock);
  21620. - return;
  21621. - }
  21622. + if (WARN_ON(!list_empty(&work->entry)))
  21623. + goto out;
  21624. pwq->nr_in_flight[pwq->work_color]++;
  21625. work_flags = work_color_to_flags(pwq->work_color);
  21626. @@ -1458,7 +1488,9 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
  21627. insert_work(pwq, work, worklist, work_flags);
  21628. +out:
  21629. spin_unlock(&pwq->pool->lock);
  21630. + rcu_read_unlock();
  21631. }
  21632. /**
  21633. @@ -1478,14 +1510,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
  21634. bool ret = false;
  21635. unsigned long flags;
  21636. - local_irq_save(flags);
  21637. + local_lock_irqsave(pendingb_lock,flags);
  21638. if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
  21639. __queue_work(cpu, wq, work);
  21640. ret = true;
  21641. }
  21642. - local_irq_restore(flags);
  21643. + local_unlock_irqrestore(pendingb_lock, flags);
  21644. return ret;
  21645. }
  21646. EXPORT_SYMBOL(queue_work_on);
  21647. @@ -1552,14 +1584,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
  21648. unsigned long flags;
  21649. /* read the comment in __queue_work() */
  21650. - local_irq_save(flags);
  21651. + local_lock_irqsave(pendingb_lock, flags);
  21652. if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
  21653. __queue_delayed_work(cpu, wq, dwork, delay);
  21654. ret = true;
  21655. }
  21656. - local_irq_restore(flags);
  21657. + local_unlock_irqrestore(pendingb_lock, flags);
  21658. return ret;
  21659. }
  21660. EXPORT_SYMBOL(queue_delayed_work_on);
  21661. @@ -1594,7 +1626,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
  21662. if (likely(ret >= 0)) {
  21663. __queue_delayed_work(cpu, wq, dwork, delay);
  21664. - local_irq_restore(flags);
  21665. + local_unlock_irqrestore(pendingb_lock, flags);
  21666. }
  21667. /* -ENOENT from try_to_grab_pending() becomes %true */
  21668. @@ -1627,7 +1659,9 @@ static void worker_enter_idle(struct worker *worker)
  21669. worker->last_active = jiffies;
  21670. /* idle_list is LIFO */
  21671. + rt_lock_idle_list(pool);
  21672. list_add(&worker->entry, &pool->idle_list);
  21673. + rt_unlock_idle_list(pool);
  21674. if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
  21675. mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
  21676. @@ -1660,7 +1694,9 @@ static void worker_leave_idle(struct worker *worker)
  21677. return;
  21678. worker_clr_flags(worker, WORKER_IDLE);
  21679. pool->nr_idle--;
  21680. + rt_lock_idle_list(pool);
  21681. list_del_init(&worker->entry);
  21682. + rt_unlock_idle_list(pool);
  21683. }
  21684. static struct worker *alloc_worker(int node)
  21685. @@ -1826,7 +1862,9 @@ static void destroy_worker(struct worker *worker)
  21686. pool->nr_workers--;
  21687. pool->nr_idle--;
  21688. + rt_lock_idle_list(pool);
  21689. list_del_init(&worker->entry);
  21690. + rt_unlock_idle_list(pool);
  21691. worker->flags |= WORKER_DIE;
  21692. wake_up_process(worker->task);
  21693. }
  21694. @@ -2785,14 +2823,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
  21695. might_sleep();
  21696. - local_irq_disable();
  21697. + rcu_read_lock();
  21698. pool = get_work_pool(work);
  21699. if (!pool) {
  21700. - local_irq_enable();
  21701. + rcu_read_unlock();
  21702. return false;
  21703. }
  21704. - spin_lock(&pool->lock);
  21705. + spin_lock_irq(&pool->lock);
  21706. /* see the comment in try_to_grab_pending() with the same code */
  21707. pwq = get_work_pwq(work);
  21708. if (pwq) {
  21709. @@ -2821,10 +2859,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
  21710. else
  21711. lock_map_acquire_read(&pwq->wq->lockdep_map);
  21712. lock_map_release(&pwq->wq->lockdep_map);
  21713. -
  21714. + rcu_read_unlock();
  21715. return true;
  21716. already_gone:
  21717. spin_unlock_irq(&pool->lock);
  21718. + rcu_read_unlock();
  21719. return false;
  21720. }
  21721. @@ -2911,7 +2950,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
  21722. /* tell other tasks trying to grab @work to back off */
  21723. mark_work_canceling(work);
  21724. - local_irq_restore(flags);
  21725. + local_unlock_irqrestore(pendingb_lock, flags);
  21726. flush_work(work);
  21727. clear_work_data(work);
  21728. @@ -2966,10 +3005,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
  21729. */
  21730. bool flush_delayed_work(struct delayed_work *dwork)
  21731. {
  21732. - local_irq_disable();
  21733. + local_lock_irq(pendingb_lock);
  21734. if (del_timer_sync(&dwork->timer))
  21735. __queue_work(dwork->cpu, dwork->wq, &dwork->work);
  21736. - local_irq_enable();
  21737. + local_unlock_irq(pendingb_lock);
  21738. return flush_work(&dwork->work);
  21739. }
  21740. EXPORT_SYMBOL(flush_delayed_work);
  21741. @@ -2987,7 +3026,7 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork)
  21742. return false;
  21743. set_work_pool_and_clear_pending(work, get_work_pool_id(work));
  21744. - local_irq_restore(flags);
  21745. + local_unlock_irqrestore(pendingb_lock, flags);
  21746. return ret;
  21747. }
  21748. @@ -3245,7 +3284,7 @@ static void rcu_free_pool(struct rcu_head *rcu)
  21749. * put_unbound_pool - put a worker_pool
  21750. * @pool: worker_pool to put
  21751. *
  21752. - * Put @pool. If its refcnt reaches zero, it gets destroyed in sched-RCU
  21753. + * Put @pool. If its refcnt reaches zero, it gets destroyed in RCU
  21754. * safe manner. get_unbound_pool() calls this function on its failure path
  21755. * and this function should be able to release pools which went through,
  21756. * successfully or not, init_worker_pool().
  21757. @@ -3299,8 +3338,8 @@ static void put_unbound_pool(struct worker_pool *pool)
  21758. del_timer_sync(&pool->idle_timer);
  21759. del_timer_sync(&pool->mayday_timer);
  21760. - /* sched-RCU protected to allow dereferences from get_work_pool() */
  21761. - call_rcu_sched(&pool->rcu, rcu_free_pool);
  21762. + /* RCU protected to allow dereferences from get_work_pool() */
  21763. + call_rcu(&pool->rcu, rcu_free_pool);
  21764. }
  21765. /**
  21766. @@ -3407,14 +3446,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work)
  21767. put_unbound_pool(pool);
  21768. mutex_unlock(&wq_pool_mutex);
  21769. - call_rcu_sched(&pwq->rcu, rcu_free_pwq);
  21770. + call_rcu(&pwq->rcu, rcu_free_pwq);
  21771. /*
  21772. * If we're the last pwq going away, @wq is already dead and no one
  21773. * is gonna access it anymore. Schedule RCU free.
  21774. */
  21775. if (is_last)
  21776. - call_rcu_sched(&wq->rcu, rcu_free_wq);
  21777. + call_rcu(&wq->rcu, rcu_free_wq);
  21778. }
  21779. /**
  21780. @@ -4064,7 +4103,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
  21781. * The base ref is never dropped on per-cpu pwqs. Directly
  21782. * schedule RCU free.
  21783. */
  21784. - call_rcu_sched(&wq->rcu, rcu_free_wq);
  21785. + call_rcu(&wq->rcu, rcu_free_wq);
  21786. } else {
  21787. /*
  21788. * We're the sole accessor of @wq at this point. Directly
  21789. @@ -4157,7 +4196,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
  21790. struct pool_workqueue *pwq;
  21791. bool ret;
  21792. - rcu_read_lock_sched();
  21793. + rcu_read_lock();
  21794. + preempt_disable();
  21795. if (cpu == WORK_CPU_UNBOUND)
  21796. cpu = smp_processor_id();
  21797. @@ -4168,7 +4208,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
  21798. pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
  21799. ret = !list_empty(&pwq->delayed_works);
  21800. - rcu_read_unlock_sched();
  21801. + preempt_enable();
  21802. + rcu_read_unlock();
  21803. return ret;
  21804. }
  21805. @@ -4194,15 +4235,15 @@ unsigned int work_busy(struct work_struct *work)
  21806. if (work_pending(work))
  21807. ret |= WORK_BUSY_PENDING;
  21808. - local_irq_save(flags);
  21809. + rcu_read_lock();
  21810. pool = get_work_pool(work);
  21811. if (pool) {
  21812. - spin_lock(&pool->lock);
  21813. + spin_lock_irqsave(&pool->lock, flags);
  21814. if (find_worker_executing_work(pool, work))
  21815. ret |= WORK_BUSY_RUNNING;
  21816. - spin_unlock(&pool->lock);
  21817. + spin_unlock_irqrestore(&pool->lock, flags);
  21818. }
  21819. - local_irq_restore(flags);
  21820. + rcu_read_unlock();
  21821. return ret;
  21822. }
  21823. @@ -4391,7 +4432,7 @@ void show_workqueue_state(void)
  21824. unsigned long flags;
  21825. int pi;
  21826. - rcu_read_lock_sched();
  21827. + rcu_read_lock();
  21828. pr_info("Showing busy workqueues and worker pools:\n");
  21829. @@ -4444,7 +4485,7 @@ void show_workqueue_state(void)
  21830. spin_unlock_irqrestore(&pool->lock, flags);
  21831. }
  21832. - rcu_read_unlock_sched();
  21833. + rcu_read_unlock();
  21834. }
  21835. /*
  21836. @@ -4782,16 +4823,16 @@ bool freeze_workqueues_busy(void)
  21837. * nr_active is monotonically decreasing. It's safe
  21838. * to peek without lock.
  21839. */
  21840. - rcu_read_lock_sched();
  21841. + rcu_read_lock();
  21842. for_each_pwq(pwq, wq) {
  21843. WARN_ON_ONCE(pwq->nr_active < 0);
  21844. if (pwq->nr_active) {
  21845. busy = true;
  21846. - rcu_read_unlock_sched();
  21847. + rcu_read_unlock();
  21848. goto out_unlock;
  21849. }
  21850. }
  21851. - rcu_read_unlock_sched();
  21852. + rcu_read_unlock();
  21853. }
  21854. out_unlock:
  21855. mutex_unlock(&wq_pool_mutex);
  21856. @@ -4981,7 +5022,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
  21857. const char *delim = "";
  21858. int node, written = 0;
  21859. - rcu_read_lock_sched();
  21860. + get_online_cpus();
  21861. + rcu_read_lock();
  21862. for_each_node(node) {
  21863. written += scnprintf(buf + written, PAGE_SIZE - written,
  21864. "%s%d:%d", delim, node,
  21865. @@ -4989,7 +5031,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
  21866. delim = " ";
  21867. }
  21868. written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
  21869. - rcu_read_unlock_sched();
  21870. + rcu_read_unlock();
  21871. + put_online_cpus();
  21872. return written;
  21873. }
  21874. diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
  21875. index 8635417c587b..f000c4d6917e 100644
  21876. --- a/kernel/workqueue_internal.h
  21877. +++ b/kernel/workqueue_internal.h
  21878. @@ -43,6 +43,7 @@ struct worker {
  21879. unsigned long last_active; /* L: last active timestamp */
  21880. unsigned int flags; /* X: flags */
  21881. int id; /* I: worker id */
  21882. + int sleeping; /* None */
  21883. /*
  21884. * Opaque string set with work_set_desc(). Printed out with task
  21885. @@ -68,7 +69,7 @@ static inline struct worker *current_wq_worker(void)
  21886. * Scheduler hooks for concurrency managed workqueue. Only to be used from
  21887. * sched/core.c and workqueue.c.
  21888. */
  21889. -void wq_worker_waking_up(struct task_struct *task, int cpu);
  21890. -struct task_struct *wq_worker_sleeping(struct task_struct *task);
  21891. +void wq_worker_running(struct task_struct *task);
  21892. +void wq_worker_sleeping(struct task_struct *task);
  21893. #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
  21894. diff --git a/lib/Kconfig b/lib/Kconfig
  21895. index 260a80e313b9..b06becb3f477 100644
  21896. --- a/lib/Kconfig
  21897. +++ b/lib/Kconfig
  21898. @@ -400,6 +400,7 @@ config CHECK_SIGNATURE
  21899. config CPUMASK_OFFSTACK
  21900. bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
  21901. + depends on !PREEMPT_RT_FULL
  21902. help
  21903. Use dynamic allocation for cpumask_var_t, instead of putting
  21904. them on the stack. This is a bit more expensive, but avoids
  21905. diff --git a/lib/debugobjects.c b/lib/debugobjects.c
  21906. index 056052dc8e91..d8494e126de8 100644
  21907. --- a/lib/debugobjects.c
  21908. +++ b/lib/debugobjects.c
  21909. @@ -308,7 +308,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
  21910. struct debug_obj *obj;
  21911. unsigned long flags;
  21912. - fill_pool();
  21913. +#ifdef CONFIG_PREEMPT_RT_FULL
  21914. + if (preempt_count() == 0 && !irqs_disabled())
  21915. +#endif
  21916. + fill_pool();
  21917. db = get_bucket((unsigned long) addr);
  21918. diff --git a/lib/idr.c b/lib/idr.c
  21919. index 6098336df267..9decbe914595 100644
  21920. --- a/lib/idr.c
  21921. +++ b/lib/idr.c
  21922. @@ -30,6 +30,7 @@
  21923. #include <linux/idr.h>
  21924. #include <linux/spinlock.h>
  21925. #include <linux/percpu.h>
  21926. +#include <linux/locallock.h>
  21927. #define MAX_IDR_SHIFT (sizeof(int) * 8 - 1)
  21928. #define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
  21929. @@ -45,6 +46,37 @@ static DEFINE_PER_CPU(struct idr_layer *, idr_preload_head);
  21930. static DEFINE_PER_CPU(int, idr_preload_cnt);
  21931. static DEFINE_SPINLOCK(simple_ida_lock);
  21932. +#ifdef CONFIG_PREEMPT_RT_FULL
  21933. +static DEFINE_LOCAL_IRQ_LOCK(idr_lock);
  21934. +
  21935. +static inline void idr_preload_lock(void)
  21936. +{
  21937. + local_lock(idr_lock);
  21938. +}
  21939. +
  21940. +static inline void idr_preload_unlock(void)
  21941. +{
  21942. + local_unlock(idr_lock);
  21943. +}
  21944. +
  21945. +void idr_preload_end(void)
  21946. +{
  21947. + idr_preload_unlock();
  21948. +}
  21949. +EXPORT_SYMBOL(idr_preload_end);
  21950. +#else
  21951. +static inline void idr_preload_lock(void)
  21952. +{
  21953. + preempt_disable();
  21954. +}
  21955. +
  21956. +static inline void idr_preload_unlock(void)
  21957. +{
  21958. + preempt_enable();
  21959. +}
  21960. +#endif
  21961. +
  21962. +
  21963. /* the maximum ID which can be allocated given idr->layers */
  21964. static int idr_max(int layers)
  21965. {
  21966. @@ -115,14 +147,14 @@ static struct idr_layer *idr_layer_alloc(gfp_t gfp_mask, struct idr *layer_idr)
  21967. * context. See idr_preload() for details.
  21968. */
  21969. if (!in_interrupt()) {
  21970. - preempt_disable();
  21971. + idr_preload_lock();
  21972. new = __this_cpu_read(idr_preload_head);
  21973. if (new) {
  21974. __this_cpu_write(idr_preload_head, new->ary[0]);
  21975. __this_cpu_dec(idr_preload_cnt);
  21976. new->ary[0] = NULL;
  21977. }
  21978. - preempt_enable();
  21979. + idr_preload_unlock();
  21980. if (new)
  21981. return new;
  21982. }
  21983. @@ -366,7 +398,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id,
  21984. idr_mark_full(pa, id);
  21985. }
  21986. -
  21987. /**
  21988. * idr_preload - preload for idr_alloc()
  21989. * @gfp_mask: allocation mask to use for preloading
  21990. @@ -401,7 +432,7 @@ void idr_preload(gfp_t gfp_mask)
  21991. WARN_ON_ONCE(in_interrupt());
  21992. might_sleep_if(gfpflags_allow_blocking(gfp_mask));
  21993. - preempt_disable();
  21994. + idr_preload_lock();
  21995. /*
  21996. * idr_alloc() is likely to succeed w/o full idr_layer buffer and
  21997. @@ -413,9 +444,9 @@ void idr_preload(gfp_t gfp_mask)
  21998. while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) {
  21999. struct idr_layer *new;
  22000. - preempt_enable();
  22001. + idr_preload_unlock();
  22002. new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
  22003. - preempt_disable();
  22004. + idr_preload_lock();
  22005. if (!new)
  22006. break;
  22007. diff --git a/lib/irq_poll.c b/lib/irq_poll.c
  22008. index 1d6565e81030..b23a79761df7 100644
  22009. --- a/lib/irq_poll.c
  22010. +++ b/lib/irq_poll.c
  22011. @@ -36,6 +36,7 @@ void irq_poll_sched(struct irq_poll *iop)
  22012. list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
  22013. __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  22014. local_irq_restore(flags);
  22015. + preempt_check_resched_rt();
  22016. }
  22017. EXPORT_SYMBOL(irq_poll_sched);
  22018. @@ -71,6 +72,7 @@ void irq_poll_complete(struct irq_poll *iop)
  22019. local_irq_save(flags);
  22020. __irq_poll_complete(iop);
  22021. local_irq_restore(flags);
  22022. + preempt_check_resched_rt();
  22023. }
  22024. EXPORT_SYMBOL(irq_poll_complete);
  22025. @@ -95,6 +97,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
  22026. }
  22027. local_irq_enable();
  22028. + preempt_check_resched_rt();
  22029. /* Even though interrupts have been re-enabled, this
  22030. * access is safe because interrupts can only add new
  22031. @@ -132,6 +135,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
  22032. __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  22033. local_irq_enable();
  22034. + preempt_check_resched_rt();
  22035. }
  22036. /**
  22037. @@ -195,6 +199,7 @@ static int irq_poll_cpu_dead(unsigned int cpu)
  22038. this_cpu_ptr(&blk_cpu_iopoll));
  22039. __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  22040. local_irq_enable();
  22041. + preempt_check_resched_rt();
  22042. return 0;
  22043. }
  22044. diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
  22045. index f3a217ea0388..4611b156ef79 100644
  22046. --- a/lib/locking-selftest.c
  22047. +++ b/lib/locking-selftest.c
  22048. @@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem)
  22049. #include "locking-selftest-spin-hardirq.h"
  22050. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
  22051. +#ifndef CONFIG_PREEMPT_RT_FULL
  22052. +
  22053. #include "locking-selftest-rlock-hardirq.h"
  22054. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
  22055. @@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock)
  22056. #include "locking-selftest-wlock-softirq.h"
  22057. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
  22058. +#endif
  22059. +
  22060. #undef E1
  22061. #undef E2
  22062. +#ifndef CONFIG_PREEMPT_RT_FULL
  22063. /*
  22064. * Enabling hardirqs with a softirq-safe lock held:
  22065. */
  22066. @@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
  22067. #undef E1
  22068. #undef E2
  22069. +#endif
  22070. +
  22071. /*
  22072. * Enabling irqs with an irq-safe lock held:
  22073. */
  22074. @@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
  22075. #include "locking-selftest-spin-hardirq.h"
  22076. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
  22077. +#ifndef CONFIG_PREEMPT_RT_FULL
  22078. +
  22079. #include "locking-selftest-rlock-hardirq.h"
  22080. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
  22081. @@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock)
  22082. #include "locking-selftest-wlock-softirq.h"
  22083. GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
  22084. +#endif
  22085. +
  22086. #undef E1
  22087. #undef E2
  22088. @@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
  22089. #include "locking-selftest-spin-hardirq.h"
  22090. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
  22091. +#ifndef CONFIG_PREEMPT_RT_FULL
  22092. +
  22093. #include "locking-selftest-rlock-hardirq.h"
  22094. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
  22095. @@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock)
  22096. #include "locking-selftest-wlock-softirq.h"
  22097. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
  22098. +#endif
  22099. +
  22100. #undef E1
  22101. #undef E2
  22102. #undef E3
  22103. @@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
  22104. #include "locking-selftest-spin-hardirq.h"
  22105. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
  22106. +#ifndef CONFIG_PREEMPT_RT_FULL
  22107. +
  22108. #include "locking-selftest-rlock-hardirq.h"
  22109. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
  22110. @@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock)
  22111. #include "locking-selftest-wlock-softirq.h"
  22112. GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
  22113. +#endif
  22114. +
  22115. #undef E1
  22116. #undef E2
  22117. #undef E3
  22118. +#ifndef CONFIG_PREEMPT_RT_FULL
  22119. +
  22120. /*
  22121. * read-lock / write-lock irq inversion.
  22122. *
  22123. @@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock)
  22124. #undef E2
  22125. #undef E3
  22126. +#endif
  22127. +
  22128. +#ifndef CONFIG_PREEMPT_RT_FULL
  22129. +
  22130. /*
  22131. * read-lock / write-lock recursion that is actually safe.
  22132. */
  22133. @@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
  22134. #undef E2
  22135. #undef E3
  22136. +#endif
  22137. +
  22138. /*
  22139. * read-lock / write-lock recursion that is unsafe.
  22140. */
  22141. @@ -1858,6 +1885,7 @@ void locking_selftest(void)
  22142. printk(" --------------------------------------------------------------------------\n");
  22143. +#ifndef CONFIG_PREEMPT_RT_FULL
  22144. /*
  22145. * irq-context testcases:
  22146. */
  22147. @@ -1870,6 +1898,28 @@ void locking_selftest(void)
  22148. DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion);
  22149. // DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2);
  22150. +#else
  22151. + /* On -rt, we only do hardirq context test for raw spinlock */
  22152. + DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 12);
  22153. + DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 21);
  22154. +
  22155. + DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 12);
  22156. + DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 21);
  22157. +
  22158. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 123);
  22159. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 132);
  22160. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 213);
  22161. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 231);
  22162. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 312);
  22163. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 321);
  22164. +
  22165. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 123);
  22166. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 132);
  22167. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 213);
  22168. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 231);
  22169. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 312);
  22170. + DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 321);
  22171. +#endif
  22172. ww_tests();
  22173. diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c
  22174. index 6d40944960de..822a2c027e72 100644
  22175. --- a/lib/percpu_ida.c
  22176. +++ b/lib/percpu_ida.c
  22177. @@ -26,6 +26,9 @@
  22178. #include <linux/string.h>
  22179. #include <linux/spinlock.h>
  22180. #include <linux/percpu_ida.h>
  22181. +#include <linux/locallock.h>
  22182. +
  22183. +static DEFINE_LOCAL_IRQ_LOCK(irq_off_lock);
  22184. struct percpu_ida_cpu {
  22185. /*
  22186. @@ -148,13 +151,13 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
  22187. unsigned long flags;
  22188. int tag;
  22189. - local_irq_save(flags);
  22190. + local_lock_irqsave(irq_off_lock, flags);
  22191. tags = this_cpu_ptr(pool->tag_cpu);
  22192. /* Fastpath */
  22193. tag = alloc_local_tag(tags);
  22194. if (likely(tag >= 0)) {
  22195. - local_irq_restore(flags);
  22196. + local_unlock_irqrestore(irq_off_lock, flags);
  22197. return tag;
  22198. }
  22199. @@ -173,6 +176,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
  22200. if (!tags->nr_free)
  22201. alloc_global_tags(pool, tags);
  22202. +
  22203. if (!tags->nr_free)
  22204. steal_tags(pool, tags);
  22205. @@ -184,7 +188,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
  22206. }
  22207. spin_unlock(&pool->lock);
  22208. - local_irq_restore(flags);
  22209. + local_unlock_irqrestore(irq_off_lock, flags);
  22210. if (tag >= 0 || state == TASK_RUNNING)
  22211. break;
  22212. @@ -196,7 +200,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
  22213. schedule();
  22214. - local_irq_save(flags);
  22215. + local_lock_irqsave(irq_off_lock, flags);
  22216. tags = this_cpu_ptr(pool->tag_cpu);
  22217. }
  22218. if (state != TASK_RUNNING)
  22219. @@ -221,7 +225,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
  22220. BUG_ON(tag >= pool->nr_tags);
  22221. - local_irq_save(flags);
  22222. + local_lock_irqsave(irq_off_lock, flags);
  22223. tags = this_cpu_ptr(pool->tag_cpu);
  22224. spin_lock(&tags->lock);
  22225. @@ -253,7 +257,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
  22226. spin_unlock(&pool->lock);
  22227. }
  22228. - local_irq_restore(flags);
  22229. + local_unlock_irqrestore(irq_off_lock, flags);
  22230. }
  22231. EXPORT_SYMBOL_GPL(percpu_ida_free);
  22232. @@ -345,7 +349,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
  22233. struct percpu_ida_cpu *remote;
  22234. unsigned cpu, i, err = 0;
  22235. - local_irq_save(flags);
  22236. + local_lock_irqsave(irq_off_lock, flags);
  22237. for_each_possible_cpu(cpu) {
  22238. remote = per_cpu_ptr(pool->tag_cpu, cpu);
  22239. spin_lock(&remote->lock);
  22240. @@ -367,7 +371,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
  22241. }
  22242. spin_unlock(&pool->lock);
  22243. out:
  22244. - local_irq_restore(flags);
  22245. + local_unlock_irqrestore(irq_off_lock, flags);
  22246. return err;
  22247. }
  22248. EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
  22249. diff --git a/lib/radix-tree.c b/lib/radix-tree.c
  22250. index 8e6d552c40dd..741da5a77fd5 100644
  22251. --- a/lib/radix-tree.c
  22252. +++ b/lib/radix-tree.c
  22253. @@ -36,7 +36,7 @@
  22254. #include <linux/bitops.h>
  22255. #include <linux/rcupdate.h>
  22256. #include <linux/preempt.h> /* in_interrupt() */
  22257. -
  22258. +#include <linux/locallock.h>
  22259. /* Number of nodes in fully populated tree of given height */
  22260. static unsigned long height_to_maxnodes[RADIX_TREE_MAX_PATH + 1] __read_mostly;
  22261. @@ -68,6 +68,7 @@ struct radix_tree_preload {
  22262. struct radix_tree_node *nodes;
  22263. };
  22264. static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
  22265. +static DEFINE_LOCAL_IRQ_LOCK(radix_tree_preloads_lock);
  22266. static inline void *node_to_entry(void *ptr)
  22267. {
  22268. @@ -290,13 +291,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)
  22269. * succeed in getting a node here (and never reach
  22270. * kmem_cache_alloc)
  22271. */
  22272. - rtp = this_cpu_ptr(&radix_tree_preloads);
  22273. + rtp = &get_locked_var(radix_tree_preloads_lock, radix_tree_preloads);
  22274. if (rtp->nr) {
  22275. ret = rtp->nodes;
  22276. rtp->nodes = ret->private_data;
  22277. ret->private_data = NULL;
  22278. rtp->nr--;
  22279. }
  22280. + put_locked_var(radix_tree_preloads_lock, radix_tree_preloads);
  22281. /*
  22282. * Update the allocation stack trace as this is more useful
  22283. * for debugging.
  22284. @@ -357,14 +359,14 @@ static int __radix_tree_preload(gfp_t gfp_mask, int nr)
  22285. */
  22286. gfp_mask &= ~__GFP_ACCOUNT;
  22287. - preempt_disable();
  22288. + local_lock(radix_tree_preloads_lock);
  22289. rtp = this_cpu_ptr(&radix_tree_preloads);
  22290. while (rtp->nr < nr) {
  22291. - preempt_enable();
  22292. + local_unlock(radix_tree_preloads_lock);
  22293. node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
  22294. if (node == NULL)
  22295. goto out;
  22296. - preempt_disable();
  22297. + local_lock(radix_tree_preloads_lock);
  22298. rtp = this_cpu_ptr(&radix_tree_preloads);
  22299. if (rtp->nr < nr) {
  22300. node->private_data = rtp->nodes;
  22301. @@ -406,7 +408,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
  22302. if (gfpflags_allow_blocking(gfp_mask))
  22303. return __radix_tree_preload(gfp_mask, RADIX_TREE_PRELOAD_SIZE);
  22304. /* Preloading doesn't help anything with this gfp mask, skip it */
  22305. - preempt_disable();
  22306. + local_lock(radix_tree_preloads_lock);
  22307. return 0;
  22308. }
  22309. EXPORT_SYMBOL(radix_tree_maybe_preload);
  22310. @@ -422,7 +424,7 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
  22311. /* Preloading doesn't help anything with this gfp mask, skip it */
  22312. if (!gfpflags_allow_blocking(gfp_mask)) {
  22313. - preempt_disable();
  22314. + local_lock(radix_tree_preloads_lock);
  22315. return 0;
  22316. }
  22317. @@ -456,6 +458,12 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
  22318. return __radix_tree_preload(gfp_mask, nr_nodes);
  22319. }
  22320. +void radix_tree_preload_end(void)
  22321. +{
  22322. + local_unlock(radix_tree_preloads_lock);
  22323. +}
  22324. +EXPORT_SYMBOL(radix_tree_preload_end);
  22325. +
  22326. /*
  22327. * The maximum index which can be stored in a radix tree
  22328. */
  22329. diff --git a/lib/scatterlist.c b/lib/scatterlist.c
  22330. index 004fc70fc56a..ccc46992a517 100644
  22331. --- a/lib/scatterlist.c
  22332. +++ b/lib/scatterlist.c
  22333. @@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
  22334. flush_kernel_dcache_page(miter->page);
  22335. if (miter->__flags & SG_MITER_ATOMIC) {
  22336. - WARN_ON_ONCE(preemptible());
  22337. + WARN_ON_ONCE(!pagefault_disabled());
  22338. kunmap_atomic(miter->addr);
  22339. } else
  22340. kunmap(miter->page);
  22341. @@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
  22342. if (!sg_miter_skip(&miter, skip))
  22343. return false;
  22344. - local_irq_save(flags);
  22345. + local_irq_save_nort(flags);
  22346. while (sg_miter_next(&miter) && offset < buflen) {
  22347. unsigned int len;
  22348. @@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
  22349. sg_miter_stop(&miter);
  22350. - local_irq_restore(flags);
  22351. + local_irq_restore_nort(flags);
  22352. return offset;
  22353. }
  22354. EXPORT_SYMBOL(sg_copy_buffer);
  22355. diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
  22356. index 1afec32de6f2..11fa431046a8 100644
  22357. --- a/lib/smp_processor_id.c
  22358. +++ b/lib/smp_processor_id.c
  22359. @@ -39,8 +39,9 @@ notrace static unsigned int check_preemption_disabled(const char *what1,
  22360. if (!printk_ratelimit())
  22361. goto out_enable;
  22362. - printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x] code: %s/%d\n",
  22363. - what1, what2, preempt_count() - 1, current->comm, current->pid);
  22364. + printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x %08x] code: %s/%d\n",
  22365. + what1, what2, preempt_count() - 1, __migrate_disabled(current),
  22366. + current->comm, current->pid);
  22367. print_symbol("caller is %s\n", (long)__builtin_return_address(0));
  22368. dump_stack();
  22369. diff --git a/mm/Kconfig b/mm/Kconfig
  22370. index 86e3e0e74d20..77e5862a1ed2 100644
  22371. --- a/mm/Kconfig
  22372. +++ b/mm/Kconfig
  22373. @@ -410,7 +410,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
  22374. config TRANSPARENT_HUGEPAGE
  22375. bool "Transparent Hugepage Support"
  22376. - depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
  22377. + depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
  22378. select COMPACTION
  22379. select RADIX_TREE_MULTIORDER
  22380. help
  22381. diff --git a/mm/backing-dev.c b/mm/backing-dev.c
  22382. index 6ff2d7744223..b5a91dd53b5f 100644
  22383. --- a/mm/backing-dev.c
  22384. +++ b/mm/backing-dev.c
  22385. @@ -457,9 +457,9 @@ void wb_congested_put(struct bdi_writeback_congested *congested)
  22386. {
  22387. unsigned long flags;
  22388. - local_irq_save(flags);
  22389. + local_irq_save_nort(flags);
  22390. if (!atomic_dec_and_lock(&congested->refcnt, &cgwb_lock)) {
  22391. - local_irq_restore(flags);
  22392. + local_irq_restore_nort(flags);
  22393. return;
  22394. }
  22395. diff --git a/mm/compaction.c b/mm/compaction.c
  22396. index 70e6bec46dc2..6678ed58b7c6 100644
  22397. --- a/mm/compaction.c
  22398. +++ b/mm/compaction.c
  22399. @@ -1593,10 +1593,12 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro
  22400. block_start_pfn(cc->migrate_pfn, cc->order);
  22401. if (cc->last_migrated_pfn < current_block_start) {
  22402. - cpu = get_cpu();
  22403. + cpu = get_cpu_light();
  22404. + local_lock_irq(swapvec_lock);
  22405. lru_add_drain_cpu(cpu);
  22406. + local_unlock_irq(swapvec_lock);
  22407. drain_local_pages(zone);
  22408. - put_cpu();
  22409. + put_cpu_light();
  22410. /* No more flushing until we migrate again */
  22411. cc->last_migrated_pfn = 0;
  22412. }
  22413. diff --git a/mm/filemap.c b/mm/filemap.c
  22414. index edfb90e3830c..a8d2c7a73d54 100644
  22415. --- a/mm/filemap.c
  22416. +++ b/mm/filemap.c
  22417. @@ -159,9 +159,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
  22418. * node->private_list is protected by
  22419. * mapping->tree_lock.
  22420. */
  22421. - if (!list_empty(&node->private_list))
  22422. - list_lru_del(&workingset_shadow_nodes,
  22423. + if (!list_empty(&node->private_list)) {
  22424. + local_lock(workingset_shadow_lock);
  22425. + list_lru_del(&__workingset_shadow_nodes,
  22426. &node->private_list);
  22427. + local_unlock(workingset_shadow_lock);
  22428. + }
  22429. }
  22430. return 0;
  22431. }
  22432. @@ -217,8 +220,10 @@ static void page_cache_tree_delete(struct address_space *mapping,
  22433. if (!dax_mapping(mapping) && !workingset_node_pages(node) &&
  22434. list_empty(&node->private_list)) {
  22435. node->private_data = mapping;
  22436. - list_lru_add(&workingset_shadow_nodes,
  22437. - &node->private_list);
  22438. + local_lock(workingset_shadow_lock);
  22439. + list_lru_add(&__workingset_shadow_nodes,
  22440. + &node->private_list);
  22441. + local_unlock(workingset_shadow_lock);
  22442. }
  22443. }
  22444. diff --git a/mm/highmem.c b/mm/highmem.c
  22445. index 50b4ca6787f0..77518a3b35a1 100644
  22446. --- a/mm/highmem.c
  22447. +++ b/mm/highmem.c
  22448. @@ -29,10 +29,11 @@
  22449. #include <linux/kgdb.h>
  22450. #include <asm/tlbflush.h>
  22451. -
  22452. +#ifndef CONFIG_PREEMPT_RT_FULL
  22453. #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
  22454. DEFINE_PER_CPU(int, __kmap_atomic_idx);
  22455. #endif
  22456. +#endif
  22457. /*
  22458. * Virtual_count is not a pure "count".
  22459. @@ -107,8 +108,9 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
  22460. unsigned long totalhigh_pages __read_mostly;
  22461. EXPORT_SYMBOL(totalhigh_pages);
  22462. -
  22463. +#ifndef CONFIG_PREEMPT_RT_FULL
  22464. EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
  22465. +#endif
  22466. unsigned int nr_free_highpages (void)
  22467. {
  22468. diff --git a/mm/memcontrol.c b/mm/memcontrol.c
  22469. index 47559cc0cdcc..1f2ebc924916 100644
  22470. --- a/mm/memcontrol.c
  22471. +++ b/mm/memcontrol.c
  22472. @@ -67,6 +67,7 @@
  22473. #include <net/sock.h>
  22474. #include <net/ip.h>
  22475. #include "slab.h"
  22476. +#include <linux/locallock.h>
  22477. #include <asm/uaccess.h>
  22478. @@ -92,6 +93,8 @@ int do_swap_account __read_mostly;
  22479. #define do_swap_account 0
  22480. #endif
  22481. +static DEFINE_LOCAL_IRQ_LOCK(event_lock);
  22482. +
  22483. /* Whether legacy memory+swap accounting is active */
  22484. static bool do_memsw_account(void)
  22485. {
  22486. @@ -1692,6 +1695,7 @@ struct memcg_stock_pcp {
  22487. #define FLUSHING_CACHED_CHARGE 0
  22488. };
  22489. static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
  22490. +static DEFINE_LOCAL_IRQ_LOCK(memcg_stock_ll);
  22491. static DEFINE_MUTEX(percpu_charge_mutex);
  22492. /**
  22493. @@ -1714,7 +1718,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
  22494. if (nr_pages > CHARGE_BATCH)
  22495. return ret;
  22496. - local_irq_save(flags);
  22497. + local_lock_irqsave(memcg_stock_ll, flags);
  22498. stock = this_cpu_ptr(&memcg_stock);
  22499. if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
  22500. @@ -1722,7 +1726,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
  22501. ret = true;
  22502. }
  22503. - local_irq_restore(flags);
  22504. + local_unlock_irqrestore(memcg_stock_ll, flags);
  22505. return ret;
  22506. }
  22507. @@ -1749,13 +1753,13 @@ static void drain_local_stock(struct work_struct *dummy)
  22508. struct memcg_stock_pcp *stock;
  22509. unsigned long flags;
  22510. - local_irq_save(flags);
  22511. + local_lock_irqsave(memcg_stock_ll, flags);
  22512. stock = this_cpu_ptr(&memcg_stock);
  22513. drain_stock(stock);
  22514. clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
  22515. - local_irq_restore(flags);
  22516. + local_unlock_irqrestore(memcg_stock_ll, flags);
  22517. }
  22518. /*
  22519. @@ -1767,7 +1771,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
  22520. struct memcg_stock_pcp *stock;
  22521. unsigned long flags;
  22522. - local_irq_save(flags);
  22523. + local_lock_irqsave(memcg_stock_ll, flags);
  22524. stock = this_cpu_ptr(&memcg_stock);
  22525. if (stock->cached != memcg) { /* reset if necessary */
  22526. @@ -1776,7 +1780,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
  22527. }
  22528. stock->nr_pages += nr_pages;
  22529. - local_irq_restore(flags);
  22530. + local_unlock_irqrestore(memcg_stock_ll, flags);
  22531. }
  22532. /*
  22533. @@ -1792,7 +1796,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
  22534. return;
  22535. /* Notify other cpus that system-wide "drain" is running */
  22536. get_online_cpus();
  22537. - curcpu = get_cpu();
  22538. + curcpu = get_cpu_light();
  22539. for_each_online_cpu(cpu) {
  22540. struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
  22541. struct mem_cgroup *memcg;
  22542. @@ -1809,7 +1813,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
  22543. schedule_work_on(cpu, &stock->work);
  22544. }
  22545. }
  22546. - put_cpu();
  22547. + put_cpu_light();
  22548. put_online_cpus();
  22549. mutex_unlock(&percpu_charge_mutex);
  22550. }
  22551. @@ -4555,12 +4559,12 @@ static int mem_cgroup_move_account(struct page *page,
  22552. ret = 0;
  22553. - local_irq_disable();
  22554. + local_lock_irq(event_lock);
  22555. mem_cgroup_charge_statistics(to, page, compound, nr_pages);
  22556. memcg_check_events(to, page);
  22557. mem_cgroup_charge_statistics(from, page, compound, -nr_pages);
  22558. memcg_check_events(from, page);
  22559. - local_irq_enable();
  22560. + local_unlock_irq(event_lock);
  22561. out_unlock:
  22562. unlock_page(page);
  22563. out:
  22564. @@ -5435,10 +5439,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
  22565. commit_charge(page, memcg, lrucare);
  22566. - local_irq_disable();
  22567. + local_lock_irq(event_lock);
  22568. mem_cgroup_charge_statistics(memcg, page, compound, nr_pages);
  22569. memcg_check_events(memcg, page);
  22570. - local_irq_enable();
  22571. + local_unlock_irq(event_lock);
  22572. if (do_memsw_account() && PageSwapCache(page)) {
  22573. swp_entry_t entry = { .val = page_private(page) };
  22574. @@ -5494,14 +5498,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
  22575. memcg_oom_recover(memcg);
  22576. }
  22577. - local_irq_save(flags);
  22578. + local_lock_irqsave(event_lock, flags);
  22579. __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS], nr_anon);
  22580. __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_CACHE], nr_file);
  22581. __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS_HUGE], nr_huge);
  22582. __this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGPGOUT], pgpgout);
  22583. __this_cpu_add(memcg->stat->nr_page_events, nr_pages);
  22584. memcg_check_events(memcg, dummy_page);
  22585. - local_irq_restore(flags);
  22586. + local_unlock_irqrestore(event_lock, flags);
  22587. if (!mem_cgroup_is_root(memcg))
  22588. css_put_many(&memcg->css, nr_pages);
  22589. @@ -5656,10 +5660,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
  22590. commit_charge(newpage, memcg, false);
  22591. - local_irq_save(flags);
  22592. + local_lock_irqsave(event_lock, flags);
  22593. mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
  22594. memcg_check_events(memcg, newpage);
  22595. - local_irq_restore(flags);
  22596. + local_unlock_irqrestore(event_lock, flags);
  22597. }
  22598. DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
  22599. @@ -5850,6 +5854,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
  22600. {
  22601. struct mem_cgroup *memcg, *swap_memcg;
  22602. unsigned short oldid;
  22603. + unsigned long flags;
  22604. VM_BUG_ON_PAGE(PageLRU(page), page);
  22605. VM_BUG_ON_PAGE(page_count(page), page);
  22606. @@ -5890,12 +5895,16 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
  22607. * important here to have the interrupts disabled because it is the
  22608. * only synchronisation we have for udpating the per-CPU variables.
  22609. */
  22610. + local_lock_irqsave(event_lock, flags);
  22611. +#ifndef CONFIG_PREEMPT_RT_BASE
  22612. VM_BUG_ON(!irqs_disabled());
  22613. +#endif
  22614. mem_cgroup_charge_statistics(memcg, page, false, -1);
  22615. memcg_check_events(memcg, page);
  22616. if (!mem_cgroup_is_root(memcg))
  22617. css_put(&memcg->css);
  22618. + local_unlock_irqrestore(event_lock, flags);
  22619. }
  22620. /*
  22621. diff --git a/mm/mmu_context.c b/mm/mmu_context.c
  22622. index 6f4d27c5bb32..5cd25c745a8f 100644
  22623. --- a/mm/mmu_context.c
  22624. +++ b/mm/mmu_context.c
  22625. @@ -23,6 +23,7 @@ void use_mm(struct mm_struct *mm)
  22626. struct task_struct *tsk = current;
  22627. task_lock(tsk);
  22628. + preempt_disable_rt();
  22629. active_mm = tsk->active_mm;
  22630. if (active_mm != mm) {
  22631. atomic_inc(&mm->mm_count);
  22632. @@ -30,6 +31,7 @@ void use_mm(struct mm_struct *mm)
  22633. }
  22634. tsk->mm = mm;
  22635. switch_mm(active_mm, mm, tsk);
  22636. + preempt_enable_rt();
  22637. task_unlock(tsk);
  22638. #ifdef finish_arch_post_lock_switch
  22639. finish_arch_post_lock_switch();
  22640. diff --git a/mm/page_alloc.c b/mm/page_alloc.c
  22641. index 5b06fb385dd7..86457a2fca20 100644
  22642. --- a/mm/page_alloc.c
  22643. +++ b/mm/page_alloc.c
  22644. @@ -61,6 +61,7 @@
  22645. #include <linux/page_ext.h>
  22646. #include <linux/hugetlb.h>
  22647. #include <linux/sched/rt.h>
  22648. +#include <linux/locallock.h>
  22649. #include <linux/page_owner.h>
  22650. #include <linux/kthread.h>
  22651. #include <linux/memcontrol.h>
  22652. @@ -281,6 +282,18 @@ EXPORT_SYMBOL(nr_node_ids);
  22653. EXPORT_SYMBOL(nr_online_nodes);
  22654. #endif
  22655. +static DEFINE_LOCAL_IRQ_LOCK(pa_lock);
  22656. +
  22657. +#ifdef CONFIG_PREEMPT_RT_BASE
  22658. +# define cpu_lock_irqsave(cpu, flags) \
  22659. + local_lock_irqsave_on(pa_lock, flags, cpu)
  22660. +# define cpu_unlock_irqrestore(cpu, flags) \
  22661. + local_unlock_irqrestore_on(pa_lock, flags, cpu)
  22662. +#else
  22663. +# define cpu_lock_irqsave(cpu, flags) local_irq_save(flags)
  22664. +# define cpu_unlock_irqrestore(cpu, flags) local_irq_restore(flags)
  22665. +#endif
  22666. +
  22667. int page_group_by_mobility_disabled __read_mostly;
  22668. #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
  22669. @@ -1072,7 +1085,7 @@ static bool bulkfree_pcp_prepare(struct page *page)
  22670. #endif /* CONFIG_DEBUG_VM */
  22671. /*
  22672. - * Frees a number of pages from the PCP lists
  22673. + * Frees a number of pages which have been collected from the pcp lists.
  22674. * Assumes all pages on list are in same zone, and of same order.
  22675. * count is the number of pages to free.
  22676. *
  22677. @@ -1083,19 +1096,58 @@ static bool bulkfree_pcp_prepare(struct page *page)
  22678. * pinned" detection logic.
  22679. */
  22680. static void free_pcppages_bulk(struct zone *zone, int count,
  22681. - struct per_cpu_pages *pcp)
  22682. + struct list_head *list)
  22683. {
  22684. - int migratetype = 0;
  22685. - int batch_free = 0;
  22686. unsigned long nr_scanned;
  22687. bool isolated_pageblocks;
  22688. + unsigned long flags;
  22689. +
  22690. + spin_lock_irqsave(&zone->lock, flags);
  22691. - spin_lock(&zone->lock);
  22692. isolated_pageblocks = has_isolate_pageblock(zone);
  22693. nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
  22694. if (nr_scanned)
  22695. __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
  22696. + while (!list_empty(list)) {
  22697. + struct page *page;
  22698. + int mt; /* migratetype of the to-be-freed page */
  22699. +
  22700. + page = list_first_entry(list, struct page, lru);
  22701. + /* must delete as __free_one_page list manipulates */
  22702. + list_del(&page->lru);
  22703. +
  22704. + mt = get_pcppage_migratetype(page);
  22705. + /* MIGRATE_ISOLATE page should not go to pcplists */
  22706. + VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
  22707. + /* Pageblock could have been isolated meanwhile */
  22708. + if (unlikely(isolated_pageblocks))
  22709. + mt = get_pageblock_migratetype(page);
  22710. +
  22711. + if (bulkfree_pcp_prepare(page))
  22712. + continue;
  22713. +
  22714. + __free_one_page(page, page_to_pfn(page), zone, 0, mt);
  22715. + trace_mm_page_pcpu_drain(page, 0, mt);
  22716. + count--;
  22717. + }
  22718. + WARN_ON(count != 0);
  22719. + spin_unlock_irqrestore(&zone->lock, flags);
  22720. +}
  22721. +
  22722. +/*
  22723. + * Moves a number of pages from the PCP lists to free list which
  22724. + * is freed outside of the locked region.
  22725. + *
  22726. + * Assumes all pages on list are in same zone, and of same order.
  22727. + * count is the number of pages to free.
  22728. + */
  22729. +static void isolate_pcp_pages(int count, struct per_cpu_pages *src,
  22730. + struct list_head *dst)
  22731. +{
  22732. + int migratetype = 0;
  22733. + int batch_free = 0;
  22734. +
  22735. while (count) {
  22736. struct page *page;
  22737. struct list_head *list;
  22738. @@ -1111,7 +1163,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
  22739. batch_free++;
  22740. if (++migratetype == MIGRATE_PCPTYPES)
  22741. migratetype = 0;
  22742. - list = &pcp->lists[migratetype];
  22743. + list = &src->lists[migratetype];
  22744. } while (list_empty(list));
  22745. /* This is the only non-empty list. Free them all. */
  22746. @@ -1119,27 +1171,12 @@ static void free_pcppages_bulk(struct zone *zone, int count,
  22747. batch_free = count;
  22748. do {
  22749. - int mt; /* migratetype of the to-be-freed page */
  22750. -
  22751. page = list_last_entry(list, struct page, lru);
  22752. - /* must delete as __free_one_page list manipulates */
  22753. list_del(&page->lru);
  22754. - mt = get_pcppage_migratetype(page);
  22755. - /* MIGRATE_ISOLATE page should not go to pcplists */
  22756. - VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
  22757. - /* Pageblock could have been isolated meanwhile */
  22758. - if (unlikely(isolated_pageblocks))
  22759. - mt = get_pageblock_migratetype(page);
  22760. -
  22761. - if (bulkfree_pcp_prepare(page))
  22762. - continue;
  22763. -
  22764. - __free_one_page(page, page_to_pfn(page), zone, 0, mt);
  22765. - trace_mm_page_pcpu_drain(page, 0, mt);
  22766. + list_add(&page->lru, dst);
  22767. } while (--count && --batch_free && !list_empty(list));
  22768. }
  22769. - spin_unlock(&zone->lock);
  22770. }
  22771. static void free_one_page(struct zone *zone,
  22772. @@ -1148,7 +1185,9 @@ static void free_one_page(struct zone *zone,
  22773. int migratetype)
  22774. {
  22775. unsigned long nr_scanned;
  22776. - spin_lock(&zone->lock);
  22777. + unsigned long flags;
  22778. +
  22779. + spin_lock_irqsave(&zone->lock, flags);
  22780. nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
  22781. if (nr_scanned)
  22782. __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
  22783. @@ -1158,7 +1197,7 @@ static void free_one_page(struct zone *zone,
  22784. migratetype = get_pfnblock_migratetype(page, pfn);
  22785. }
  22786. __free_one_page(page, pfn, zone, order, migratetype);
  22787. - spin_unlock(&zone->lock);
  22788. + spin_unlock_irqrestore(&zone->lock, flags);
  22789. }
  22790. static void __meminit __init_single_page(struct page *page, unsigned long pfn,
  22791. @@ -1244,10 +1283,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
  22792. return;
  22793. migratetype = get_pfnblock_migratetype(page, pfn);
  22794. - local_irq_save(flags);
  22795. + local_lock_irqsave(pa_lock, flags);
  22796. __count_vm_events(PGFREE, 1 << order);
  22797. free_one_page(page_zone(page), page, pfn, order, migratetype);
  22798. - local_irq_restore(flags);
  22799. + local_unlock_irqrestore(pa_lock, flags);
  22800. }
  22801. static void __init __free_pages_boot_core(struct page *page, unsigned int order)
  22802. @@ -2246,16 +2285,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
  22803. void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
  22804. {
  22805. unsigned long flags;
  22806. + LIST_HEAD(dst);
  22807. int to_drain, batch;
  22808. - local_irq_save(flags);
  22809. + local_lock_irqsave(pa_lock, flags);
  22810. batch = READ_ONCE(pcp->batch);
  22811. to_drain = min(pcp->count, batch);
  22812. if (to_drain > 0) {
  22813. - free_pcppages_bulk(zone, to_drain, pcp);
  22814. + isolate_pcp_pages(to_drain, pcp, &dst);
  22815. pcp->count -= to_drain;
  22816. }
  22817. - local_irq_restore(flags);
  22818. + local_unlock_irqrestore(pa_lock, flags);
  22819. + free_pcppages_bulk(zone, to_drain, &dst);
  22820. }
  22821. #endif
  22822. @@ -2271,16 +2312,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
  22823. unsigned long flags;
  22824. struct per_cpu_pageset *pset;
  22825. struct per_cpu_pages *pcp;
  22826. + LIST_HEAD(dst);
  22827. + int count;
  22828. - local_irq_save(flags);
  22829. + cpu_lock_irqsave(cpu, flags);
  22830. pset = per_cpu_ptr(zone->pageset, cpu);
  22831. pcp = &pset->pcp;
  22832. - if (pcp->count) {
  22833. - free_pcppages_bulk(zone, pcp->count, pcp);
  22834. + count = pcp->count;
  22835. + if (count) {
  22836. + isolate_pcp_pages(count, pcp, &dst);
  22837. pcp->count = 0;
  22838. }
  22839. - local_irq_restore(flags);
  22840. + cpu_unlock_irqrestore(cpu, flags);
  22841. + if (count)
  22842. + free_pcppages_bulk(zone, count, &dst);
  22843. }
  22844. /*
  22845. @@ -2366,8 +2412,17 @@ void drain_all_pages(struct zone *zone)
  22846. else
  22847. cpumask_clear_cpu(cpu, &cpus_with_pcps);
  22848. }
  22849. +#ifndef CONFIG_PREEMPT_RT_BASE
  22850. on_each_cpu_mask(&cpus_with_pcps, (smp_call_func_t) drain_local_pages,
  22851. zone, 1);
  22852. +#else
  22853. + for_each_cpu(cpu, &cpus_with_pcps) {
  22854. + if (zone)
  22855. + drain_pages_zone(cpu, zone);
  22856. + else
  22857. + drain_pages(cpu);
  22858. + }
  22859. +#endif
  22860. }
  22861. #ifdef CONFIG_HIBERNATION
  22862. @@ -2427,7 +2482,7 @@ void free_hot_cold_page(struct page *page, bool cold)
  22863. migratetype = get_pfnblock_migratetype(page, pfn);
  22864. set_pcppage_migratetype(page, migratetype);
  22865. - local_irq_save(flags);
  22866. + local_lock_irqsave(pa_lock, flags);
  22867. __count_vm_event(PGFREE);
  22868. /*
  22869. @@ -2453,12 +2508,17 @@ void free_hot_cold_page(struct page *page, bool cold)
  22870. pcp->count++;
  22871. if (pcp->count >= pcp->high) {
  22872. unsigned long batch = READ_ONCE(pcp->batch);
  22873. - free_pcppages_bulk(zone, batch, pcp);
  22874. + LIST_HEAD(dst);
  22875. +
  22876. + isolate_pcp_pages(batch, pcp, &dst);
  22877. pcp->count -= batch;
  22878. + local_unlock_irqrestore(pa_lock, flags);
  22879. + free_pcppages_bulk(zone, batch, &dst);
  22880. + return;
  22881. }
  22882. out:
  22883. - local_irq_restore(flags);
  22884. + local_unlock_irqrestore(pa_lock, flags);
  22885. }
  22886. /*
  22887. @@ -2600,7 +2660,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
  22888. struct per_cpu_pages *pcp;
  22889. struct list_head *list;
  22890. - local_irq_save(flags);
  22891. + local_lock_irqsave(pa_lock, flags);
  22892. do {
  22893. pcp = &this_cpu_ptr(zone->pageset)->pcp;
  22894. list = &pcp->lists[migratetype];
  22895. @@ -2627,7 +2687,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
  22896. * allocate greater than order-1 page units with __GFP_NOFAIL.
  22897. */
  22898. WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
  22899. - spin_lock_irqsave(&zone->lock, flags);
  22900. + local_spin_lock_irqsave(pa_lock, &zone->lock, flags);
  22901. do {
  22902. page = NULL;
  22903. @@ -2639,22 +2699,24 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
  22904. if (!page)
  22905. page = __rmqueue(zone, order, migratetype);
  22906. } while (page && check_new_pages(page, order));
  22907. - spin_unlock(&zone->lock);
  22908. - if (!page)
  22909. + if (!page) {
  22910. + spin_unlock(&zone->lock);
  22911. goto failed;
  22912. + }
  22913. __mod_zone_freepage_state(zone, -(1 << order),
  22914. get_pcppage_migratetype(page));
  22915. + spin_unlock(&zone->lock);
  22916. }
  22917. __count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
  22918. zone_statistics(preferred_zone, zone, gfp_flags);
  22919. - local_irq_restore(flags);
  22920. + local_unlock_irqrestore(pa_lock, flags);
  22921. VM_BUG_ON_PAGE(bad_range(zone, page), page);
  22922. return page;
  22923. failed:
  22924. - local_irq_restore(flags);
  22925. + local_unlock_irqrestore(pa_lock, flags);
  22926. return NULL;
  22927. }
  22928. @@ -6532,7 +6594,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
  22929. int cpu = (unsigned long)hcpu;
  22930. if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
  22931. + local_lock_irq_on(swapvec_lock, cpu);
  22932. lru_add_drain_cpu(cpu);
  22933. + local_unlock_irq_on(swapvec_lock, cpu);
  22934. drain_pages(cpu);
  22935. /*
  22936. @@ -6558,6 +6622,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
  22937. void __init page_alloc_init(void)
  22938. {
  22939. hotcpu_notifier(page_alloc_cpu_notify, 0);
  22940. + local_irq_lock_init(pa_lock);
  22941. }
  22942. /*
  22943. @@ -7386,7 +7451,7 @@ void zone_pcp_reset(struct zone *zone)
  22944. struct per_cpu_pageset *pset;
  22945. /* avoid races with drain_pages() */
  22946. - local_irq_save(flags);
  22947. + local_lock_irqsave(pa_lock, flags);
  22948. if (zone->pageset != &boot_pageset) {
  22949. for_each_online_cpu(cpu) {
  22950. pset = per_cpu_ptr(zone->pageset, cpu);
  22951. @@ -7395,7 +7460,7 @@ void zone_pcp_reset(struct zone *zone)
  22952. free_percpu(zone->pageset);
  22953. zone->pageset = &boot_pageset;
  22954. }
  22955. - local_irq_restore(flags);
  22956. + local_unlock_irqrestore(pa_lock, flags);
  22957. }
  22958. #ifdef CONFIG_MEMORY_HOTREMOVE
  22959. diff --git a/mm/percpu.c b/mm/percpu.c
  22960. index f014cebbf405..4e739fcf91bf 100644
  22961. --- a/mm/percpu.c
  22962. +++ b/mm/percpu.c
  22963. @@ -1283,6 +1283,31 @@ void free_percpu(void __percpu *ptr)
  22964. }
  22965. EXPORT_SYMBOL_GPL(free_percpu);
  22966. +bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr)
  22967. +{
  22968. +#ifdef CONFIG_SMP
  22969. + const size_t static_size = __per_cpu_end - __per_cpu_start;
  22970. + void __percpu *base = __addr_to_pcpu_ptr(pcpu_base_addr);
  22971. + unsigned int cpu;
  22972. +
  22973. + for_each_possible_cpu(cpu) {
  22974. + void *start = per_cpu_ptr(base, cpu);
  22975. + void *va = (void *)addr;
  22976. +
  22977. + if (va >= start && va < start + static_size) {
  22978. + if (can_addr) {
  22979. + *can_addr = (unsigned long) (va - start);
  22980. + *can_addr += (unsigned long)
  22981. + per_cpu_ptr(base, get_boot_cpu_id());
  22982. + }
  22983. + return true;
  22984. + }
  22985. + }
  22986. +#endif
  22987. + /* on UP, can't distinguish from other static vars, always false */
  22988. + return false;
  22989. +}
  22990. +
  22991. /**
  22992. * is_kernel_percpu_address - test whether address is from static percpu area
  22993. * @addr: address to test
  22994. @@ -1296,20 +1321,7 @@ EXPORT_SYMBOL_GPL(free_percpu);
  22995. */
  22996. bool is_kernel_percpu_address(unsigned long addr)
  22997. {
  22998. -#ifdef CONFIG_SMP
  22999. - const size_t static_size = __per_cpu_end - __per_cpu_start;
  23000. - void __percpu *base = __addr_to_pcpu_ptr(pcpu_base_addr);
  23001. - unsigned int cpu;
  23002. -
  23003. - for_each_possible_cpu(cpu) {
  23004. - void *start = per_cpu_ptr(base, cpu);
  23005. -
  23006. - if ((void *)addr >= start && (void *)addr < start + static_size)
  23007. - return true;
  23008. - }
  23009. -#endif
  23010. - /* on UP, can't distinguish from other static vars, always false */
  23011. - return false;
  23012. + return __is_kernel_percpu_address(addr, NULL);
  23013. }
  23014. /**
  23015. diff --git a/mm/slab.h b/mm/slab.h
  23016. index ceb7d70cdb76..dfd281e43fbe 100644
  23017. --- a/mm/slab.h
  23018. +++ b/mm/slab.h
  23019. @@ -426,7 +426,11 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
  23020. * The slab lists for all objects.
  23021. */
  23022. struct kmem_cache_node {
  23023. +#ifdef CONFIG_SLUB
  23024. + raw_spinlock_t list_lock;
  23025. +#else
  23026. spinlock_t list_lock;
  23027. +#endif
  23028. #ifdef CONFIG_SLAB
  23029. struct list_head slabs_partial; /* partial list first, better asm code */
  23030. diff --git a/mm/slub.c b/mm/slub.c
  23031. index 58c7526f8de2..6d72b7f87129 100644
  23032. --- a/mm/slub.c
  23033. +++ b/mm/slub.c
  23034. @@ -1141,7 +1141,7 @@ static noinline int free_debug_processing(
  23035. unsigned long uninitialized_var(flags);
  23036. int ret = 0;
  23037. - spin_lock_irqsave(&n->list_lock, flags);
  23038. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23039. slab_lock(page);
  23040. if (s->flags & SLAB_CONSISTENCY_CHECKS) {
  23041. @@ -1176,7 +1176,7 @@ static noinline int free_debug_processing(
  23042. bulk_cnt, cnt);
  23043. slab_unlock(page);
  23044. - spin_unlock_irqrestore(&n->list_lock, flags);
  23045. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23046. if (!ret)
  23047. slab_fix(s, "Object at 0x%p not freed", object);
  23048. return ret;
  23049. @@ -1304,6 +1304,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,
  23050. #endif /* CONFIG_SLUB_DEBUG */
  23051. +struct slub_free_list {
  23052. + raw_spinlock_t lock;
  23053. + struct list_head list;
  23054. +};
  23055. +static DEFINE_PER_CPU(struct slub_free_list, slub_free_list);
  23056. +
  23057. /*
  23058. * Hooks for other subsystems that check memory allocations. In a typical
  23059. * production configuration these hooks all should produce no code at all.
  23060. @@ -1527,10 +1533,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
  23061. void *start, *p;
  23062. int idx, order;
  23063. bool shuffle;
  23064. + bool enableirqs = false;
  23065. flags &= gfp_allowed_mask;
  23066. if (gfpflags_allow_blocking(flags))
  23067. + enableirqs = true;
  23068. +#ifdef CONFIG_PREEMPT_RT_FULL
  23069. + if (system_state == SYSTEM_RUNNING)
  23070. + enableirqs = true;
  23071. +#endif
  23072. + if (enableirqs)
  23073. local_irq_enable();
  23074. flags |= s->allocflags;
  23075. @@ -1605,7 +1618,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
  23076. page->frozen = 1;
  23077. out:
  23078. - if (gfpflags_allow_blocking(flags))
  23079. + if (enableirqs)
  23080. local_irq_disable();
  23081. if (!page)
  23082. return NULL;
  23083. @@ -1664,6 +1677,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
  23084. __free_pages(page, order);
  23085. }
  23086. +static void free_delayed(struct list_head *h)
  23087. +{
  23088. + while(!list_empty(h)) {
  23089. + struct page *page = list_first_entry(h, struct page, lru);
  23090. +
  23091. + list_del(&page->lru);
  23092. + __free_slab(page->slab_cache, page);
  23093. + }
  23094. +}
  23095. +
  23096. #define need_reserve_slab_rcu \
  23097. (sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
  23098. @@ -1695,6 +1718,12 @@ static void free_slab(struct kmem_cache *s, struct page *page)
  23099. }
  23100. call_rcu(head, rcu_free_slab);
  23101. + } else if (irqs_disabled()) {
  23102. + struct slub_free_list *f = this_cpu_ptr(&slub_free_list);
  23103. +
  23104. + raw_spin_lock(&f->lock);
  23105. + list_add(&page->lru, &f->list);
  23106. + raw_spin_unlock(&f->lock);
  23107. } else
  23108. __free_slab(s, page);
  23109. }
  23110. @@ -1802,7 +1831,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
  23111. if (!n || !n->nr_partial)
  23112. return NULL;
  23113. - spin_lock(&n->list_lock);
  23114. + raw_spin_lock(&n->list_lock);
  23115. list_for_each_entry_safe(page, page2, &n->partial, lru) {
  23116. void *t;
  23117. @@ -1827,7 +1856,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
  23118. break;
  23119. }
  23120. - spin_unlock(&n->list_lock);
  23121. + raw_spin_unlock(&n->list_lock);
  23122. return object;
  23123. }
  23124. @@ -2073,7 +2102,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
  23125. * that acquire_slab() will see a slab page that
  23126. * is frozen
  23127. */
  23128. - spin_lock(&n->list_lock);
  23129. + raw_spin_lock(&n->list_lock);
  23130. }
  23131. } else {
  23132. m = M_FULL;
  23133. @@ -2084,7 +2113,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
  23134. * slabs from diagnostic functions will not see
  23135. * any frozen slabs.
  23136. */
  23137. - spin_lock(&n->list_lock);
  23138. + raw_spin_lock(&n->list_lock);
  23139. }
  23140. }
  23141. @@ -2119,7 +2148,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
  23142. goto redo;
  23143. if (lock)
  23144. - spin_unlock(&n->list_lock);
  23145. + raw_spin_unlock(&n->list_lock);
  23146. if (m == M_FREE) {
  23147. stat(s, DEACTIVATE_EMPTY);
  23148. @@ -2151,10 +2180,10 @@ static void unfreeze_partials(struct kmem_cache *s,
  23149. n2 = get_node(s, page_to_nid(page));
  23150. if (n != n2) {
  23151. if (n)
  23152. - spin_unlock(&n->list_lock);
  23153. + raw_spin_unlock(&n->list_lock);
  23154. n = n2;
  23155. - spin_lock(&n->list_lock);
  23156. + raw_spin_lock(&n->list_lock);
  23157. }
  23158. do {
  23159. @@ -2183,7 +2212,7 @@ static void unfreeze_partials(struct kmem_cache *s,
  23160. }
  23161. if (n)
  23162. - spin_unlock(&n->list_lock);
  23163. + raw_spin_unlock(&n->list_lock);
  23164. while (discard_page) {
  23165. page = discard_page;
  23166. @@ -2222,14 +2251,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
  23167. pobjects = oldpage->pobjects;
  23168. pages = oldpage->pages;
  23169. if (drain && pobjects > s->cpu_partial) {
  23170. + struct slub_free_list *f;
  23171. unsigned long flags;
  23172. + LIST_HEAD(tofree);
  23173. /*
  23174. * partial array is full. Move the existing
  23175. * set to the per node partial list.
  23176. */
  23177. local_irq_save(flags);
  23178. unfreeze_partials(s, this_cpu_ptr(s->cpu_slab));
  23179. + f = this_cpu_ptr(&slub_free_list);
  23180. + raw_spin_lock(&f->lock);
  23181. + list_splice_init(&f->list, &tofree);
  23182. + raw_spin_unlock(&f->lock);
  23183. local_irq_restore(flags);
  23184. + free_delayed(&tofree);
  23185. oldpage = NULL;
  23186. pobjects = 0;
  23187. pages = 0;
  23188. @@ -2301,7 +2337,22 @@ static bool has_cpu_slab(int cpu, void *info)
  23189. static void flush_all(struct kmem_cache *s)
  23190. {
  23191. + LIST_HEAD(tofree);
  23192. + int cpu;
  23193. +
  23194. on_each_cpu_cond(has_cpu_slab, flush_cpu_slab, s, 1, GFP_ATOMIC);
  23195. + for_each_online_cpu(cpu) {
  23196. + struct slub_free_list *f;
  23197. +
  23198. + if (!has_cpu_slab(cpu, s))
  23199. + continue;
  23200. +
  23201. + f = &per_cpu(slub_free_list, cpu);
  23202. + raw_spin_lock_irq(&f->lock);
  23203. + list_splice_init(&f->list, &tofree);
  23204. + raw_spin_unlock_irq(&f->lock);
  23205. + free_delayed(&tofree);
  23206. + }
  23207. }
  23208. /*
  23209. @@ -2356,10 +2407,10 @@ static unsigned long count_partial(struct kmem_cache_node *n,
  23210. unsigned long x = 0;
  23211. struct page *page;
  23212. - spin_lock_irqsave(&n->list_lock, flags);
  23213. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23214. list_for_each_entry(page, &n->partial, lru)
  23215. x += get_count(page);
  23216. - spin_unlock_irqrestore(&n->list_lock, flags);
  23217. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23218. return x;
  23219. }
  23220. #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
  23221. @@ -2497,8 +2548,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page)
  23222. * already disabled (which is the case for bulk allocation).
  23223. */
  23224. static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
  23225. - unsigned long addr, struct kmem_cache_cpu *c)
  23226. + unsigned long addr, struct kmem_cache_cpu *c,
  23227. + struct list_head *to_free)
  23228. {
  23229. + struct slub_free_list *f;
  23230. void *freelist;
  23231. struct page *page;
  23232. @@ -2558,6 +2611,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
  23233. VM_BUG_ON(!c->page->frozen);
  23234. c->freelist = get_freepointer(s, freelist);
  23235. c->tid = next_tid(c->tid);
  23236. +
  23237. +out:
  23238. + f = this_cpu_ptr(&slub_free_list);
  23239. + raw_spin_lock(&f->lock);
  23240. + list_splice_init(&f->list, to_free);
  23241. + raw_spin_unlock(&f->lock);
  23242. +
  23243. return freelist;
  23244. new_slab:
  23245. @@ -2589,7 +2649,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
  23246. deactivate_slab(s, page, get_freepointer(s, freelist));
  23247. c->page = NULL;
  23248. c->freelist = NULL;
  23249. - return freelist;
  23250. + goto out;
  23251. }
  23252. /*
  23253. @@ -2601,6 +2661,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
  23254. {
  23255. void *p;
  23256. unsigned long flags;
  23257. + LIST_HEAD(tofree);
  23258. local_irq_save(flags);
  23259. #ifdef CONFIG_PREEMPT
  23260. @@ -2612,8 +2673,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
  23261. c = this_cpu_ptr(s->cpu_slab);
  23262. #endif
  23263. - p = ___slab_alloc(s, gfpflags, node, addr, c);
  23264. + p = ___slab_alloc(s, gfpflags, node, addr, c, &tofree);
  23265. local_irq_restore(flags);
  23266. + free_delayed(&tofree);
  23267. return p;
  23268. }
  23269. @@ -2799,7 +2861,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
  23270. do {
  23271. if (unlikely(n)) {
  23272. - spin_unlock_irqrestore(&n->list_lock, flags);
  23273. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23274. n = NULL;
  23275. }
  23276. prior = page->freelist;
  23277. @@ -2831,7 +2893,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
  23278. * Otherwise the list_lock will synchronize with
  23279. * other processors updating the list of slabs.
  23280. */
  23281. - spin_lock_irqsave(&n->list_lock, flags);
  23282. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23283. }
  23284. }
  23285. @@ -2873,7 +2935,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
  23286. add_partial(n, page, DEACTIVATE_TO_TAIL);
  23287. stat(s, FREE_ADD_PARTIAL);
  23288. }
  23289. - spin_unlock_irqrestore(&n->list_lock, flags);
  23290. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23291. return;
  23292. slab_empty:
  23293. @@ -2888,7 +2950,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
  23294. remove_full(s, n, page);
  23295. }
  23296. - spin_unlock_irqrestore(&n->list_lock, flags);
  23297. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23298. stat(s, FREE_SLAB);
  23299. discard_slab(s, page);
  23300. }
  23301. @@ -3093,6 +3155,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
  23302. void **p)
  23303. {
  23304. struct kmem_cache_cpu *c;
  23305. + LIST_HEAD(to_free);
  23306. int i;
  23307. /* memcg and kmem_cache debug support */
  23308. @@ -3116,7 +3179,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
  23309. * of re-populating per CPU c->freelist
  23310. */
  23311. p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
  23312. - _RET_IP_, c);
  23313. + _RET_IP_, c, &to_free);
  23314. if (unlikely(!p[i]))
  23315. goto error;
  23316. @@ -3128,6 +3191,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
  23317. }
  23318. c->tid = next_tid(c->tid);
  23319. local_irq_enable();
  23320. + free_delayed(&to_free);
  23321. /* Clear memory outside IRQ disabled fastpath loop */
  23322. if (unlikely(flags & __GFP_ZERO)) {
  23323. @@ -3275,7 +3339,7 @@ static void
  23324. init_kmem_cache_node(struct kmem_cache_node *n)
  23325. {
  23326. n->nr_partial = 0;
  23327. - spin_lock_init(&n->list_lock);
  23328. + raw_spin_lock_init(&n->list_lock);
  23329. INIT_LIST_HEAD(&n->partial);
  23330. #ifdef CONFIG_SLUB_DEBUG
  23331. atomic_long_set(&n->nr_slabs, 0);
  23332. @@ -3619,6 +3683,10 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
  23333. const char *text)
  23334. {
  23335. #ifdef CONFIG_SLUB_DEBUG
  23336. +#ifdef CONFIG_PREEMPT_RT_BASE
  23337. + /* XXX move out of irq-off section */
  23338. + slab_err(s, page, text, s->name);
  23339. +#else
  23340. void *addr = page_address(page);
  23341. void *p;
  23342. unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
  23343. @@ -3639,6 +3707,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
  23344. slab_unlock(page);
  23345. kfree(map);
  23346. #endif
  23347. +#endif
  23348. }
  23349. /*
  23350. @@ -3652,7 +3721,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
  23351. struct page *page, *h;
  23352. BUG_ON(irqs_disabled());
  23353. - spin_lock_irq(&n->list_lock);
  23354. + raw_spin_lock_irq(&n->list_lock);
  23355. list_for_each_entry_safe(page, h, &n->partial, lru) {
  23356. if (!page->inuse) {
  23357. remove_partial(n, page);
  23358. @@ -3662,7 +3731,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
  23359. "Objects remaining in %s on __kmem_cache_shutdown()");
  23360. }
  23361. }
  23362. - spin_unlock_irq(&n->list_lock);
  23363. + raw_spin_unlock_irq(&n->list_lock);
  23364. list_for_each_entry_safe(page, h, &discard, lru)
  23365. discard_slab(s, page);
  23366. @@ -3905,7 +3974,7 @@ int __kmem_cache_shrink(struct kmem_cache *s)
  23367. for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
  23368. INIT_LIST_HEAD(promote + i);
  23369. - spin_lock_irqsave(&n->list_lock, flags);
  23370. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23371. /*
  23372. * Build lists of slabs to discard or promote.
  23373. @@ -3936,7 +4005,7 @@ int __kmem_cache_shrink(struct kmem_cache *s)
  23374. for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
  23375. list_splice(promote + i, &n->partial);
  23376. - spin_unlock_irqrestore(&n->list_lock, flags);
  23377. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23378. /* Release empty slabs */
  23379. list_for_each_entry_safe(page, t, &discard, lru)
  23380. @@ -4112,6 +4181,12 @@ void __init kmem_cache_init(void)
  23381. {
  23382. static __initdata struct kmem_cache boot_kmem_cache,
  23383. boot_kmem_cache_node;
  23384. + int cpu;
  23385. +
  23386. + for_each_possible_cpu(cpu) {
  23387. + raw_spin_lock_init(&per_cpu(slub_free_list, cpu).lock);
  23388. + INIT_LIST_HEAD(&per_cpu(slub_free_list, cpu).list);
  23389. + }
  23390. if (debug_guardpage_minorder())
  23391. slub_max_order = 0;
  23392. @@ -4320,7 +4395,7 @@ static int validate_slab_node(struct kmem_cache *s,
  23393. struct page *page;
  23394. unsigned long flags;
  23395. - spin_lock_irqsave(&n->list_lock, flags);
  23396. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23397. list_for_each_entry(page, &n->partial, lru) {
  23398. validate_slab_slab(s, page, map);
  23399. @@ -4342,7 +4417,7 @@ static int validate_slab_node(struct kmem_cache *s,
  23400. s->name, count, atomic_long_read(&n->nr_slabs));
  23401. out:
  23402. - spin_unlock_irqrestore(&n->list_lock, flags);
  23403. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23404. return count;
  23405. }
  23406. @@ -4530,12 +4605,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
  23407. if (!atomic_long_read(&n->nr_slabs))
  23408. continue;
  23409. - spin_lock_irqsave(&n->list_lock, flags);
  23410. + raw_spin_lock_irqsave(&n->list_lock, flags);
  23411. list_for_each_entry(page, &n->partial, lru)
  23412. process_slab(&t, s, page, alloc, map);
  23413. list_for_each_entry(page, &n->full, lru)
  23414. process_slab(&t, s, page, alloc, map);
  23415. - spin_unlock_irqrestore(&n->list_lock, flags);
  23416. + raw_spin_unlock_irqrestore(&n->list_lock, flags);
  23417. }
  23418. for (i = 0; i < t.count; i++) {
  23419. diff --git a/mm/swap.c b/mm/swap.c
  23420. index 4dcf852e1e6d..69c3a5b24060 100644
  23421. --- a/mm/swap.c
  23422. +++ b/mm/swap.c
  23423. @@ -32,6 +32,7 @@
  23424. #include <linux/memcontrol.h>
  23425. #include <linux/gfp.h>
  23426. #include <linux/uio.h>
  23427. +#include <linux/locallock.h>
  23428. #include <linux/hugetlb.h>
  23429. #include <linux/page_idle.h>
  23430. @@ -50,6 +51,8 @@ static DEFINE_PER_CPU(struct pagevec, lru_deactivate_pvecs);
  23431. #ifdef CONFIG_SMP
  23432. static DEFINE_PER_CPU(struct pagevec, activate_page_pvecs);
  23433. #endif
  23434. +static DEFINE_LOCAL_IRQ_LOCK(rotate_lock);
  23435. +DEFINE_LOCAL_IRQ_LOCK(swapvec_lock);
  23436. /*
  23437. * This path almost never happens for VM activity - pages are normally
  23438. @@ -240,11 +243,11 @@ void rotate_reclaimable_page(struct page *page)
  23439. unsigned long flags;
  23440. get_page(page);
  23441. - local_irq_save(flags);
  23442. + local_lock_irqsave(rotate_lock, flags);
  23443. pvec = this_cpu_ptr(&lru_rotate_pvecs);
  23444. if (!pagevec_add(pvec, page) || PageCompound(page))
  23445. pagevec_move_tail(pvec);
  23446. - local_irq_restore(flags);
  23447. + local_unlock_irqrestore(rotate_lock, flags);
  23448. }
  23449. }
  23450. @@ -294,12 +297,13 @@ void activate_page(struct page *page)
  23451. {
  23452. page = compound_head(page);
  23453. if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
  23454. - struct pagevec *pvec = &get_cpu_var(activate_page_pvecs);
  23455. + struct pagevec *pvec = &get_locked_var(swapvec_lock,
  23456. + activate_page_pvecs);
  23457. get_page(page);
  23458. if (!pagevec_add(pvec, page) || PageCompound(page))
  23459. pagevec_lru_move_fn(pvec, __activate_page, NULL);
  23460. - put_cpu_var(activate_page_pvecs);
  23461. + put_locked_var(swapvec_lock, activate_page_pvecs);
  23462. }
  23463. }
  23464. @@ -326,7 +330,7 @@ void activate_page(struct page *page)
  23465. static void __lru_cache_activate_page(struct page *page)
  23466. {
  23467. - struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
  23468. + struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
  23469. int i;
  23470. /*
  23471. @@ -348,7 +352,7 @@ static void __lru_cache_activate_page(struct page *page)
  23472. }
  23473. }
  23474. - put_cpu_var(lru_add_pvec);
  23475. + put_locked_var(swapvec_lock, lru_add_pvec);
  23476. }
  23477. /*
  23478. @@ -390,12 +394,12 @@ EXPORT_SYMBOL(mark_page_accessed);
  23479. static void __lru_cache_add(struct page *page)
  23480. {
  23481. - struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
  23482. + struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
  23483. get_page(page);
  23484. if (!pagevec_add(pvec, page) || PageCompound(page))
  23485. __pagevec_lru_add(pvec);
  23486. - put_cpu_var(lru_add_pvec);
  23487. + put_locked_var(swapvec_lock, lru_add_pvec);
  23488. }
  23489. /**
  23490. @@ -593,9 +597,15 @@ void lru_add_drain_cpu(int cpu)
  23491. unsigned long flags;
  23492. /* No harm done if a racing interrupt already did this */
  23493. - local_irq_save(flags);
  23494. +#ifdef CONFIG_PREEMPT_RT_BASE
  23495. + local_lock_irqsave_on(rotate_lock, flags, cpu);
  23496. pagevec_move_tail(pvec);
  23497. - local_irq_restore(flags);
  23498. + local_unlock_irqrestore_on(rotate_lock, flags, cpu);
  23499. +#else
  23500. + local_lock_irqsave(rotate_lock, flags);
  23501. + pagevec_move_tail(pvec);
  23502. + local_unlock_irqrestore(rotate_lock, flags);
  23503. +#endif
  23504. }
  23505. pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
  23506. @@ -627,11 +637,12 @@ void deactivate_file_page(struct page *page)
  23507. return;
  23508. if (likely(get_page_unless_zero(page))) {
  23509. - struct pagevec *pvec = &get_cpu_var(lru_deactivate_file_pvecs);
  23510. + struct pagevec *pvec = &get_locked_var(swapvec_lock,
  23511. + lru_deactivate_file_pvecs);
  23512. if (!pagevec_add(pvec, page) || PageCompound(page))
  23513. pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
  23514. - put_cpu_var(lru_deactivate_file_pvecs);
  23515. + put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
  23516. }
  23517. }
  23518. @@ -646,27 +657,31 @@ void deactivate_file_page(struct page *page)
  23519. void deactivate_page(struct page *page)
  23520. {
  23521. if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {
  23522. - struct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs);
  23523. + struct pagevec *pvec = &get_locked_var(swapvec_lock,
  23524. + lru_deactivate_pvecs);
  23525. get_page(page);
  23526. if (!pagevec_add(pvec, page) || PageCompound(page))
  23527. pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);
  23528. - put_cpu_var(lru_deactivate_pvecs);
  23529. + put_locked_var(swapvec_lock, lru_deactivate_pvecs);
  23530. }
  23531. }
  23532. void lru_add_drain(void)
  23533. {
  23534. - lru_add_drain_cpu(get_cpu());
  23535. - put_cpu();
  23536. + lru_add_drain_cpu(local_lock_cpu(swapvec_lock));
  23537. + local_unlock_cpu(swapvec_lock);
  23538. }
  23539. -static void lru_add_drain_per_cpu(struct work_struct *dummy)
  23540. +#ifdef CONFIG_PREEMPT_RT_BASE
  23541. +static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
  23542. {
  23543. - lru_add_drain();
  23544. + local_lock_on(swapvec_lock, cpu);
  23545. + lru_add_drain_cpu(cpu);
  23546. + local_unlock_on(swapvec_lock, cpu);
  23547. }
  23548. -static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
  23549. +#else
  23550. /*
  23551. * lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM
  23552. @@ -686,6 +701,22 @@ static int __init lru_init(void)
  23553. }
  23554. early_initcall(lru_init);
  23555. +static void lru_add_drain_per_cpu(struct work_struct *dummy)
  23556. +{
  23557. + lru_add_drain();
  23558. +}
  23559. +
  23560. +static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
  23561. +static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
  23562. +{
  23563. + struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
  23564. +
  23565. + INIT_WORK(work, lru_add_drain_per_cpu);
  23566. + queue_work_on(cpu, lru_add_drain_wq, work);
  23567. + cpumask_set_cpu(cpu, has_work);
  23568. +}
  23569. +#endif
  23570. +
  23571. void lru_add_drain_all(void)
  23572. {
  23573. static DEFINE_MUTEX(lock);
  23574. @@ -697,21 +728,18 @@ void lru_add_drain_all(void)
  23575. cpumask_clear(&has_work);
  23576. for_each_online_cpu(cpu) {
  23577. - struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
  23578. -
  23579. if (pagevec_count(&per_cpu(lru_add_pvec, cpu)) ||
  23580. pagevec_count(&per_cpu(lru_rotate_pvecs, cpu)) ||
  23581. pagevec_count(&per_cpu(lru_deactivate_file_pvecs, cpu)) ||
  23582. pagevec_count(&per_cpu(lru_deactivate_pvecs, cpu)) ||
  23583. - need_activate_page_drain(cpu)) {
  23584. - INIT_WORK(work, lru_add_drain_per_cpu);
  23585. - queue_work_on(cpu, lru_add_drain_wq, work);
  23586. - cpumask_set_cpu(cpu, &has_work);
  23587. - }
  23588. + need_activate_page_drain(cpu))
  23589. + remote_lru_add_drain(cpu, &has_work);
  23590. }
  23591. +#ifndef CONFIG_PREEMPT_RT_BASE
  23592. for_each_cpu(cpu, &has_work)
  23593. flush_work(&per_cpu(lru_add_drain_work, cpu));
  23594. +#endif
  23595. put_online_cpus();
  23596. mutex_unlock(&lock);
  23597. diff --git a/mm/truncate.c b/mm/truncate.c
  23598. index 8d8c62d89e6d..5bf1bd25d077 100644
  23599. --- a/mm/truncate.c
  23600. +++ b/mm/truncate.c
  23601. @@ -62,9 +62,12 @@ static void clear_exceptional_entry(struct address_space *mapping,
  23602. * protected by mapping->tree_lock.
  23603. */
  23604. if (!workingset_node_shadows(node) &&
  23605. - !list_empty(&node->private_list))
  23606. - list_lru_del(&workingset_shadow_nodes,
  23607. + !list_empty(&node->private_list)) {
  23608. + local_lock(workingset_shadow_lock);
  23609. + list_lru_del(&__workingset_shadow_nodes,
  23610. &node->private_list);
  23611. + local_unlock(workingset_shadow_lock);
  23612. + }
  23613. __radix_tree_delete_node(&mapping->page_tree, node);
  23614. unlock:
  23615. spin_unlock_irq(&mapping->tree_lock);
  23616. diff --git a/mm/vmalloc.c b/mm/vmalloc.c
  23617. index f2481cb4e6b2..db4de08fa97c 100644
  23618. --- a/mm/vmalloc.c
  23619. +++ b/mm/vmalloc.c
  23620. @@ -845,7 +845,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
  23621. struct vmap_block *vb;
  23622. struct vmap_area *va;
  23623. unsigned long vb_idx;
  23624. - int node, err;
  23625. + int node, err, cpu;
  23626. void *vaddr;
  23627. node = numa_node_id();
  23628. @@ -888,11 +888,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
  23629. BUG_ON(err);
  23630. radix_tree_preload_end();
  23631. - vbq = &get_cpu_var(vmap_block_queue);
  23632. + cpu = get_cpu_light();
  23633. + vbq = this_cpu_ptr(&vmap_block_queue);
  23634. spin_lock(&vbq->lock);
  23635. list_add_tail_rcu(&vb->free_list, &vbq->free);
  23636. spin_unlock(&vbq->lock);
  23637. - put_cpu_var(vmap_block_queue);
  23638. + put_cpu_light();
  23639. return vaddr;
  23640. }
  23641. @@ -961,6 +962,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
  23642. struct vmap_block *vb;
  23643. void *vaddr = NULL;
  23644. unsigned int order;
  23645. + int cpu;
  23646. BUG_ON(offset_in_page(size));
  23647. BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
  23648. @@ -975,7 +977,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
  23649. order = get_order(size);
  23650. rcu_read_lock();
  23651. - vbq = &get_cpu_var(vmap_block_queue);
  23652. + cpu = get_cpu_light();
  23653. + vbq = this_cpu_ptr(&vmap_block_queue);
  23654. list_for_each_entry_rcu(vb, &vbq->free, free_list) {
  23655. unsigned long pages_off;
  23656. @@ -998,7 +1001,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
  23657. break;
  23658. }
  23659. - put_cpu_var(vmap_block_queue);
  23660. + put_cpu_light();
  23661. rcu_read_unlock();
  23662. /* Allocate new block if nothing was found */
  23663. diff --git a/mm/vmstat.c b/mm/vmstat.c
  23664. index 604f26a4f696..312006d2db50 100644
  23665. --- a/mm/vmstat.c
  23666. +++ b/mm/vmstat.c
  23667. @@ -245,6 +245,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
  23668. long x;
  23669. long t;
  23670. + preempt_disable_rt();
  23671. x = delta + __this_cpu_read(*p);
  23672. t = __this_cpu_read(pcp->stat_threshold);
  23673. @@ -254,6 +255,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
  23674. x = 0;
  23675. }
  23676. __this_cpu_write(*p, x);
  23677. + preempt_enable_rt();
  23678. }
  23679. EXPORT_SYMBOL(__mod_zone_page_state);
  23680. @@ -265,6 +267,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
  23681. long x;
  23682. long t;
  23683. + preempt_disable_rt();
  23684. x = delta + __this_cpu_read(*p);
  23685. t = __this_cpu_read(pcp->stat_threshold);
  23686. @@ -274,6 +277,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
  23687. x = 0;
  23688. }
  23689. __this_cpu_write(*p, x);
  23690. + preempt_enable_rt();
  23691. }
  23692. EXPORT_SYMBOL(__mod_node_page_state);
  23693. @@ -306,6 +310,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
  23694. s8 __percpu *p = pcp->vm_stat_diff + item;
  23695. s8 v, t;
  23696. + preempt_disable_rt();
  23697. v = __this_cpu_inc_return(*p);
  23698. t = __this_cpu_read(pcp->stat_threshold);
  23699. if (unlikely(v > t)) {
  23700. @@ -314,6 +319,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
  23701. zone_page_state_add(v + overstep, zone, item);
  23702. __this_cpu_write(*p, -overstep);
  23703. }
  23704. + preempt_enable_rt();
  23705. }
  23706. void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23707. @@ -322,6 +328,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23708. s8 __percpu *p = pcp->vm_node_stat_diff + item;
  23709. s8 v, t;
  23710. + preempt_disable_rt();
  23711. v = __this_cpu_inc_return(*p);
  23712. t = __this_cpu_read(pcp->stat_threshold);
  23713. if (unlikely(v > t)) {
  23714. @@ -330,6 +337,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23715. node_page_state_add(v + overstep, pgdat, item);
  23716. __this_cpu_write(*p, -overstep);
  23717. }
  23718. + preempt_enable_rt();
  23719. }
  23720. void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
  23721. @@ -350,6 +358,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
  23722. s8 __percpu *p = pcp->vm_stat_diff + item;
  23723. s8 v, t;
  23724. + preempt_disable_rt();
  23725. v = __this_cpu_dec_return(*p);
  23726. t = __this_cpu_read(pcp->stat_threshold);
  23727. if (unlikely(v < - t)) {
  23728. @@ -358,6 +367,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
  23729. zone_page_state_add(v - overstep, zone, item);
  23730. __this_cpu_write(*p, overstep);
  23731. }
  23732. + preempt_enable_rt();
  23733. }
  23734. void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23735. @@ -366,6 +376,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23736. s8 __percpu *p = pcp->vm_node_stat_diff + item;
  23737. s8 v, t;
  23738. + preempt_disable_rt();
  23739. v = __this_cpu_dec_return(*p);
  23740. t = __this_cpu_read(pcp->stat_threshold);
  23741. if (unlikely(v < - t)) {
  23742. @@ -374,6 +385,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
  23743. node_page_state_add(v - overstep, pgdat, item);
  23744. __this_cpu_write(*p, overstep);
  23745. }
  23746. + preempt_enable_rt();
  23747. }
  23748. void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
  23749. diff --git a/mm/workingset.c b/mm/workingset.c
  23750. index 4c4f05655e6e..b97b1e87b54c 100644
  23751. --- a/mm/workingset.c
  23752. +++ b/mm/workingset.c
  23753. @@ -334,7 +334,8 @@ void workingset_activation(struct page *page)
  23754. * point where they would still be useful.
  23755. */
  23756. -struct list_lru workingset_shadow_nodes;
  23757. +struct list_lru __workingset_shadow_nodes;
  23758. +DEFINE_LOCAL_IRQ_LOCK(workingset_shadow_lock);
  23759. static unsigned long count_shadow_nodes(struct shrinker *shrinker,
  23760. struct shrink_control *sc)
  23761. @@ -344,9 +345,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
  23762. unsigned long pages;
  23763. /* list_lru lock nests inside IRQ-safe mapping->tree_lock */
  23764. - local_irq_disable();
  23765. - shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
  23766. - local_irq_enable();
  23767. + local_lock_irq(workingset_shadow_lock);
  23768. + shadow_nodes = list_lru_shrink_count(&__workingset_shadow_nodes, sc);
  23769. + local_unlock_irq(workingset_shadow_lock);
  23770. if (sc->memcg) {
  23771. pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
  23772. @@ -438,9 +439,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
  23773. spin_unlock(&mapping->tree_lock);
  23774. ret = LRU_REMOVED_RETRY;
  23775. out:
  23776. - local_irq_enable();
  23777. + local_unlock_irq(workingset_shadow_lock);
  23778. cond_resched();
  23779. - local_irq_disable();
  23780. + local_lock_irq(workingset_shadow_lock);
  23781. spin_lock(lru_lock);
  23782. return ret;
  23783. }
  23784. @@ -451,10 +452,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker,
  23785. unsigned long ret;
  23786. /* list_lru lock nests inside IRQ-safe mapping->tree_lock */
  23787. - local_irq_disable();
  23788. - ret = list_lru_shrink_walk(&workingset_shadow_nodes, sc,
  23789. + local_lock_irq(workingset_shadow_lock);
  23790. + ret = list_lru_shrink_walk(&__workingset_shadow_nodes, sc,
  23791. shadow_lru_isolate, NULL);
  23792. - local_irq_enable();
  23793. + local_unlock_irq(workingset_shadow_lock);
  23794. return ret;
  23795. }
  23796. @@ -492,7 +493,7 @@ static int __init workingset_init(void)
  23797. pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
  23798. timestamp_bits, max_order, bucket_order);
  23799. - ret = __list_lru_init(&workingset_shadow_nodes, true, &shadow_nodes_key);
  23800. + ret = __list_lru_init(&__workingset_shadow_nodes, true, &shadow_nodes_key);
  23801. if (ret)
  23802. goto err;
  23803. ret = register_shrinker(&workingset_shadow_shrinker);
  23804. @@ -500,7 +501,7 @@ static int __init workingset_init(void)
  23805. goto err_list_lru;
  23806. return 0;
  23807. err_list_lru:
  23808. - list_lru_destroy(&workingset_shadow_nodes);
  23809. + list_lru_destroy(&__workingset_shadow_nodes);
  23810. err:
  23811. return ret;
  23812. }
  23813. diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
  23814. index 1689bb58e0d1..e52a8cb6aa5a 100644
  23815. --- a/mm/zsmalloc.c
  23816. +++ b/mm/zsmalloc.c
  23817. @@ -53,6 +53,7 @@
  23818. #include <linux/mount.h>
  23819. #include <linux/migrate.h>
  23820. #include <linux/pagemap.h>
  23821. +#include <linux/locallock.h>
  23822. #define ZSPAGE_MAGIC 0x58
  23823. @@ -70,9 +71,22 @@
  23824. */
  23825. #define ZS_MAX_ZSPAGE_ORDER 2
  23826. #define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_ZSPAGE_ORDER)
  23827. -
  23828. #define ZS_HANDLE_SIZE (sizeof(unsigned long))
  23829. +#ifdef CONFIG_PREEMPT_RT_FULL
  23830. +
  23831. +struct zsmalloc_handle {
  23832. + unsigned long addr;
  23833. + struct mutex lock;
  23834. +};
  23835. +
  23836. +#define ZS_HANDLE_ALLOC_SIZE (sizeof(struct zsmalloc_handle))
  23837. +
  23838. +#else
  23839. +
  23840. +#define ZS_HANDLE_ALLOC_SIZE (sizeof(unsigned long))
  23841. +#endif
  23842. +
  23843. /*
  23844. * Object location (<PFN>, <obj_idx>) is encoded as
  23845. * as single (unsigned long) handle value.
  23846. @@ -327,7 +341,7 @@ static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) {}
  23847. static int create_cache(struct zs_pool *pool)
  23848. {
  23849. - pool->handle_cachep = kmem_cache_create("zs_handle", ZS_HANDLE_SIZE,
  23850. + pool->handle_cachep = kmem_cache_create("zs_handle", ZS_HANDLE_ALLOC_SIZE,
  23851. 0, 0, NULL);
  23852. if (!pool->handle_cachep)
  23853. return 1;
  23854. @@ -351,10 +365,27 @@ static void destroy_cache(struct zs_pool *pool)
  23855. static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
  23856. {
  23857. - return (unsigned long)kmem_cache_alloc(pool->handle_cachep,
  23858. - gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
  23859. + void *p;
  23860. +
  23861. + p = kmem_cache_alloc(pool->handle_cachep,
  23862. + gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
  23863. +#ifdef CONFIG_PREEMPT_RT_FULL
  23864. + if (p) {
  23865. + struct zsmalloc_handle *zh = p;
  23866. +
  23867. + mutex_init(&zh->lock);
  23868. + }
  23869. +#endif
  23870. + return (unsigned long)p;
  23871. }
  23872. +#ifdef CONFIG_PREEMPT_RT_FULL
  23873. +static struct zsmalloc_handle *zs_get_pure_handle(unsigned long handle)
  23874. +{
  23875. + return (void *)(handle &~((1 << OBJ_TAG_BITS) - 1));
  23876. +}
  23877. +#endif
  23878. +
  23879. static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
  23880. {
  23881. kmem_cache_free(pool->handle_cachep, (void *)handle);
  23882. @@ -373,12 +404,18 @@ static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)
  23883. static void record_obj(unsigned long handle, unsigned long obj)
  23884. {
  23885. +#ifdef CONFIG_PREEMPT_RT_FULL
  23886. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23887. +
  23888. + WRITE_ONCE(zh->addr, obj);
  23889. +#else
  23890. /*
  23891. * lsb of @obj represents handle lock while other bits
  23892. * represent object value the handle is pointing so
  23893. * updating shouldn't do store tearing.
  23894. */
  23895. WRITE_ONCE(*(unsigned long *)handle, obj);
  23896. +#endif
  23897. }
  23898. /* zpool driver */
  23899. @@ -467,6 +504,7 @@ MODULE_ALIAS("zpool-zsmalloc");
  23900. /* per-cpu VM mapping areas for zspage accesses that cross page boundaries */
  23901. static DEFINE_PER_CPU(struct mapping_area, zs_map_area);
  23902. +static DEFINE_LOCAL_IRQ_LOCK(zs_map_area_lock);
  23903. static bool is_zspage_isolated(struct zspage *zspage)
  23904. {
  23905. @@ -902,7 +940,13 @@ static unsigned long location_to_obj(struct page *page, unsigned int obj_idx)
  23906. static unsigned long handle_to_obj(unsigned long handle)
  23907. {
  23908. +#ifdef CONFIG_PREEMPT_RT_FULL
  23909. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23910. +
  23911. + return zh->addr;
  23912. +#else
  23913. return *(unsigned long *)handle;
  23914. +#endif
  23915. }
  23916. static unsigned long obj_to_head(struct page *page, void *obj)
  23917. @@ -916,22 +960,46 @@ static unsigned long obj_to_head(struct page *page, void *obj)
  23918. static inline int testpin_tag(unsigned long handle)
  23919. {
  23920. +#ifdef CONFIG_PREEMPT_RT_FULL
  23921. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23922. +
  23923. + return mutex_is_locked(&zh->lock);
  23924. +#else
  23925. return bit_spin_is_locked(HANDLE_PIN_BIT, (unsigned long *)handle);
  23926. +#endif
  23927. }
  23928. static inline int trypin_tag(unsigned long handle)
  23929. {
  23930. +#ifdef CONFIG_PREEMPT_RT_FULL
  23931. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23932. +
  23933. + return mutex_trylock(&zh->lock);
  23934. +#else
  23935. return bit_spin_trylock(HANDLE_PIN_BIT, (unsigned long *)handle);
  23936. +#endif
  23937. }
  23938. static void pin_tag(unsigned long handle)
  23939. {
  23940. +#ifdef CONFIG_PREEMPT_RT_FULL
  23941. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23942. +
  23943. + return mutex_lock(&zh->lock);
  23944. +#else
  23945. bit_spin_lock(HANDLE_PIN_BIT, (unsigned long *)handle);
  23946. +#endif
  23947. }
  23948. static void unpin_tag(unsigned long handle)
  23949. {
  23950. +#ifdef CONFIG_PREEMPT_RT_FULL
  23951. + struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
  23952. +
  23953. + return mutex_unlock(&zh->lock);
  23954. +#else
  23955. bit_spin_unlock(HANDLE_PIN_BIT, (unsigned long *)handle);
  23956. +#endif
  23957. }
  23958. static void reset_page(struct page *page)
  23959. @@ -1423,7 +1491,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
  23960. class = pool->size_class[class_idx];
  23961. off = (class->size * obj_idx) & ~PAGE_MASK;
  23962. - area = &get_cpu_var(zs_map_area);
  23963. + area = &get_locked_var(zs_map_area_lock, zs_map_area);
  23964. area->vm_mm = mm;
  23965. if (off + class->size <= PAGE_SIZE) {
  23966. /* this object is contained entirely within a page */
  23967. @@ -1477,7 +1545,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
  23968. __zs_unmap_object(area, pages, off, class->size);
  23969. }
  23970. - put_cpu_var(zs_map_area);
  23971. + put_locked_var(zs_map_area_lock, zs_map_area);
  23972. migrate_read_unlock(zspage);
  23973. unpin_tag(handle);
  23974. diff --git a/net/core/dev.c b/net/core/dev.c
  23975. index 2e04fd188081..3ba60ef8c79e 100644
  23976. --- a/net/core/dev.c
  23977. +++ b/net/core/dev.c
  23978. @@ -190,6 +190,7 @@ static unsigned int napi_gen_id = NR_CPUS;
  23979. static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
  23980. static seqcount_t devnet_rename_seq;
  23981. +static DEFINE_MUTEX(devnet_rename_mutex);
  23982. static inline void dev_base_seq_inc(struct net *net)
  23983. {
  23984. @@ -211,14 +212,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
  23985. static inline void rps_lock(struct softnet_data *sd)
  23986. {
  23987. #ifdef CONFIG_RPS
  23988. - spin_lock(&sd->input_pkt_queue.lock);
  23989. + raw_spin_lock(&sd->input_pkt_queue.raw_lock);
  23990. #endif
  23991. }
  23992. static inline void rps_unlock(struct softnet_data *sd)
  23993. {
  23994. #ifdef CONFIG_RPS
  23995. - spin_unlock(&sd->input_pkt_queue.lock);
  23996. + raw_spin_unlock(&sd->input_pkt_queue.raw_lock);
  23997. #endif
  23998. }
  23999. @@ -888,7 +889,8 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
  24000. strcpy(name, dev->name);
  24001. rcu_read_unlock();
  24002. if (read_seqcount_retry(&devnet_rename_seq, seq)) {
  24003. - cond_resched();
  24004. + mutex_lock(&devnet_rename_mutex);
  24005. + mutex_unlock(&devnet_rename_mutex);
  24006. goto retry;
  24007. }
  24008. @@ -1157,20 +1159,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
  24009. if (dev->flags & IFF_UP)
  24010. return -EBUSY;
  24011. - write_seqcount_begin(&devnet_rename_seq);
  24012. + mutex_lock(&devnet_rename_mutex);
  24013. + __raw_write_seqcount_begin(&devnet_rename_seq);
  24014. - if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
  24015. - write_seqcount_end(&devnet_rename_seq);
  24016. - return 0;
  24017. - }
  24018. + if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
  24019. + goto outunlock;
  24020. memcpy(oldname, dev->name, IFNAMSIZ);
  24021. err = dev_get_valid_name(net, dev, newname);
  24022. - if (err < 0) {
  24023. - write_seqcount_end(&devnet_rename_seq);
  24024. - return err;
  24025. - }
  24026. + if (err < 0)
  24027. + goto outunlock;
  24028. if (oldname[0] && !strchr(oldname, '%'))
  24029. netdev_info(dev, "renamed from %s\n", oldname);
  24030. @@ -1183,11 +1182,12 @@ int dev_change_name(struct net_device *dev, const char *newname)
  24031. if (ret) {
  24032. memcpy(dev->name, oldname, IFNAMSIZ);
  24033. dev->name_assign_type = old_assign_type;
  24034. - write_seqcount_end(&devnet_rename_seq);
  24035. - return ret;
  24036. + err = ret;
  24037. + goto outunlock;
  24038. }
  24039. - write_seqcount_end(&devnet_rename_seq);
  24040. + __raw_write_seqcount_end(&devnet_rename_seq);
  24041. + mutex_unlock(&devnet_rename_mutex);
  24042. netdev_adjacent_rename_links(dev, oldname);
  24043. @@ -1208,7 +1208,8 @@ int dev_change_name(struct net_device *dev, const char *newname)
  24044. /* err >= 0 after dev_alloc_name() or stores the first errno */
  24045. if (err >= 0) {
  24046. err = ret;
  24047. - write_seqcount_begin(&devnet_rename_seq);
  24048. + mutex_lock(&devnet_rename_mutex);
  24049. + __raw_write_seqcount_begin(&devnet_rename_seq);
  24050. memcpy(dev->name, oldname, IFNAMSIZ);
  24051. memcpy(oldname, newname, IFNAMSIZ);
  24052. dev->name_assign_type = old_assign_type;
  24053. @@ -1221,6 +1222,11 @@ int dev_change_name(struct net_device *dev, const char *newname)
  24054. }
  24055. return err;
  24056. +
  24057. +outunlock:
  24058. + __raw_write_seqcount_end(&devnet_rename_seq);
  24059. + mutex_unlock(&devnet_rename_mutex);
  24060. + return err;
  24061. }
  24062. /**
  24063. @@ -2285,6 +2291,7 @@ static void __netif_reschedule(struct Qdisc *q)
  24064. sd->output_queue_tailp = &q->next_sched;
  24065. raise_softirq_irqoff(NET_TX_SOFTIRQ);
  24066. local_irq_restore(flags);
  24067. + preempt_check_resched_rt();
  24068. }
  24069. void __netif_schedule(struct Qdisc *q)
  24070. @@ -2366,6 +2373,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
  24071. __this_cpu_write(softnet_data.completion_queue, skb);
  24072. raise_softirq_irqoff(NET_TX_SOFTIRQ);
  24073. local_irq_restore(flags);
  24074. + preempt_check_resched_rt();
  24075. }
  24076. EXPORT_SYMBOL(__dev_kfree_skb_irq);
  24077. @@ -3100,7 +3108,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
  24078. * This permits qdisc->running owner to get the lock more
  24079. * often and dequeue packets faster.
  24080. */
  24081. +#ifdef CONFIG_PREEMPT_RT_FULL
  24082. + contended = true;
  24083. +#else
  24084. contended = qdisc_is_running(q);
  24085. +#endif
  24086. if (unlikely(contended))
  24087. spin_lock(&q->busylock);
  24088. @@ -3163,8 +3175,10 @@ static void skb_update_prio(struct sk_buff *skb)
  24089. #define skb_update_prio(skb)
  24090. #endif
  24091. +#ifndef CONFIG_PREEMPT_RT_FULL
  24092. DEFINE_PER_CPU(int, xmit_recursion);
  24093. EXPORT_SYMBOL(xmit_recursion);
  24094. +#endif
  24095. /**
  24096. * dev_loopback_xmit - loop back @skb
  24097. @@ -3398,8 +3412,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
  24098. int cpu = smp_processor_id(); /* ok because BHs are off */
  24099. if (txq->xmit_lock_owner != cpu) {
  24100. - if (unlikely(__this_cpu_read(xmit_recursion) >
  24101. - XMIT_RECURSION_LIMIT))
  24102. + if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT))
  24103. goto recursion_alert;
  24104. skb = validate_xmit_skb(skb, dev);
  24105. @@ -3409,9 +3422,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
  24106. HARD_TX_LOCK(dev, txq, cpu);
  24107. if (!netif_xmit_stopped(txq)) {
  24108. - __this_cpu_inc(xmit_recursion);
  24109. + xmit_rec_inc();
  24110. skb = dev_hard_start_xmit(skb, dev, txq, &rc);
  24111. - __this_cpu_dec(xmit_recursion);
  24112. + xmit_rec_dec();
  24113. if (dev_xmit_complete(rc)) {
  24114. HARD_TX_UNLOCK(dev, txq);
  24115. goto out;
  24116. @@ -3785,6 +3798,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
  24117. rps_unlock(sd);
  24118. local_irq_restore(flags);
  24119. + preempt_check_resched_rt();
  24120. atomic_long_inc(&skb->dev->rx_dropped);
  24121. kfree_skb(skb);
  24122. @@ -3803,7 +3817,7 @@ static int netif_rx_internal(struct sk_buff *skb)
  24123. struct rps_dev_flow voidflow, *rflow = &voidflow;
  24124. int cpu;
  24125. - preempt_disable();
  24126. + migrate_disable();
  24127. rcu_read_lock();
  24128. cpu = get_rps_cpu(skb->dev, skb, &rflow);
  24129. @@ -3813,13 +3827,13 @@ static int netif_rx_internal(struct sk_buff *skb)
  24130. ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
  24131. rcu_read_unlock();
  24132. - preempt_enable();
  24133. + migrate_enable();
  24134. } else
  24135. #endif
  24136. {
  24137. unsigned int qtail;
  24138. - ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
  24139. - put_cpu();
  24140. + ret = enqueue_to_backlog(skb, get_cpu_light(), &qtail);
  24141. + put_cpu_light();
  24142. }
  24143. return ret;
  24144. }
  24145. @@ -3853,11 +3867,9 @@ int netif_rx_ni(struct sk_buff *skb)
  24146. trace_netif_rx_ni_entry(skb);
  24147. - preempt_disable();
  24148. + local_bh_disable();
  24149. err = netif_rx_internal(skb);
  24150. - if (local_softirq_pending())
  24151. - do_softirq();
  24152. - preempt_enable();
  24153. + local_bh_enable();
  24154. return err;
  24155. }
  24156. @@ -4336,7 +4348,7 @@ static void flush_backlog(struct work_struct *work)
  24157. skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
  24158. if (skb->dev->reg_state == NETREG_UNREGISTERING) {
  24159. __skb_unlink(skb, &sd->input_pkt_queue);
  24160. - kfree_skb(skb);
  24161. + __skb_queue_tail(&sd->tofree_queue, skb);
  24162. input_queue_head_incr(sd);
  24163. }
  24164. }
  24165. @@ -4346,11 +4358,14 @@ static void flush_backlog(struct work_struct *work)
  24166. skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
  24167. if (skb->dev->reg_state == NETREG_UNREGISTERING) {
  24168. __skb_unlink(skb, &sd->process_queue);
  24169. - kfree_skb(skb);
  24170. + __skb_queue_tail(&sd->tofree_queue, skb);
  24171. input_queue_head_incr(sd);
  24172. }
  24173. }
  24174. + if (!skb_queue_empty(&sd->tofree_queue))
  24175. + raise_softirq_irqoff(NET_RX_SOFTIRQ);
  24176. local_bh_enable();
  24177. +
  24178. }
  24179. static void flush_all_backlogs(void)
  24180. @@ -4831,6 +4846,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
  24181. sd->rps_ipi_list = NULL;
  24182. local_irq_enable();
  24183. + preempt_check_resched_rt();
  24184. /* Send pending IPI's to kick RPS processing on remote cpus. */
  24185. while (remsd) {
  24186. @@ -4844,6 +4860,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
  24187. } else
  24188. #endif
  24189. local_irq_enable();
  24190. + preempt_check_resched_rt();
  24191. }
  24192. static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
  24193. @@ -4873,7 +4890,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
  24194. while (again) {
  24195. struct sk_buff *skb;
  24196. + local_irq_disable();
  24197. while ((skb = __skb_dequeue(&sd->process_queue))) {
  24198. + local_irq_enable();
  24199. rcu_read_lock();
  24200. __netif_receive_skb(skb);
  24201. rcu_read_unlock();
  24202. @@ -4881,9 +4900,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
  24203. if (++work >= quota)
  24204. return work;
  24205. + local_irq_disable();
  24206. }
  24207. - local_irq_disable();
  24208. rps_lock(sd);
  24209. if (skb_queue_empty(&sd->input_pkt_queue)) {
  24210. /*
  24211. @@ -4921,9 +4940,11 @@ void __napi_schedule(struct napi_struct *n)
  24212. local_irq_save(flags);
  24213. ____napi_schedule(this_cpu_ptr(&softnet_data), n);
  24214. local_irq_restore(flags);
  24215. + preempt_check_resched_rt();
  24216. }
  24217. EXPORT_SYMBOL(__napi_schedule);
  24218. +#ifndef CONFIG_PREEMPT_RT_FULL
  24219. /**
  24220. * __napi_schedule_irqoff - schedule for receive
  24221. * @n: entry to schedule
  24222. @@ -4935,6 +4956,7 @@ void __napi_schedule_irqoff(struct napi_struct *n)
  24223. ____napi_schedule(this_cpu_ptr(&softnet_data), n);
  24224. }
  24225. EXPORT_SYMBOL(__napi_schedule_irqoff);
  24226. +#endif
  24227. void __napi_complete(struct napi_struct *n)
  24228. {
  24229. @@ -5224,13 +5246,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
  24230. struct softnet_data *sd = this_cpu_ptr(&softnet_data);
  24231. unsigned long time_limit = jiffies + 2;
  24232. int budget = netdev_budget;
  24233. + struct sk_buff_head tofree_q;
  24234. + struct sk_buff *skb;
  24235. LIST_HEAD(list);
  24236. LIST_HEAD(repoll);
  24237. + __skb_queue_head_init(&tofree_q);
  24238. +
  24239. local_irq_disable();
  24240. + skb_queue_splice_init(&sd->tofree_queue, &tofree_q);
  24241. list_splice_init(&sd->poll_list, &list);
  24242. local_irq_enable();
  24243. + while ((skb = __skb_dequeue(&tofree_q)))
  24244. + kfree_skb(skb);
  24245. +
  24246. for (;;) {
  24247. struct napi_struct *n;
  24248. @@ -5261,7 +5291,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
  24249. list_splice_tail(&repoll, &list);
  24250. list_splice(&list, &sd->poll_list);
  24251. if (!list_empty(&sd->poll_list))
  24252. - __raise_softirq_irqoff(NET_RX_SOFTIRQ);
  24253. + __raise_softirq_irqoff_ksoft(NET_RX_SOFTIRQ);
  24254. net_rps_action_and_irq_enable(sd);
  24255. }
  24256. @@ -8022,16 +8052,20 @@ static int dev_cpu_callback(struct notifier_block *nfb,
  24257. raise_softirq_irqoff(NET_TX_SOFTIRQ);
  24258. local_irq_enable();
  24259. + preempt_check_resched_rt();
  24260. /* Process offline CPU's input_pkt_queue */
  24261. while ((skb = __skb_dequeue(&oldsd->process_queue))) {
  24262. netif_rx_ni(skb);
  24263. input_queue_head_incr(oldsd);
  24264. }
  24265. - while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
  24266. + while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
  24267. netif_rx_ni(skb);
  24268. input_queue_head_incr(oldsd);
  24269. }
  24270. + while ((skb = __skb_dequeue(&oldsd->tofree_queue))) {
  24271. + kfree_skb(skb);
  24272. + }
  24273. return NOTIFY_OK;
  24274. }
  24275. @@ -8336,8 +8370,9 @@ static int __init net_dev_init(void)
  24276. INIT_WORK(flush, flush_backlog);
  24277. - skb_queue_head_init(&sd->input_pkt_queue);
  24278. - skb_queue_head_init(&sd->process_queue);
  24279. + skb_queue_head_init_raw(&sd->input_pkt_queue);
  24280. + skb_queue_head_init_raw(&sd->process_queue);
  24281. + skb_queue_head_init_raw(&sd->tofree_queue);
  24282. INIT_LIST_HEAD(&sd->poll_list);
  24283. sd->output_queue_tailp = &sd->output_queue;
  24284. #ifdef CONFIG_RPS
  24285. diff --git a/net/core/filter.c b/net/core/filter.c
  24286. index b391209838ef..b86e9681a88e 100644
  24287. --- a/net/core/filter.c
  24288. +++ b/net/core/filter.c
  24289. @@ -1645,7 +1645,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
  24290. {
  24291. int ret;
  24292. - if (unlikely(__this_cpu_read(xmit_recursion) > XMIT_RECURSION_LIMIT)) {
  24293. + if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT)) {
  24294. net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");
  24295. kfree_skb(skb);
  24296. return -ENETDOWN;
  24297. @@ -1653,9 +1653,9 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
  24298. skb->dev = dev;
  24299. - __this_cpu_inc(xmit_recursion);
  24300. + xmit_rec_inc();
  24301. ret = dev_queue_xmit(skb);
  24302. - __this_cpu_dec(xmit_recursion);
  24303. + xmit_rec_dec();
  24304. return ret;
  24305. }
  24306. diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
  24307. index cad8e791f28e..2a9364fe62a5 100644
  24308. --- a/net/core/gen_estimator.c
  24309. +++ b/net/core/gen_estimator.c
  24310. @@ -84,7 +84,7 @@ struct gen_estimator
  24311. struct gnet_stats_basic_packed *bstats;
  24312. struct gnet_stats_rate_est64 *rate_est;
  24313. spinlock_t *stats_lock;
  24314. - seqcount_t *running;
  24315. + net_seqlock_t *running;
  24316. int ewma_log;
  24317. u32 last_packets;
  24318. unsigned long avpps;
  24319. @@ -213,7 +213,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
  24320. struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  24321. struct gnet_stats_rate_est64 *rate_est,
  24322. spinlock_t *stats_lock,
  24323. - seqcount_t *running,
  24324. + net_seqlock_t *running,
  24325. struct nlattr *opt)
  24326. {
  24327. struct gen_estimator *est;
  24328. @@ -309,7 +309,7 @@ int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
  24329. struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  24330. struct gnet_stats_rate_est64 *rate_est,
  24331. spinlock_t *stats_lock,
  24332. - seqcount_t *running, struct nlattr *opt)
  24333. + net_seqlock_t *running, struct nlattr *opt)
  24334. {
  24335. gen_kill_estimator(bstats, rate_est);
  24336. return gen_new_estimator(bstats, cpu_bstats, rate_est, stats_lock, running, opt);
  24337. diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
  24338. index 508e051304fb..bc3b17b78c94 100644
  24339. --- a/net/core/gen_stats.c
  24340. +++ b/net/core/gen_stats.c
  24341. @@ -130,7 +130,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,
  24342. }
  24343. void
  24344. -__gnet_stats_copy_basic(const seqcount_t *running,
  24345. +__gnet_stats_copy_basic(net_seqlock_t *running,
  24346. struct gnet_stats_basic_packed *bstats,
  24347. struct gnet_stats_basic_cpu __percpu *cpu,
  24348. struct gnet_stats_basic_packed *b)
  24349. @@ -143,10 +143,10 @@ __gnet_stats_copy_basic(const seqcount_t *running,
  24350. }
  24351. do {
  24352. if (running)
  24353. - seq = read_seqcount_begin(running);
  24354. + seq = net_seq_begin(running);
  24355. bstats->bytes = b->bytes;
  24356. bstats->packets = b->packets;
  24357. - } while (running && read_seqcount_retry(running, seq));
  24358. + } while (running && net_seq_retry(running, seq));
  24359. }
  24360. EXPORT_SYMBOL(__gnet_stats_copy_basic);
  24361. @@ -164,7 +164,7 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);
  24362. * if the room in the socket buffer was not sufficient.
  24363. */
  24364. int
  24365. -gnet_stats_copy_basic(const seqcount_t *running,
  24366. +gnet_stats_copy_basic(net_seqlock_t *running,
  24367. struct gnet_dump *d,
  24368. struct gnet_stats_basic_cpu __percpu *cpu,
  24369. struct gnet_stats_basic_packed *b)
  24370. diff --git a/net/core/skbuff.c b/net/core/skbuff.c
  24371. index fe008f1bd930..9fa6bea3dd3f 100644
  24372. --- a/net/core/skbuff.c
  24373. +++ b/net/core/skbuff.c
  24374. @@ -64,6 +64,7 @@
  24375. #include <linux/errqueue.h>
  24376. #include <linux/prefetch.h>
  24377. #include <linux/if_vlan.h>
  24378. +#include <linux/locallock.h>
  24379. #include <net/protocol.h>
  24380. #include <net/dst.h>
  24381. @@ -360,6 +361,8 @@ struct napi_alloc_cache {
  24382. static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
  24383. static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
  24384. +static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock);
  24385. +static DEFINE_LOCAL_IRQ_LOCK(napi_alloc_cache_lock);
  24386. static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
  24387. {
  24388. @@ -367,10 +370,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
  24389. unsigned long flags;
  24390. void *data;
  24391. - local_irq_save(flags);
  24392. + local_lock_irqsave(netdev_alloc_lock, flags);
  24393. nc = this_cpu_ptr(&netdev_alloc_cache);
  24394. data = __alloc_page_frag(nc, fragsz, gfp_mask);
  24395. - local_irq_restore(flags);
  24396. + local_unlock_irqrestore(netdev_alloc_lock, flags);
  24397. return data;
  24398. }
  24399. @@ -389,9 +392,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
  24400. static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
  24401. {
  24402. - struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  24403. + struct napi_alloc_cache *nc;
  24404. + void *data;
  24405. - return __alloc_page_frag(&nc->page, fragsz, gfp_mask);
  24406. + nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24407. + data = __alloc_page_frag(&nc->page, fragsz, gfp_mask);
  24408. + put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24409. + return data;
  24410. }
  24411. void *napi_alloc_frag(unsigned int fragsz)
  24412. @@ -438,13 +445,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
  24413. if (sk_memalloc_socks())
  24414. gfp_mask |= __GFP_MEMALLOC;
  24415. - local_irq_save(flags);
  24416. + local_lock_irqsave(netdev_alloc_lock, flags);
  24417. nc = this_cpu_ptr(&netdev_alloc_cache);
  24418. data = __alloc_page_frag(nc, len, gfp_mask);
  24419. pfmemalloc = nc->pfmemalloc;
  24420. - local_irq_restore(flags);
  24421. + local_unlock_irqrestore(netdev_alloc_lock, flags);
  24422. if (unlikely(!data))
  24423. return NULL;
  24424. @@ -485,9 +492,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
  24425. struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
  24426. gfp_t gfp_mask)
  24427. {
  24428. - struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  24429. + struct napi_alloc_cache *nc;
  24430. struct sk_buff *skb;
  24431. void *data;
  24432. + bool pfmemalloc;
  24433. len += NET_SKB_PAD + NET_IP_ALIGN;
  24434. @@ -505,7 +513,10 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
  24435. if (sk_memalloc_socks())
  24436. gfp_mask |= __GFP_MEMALLOC;
  24437. + nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24438. data = __alloc_page_frag(&nc->page, len, gfp_mask);
  24439. + pfmemalloc = nc->page.pfmemalloc;
  24440. + put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24441. if (unlikely(!data))
  24442. return NULL;
  24443. @@ -516,7 +527,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
  24444. }
  24445. /* use OR instead of assignment to avoid clearing of bits in mask */
  24446. - if (nc->page.pfmemalloc)
  24447. + if (pfmemalloc)
  24448. skb->pfmemalloc = 1;
  24449. skb->head_frag = 1;
  24450. @@ -760,23 +771,26 @@ EXPORT_SYMBOL(consume_skb);
  24451. void __kfree_skb_flush(void)
  24452. {
  24453. - struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  24454. + struct napi_alloc_cache *nc;
  24455. + nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24456. /* flush skb_cache if containing objects */
  24457. if (nc->skb_count) {
  24458. kmem_cache_free_bulk(skbuff_head_cache, nc->skb_count,
  24459. nc->skb_cache);
  24460. nc->skb_count = 0;
  24461. }
  24462. + put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24463. }
  24464. static inline void _kfree_skb_defer(struct sk_buff *skb)
  24465. {
  24466. - struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  24467. + struct napi_alloc_cache *nc;
  24468. /* drop skb->head and call any destructors for packet */
  24469. skb_release_all(skb);
  24470. + nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24471. /* record skb to CPU local list */
  24472. nc->skb_cache[nc->skb_count++] = skb;
  24473. @@ -791,6 +805,7 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
  24474. nc->skb_cache);
  24475. nc->skb_count = 0;
  24476. }
  24477. + put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
  24478. }
  24479. void __kfree_skb_defer(struct sk_buff *skb)
  24480. {
  24481. diff --git a/net/core/sock.c b/net/core/sock.c
  24482. index 470a2043b846..2b09a5a33d8d 100644
  24483. --- a/net/core/sock.c
  24484. +++ b/net/core/sock.c
  24485. @@ -2499,12 +2499,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
  24486. if (sk->sk_lock.owned)
  24487. __lock_sock(sk);
  24488. sk->sk_lock.owned = 1;
  24489. - spin_unlock(&sk->sk_lock.slock);
  24490. + spin_unlock_bh(&sk->sk_lock.slock);
  24491. /*
  24492. * The sk_lock has mutex_lock() semantics here:
  24493. */
  24494. mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
  24495. - local_bh_enable();
  24496. }
  24497. EXPORT_SYMBOL(lock_sock_nested);
  24498. diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
  24499. index 48734ee6293f..e6864ff11352 100644
  24500. --- a/net/ipv4/icmp.c
  24501. +++ b/net/ipv4/icmp.c
  24502. @@ -69,6 +69,7 @@
  24503. #include <linux/jiffies.h>
  24504. #include <linux/kernel.h>
  24505. #include <linux/fcntl.h>
  24506. +#include <linux/sysrq.h>
  24507. #include <linux/socket.h>
  24508. #include <linux/in.h>
  24509. #include <linux/inet.h>
  24510. @@ -77,6 +78,7 @@
  24511. #include <linux/string.h>
  24512. #include <linux/netfilter_ipv4.h>
  24513. #include <linux/slab.h>
  24514. +#include <linux/locallock.h>
  24515. #include <net/snmp.h>
  24516. #include <net/ip.h>
  24517. #include <net/route.h>
  24518. @@ -204,6 +206,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];
  24519. *
  24520. * On SMP we have one ICMP socket per-cpu.
  24521. */
  24522. +static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock);
  24523. +
  24524. static struct sock *icmp_sk(struct net *net)
  24525. {
  24526. return *this_cpu_ptr(net->ipv4.icmp_sk);
  24527. @@ -215,12 +219,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
  24528. local_bh_disable();
  24529. + local_lock(icmp_sk_lock);
  24530. sk = icmp_sk(net);
  24531. if (unlikely(!spin_trylock(&sk->sk_lock.slock))) {
  24532. /* This can happen if the output path signals a
  24533. * dst_link_failure() for an outgoing ICMP packet.
  24534. */
  24535. + local_unlock(icmp_sk_lock);
  24536. local_bh_enable();
  24537. return NULL;
  24538. }
  24539. @@ -230,6 +236,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
  24540. static inline void icmp_xmit_unlock(struct sock *sk)
  24541. {
  24542. spin_unlock_bh(&sk->sk_lock.slock);
  24543. + local_unlock(icmp_sk_lock);
  24544. }
  24545. int sysctl_icmp_msgs_per_sec __read_mostly = 1000;
  24546. @@ -358,6 +365,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
  24547. struct sock *sk;
  24548. struct sk_buff *skb;
  24549. + local_lock(icmp_sk_lock);
  24550. sk = icmp_sk(dev_net((*rt)->dst.dev));
  24551. if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param,
  24552. icmp_param->data_len+icmp_param->head_len,
  24553. @@ -380,6 +388,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
  24554. skb->ip_summed = CHECKSUM_NONE;
  24555. ip_push_pending_frames(sk, fl4);
  24556. }
  24557. + local_unlock(icmp_sk_lock);
  24558. }
  24559. /*
  24560. @@ -891,6 +900,30 @@ static bool icmp_redirect(struct sk_buff *skb)
  24561. }
  24562. /*
  24563. + * 32bit and 64bit have different timestamp length, so we check for
  24564. + * the cookie at offset 20 and verify it is repeated at offset 50
  24565. + */
  24566. +#define CO_POS0 20
  24567. +#define CO_POS1 50
  24568. +#define CO_SIZE sizeof(int)
  24569. +#define ICMP_SYSRQ_SIZE 57
  24570. +
  24571. +/*
  24572. + * We got a ICMP_SYSRQ_SIZE sized ping request. Check for the cookie
  24573. + * pattern and if it matches send the next byte as a trigger to sysrq.
  24574. + */
  24575. +static void icmp_check_sysrq(struct net *net, struct sk_buff *skb)
  24576. +{
  24577. + int cookie = htonl(net->ipv4.sysctl_icmp_echo_sysrq);
  24578. + char *p = skb->data;
  24579. +
  24580. + if (!memcmp(&cookie, p + CO_POS0, CO_SIZE) &&
  24581. + !memcmp(&cookie, p + CO_POS1, CO_SIZE) &&
  24582. + p[CO_POS0 + CO_SIZE] == p[CO_POS1 + CO_SIZE])
  24583. + handle_sysrq(p[CO_POS0 + CO_SIZE]);
  24584. +}
  24585. +
  24586. +/*
  24587. * Handle ICMP_ECHO ("ping") requests.
  24588. *
  24589. * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
  24590. @@ -917,6 +950,11 @@ static bool icmp_echo(struct sk_buff *skb)
  24591. icmp_param.data_len = skb->len;
  24592. icmp_param.head_len = sizeof(struct icmphdr);
  24593. icmp_reply(&icmp_param, skb);
  24594. +
  24595. + if (skb->len == ICMP_SYSRQ_SIZE &&
  24596. + net->ipv4.sysctl_icmp_echo_sysrq) {
  24597. + icmp_check_sysrq(net, skb);
  24598. + }
  24599. }
  24600. /* should there be an ICMP stat for ignored echos? */
  24601. return true;
  24602. diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
  24603. index 80bc36b25de2..215b90adfb05 100644
  24604. --- a/net/ipv4/sysctl_net_ipv4.c
  24605. +++ b/net/ipv4/sysctl_net_ipv4.c
  24606. @@ -681,6 +681,13 @@ static struct ctl_table ipv4_net_table[] = {
  24607. .proc_handler = proc_dointvec
  24608. },
  24609. {
  24610. + .procname = "icmp_echo_sysrq",
  24611. + .data = &init_net.ipv4.sysctl_icmp_echo_sysrq,
  24612. + .maxlen = sizeof(int),
  24613. + .mode = 0644,
  24614. + .proc_handler = proc_dointvec
  24615. + },
  24616. + {
  24617. .procname = "icmp_ignore_bogus_error_responses",
  24618. .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
  24619. .maxlen = sizeof(int),
  24620. diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
  24621. index 6988566dc72f..672fffcde28c 100644
  24622. --- a/net/ipv4/tcp_ipv4.c
  24623. +++ b/net/ipv4/tcp_ipv4.c
  24624. @@ -62,6 +62,7 @@
  24625. #include <linux/init.h>
  24626. #include <linux/times.h>
  24627. #include <linux/slab.h>
  24628. +#include <linux/locallock.h>
  24629. #include <net/net_namespace.h>
  24630. #include <net/icmp.h>
  24631. @@ -568,6 +569,7 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb)
  24632. }
  24633. EXPORT_SYMBOL(tcp_v4_send_check);
  24634. +static DEFINE_LOCAL_IRQ_LOCK(tcp_sk_lock);
  24635. /*
  24636. * This routine will send an RST to the other tcp.
  24637. *
  24638. @@ -695,6 +697,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
  24639. offsetof(struct inet_timewait_sock, tw_bound_dev_if));
  24640. arg.tos = ip_hdr(skb)->tos;
  24641. +
  24642. + local_lock(tcp_sk_lock);
  24643. local_bh_disable();
  24644. ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
  24645. skb, &TCP_SKB_CB(skb)->header.h4.opt,
  24646. @@ -704,6 +708,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
  24647. __TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
  24648. __TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
  24649. local_bh_enable();
  24650. + local_unlock(tcp_sk_lock);
  24651. #ifdef CONFIG_TCP_MD5SIG
  24652. out:
  24653. @@ -779,6 +784,7 @@ static void tcp_v4_send_ack(struct net *net,
  24654. if (oif)
  24655. arg.bound_dev_if = oif;
  24656. arg.tos = tos;
  24657. + local_lock(tcp_sk_lock);
  24658. local_bh_disable();
  24659. ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
  24660. skb, &TCP_SKB_CB(skb)->header.h4.opt,
  24661. @@ -787,6 +793,7 @@ static void tcp_v4_send_ack(struct net *net,
  24662. __TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
  24663. local_bh_enable();
  24664. + local_unlock(tcp_sk_lock);
  24665. }
  24666. static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
  24667. diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
  24668. index acaaf616da71..09020dbcc089 100644
  24669. --- a/net/mac80211/rx.c
  24670. +++ b/net/mac80211/rx.c
  24671. @@ -4230,7 +4230,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
  24672. struct ieee80211_supported_band *sband;
  24673. struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  24674. - WARN_ON_ONCE(softirq_count() == 0);
  24675. + WARN_ON_ONCE_NONRT(softirq_count() == 0);
  24676. if (WARN_ON(status->band >= NUM_NL80211_BANDS))
  24677. goto drop;
  24678. diff --git a/net/netfilter/core.c b/net/netfilter/core.c
  24679. index 004af030ef1a..b64f751bda45 100644
  24680. --- a/net/netfilter/core.c
  24681. +++ b/net/netfilter/core.c
  24682. @@ -22,12 +22,18 @@
  24683. #include <linux/proc_fs.h>
  24684. #include <linux/mutex.h>
  24685. #include <linux/slab.h>
  24686. +#include <linux/locallock.h>
  24687. #include <linux/rcupdate.h>
  24688. #include <net/net_namespace.h>
  24689. #include <net/sock.h>
  24690. #include "nf_internals.h"
  24691. +#ifdef CONFIG_PREEMPT_RT_BASE
  24692. +DEFINE_LOCAL_IRQ_LOCK(xt_write_lock);
  24693. +EXPORT_PER_CPU_SYMBOL(xt_write_lock);
  24694. +#endif
  24695. +
  24696. static DEFINE_MUTEX(afinfo_mutex);
  24697. const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
  24698. diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
  24699. index cb76ff3088e9..3f42c5b1af55 100644
  24700. --- a/net/packet/af_packet.c
  24701. +++ b/net/packet/af_packet.c
  24702. @@ -63,6 +63,7 @@
  24703. #include <linux/if_packet.h>
  24704. #include <linux/wireless.h>
  24705. #include <linux/kernel.h>
  24706. +#include <linux/delay.h>
  24707. #include <linux/kmod.h>
  24708. #include <linux/slab.h>
  24709. #include <linux/vmalloc.h>
  24710. @@ -694,7 +695,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
  24711. if (BLOCK_NUM_PKTS(pbd)) {
  24712. while (atomic_read(&pkc->blk_fill_in_prog)) {
  24713. /* Waiting for skb_copy_bits to finish... */
  24714. - cpu_relax();
  24715. + cpu_chill();
  24716. }
  24717. }
  24718. @@ -956,7 +957,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
  24719. if (!(status & TP_STATUS_BLK_TMO)) {
  24720. while (atomic_read(&pkc->blk_fill_in_prog)) {
  24721. /* Waiting for skb_copy_bits to finish... */
  24722. - cpu_relax();
  24723. + cpu_chill();
  24724. }
  24725. }
  24726. prb_close_block(pkc, pbd, po, status);
  24727. diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
  24728. index 977f69886c00..f3e7a36b0396 100644
  24729. --- a/net/rds/ib_rdma.c
  24730. +++ b/net/rds/ib_rdma.c
  24731. @@ -34,6 +34,7 @@
  24732. #include <linux/slab.h>
  24733. #include <linux/rculist.h>
  24734. #include <linux/llist.h>
  24735. +#include <linux/delay.h>
  24736. #include "rds_single_path.h"
  24737. #include "ib_mr.h"
  24738. @@ -210,7 +211,7 @@ static inline void wait_clean_list_grace(void)
  24739. for_each_online_cpu(cpu) {
  24740. flag = &per_cpu(clean_list_grace, cpu);
  24741. while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
  24742. - cpu_relax();
  24743. + cpu_chill();
  24744. }
  24745. }
  24746. diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
  24747. index 7d921e56e715..13df56a738e5 100644
  24748. --- a/net/rxrpc/security.c
  24749. +++ b/net/rxrpc/security.c
  24750. @@ -19,9 +19,6 @@
  24751. #include <keys/rxrpc-type.h>
  24752. #include "ar-internal.h"
  24753. -static LIST_HEAD(rxrpc_security_methods);
  24754. -static DECLARE_RWSEM(rxrpc_security_sem);
  24755. -
  24756. static const struct rxrpc_security *rxrpc_security_types[] = {
  24757. [RXRPC_SECURITY_NONE] = &rxrpc_no_security,
  24758. #ifdef CONFIG_RXKAD
  24759. diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
  24760. index 206dc24add3a..00ea9bde5bb3 100644
  24761. --- a/net/sched/sch_api.c
  24762. +++ b/net/sched/sch_api.c
  24763. @@ -981,7 +981,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
  24764. rcu_assign_pointer(sch->stab, stab);
  24765. }
  24766. if (tca[TCA_RATE]) {
  24767. - seqcount_t *running;
  24768. + net_seqlock_t *running;
  24769. err = -EOPNOTSUPP;
  24770. if (sch->flags & TCQ_F_MQROOT)
  24771. diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
  24772. index 6cfb6e9038c2..20727e1347de 100644
  24773. --- a/net/sched/sch_generic.c
  24774. +++ b/net/sched/sch_generic.c
  24775. @@ -425,7 +425,11 @@ struct Qdisc noop_qdisc = {
  24776. .ops = &noop_qdisc_ops,
  24777. .q.lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
  24778. .dev_queue = &noop_netdev_queue,
  24779. +#ifdef CONFIG_PREEMPT_RT_BASE
  24780. + .running = __SEQLOCK_UNLOCKED(noop_qdisc.running),
  24781. +#else
  24782. .running = SEQCNT_ZERO(noop_qdisc.running),
  24783. +#endif
  24784. .busylock = __SPIN_LOCK_UNLOCKED(noop_qdisc.busylock),
  24785. };
  24786. EXPORT_SYMBOL(noop_qdisc);
  24787. @@ -624,9 +628,17 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
  24788. lockdep_set_class(&sch->busylock,
  24789. dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
  24790. +#ifdef CONFIG_PREEMPT_RT_BASE
  24791. + seqlock_init(&sch->running);
  24792. + lockdep_set_class(&sch->running.seqcount,
  24793. + dev->qdisc_running_key ?: &qdisc_running_key);
  24794. + lockdep_set_class(&sch->running.lock,
  24795. + dev->qdisc_running_key ?: &qdisc_running_key);
  24796. +#else
  24797. seqcount_init(&sch->running);
  24798. lockdep_set_class(&sch->running,
  24799. dev->qdisc_running_key ?: &qdisc_running_key);
  24800. +#endif
  24801. sch->ops = ops;
  24802. sch->enqueue = ops->enqueue;
  24803. @@ -925,7 +937,7 @@ void dev_deactivate_many(struct list_head *head)
  24804. /* Wait for outstanding qdisc_run calls. */
  24805. list_for_each_entry(dev, head, close_list)
  24806. while (some_qdisc_is_busy(dev))
  24807. - yield();
  24808. + msleep(1);
  24809. }
  24810. void dev_deactivate(struct net_device *dev)
  24811. diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
  24812. index 9c9db55a0c1e..e6583b018a72 100644
  24813. --- a/net/sunrpc/svc_xprt.c
  24814. +++ b/net/sunrpc/svc_xprt.c
  24815. @@ -396,7 +396,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
  24816. goto out;
  24817. }
  24818. - cpu = get_cpu();
  24819. + cpu = get_cpu_light();
  24820. pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
  24821. atomic_long_inc(&pool->sp_stats.packets);
  24822. @@ -432,7 +432,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
  24823. atomic_long_inc(&pool->sp_stats.threads_woken);
  24824. wake_up_process(rqstp->rq_task);
  24825. - put_cpu();
  24826. + put_cpu_light();
  24827. goto out;
  24828. }
  24829. rcu_read_unlock();
  24830. @@ -453,7 +453,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
  24831. goto redo_search;
  24832. }
  24833. rqstp = NULL;
  24834. - put_cpu();
  24835. + put_cpu_light();
  24836. out:
  24837. trace_svc_xprt_do_enqueue(xprt, rqstp);
  24838. }
  24839. diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
  24840. index 6fdc97ef6023..523e0420d7f0 100755
  24841. --- a/scripts/mkcompile_h
  24842. +++ b/scripts/mkcompile_h
  24843. @@ -4,7 +4,8 @@ TARGET=$1
  24844. ARCH=$2
  24845. SMP=$3
  24846. PREEMPT=$4
  24847. -CC=$5
  24848. +RT=$5
  24849. +CC=$6
  24850. vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
  24851. @@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION"
  24852. CONFIG_FLAGS=""
  24853. if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
  24854. if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
  24855. +if [ -n "$RT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS RT"; fi
  24856. UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
  24857. # Truncate to maximum length
  24858. diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
  24859. index 9d33c1e85c79..3d307bda86f9 100644
  24860. --- a/sound/core/pcm_native.c
  24861. +++ b/sound/core/pcm_native.c
  24862. @@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock);
  24863. void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
  24864. {
  24865. if (!substream->pcm->nonatomic)
  24866. - local_irq_disable();
  24867. + local_irq_disable_nort();
  24868. snd_pcm_stream_lock(substream);
  24869. }
  24870. EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);
  24871. @@ -150,7 +150,7 @@ void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream)
  24872. {
  24873. snd_pcm_stream_unlock(substream);
  24874. if (!substream->pcm->nonatomic)
  24875. - local_irq_enable();
  24876. + local_irq_enable_nort();
  24877. }
  24878. EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);
  24879. @@ -158,7 +158,7 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream)
  24880. {
  24881. unsigned long flags = 0;
  24882. if (!substream->pcm->nonatomic)
  24883. - local_irq_save(flags);
  24884. + local_irq_save_nort(flags);
  24885. snd_pcm_stream_lock(substream);
  24886. return flags;
  24887. }
  24888. @@ -176,7 +176,7 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
  24889. {
  24890. snd_pcm_stream_unlock(substream);
  24891. if (!substream->pcm->nonatomic)
  24892. - local_irq_restore(flags);
  24893. + local_irq_restore_nort(flags);
  24894. }
  24895. EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);