6.S081 Lab8: locks

两个作业都是修改数据结构将粗粒度锁替换为细粒度锁降低锁争用增加并行度

Memory allocator

将唯一的空闲链表改为每个CPU一个,只有在当前CPU去其他CPU下的空闲链表取块时会产生锁争用

  1. 修改kmem结构体:

    struct {
        struct spinlock lock[NCPU];
        struct run *freelist[NCPU];
    } kmem;
    
  2. 修改函数kinit

    void
    kinit()
    {
        for(int i = 0; i<NCPU; ++i)
            initlock(&kmem.lock[i], "kmem");
        freerange(end, (void*)PHYSTOP);
    }
    
  3. 修改函数kfree

    void
    kfree(void *pa)
    {
        struct run *r;
    
        if(((uint64)pa % PGSIZE) != 0 || (char*)pa < end || (uint64)pa >= PHYSTOP)
            panic("kfree");
    
        // Fill with junk to catch dangling refs.
        memset(pa, 1, PGSIZE);
    
        r = (struct run*)pa;
    
        push_off();
        acquire(&kmem.lock[cpuid()]);
        r->next = kmem.freelist[cpuid()];
        kmem.freelist[cpuid()] = r;
        release(&kmem.lock[cpuid()]);
        pop_off();
    }
    
  4. 修改函数kalloc

    void *
    kalloc(void)
    {
        struct run *r;
    
        push_off();
        for(int i = cpuid(), j = 0; j<NCPU; j++, i = (i+1)%NCPU) {
            acquire(&kmem.lock[i]);
    
            r = kmem.freelist[i];
            if(r) {
            kmem.freelist[i] = r->next;
            release(&kmem.lock[i]);
            break;
            }
    
            release(&kmem.lock[i]);
        }
        pop_off();
    
        if(r)
            memset((char*)r, 5, PGSIZE); // fill with junk
        return (void*)r;
    }
    

Buffer cache

不要吝啬加锁,锁越少越粗争用越多,进入和退出临界区都要记得加锁操作

  1. 宏定义哈希桶数量、哈希函数

    #define NBUCKET 13
    #define TSH(x) (x%NBUCKET)
    
  2. 定义结构体bmem,增加结构体bcache字段:

    struct bmem {
        struct spinlock locks[NBUCKET];
        struct buf heads[NBUCKET];
    };
    
    struct {
        struct spinlock lock;
        struct buf buf[NBUF];
    
        // Linked list of all buffers, through prev/next.
        // Sorted by how recently the buffer was used.
        // head.next is most recent, head.prev is least.
        struct bmem HT;
    } bcache;
    
  3. 增加结构体buf字段:

    struct buf {
        int valid;   // has data been read from disk?
        int disk;    // does disk "own" buf?
        uint dev;
        uint blockno;
        struct sleeplock lock;
        uint refcnt;
        struct buf *prev; // LRU cache list
        struct buf *next;
        uchar data[BSIZE];
        uint tick;  // add here!
    };
    
  4. 修改函数binit

    void
    binit(void)
    {
        struct buf *b;
    
        initlock(&bcache.lock, "bcache");
    
        // init buckets' lock and init list struct
        for(int i = 0; i<NBUCKET; ++i) {
            initlock(&bcache.HT.locks[i], "bucket");
    
            bcache.HT.heads[i].prev = &bcache.HT.heads[i];
            bcache.HT.heads[i].next = &bcache.HT.heads[i];
        }
    
        // init every buf sleeplock add them to the first bucket
        for(b = bcache.buf; b < bcache.buf+NBUF; ++b) {
            initsleeplock(&b->lock, "buf");
    
            b->next = bcache.HT.heads[TSH(b->blockno)].next;
            b->prev = &bcache.HT.heads[TSH(b->blockno)];
            bcache.HT.heads[TSH(b->blockno)].next->prev = b;
            bcache.HT.heads[TSH(b->blockno)].next = b;
        }
    }
    
  5. 修改函数bget:

    static struct buf*
    bget(uint dev, uint blockno)
    {
        struct buf* b;
        struct buf* t = 0;
        uint min_tick = ~0;
    
        acquire(&bcache.HT.locks[TSH(blockno)]);
        // Is the block already cached?
        for(b = bcache.HT.heads[TSH(blockno)].next; b != &bcache.HT.heads[TSH(blockno)]; b = b->next)
            if(b->dev == dev && b->blockno == blockno){
                b->refcnt++;
                release(&bcache.HT.locks[TSH(blockno)]);
                acquiresleep(&b->lock);
                return b;
            }
        release(&bcache.HT.locks[TSH(blockno)]);
    
        // Not cached.
        // Recycle the least recently used (LRU) unused buffer.
        acquire(&bcache.lock);
    
        acquire(&bcache.HT.locks[TSH(blockno)]);
        // check agein. Is the block already cached?
        for(b = bcache.HT.heads[TSH(blockno)].next; b != &bcache.HT.heads[TSH(blockno)]; b = b->next)
            if(b->dev == dev && b->blockno == blockno){
                b->refcnt++;
                release(&bcache.HT.locks[TSH(blockno)]);
                acquiresleep(&b->lock);
                return b;
            }
        release(&bcache.HT.locks[TSH(blockno)]);
    
        // get LRU buf
        for(int i = 0; i<NBUCKET; ++i) {
            acquire(&bcache.HT.locks[i]);
            for(b = bcache.HT.heads[i].next; b != &bcache.HT.heads[i]; b = b->next)
                if(!b->refcnt && b->tick < min_tick) {
                    min_tick = b->tick;
                    t = b;
                }
            release(&bcache.HT.locks[i]);
        }
    
        if(t) {
            // if the bucket not same, delete from old and insert new bucket
            // pay attention to the lock!
            if(TSH(t->blockno) != TSH(blockno)) {
                acquire(&bcache.HT.locks[TSH(t->blockno)]);
                t->next->prev = t->prev;
                t->prev->next = t->next;
                release(&bcache.HT.locks[TSH(t->blockno)]);
    
                acquire(&bcache.HT.locks[TSH(blockno)]);
                t->next = bcache.HT.heads[TSH(blockno)].next;
                t->prev = &bcache.HT.heads[TSH(blockno)];
                bcache.HT.heads[TSH(blockno)].next->prev = t;
                bcache.HT.heads[TSH(blockno)].next = t;
                release(&bcache.HT.locks[TSH(blockno)]);
            }
    
            t->dev = dev;
            t->blockno = blockno;
            t->valid = 0;
            t->refcnt = 1;
    
            release(&bcache.lock);
            acquiresleep(&t->lock);
            return t;
        }
    
        panic("bget: no buffers");
    }
    
  6. 修改函数brelse:

    void
    brelse(struct buf *b)
    {
        if(!holdingsleep(&b->lock))
            panic("brelse");
    
        releasesleep(&b->lock);
    
        acquire(&bcache.HT.locks[TSH(b->blockno)]);
        b->refcnt--;
        if (b->refcnt == 0)
            // no one is waiting for it.
            b->tick = ticks; // update tick
        
        release(&bcache.HT.locks[TSH(b->blockno)]);
    }
    
  7. 修改函数bpin、bunpin:

    void
    bpin(struct buf *b) {
        acquire(&bcache.HT.locks[TSH(b->blockno)]);
        b->refcnt++;
        release(&bcache.HT.locks[TSH(b->blockno)]);
    }
    
    void
    bunpin(struct buf *b) {
        acquire(&bcache.HT.locks[TSH(b->blockno)]);
        b->refcnt--;
        release(&bcache.HT.locks[TSH(b->blockno)]);
    }
    

结果

在这里插入图片描述

  • 0
    点赞
  • 2
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值